Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 968e844

Browse files
author
Blankj
committed
see 06/11 log
1 parent 44bd2ef commit 968e844

35 files changed

Lines changed: 2333 additions & 1388 deletions

‎README-CN.md‎

Lines changed: 47 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -492,37 +492,40 @@ addView : 为SnackBar添加布局
492492
dismiss : 取消snackbar显示
493493
```
494494

495-
* ### SpannableString相关→[SpannableStringUtils.java][spannable.java]→[Demo][spannable.demo]
496-
```
497-
Builder.setFlag : 设置标识
498-
Builder.setForegroundColor: 设置前景色
499-
Builder.setBackgroundColor: 设置背景色
500-
Builder.setQuoteColor : 设置引用线的颜色
501-
Builder.setLeadingMargin : 设置缩进
502-
Builder.setMargin : 设置间距
503-
Builder.setBullet : 设置列表标记
504-
Builder.setFontSize : 设置字体尺寸
505-
Builder.setFontProportion : 设置字体比例
506-
Builder.setFontXProportion: 设置字体横向比例
507-
Builder.setStrikethrough : 设置删除线
508-
Builder.setUnderline : 设置下划线
509-
Builder.setSuperscript : 设置上标
510-
Builder.setSubscript : 设置下标
511-
Builder.setBold : 设置粗体
512-
Builder.setItalic : 设置斜体
513-
Builder.setBoldItalic : 设置粗斜体
514-
Builder.setFontFamily : 设置字体系列
515-
Builder.setTypeface : 设置字体
516-
Builder.setAlign : 设置对齐
517-
Builder.setBitmap : 设置图片
518-
Builder.setDrawable : 设置图片
519-
Builder.setUri : 设置图片
520-
Builder.setResourceId : 设置图片
521-
Builder.setClickSpan : 设置点击事件
522-
Builder.setUrl : 设置超链接
523-
Builder.setBlur : 设置模糊
524-
Builder.append : 追加样式字符串
525-
Builder.create : 创建样式字符串
495+
* ### SpannableString相关→[SpanUtils.java][span.java]→[Demo][span.demo]
496+
```
497+
setFlag : 设置标识
498+
setForegroundColor: 设置前景色
499+
setBackgroundColor: 设置背景色
500+
setLineHeight : 设置行高
501+
setQuoteColor : 设置引用线的颜色
502+
setLeadingMargin : 设置缩进
503+
setBullet : 设置列表标记
504+
setIconMargin : 设置图标
505+
setFontSize : 设置字体尺寸
506+
setFontProportion : 设置字体比例
507+
setFontXProportion: 设置字体横向比例
508+
setStrikethrough : 设置删除线
509+
setUnderline : 设置下划线
510+
setSuperscript : 设置上标
511+
setSubscript : 设置下标
512+
setBold : 设置粗体
513+
setItalic : 设置斜体
514+
setBoldItalic : 设置粗斜体
515+
setFontFamily : 设置字体系列
516+
setTypeface : 设置字体
517+
setAlign : 设置对齐
518+
setClickSpan : 设置点击事件
519+
setUrl : 设置超链接
520+
setBlur : 设置模糊
521+
setShader : 设置着色器
522+
setShadow : 设置阴影
523+
setSpans : 设置样式
524+
append : 追加样式字符串
525+
appendLine : 追加一行样式字符串
526+
appendImage : 追加图片
527+
appendSpace : 追加空白
528+
create : 创建样式字符串
526529
```
527530

528531
* ### SP相关→[SPUtils.java][sp.java]→[Test][sp.test]
@@ -610,14 +613,17 @@ getZodiac : 获取星座
610613

611614
* ### 吐司相关→[ToastUtils.java][toast.java]→[Demo][toast.demo]
612615
```
613-
setGravity : 设置吐司位置
614-
setView : 设置吐司view
615-
getView : 获取吐司view
616-
showShortSafe: 安全地显示短时吐司
617-
showLongSafe : 安全地显示长时吐司
618-
showShort : 显示短时吐司
619-
showLong : 显示长时吐司
620-
cancel : 取消吐司显示
616+
setGravity : 设置吐司位置
617+
setView : 设置吐司view
618+
getView : 获取吐司view
619+
setBackgroundColor : 设置背景颜色
620+
setBackgroundResource: 设置背景资源
621+
setMessageColor : 设置消息颜色
622+
showShortSafe : 安全地显示短时吐司
623+
showLongSafe : 安全地显示长时吐司
624+
showShort : 显示短时吐司
625+
showLong : 显示长时吐司
626+
cancel : 取消吐司显示
621627
```
622628

623629
* ### 压缩相关→[ZipUtils.java][zip.java]→[Test][zip.test]
@@ -789,8 +795,8 @@ Utils.init(context);
789795
[snackbar.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java
790796
[snackbar.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SnackbarActivity.java
791797

792-
[spannable.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SpannableStringUtils.java
793-
[spannable.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SpannableActivity.java
798+
[span.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SpanUtils.java
799+
[span.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SpanActivity.java
794800

795801
[sp.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SPUtils.java
796802
[sp.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/SPUtilsTest.java

‎README.md‎

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -492,37 +492,40 @@ addView
492492
dismiss
493493
```
494494

495-
* ### About SpannableString→[SpannableStringUtils.java][spannable.java]→[Demo][spannable.demo]
496-
```
497-
Builder.setFlag
498-
Builder.setForegroundColor
499-
Builder.setBackgroundColor
500-
Builder.setQuoteColor
501-
Builder.setLeadingMargin
502-
Builder.setMargin
503-
Builder.setBullet
504-
Builder.setFontSize
505-
Builder.setFontProportion
506-
Builder.setFontXProportion
507-
Builder.setStrikethrough
508-
Builder.setUnderline
509-
Builder.setSuperscript
510-
Builder.setSubscript
511-
Builder.setBold
512-
Builder.setItalic
513-
Builder.setBoldItalic
514-
Builder.setFontFamily
515-
Builder.setTypeface
516-
Builder.setAlign
517-
Builder.setBitmap
518-
Builder.setDrawable
519-
Builder.setUri
520-
Builder.setResourceId
521-
Builder.setClickSpan
522-
Builder.setUrl
523-
Builder.setBlur
524-
Builder.append
525-
Builder.create
495+
* ### About Span→[SpanUtils.java][span.java]→[Demo][span.demo]
496+
```
497+
setFlag
498+
setForegroundColor
499+
setBackgroundColor
500+
setLineHeight
501+
setQuoteColor
502+
setLeadingMargin
503+
setBullet
504+
setIconMargin
505+
setFontSize
506+
setFontProportion
507+
setFontXProportion
508+
setStrikethrough
509+
setUnderline
510+
setSuperscript
511+
setSubscript
512+
setBold
513+
setItalic
514+
setBoldItalic
515+
setFontFamily
516+
setTypeface
517+
setAlign
518+
setClickSpan
519+
setUrl
520+
setBlur
521+
setShader
522+
setShadow
523+
setSpans
524+
append
525+
appendLine
526+
appendImage
527+
appendSpace
528+
create
526529
```
527530

528531
* ### About SP→[SPUtils.java][sp.java]→[Test][sp.test]
@@ -613,6 +616,9 @@ getZodiac
613616
setGravity
614617
setView
615618
getView
619+
setBackgroundColor
620+
setBackgroundResource
621+
setMessageColor
616622
showShortSafe
617623
showLongSafe
618624
showShort
@@ -789,8 +795,8 @@ Utils.init(context);
789795
[snackbar.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java
790796
[snackbar.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SnackbarActivity.java
791797

792-
[spannable.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SpannableStringUtils.java
793-
[spannable.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SpannableActivity.java
798+
[span.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SpanUtils.java
799+
[span.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SpanActivity.java
794800

795801
[sp.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SPUtils.java
796802
[sp.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/SPUtilsTest.java

‎app/build.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ File signPropertiesFile = rootProject.file('sign/keystore.properties')
44

55
android {
66
compileSdkVersion 25
7-
buildToolsVersion "25.0.2"
7+
buildToolsVersion "25.0.3"
88

99
defaultConfig {
1010
applicationId "com.blankj.androidutilcode"
1111
minSdkVersion 15
1212
targetSdkVersion 16
13-
versionCode 36
14-
versionName "1.6.4"
13+
versionCode 40
14+
versionName "1.7.0"
1515
}
1616

1717
if (signPropertiesFile.exists()) {
@@ -29,7 +29,6 @@ android {
2929

3030
buildTypes {
3131
debug {
32-
minifyEnabled false
3332
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3433
}
3534
release {

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,8 @@
7575
<activity android:name=".activity.ProcessActivity"/>
7676
<activity android:name=".activity.SDCardActivity"/>
7777
<activity android:name=".activity.SnackbarActivity"/>
78-
<activity android:name=".activity.SpannableActivity"/>
78+
<activity android:name=".activity.SpanActivity"/>
7979
<activity android:name=".activity.ToastActivity"/>
80-
<activity android:name=".activity.CacheActivity"/>
8180

8281
<service android:name=".service.LocationService"/>
8382

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.blankj.androidutilcode.R;
1010
import com.blankj.androidutilcode.base.BaseActivity;
1111
import com.blankj.utilcode.util.AppUtils;
12-
import com.blankj.utilcode.util.SpannableStringUtils;
12+
import com.blankj.utilcode.util.SpanUtils;
1313
import com.blankj.utilcode.util.ToastUtils;
1414

1515
/**
@@ -42,14 +42,15 @@ public void initView(Bundle savedInstanceState, View view) {
4242
findViewById(R.id.btn_launch_app).setOnClickListener(this);
4343
findViewById(R.id.btn_get_app_details_settings).setOnClickListener(this);
4444
TextView tvAboutApp = (TextView) findViewById(R.id.tv_about_app);
45-
tvAboutApp.setText(new SpannableStringUtils.Builder().append("app icon: ")
46-
.appendLine("").setDrawable(AppUtils.getAppIcon(), SpannableStringUtils.ALIGN_CENTER)
47-
.append(AppUtils.getAppInfo().toString())
48-
.appendLine("isAppRoot: " + AppUtils.isAppRoot())
49-
.appendLine("isAppDebug: " + AppUtils.isAppDebug())
50-
.appendLine("AppSignatureSHA1: " + AppUtils.getAppSignatureSHA1())
51-
.appendLine("isAppForeground: " + AppUtils.isAppForeground())
52-
.create());
45+
tvAboutApp.setText(
46+
new SpanUtils()
47+
.append("app icon: ").appendImage(AppUtils.getAppIcon(), SpanUtils.ALIGN_CENTER)
48+
.appendLine(AppUtils.getAppInfo().toString())
49+
.appendLine("isAppRoot: " + AppUtils.isAppRoot())
50+
.appendLine("isAppDebug: " + AppUtils.isAppDebug())
51+
.appendLine("AppSignatureSHA1: " + AppUtils.getAppSignatureSHA1())
52+
.appendLine("isAppForeground: " + AppUtils.isAppForeground())
53+
.create());
5354
}
5455

5556
@Override

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public void initView(Bundle savedInstanceState, View view) {
5050
ImageView ivAddImageWatermark = (ImageView) findViewById(R.id.iv_add_image_watermark);
5151
ImageView ivGray = (ImageView) findViewById(R.id.iv_gray);
5252

53-
Bitmap src = ImageUtils.getBitmap(getResources(), R.drawable.lena);
54-
Bitmap watermark = ImageUtils.getBitmap(getResources(), R.mipmap.ic_launcher);
53+
Bitmap src = ImageUtils.getBitmap(R.drawable.lena);
54+
Bitmap watermark = ImageUtils.getBitmap(R.mipmap.ic_launcher);
5555

5656
SizeUtils.forceGetViewSize(ivSrc, new SizeUtils.onGetSizeListener() {
5757
@Override
@@ -63,7 +63,7 @@ public void onGetSize(View view) {
6363
ivRoundCorner.setImageBitmap(ImageUtils.toRoundCorner(src, 60));
6464
ivFastBlur.setImageBitmap(ImageUtils.fastBlur(src, 0.1f, 5));
6565
ivRenderScriptBlur.setImageBitmap(ImageUtils.renderScriptBlur(src, 10));
66-
src = ImageUtils.getBitmap(getResources(), R.drawable.lena);
66+
src = ImageUtils.getBitmap(R.drawable.lena);
6767
ivStackBlur.setImageBitmap(ImageUtils.stackBlur(src, 10, false));
6868
ivAddFrame.setImageBitmap(ImageUtils.addFrame(src, 16, Color.GREEN));
6969
ivAddReflection.setImageBitmap(ImageUtils.addReflection(src, 80));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void snackbarClick(View view) {
129129
}
130130

131131
public void spannableClick(View view) {
132-
startActivity(new Intent(this, SpannableActivity.class));
132+
startActivity(new Intent(this, SpanActivity.class));
133133
}
134134

135135
public void toastClick(View view) {

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.blankj.androidutilcode.R;
99
import com.blankj.androidutilcode.base.BaseActivity;
1010
import com.blankj.utilcode.util.SnackbarUtils;
11-
import com.blankj.utilcode.util.SpannableStringUtils;
11+
import com.blankj.utilcode.util.SpanUtils;
1212
import com.blankj.utilcode.util.ToastUtils;
1313

1414
/**
@@ -22,14 +22,14 @@
2222
public class SnackbarActivity extends BaseActivity {
2323

2424
private View snackBarRootView;
25-
private final int TYPE_SHORT = 0x00;
26-
private final int TYPE_SHORT_WITH_ACTION = 0x01;
27-
private final int TYPE_LONG = 0x10;
28-
private final int TYPE_LONG_WITH_ACTION = 0x11;
29-
private final int TYPE_INDEFINITE = 0x20;
25+
private final int TYPE_SHORT = 0x00;
26+
private final int TYPE_SHORT_WITH_ACTION = 0x01;
27+
private final int TYPE_LONG = 0x10;
28+
private final int TYPE_LONG_WITH_ACTION = 0x11;
29+
private final int TYPE_INDEFINITE = 0x20;
3030
private final int TYPE_INDEFINITE_WITH_ACTION = 0x21;
31-
private final int TYPE_CUSTOM = 0x40;
32-
private final int TYPE_CUSTOM_WITH_ACTION = 0x41;
31+
private final int TYPE_CUSTOM = 0x40;
32+
private final int TYPE_CUSTOM_WITH_ACTION = 0x41;
3333

3434
@Override
3535
public void initData(Bundle bundle) {
@@ -94,9 +94,9 @@ public void onWidgetClick(View view) {
9494
}
9595

9696
private void showSnackbar(int type) {
97-
SpannableStringUtils.Builder builder = new SpannableStringUtils.Builder()
98-
.append("").setResourceId(R.mipmap.ic_launcher)
99-
.append("").setMargin(24);
97+
SpanUtils builder = new SpanUtils()
98+
.append("").appendImage(R.mipmap.ic_launcher, SpanUtils.ALIGN_CENTER)
99+
.append("").appendSpace(100);
100100
switch (type) {
101101
case TYPE_SHORT:
102102
SnackbarUtils.showShort(snackBarRootView,
@@ -147,8 +147,8 @@ public void onClick(View v) {
147147
SnackbarUtils.showShort(snackBarRootView,
148148
"",
149149
Color.BLUE,
150-
Color.LTGRAY);
151-
SnackbarUtils.addView(R.layout.snackbar_add, 0);
150+
Color.TRANSPARENT);
151+
SnackbarUtils.addView(R.layout.snackbar_custom, 1);
152152
break;
153153
case TYPE_CUSTOM_WITH_ACTION:
154154
SnackbarUtils.showShort(snackBarRootView,
@@ -162,7 +162,7 @@ public void onClick(View v) {
162162
ToastUtils.showShort(getString(R.string.snackbar_click));
163163
}
164164
});
165-
SnackbarUtils.addView(R.layout.snackbar_add, 0);
165+
SnackbarUtils.addView(R.layout.snackbar_custom, 0);
166166
break;
167167

168168
}

0 commit comments

Comments
 (0)