see 06/11 log

Author: Blankj

README-CN.md

@@ -492,37 +492,40 @@ addView       : 为SnackBar添加布局
 dismiss       : 取消snackbar显示
 ```
 
-* ### SpannableString相关→[SpannableStringUtils.java][spannable.java]→[Demo][spannable.demo]
-```
-Builder.setFlag           : 设置标识
-Builder.setForegroundColor: 设置前景色
-Builder.setBackgroundColor: 设置背景色
-Builder.setQuoteColor     : 设置引用线的颜色
-Builder.setLeadingMargin  : 设置缩进
-Builder.setMargin         : 设置间距
-Builder.setBullet         : 设置列表标记
-Builder.setFontSize       : 设置字体尺寸
-Builder.setFontProportion : 设置字体比例
-Builder.setFontXProportion: 设置字体横向比例
-Builder.setStrikethrough  : 设置删除线
-Builder.setUnderline      : 设置下划线
-Builder.setSuperscript    : 设置上标
-Builder.setSubscript      : 设置下标
-Builder.setBold           : 设置粗体
-Builder.setItalic         : 设置斜体
-Builder.setBoldItalic     : 设置粗斜体
-Builder.setFontFamily     : 设置字体系列
-Builder.setTypeface       : 设置字体
-Builder.setAlign          : 设置对齐
-Builder.setBitmap         : 设置图片
-Builder.setDrawable       : 设置图片
-Builder.setUri            : 设置图片
-Builder.setResourceId     : 设置图片
-Builder.setClickSpan      : 设置点击事件
-Builder.setUrl            : 设置超链接
-Builder.setBlur           : 设置模糊
-Builder.append            : 追加样式字符串
-Builder.create            : 创建样式字符串
+* ### SpannableString相关→[SpanUtils.java][span.java]→[Demo][span.demo]
+```
+setFlag           : 设置标识
+setForegroundColor: 设置前景色
+setBackgroundColor: 设置背景色
+setLineHeight     : 设置行高
+setQuoteColor     : 设置引用线的颜色
+setLeadingMargin  : 设置缩进
+setBullet         : 设置列表标记
+setIconMargin     : 设置图标
+setFontSize       : 设置字体尺寸
+setFontProportion : 设置字体比例
+setFontXProportion: 设置字体横向比例
+setStrikethrough  : 设置删除线
+setUnderline      : 设置下划线
+setSuperscript    : 设置上标
+setSubscript      : 设置下标
+setBold           : 设置粗体
+setItalic         : 设置斜体
+setBoldItalic     : 设置粗斜体
+setFontFamily     : 设置字体系列
+setTypeface       : 设置字体
+setAlign          : 设置对齐
+setClickSpan      : 设置点击事件
+setUrl            : 设置超链接
+setBlur           : 设置模糊
+setShader         : 设置着色器
+setShadow         : 设置阴影
+setSpans          : 设置样式
+append            : 追加样式字符串
+appendLine        : 追加一行样式字符串
+appendImage       : 追加图片
+appendSpace       : 追加空白
+create            : 创建样式字符串
 ```
 
 * ### SP相关→[SPUtils.java][sp.java]→[Test][sp.test]
@@ -610,14 +613,17 @@ getZodiac               : 获取星座
 
 * ### 吐司相关→[ToastUtils.java][toast.java]→[Demo][toast.demo]
 ```
-setGravity   : 设置吐司位置
-setView      : 设置吐司view
-getView      : 获取吐司view
-showShortSafe: 安全地显示短时吐司
-showLongSafe : 安全地显示长时吐司
-showShort    : 显示短时吐司
-showLong     : 显示长时吐司
-cancel       : 取消吐司显示
+setGravity           : 设置吐司位置
+setView              : 设置吐司view
+getView              : 获取吐司view
+setBackgroundColor   : 设置背景颜色
+setBackgroundResource: 设置背景资源
+setMessageColor      : 设置消息颜色
+showShortSafe        : 安全地显示短时吐司
+showLongSafe         : 安全地显示长时吐司
+showShort            : 显示短时吐司
+showLong             : 显示长时吐司
+cancel               : 取消吐司显示
 ```
 
 * ### 压缩相关→[ZipUtils.java][zip.java]→[Test][zip.test]
@@ -789,8 +795,8 @@ Utils.init(context);
 [snackbar.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java
 [snackbar.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SnackbarActivity.java
 
-[spannable.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SpannableStringUtils.java
-[spannable.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SpannableActivity.java
+[span.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SpanUtils.java
+[span.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SpanActivity.java
 
 [sp.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SPUtils.java
 [sp.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/SPUtilsTest.java

README.md

@@ -492,37 +492,40 @@ addView
 dismiss
 ```
 
-* ### About SpannableString→[SpannableStringUtils.java][spannable.java]→[Demo][spannable.demo]
-```
-Builder.setFlag
-Builder.setForegroundColor
-Builder.setBackgroundColor
-Builder.setQuoteColor
-Builder.setLeadingMargin
-Builder.setMargin
-Builder.setBullet
-Builder.setFontSize
-Builder.setFontProportion
-Builder.setFontXProportion
-Builder.setStrikethrough
-Builder.setUnderline
-Builder.setSuperscript
-Builder.setSubscript
-Builder.setBold
-Builder.setItalic
-Builder.setBoldItalic
-Builder.setFontFamily
-Builder.setTypeface
-Builder.setAlign
-Builder.setBitmap
-Builder.setDrawable
-Builder.setUri
-Builder.setResourceId
-Builder.setClickSpan
-Builder.setUrl
-Builder.setBlur
-Builder.append
-Builder.create
+* ### About Span→[SpanUtils.java][span.java]→[Demo][span.demo]
+```
+setFlag
+setForegroundColor
+setBackgroundColor
+setLineHeight
+setQuoteColor
+setLeadingMargin
+setBullet
+setIconMargin
+setFontSize
+setFontProportion
+setFontXProportion
+setStrikethrough
+setUnderline
+setSuperscript
+setSubscript
+setBold
+setItalic
+setBoldItalic
+setFontFamily
+setTypeface
+setAlign
+setClickSpan
+setUrl
+setBlur
+setShader
+setShadow
+setSpans
+append
+appendLine
+appendImage
+appendSpace
+create
 ```
 
 * ### About SP→[SPUtils.java][sp.java]→[Test][sp.test]
@@ -613,6 +616,9 @@ getZodiac
 setGravity
 setView
 getView
+setBackgroundColor
+setBackgroundResource
+setMessageColor
 showShortSafe
 showLongSafe
 showShort
@@ -789,8 +795,8 @@ Utils.init(context);
 [snackbar.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java
 [snackbar.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SnackbarActivity.java
 
-[spannable.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SpannableStringUtils.java
-[spannable.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SpannableActivity.java
+[span.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SpanUtils.java
+[span.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SpanActivity.java
 
 [sp.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SPUtils.java
 [sp.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/SPUtilsTest.java

app/build.gradle

@@ -4,14 +4,14 @@ File signPropertiesFile = rootProject.file('sign/keystore.properties')
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.blankj.androidutilcode"
         minSdkVersion 15
         targetSdkVersion 16
-        versionCode 36
-        versionName "1.6.4"
+        versionCode 40
+        versionName "1.7.0"
     }
 
     if (signPropertiesFile.exists()) {
@@ -29,7 +29,6 @@ android {
 
     buildTypes {
         debug {
-            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {

app/src/main/AndroidManifest.xml

@@ -75,9 +75,8 @@
         <activity android:name=".activity.ProcessActivity"/>
         <activity android:name=".activity.SDCardActivity"/>
         <activity android:name=".activity.SnackbarActivity"/>
-        <activity android:name=".activity.SpannableActivity"/>
+        <activity android:name=".activity.SpanActivity"/>
         <activity android:name=".activity.ToastActivity"/>
-        <activity android:name=".activity.CacheActivity"/>
 
         <service android:name=".service.LocationService"/>
 

app/src/main/java/com/blankj/androidutilcode/activity/AppActivity.java

@@ -9,7 +9,7 @@
 import com.blankj.androidutilcode.R;
 import com.blankj.androidutilcode.base.BaseActivity;
 import com.blankj.utilcode.util.AppUtils;
-import com.blankj.utilcode.util.SpannableStringUtils;
+import com.blankj.utilcode.util.SpanUtils;
 import com.blankj.utilcode.util.ToastUtils;
 
 /**
@@ -42,14 +42,15 @@ public void initView(Bundle savedInstanceState, View view) {
         findViewById(R.id.btn_launch_app).setOnClickListener(this);
         findViewById(R.id.btn_get_app_details_settings).setOnClickListener(this);
         TextView tvAboutApp = (TextView) findViewById(R.id.tv_about_app);
-        tvAboutApp.setText(new SpannableStringUtils.Builder().append("app icon: ")
-                .appendLine("").setDrawable(AppUtils.getAppIcon(), SpannableStringUtils.ALIGN_CENTER)
-                .append(AppUtils.getAppInfo().toString())
-                .appendLine("isAppRoot: " + AppUtils.isAppRoot())
-                .appendLine("isAppDebug: " + AppUtils.isAppDebug())
-                .appendLine("AppSignatureSHA1: " + AppUtils.getAppSignatureSHA1())
-                .appendLine("isAppForeground: " + AppUtils.isAppForeground())
-                .create());
+        tvAboutApp.setText(
+                new SpanUtils()
+                        .append("app icon: ").appendImage(AppUtils.getAppIcon(), SpanUtils.ALIGN_CENTER)
+                        .appendLine(AppUtils.getAppInfo().toString())
+                        .appendLine("isAppRoot: " + AppUtils.isAppRoot())
+                        .appendLine("isAppDebug: " + AppUtils.isAppDebug())
+                        .appendLine("AppSignatureSHA1: " + AppUtils.getAppSignatureSHA1())
+                        .appendLine("isAppForeground: " + AppUtils.isAppForeground())
+                        .create());
     }
 
     @Override

app/src/main/java/com/blankj/androidutilcode/activity/ImageActivity.java

@@ -50,8 +50,8 @@ public void initView(Bundle savedInstanceState, View view) {
         ImageView ivAddImageWatermark = (ImageView) findViewById(R.id.iv_add_image_watermark);
         ImageView ivGray = (ImageView) findViewById(R.id.iv_gray);
 
-        Bitmap src = ImageUtils.getBitmap(getResources(), R.drawable.lena);
-        Bitmap watermark = ImageUtils.getBitmap(getResources(), R.mipmap.ic_launcher);
+        Bitmap src = ImageUtils.getBitmap(R.drawable.lena);
+        Bitmap watermark = ImageUtils.getBitmap(R.mipmap.ic_launcher);
 
         SizeUtils.forceGetViewSize(ivSrc, new SizeUtils.onGetSizeListener() {
             @Override
@@ -63,7 +63,7 @@ public void onGetSize(View view) {
         ivRoundCorner.setImageBitmap(ImageUtils.toRoundCorner(src, 60));
         ivFastBlur.setImageBitmap(ImageUtils.fastBlur(src, 0.1f, 5));
         ivRenderScriptBlur.setImageBitmap(ImageUtils.renderScriptBlur(src, 10));
-        src = ImageUtils.getBitmap(getResources(), R.drawable.lena);
+        src = ImageUtils.getBitmap(R.drawable.lena);
         ivStackBlur.setImageBitmap(ImageUtils.stackBlur(src, 10, false));
         ivAddFrame.setImageBitmap(ImageUtils.addFrame(src, 16, Color.GREEN));
         ivAddReflection.setImageBitmap(ImageUtils.addReflection(src, 80));

app/src/main/java/com/blankj/androidutilcode/activity/MainActivity.java

@@ -129,7 +129,7 @@ public void snackbarClick(View view) {
     }
 
     public void spannableClick(View view) {
-        startActivity(new Intent(this, SpannableActivity.class));
+        startActivity(new Intent(this, SpanActivity.class));
     }
 
     public void toastClick(View view) {

app/src/main/java/com/blankj/androidutilcode/activity/SnackbarActivity.java

@@ -8,7 +8,7 @@
 import com.blankj.androidutilcode.R;
 import com.blankj.androidutilcode.base.BaseActivity;
 import com.blankj.utilcode.util.SnackbarUtils;
-import com.blankj.utilcode.util.SpannableStringUtils;
+import com.blankj.utilcode.util.SpanUtils;
 import com.blankj.utilcode.util.ToastUtils;
 
 /**
@@ -22,14 +22,14 @@
 public class SnackbarActivity extends BaseActivity {
 
     private View snackBarRootView;
-    private final int TYPE_SHORT = 0x00;
-    private final int TYPE_SHORT_WITH_ACTION = 0x01;
-    private final int TYPE_LONG = 0x10;
-    private final int TYPE_LONG_WITH_ACTION = 0x11;
-    private final int TYPE_INDEFINITE = 0x20;
+    private final int TYPE_SHORT                  = 0x00;
+    private final int TYPE_SHORT_WITH_ACTION      = 0x01;
+    private final int TYPE_LONG                   = 0x10;
+    private final int TYPE_LONG_WITH_ACTION       = 0x11;
+    private final int TYPE_INDEFINITE             = 0x20;
     private final int TYPE_INDEFINITE_WITH_ACTION = 0x21;
-    private final int TYPE_CUSTOM = 0x40;
-    private final int TYPE_CUSTOM_WITH_ACTION = 0x41;
+    private final int TYPE_CUSTOM                 = 0x40;
+    private final int TYPE_CUSTOM_WITH_ACTION     = 0x41;
 
     @Override
     public void initData(Bundle bundle) {
@@ -94,9 +94,9 @@ public void onWidgetClick(View view) {
     }
 
     private void showSnackbar(int type) {
-        SpannableStringUtils.Builder builder = new SpannableStringUtils.Builder()
-                .append("").setResourceId(R.mipmap.ic_launcher)
-                .append("").setMargin(24);
+        SpanUtils builder = new SpanUtils()
+                .append("").appendImage(R.mipmap.ic_launcher, SpanUtils.ALIGN_CENTER)
+                .append("").appendSpace(100);
         switch (type) {
             case TYPE_SHORT:
                 SnackbarUtils.showShort(snackBarRootView,
@@ -147,8 +147,8 @@ public void onClick(View v) {
                 SnackbarUtils.showShort(snackBarRootView,
                         "",
                         Color.BLUE,
-                        Color.LTGRAY);
-                SnackbarUtils.addView(R.layout.snackbar_add, 0);
+                        Color.TRANSPARENT);
+                SnackbarUtils.addView(R.layout.snackbar_custom, 1);
                 break;
             case TYPE_CUSTOM_WITH_ACTION:
                 SnackbarUtils.showShort(snackBarRootView,
@@ -162,7 +162,7 @@ public void onClick(View v) {
                                 ToastUtils.showShort(getString(R.string.snackbar_click));
                             }
                         });
-                SnackbarUtils.addView(R.layout.snackbar_add, 0);
+                SnackbarUtils.addView(R.layout.snackbar_custom, 0);
                 break;
 
         }