Skip to content

Commit e3eb3cb

Browse files
committed
see 05/02 log
1 parent ff141bf commit e3eb3cb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1516
-519
lines changed

README-CN.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -453,11 +453,11 @@ getMeasuredHeight: 获取测量视图高度
453453

454454
* ### Snackbar相关→[SnackbarUtils.java][snackbar.java][Demo][snackbar.demo]
455455
```
456-
showShortSnackbar : 显示短时snackbar
457-
showLongSnackbar : 显示长时snackbar
458-
showIndefiniteSnackbar: 显示自定义时长snackbar
459-
addView : 为SnackBar添加布局
460-
dismissSnackbar : 取消snackbar显示
456+
showShort : 显示短时snackbar
457+
showLong : 显示长时snackbar
458+
showIndefinite: 显示自定义时长snackbar
459+
addView : 为SnackBar添加布局
460+
dismiss : 取消snackbar显示
461461
```
462462

463463
* ### SpannableString相关→[SpannableStringUtils.java][spannable.java][Demo][spannable.demo]
@@ -580,12 +580,14 @@ getZodiac : 获取星座
580580

581581
* ### 吐司相关→[ToastUtils.java][toast.java][Demo][toast.demo]
582582
```
583-
init : 吐司初始化
584-
showShortToastSafe: 安全地显示短时吐司
585-
showLongToastSafe : 安全地显示长时吐司
586-
showShortToast : 显示短时吐司
587-
showLongToast : 显示长时吐司
588-
cancelToast : 取消吐司显示
583+
setGravity : 设置吐司位置
584+
setView : 设置吐司view
585+
getView : 获取吐司view
586+
showShortSafe: 安全地显示短时吐司
587+
showLongSafe : 安全地显示长时吐司
588+
showShort : 显示短时吐司
589+
showLong : 显示长时吐司
590+
cancel : 取消吐司显示
589591
```
590592

591593
* ### 压缩相关→[ZipUtils.java][zip.java][Test][zip.test]

README.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Android developers should collect the following utils
22

3-
[![auc][aucsvg]][auc] [![build][buildsvg]][build] [![api][apisvg]][api] [![License][licensesvg]][license]
3+
[![auc][aucsvg]][auc] [![api][apisvg]][api] [![License][licensesvg]][license]
44

55
## [README of Chinese][readme-cn.md]
66

@@ -453,11 +453,11 @@ getMeasuredHeight
453453

454454
* ### About Snackbar→[SnackbarUtils.java][snackbar.java][Demo][snackbar.demo]
455455
```
456-
showShortSnackbar
457-
showLongSnackbar
458-
showIndefiniteSnackbar
456+
showShort
457+
showLong
458+
showIndefinite
459459
addView
460-
dismissSnackbar
460+
dismiss
461461
```
462462

463463
* ### About SpannableString→[SpannableStringUtils.java][spannable.java][Demo][spannable.demo]
@@ -580,12 +580,14 @@ getZodiac
580580

581581
* ### About Toast→[ToastUtils.java][toast.java][Demo][toast.demo]
582582
```
583-
init
584-
showShortToastSafe
585-
showLongToastSafe
586-
showShortToast
587-
showLongToast
588-
cancelToast
583+
setGravity
584+
setView
585+
getView
586+
showShortSafe
587+
showLongSafe
588+
showShort
589+
showLong
590+
cancel
589591
```
590592

591593
* ### About Zip→[ZipUtils.java][zip.java][Test][zip.test]
@@ -640,9 +642,6 @@ Utils.init(context);
640642
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.4.1-blue.svg
641643
[auc]: https://github.com/Blankj/AndroidUtilCode
642644

643-
[buildsvg]: https://travis-ci.org/Blankj/AndroidUtilCode.svg?branch=master
644-
[build]: https://travis-ci.org/Blankj/AndroidUtilCode
645-
646645
[apisvg]: https://img.shields.io/badge/API-15+-blue.svg
647646
[api]: https://android-arsenal.com/api?level=15
648647

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ protected void onCreate(Bundle savedInstanceState) {
4343
btnCleanInternalFiles.setText(getFilesDir().getPath());
4444
btnCleanInternalDbs.setText(getFilesDir().getParent() + File.separator + "databases");
4545
btnCleanInternalSP.setText(getFilesDir().getParent() + File.separator + "shared_prefs");
46-
//noinspection ConstantConditions
47-
btnCleanExternalCache.setText(getExternalCacheDir().getPath());
46+
if (getExternalCacheDir() != null) {
47+
btnCleanExternalCache.setText(getExternalCacheDir().getPath());
48+
}
4849
}
4950

5051
@Override

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

Lines changed: 86 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import com.blankj.androidutilcode.R;
99
import com.blankj.utilcode.util.SnackbarUtils;
10+
import com.blankj.utilcode.util.SpannableStringUtils;
1011
import com.blankj.utilcode.util.ToastUtils;
1112

1213
/**
@@ -20,11 +21,22 @@
2021
public class SnackbarActivity extends Activity
2122
implements View.OnClickListener {
2223

24+
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;
30+
private final int TYPE_INDEFINITE_WITH_ACTION = 0x21;
31+
private final int TYPE_CUSTOM = 0x40;
32+
private final int TYPE_CUSTOM_WITH_ACTION = 0x41;
33+
2334
@Override
2435
protected void onCreate(Bundle savedInstanceState) {
2536
super.onCreate(savedInstanceState);
2637
setContentView(R.layout.activity_snackbar);
2738

39+
snackBarRootView = findViewById(android.R.id.content);
2840
findViewById(R.id.btn_short_snackbar).setOnClickListener(this);
2941
findViewById(R.id.btn_short_snackbar_with_action).setOnClickListener(this);
3042
findViewById(R.id.btn_long_snackbar).setOnClickListener(this);
@@ -38,62 +50,109 @@ protected void onCreate(Bundle savedInstanceState) {
3850

3951
@Override
4052
public void onClick(View view) {
41-
final View snackBarRootView = findViewById(android.R.id.content);
42-
4353
switch (view.getId()) {
4454
case R.id.btn_short_snackbar:
45-
SnackbarUtils.showShortSnackbar(snackBarRootView, "short snackbar", Color.YELLOW, Color.BLUE);
55+
showSnackbar(TYPE_SHORT);
4656
break;
4757
case R.id.btn_short_snackbar_with_action:
48-
SnackbarUtils.showShortSnackbar(snackBarRootView, "short snackbar", Color.YELLOW, Color.BLUE,
49-
"Short", Color.YELLOW, new View.OnClickListener() {
58+
showSnackbar(TYPE_SHORT_WITH_ACTION);
59+
break;
60+
case R.id.btn_long_snackbar:
61+
showSnackbar(TYPE_LONG);
62+
break;
63+
case R.id.btn_long_snackbar_with_action:
64+
showSnackbar(TYPE_SHORT_WITH_ACTION);
65+
break;
66+
case R.id.btn_indefinite_snackbar:
67+
showSnackbar(TYPE_INDEFINITE);
68+
break;
69+
case R.id.btn_indefinite_snackbar_with_action:
70+
showSnackbar(TYPE_INDEFINITE_WITH_ACTION);
71+
break;
72+
case R.id.btn_add_view:
73+
showSnackbar(TYPE_CUSTOM);
74+
break;
75+
case R.id.btn_add_view_with_action:
76+
showSnackbar(TYPE_CUSTOM_WITH_ACTION);
77+
break;
78+
case R.id.btn_cancel_snackbar:
79+
SnackbarUtils.dismiss();
80+
break;
81+
}
82+
}
83+
84+
private void showSnackbar(int type) {
85+
SpannableStringUtils.Builder builder = new SpannableStringUtils.Builder()
86+
.append("").setResourceId(R.drawable.ic_logo)
87+
.append("").setMargin(24);
88+
switch (type) {
89+
case TYPE_SHORT:
90+
SnackbarUtils.showShort(snackBarRootView,
91+
builder.append(getString(R.string.snackbar_short)).create(),
92+
Color.BLUE,
93+
Color.LTGRAY);
94+
break;
95+
case TYPE_SHORT_WITH_ACTION:
96+
SnackbarUtils.showShort(snackBarRootView, builder.append(getString(R.string.snackbar_short)).create(), Color.BLUE, Color.LTGRAY,
97+
"Short", Color.DKGRAY, new View.OnClickListener() {
5098
@Override
5199
public void onClick(View v) {
52-
ToastUtils.showShortToast("Click Short");
100+
ToastUtils.showShort(getString(R.string.snackbar_click));
53101
}
54102
});
55103
break;
56-
case R.id.btn_long_snackbar:
57-
SnackbarUtils.showLongSnackbar(snackBarRootView, "long snackbar", Color.YELLOW, Color.GREEN);
104+
case TYPE_LONG:
105+
SnackbarUtils.showShort(snackBarRootView,
106+
builder.append(getString(R.string.snackbar_long)).create(),
107+
Color.BLUE,
108+
Color.LTGRAY);
58109
break;
59-
case R.id.btn_long_snackbar_with_action:
60-
SnackbarUtils.showLongSnackbar(snackBarRootView, "long snackbar", Color.YELLOW, Color.GREEN,
61-
"Long", Color.YELLOW, new View.OnClickListener() {
110+
case TYPE_LONG_WITH_ACTION:
111+
SnackbarUtils.showShort(snackBarRootView, builder.append(getString(R.string.snackbar_long)).create(), Color.BLUE, Color.LTGRAY,
112+
"Short", Color.DKGRAY, new View.OnClickListener() {
62113
@Override
63114
public void onClick(View v) {
64-
ToastUtils.showLongToast("Click Long");
115+
ToastUtils.showShort(getString(R.string.snackbar_click));
65116
}
66117
});
67118
break;
68-
case R.id.btn_indefinite_snackbar:
69-
SnackbarUtils.showIndefiniteSnackbar(snackBarRootView, "Indefinite snackbar", Color.WHITE, Color.RED);
119+
case TYPE_INDEFINITE:
120+
SnackbarUtils.showShort(snackBarRootView,
121+
builder.append(getString(R.string.snackbar_indefinite)).create(),
122+
Color.BLUE,
123+
Color.LTGRAY);
70124
break;
71-
case R.id.btn_indefinite_snackbar_with_action:
72-
SnackbarUtils.showIndefiniteSnackbar(snackBarRootView, "Indefinite snackbar", Color.WHITE, Color.RED,
73-
"Indefinite", Color.YELLOW, new View.OnClickListener() {
125+
case TYPE_INDEFINITE_WITH_ACTION:
126+
SnackbarUtils.showShort(snackBarRootView, builder.append(getString(R.string.snackbar_indefinite)).create(), Color.BLUE, Color.LTGRAY,
127+
"Short", Color.DKGRAY, new View.OnClickListener() {
74128
@Override
75129
public void onClick(View v) {
76-
ToastUtils.showShortToast("Click Indefinite");
130+
ToastUtils.showShort(getString(R.string.snackbar_click));
77131
}
78132
});
79133
break;
80-
case R.id.btn_add_view:
81-
SnackbarUtils.showShortSnackbar(snackBarRootView, "short snackbar", Color.WHITE, Color.BLUE);
134+
case TYPE_CUSTOM:
135+
SnackbarUtils.showShort(snackBarRootView,
136+
"",
137+
Color.BLUE,
138+
Color.LTGRAY);
82139
SnackbarUtils.addView(R.layout.snackbar_add, 0);
83140
break;
84-
case R.id.btn_add_view_with_action:
85-
SnackbarUtils.showLongSnackbar(snackBarRootView, "short snackbar", Color.WHITE, Color.BLUE,
86-
"Short", Color.YELLOW, new View.OnClickListener() {
141+
case TYPE_CUSTOM_WITH_ACTION:
142+
SnackbarUtils.showShort(snackBarRootView,
143+
"",
144+
Color.BLUE,
145+
Color.LTGRAY,
146+
"Short",
147+
Color.DKGRAY, new View.OnClickListener() {
87148
@Override
88149
public void onClick(View v) {
89-
ToastUtils.showShortToast("Click Short");
150+
ToastUtils.showShort(getString(R.string.snackbar_click));
90151
}
91152
});
92153
SnackbarUtils.addView(R.layout.snackbar_add, 0);
93154
break;
94-
case R.id.btn_cancel_snackbar:
95-
SnackbarUtils.dismissSnackbar();
96-
break;
155+
97156
}
98157
}
99158
}

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

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* author: Blankj
2222
* blog : http://blankj.com
2323
* time : 2016/9/27
24-
* desc : SDCard工具类Demo
24+
* desc : Spannable工具类Demo
2525
* </pre>
2626
*/
2727
public class SpannableActivity extends Activity {
@@ -34,7 +34,7 @@ protected void onCreate(Bundle savedInstanceState) {
3434
ClickableSpan clickableSpan = new ClickableSpan() {
3535
@Override
3636
public void onClick(View widget) {
37-
ToastUtils.showShortToast("事件触发了");
37+
ToastUtils.showShort("事件触发了");
3838
}
3939

4040
@Override
@@ -76,18 +76,23 @@ public void updateDrawState(TextPaint ds) {
7676
.appendLine("测试居中对齐").setAlign(Layout.Alignment.ALIGN_CENTER)
7777
.appendLine("测试正常对齐").setAlign(Layout.Alignment.ALIGN_NORMAL)
7878
.append("测试小图对齐").setBackgroundColor(Color.LTGRAY)
79-
.append("image").setResourceId(R.drawable.shape_block_low, SpannableStringUtils.ALIGN_TOP)
80-
.append("image").setResourceId(R.drawable.shape_block_low, SpannableStringUtils.ALIGN_CENTER)
81-
.append("image").setResourceId(R.drawable.shape_block_low, SpannableStringUtils.ALIGN_BASELINE)
82-
.appendLine("image").setResourceId(R.drawable.shape_block_low, SpannableStringUtils.ALIGN_BOTTOM)
79+
.append("").setResourceId(R.drawable.shape_spannable_block_low, SpannableStringUtils.ALIGN_TOP)
80+
.append("").setResourceId(R.drawable.shape_spannable_block_low, SpannableStringUtils.ALIGN_CENTER)
81+
.append("").setResourceId(R.drawable.shape_spannable_block_low, SpannableStringUtils.ALIGN_BASELINE)
82+
.append("").setResourceId(R.drawable.shape_spannable_block_low, SpannableStringUtils.ALIGN_BOTTOM)
83+
.appendLine("end").setBackgroundColor(Color.LTGRAY)
8384
.append("测试顶部对齐").setBackgroundColor(Color.GREEN)
84-
.appendLine("image").setResourceId(R.drawable.shape_block_high, SpannableStringUtils.ALIGN_TOP)
85+
.append("image").setResourceId(R.drawable.shape_spannable_block_high, SpannableStringUtils.ALIGN_TOP)
86+
.appendLine("end").setBackgroundColor(Color.GREEN)
8587
.append("居中对齐").setBackgroundColor(Color.LTGRAY)
86-
.appendLine("image").setResourceId(R.drawable.shape_block_high, SpannableStringUtils.ALIGN_CENTER)
88+
.append("").setResourceId(R.drawable.shape_spannable_block_high, SpannableStringUtils.ALIGN_CENTER)
89+
.appendLine("end").setBackgroundColor(Color.LTGRAY)
8790
.append("Baseline对齐").setBackgroundColor(Color.GREEN)
88-
.appendLine("image").setResourceId(R.drawable.shape_block_high, SpannableStringUtils.ALIGN_BASELINE)
91+
.append("").setResourceId(R.drawable.shape_spannable_block_high, SpannableStringUtils.ALIGN_BASELINE)
92+
.appendLine("end").setBackgroundColor(Color.GREEN)
8993
.append("底部对齐").setBackgroundColor(Color.LTGRAY)
90-
.appendLine("image").setResourceId(R.drawable.shape_block_high, SpannableStringUtils.ALIGN_BOTTOM)
94+
.append("").setResourceId(R.drawable.shape_spannable_block_high, SpannableStringUtils.ALIGN_BOTTOM)
95+
.appendLine("end").setBackgroundColor(Color.LTGRAY)
9196
.append("测试")
9297
.appendLine("点击事件").setClickSpan(clickableSpan)
9398
.append("测试")

0 commit comments

Comments
 (0)