Skip to content

Commit bc35655

Browse files
BlankjBlankj
committed
see 06/20 log
1 parent 27fd2ed commit bc35655

File tree

12 files changed

+159
-70
lines changed

12 files changed

+159
-70
lines changed

‎README-CN.md

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@ setBgColor : 设置背景色
488488
setBgResource : 设置背景资源
489489
setDuration : 设置显示时长
490490
setAction : 设置行为
491+
setBottomMargin: 设置底边距
491492
show : 显示snackbar
492493
showSuccess : 显示预设成功的snackbar
493494
showWarning : 显示预设警告的snackbar
@@ -618,17 +619,21 @@ getZodiac : 获取星座
618619

619620
* ### 吐司相关→[ToastUtils.java][toast.java]→[Demo][toast.demo]
620621
```
621-
setGravity : 设置吐司位置
622-
setView : 设置吐司view
623-
getView : 获取吐司view
624-
setBackgroundColor : 设置背景颜色
625-
setBackgroundResource: 设置背景资源
626-
setMessageColor : 设置消息颜色
627-
showShortSafe : 安全地显示短时吐司
628-
showLongSafe : 安全地显示长时吐司
629-
showShort : 显示短时吐司
630-
showLong : 显示长时吐司
631-
cancel : 取消吐司显示
622+
setGravity : 设置吐司位置
623+
setView : 设置吐司view
624+
getView : 获取吐司view
625+
setBgColor : 设置背景颜色
626+
setBgResource : 设置背景资源
627+
setMessageColor : 设置消息颜色
628+
showShortSafe : 安全地显示短时吐司
629+
showLongSafe : 安全地显示长时吐司
630+
showShort : 显示短时吐司
631+
showLong : 显示长时吐司
632+
showCustomShortSafe: 安全地显示短时自定义吐司
633+
showCustomLongSafe : 安全地显示长时自定义吐司
634+
showCustomShort : 显示短时自定义吐司
635+
showCustomLong : 显示长时自定义吐司
636+
cancel : 取消吐司显示
632637
```
633638

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

‎README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@ setBgColor
488488
setBgResource
489489
setDuration
490490
setAction
491+
setBottomMargin
491492
show
492493
showSuccess
493494
showWarning
@@ -621,13 +622,17 @@ getZodiac
621622
setGravity
622623
setView
623624
getView
624-
setBackgroundColor
625-
setBackgroundResource
625+
setBgColor
626+
setBgResource
626627
setMessageColor
627628
showShortSafe
628629
showLongSafe
629630
showShort
630631
showLong
632+
showCustomShortSafe
633+
showCustomLongSafe
634+
showCustomShort
635+
showCustomLong
631636
cancel
632637
```
633638

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ public void appClick(View view) {
6060
startActivity(new Intent(this, AppActivity.class));
6161
}
6262

63+
public void barClick(View view) {
64+
startActivity(new Intent(this, BarActivity.class));
65+
}
66+
6367
public void cleanClick(View view) {
6468
startActivity(new Intent(this, CleanActivity.class));
6569
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ public void run() {
9393
.create());
9494
break;
9595
case R.id.btn_show_custom_view:
96-
ToastUtils.setView(R.layout.toast_custom);
97-
ToastUtils.showLong("");
96+
ToastUtils.showCustomLong(R.layout.toast_custom);
9897
break;
9998
case R.id.btn_show_middle:
10099
ToastUtils.setGravity(Gravity.CENTER, 0, 0);

‎app/src/main/res/layout/activity_main.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@
4040
android:onClick="appClick"
4141
android:text="@string/demo_app"/>
4242

43+
<Button
44+
style="@style/WideBtnStyle"
45+
android:layout_width="match_parent"
46+
android:layout_height="wrap_content"
47+
android:onClick="barClick"
48+
android:text="@string/demo_bar"/>
49+
4350
<Button
4451
style="@style/WideBtnStyle"
4552
android:layout_width="match_parent"

‎app/src/main/res/layout/snackbar_custom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_width="match_parent"
66
android:layout_height="wrap_content"
77
android:layout_gravity="center"
8-
android:background="@drawable/shape_round_rect"
8+
android:background="@drawable/shape_top_round_rect"
99
android:drawableLeft="@mipmap/ic_launcher"
1010
android:drawablePadding="@dimen/spacing_16"
1111
android:gravity="center_vertical"

‎app/src/main/res/values/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<string name="demo_activity">ActivityUtils Demo</string>
99
<string name="demo_app">AppUtils Demo</string>
10+
<string name="demo_bar">BarUtils Demo</string>
1011
<string name="demo_clean">CleanUtils Demo</string>
1112
<string name="demo_crash">CrashUtils Demo</string>
1213
<string name="demo_device">DeviceUtils Demo</string>
@@ -23,7 +24,7 @@
2324
<string name="demo_process">ProcessUtils Demo</string>
2425
<string name="demo_sdcard">SDCardUtils Demo</string>
2526
<string name="demo_snackbar">SnackbarUtils Demo</string>
26-
<string name="demo_spannable">SpannableStringUtils Demo</string>
27+
<string name="demo_spannable">SpanUtils Demo</string>
2728
<string name="demo_toast">ToastUtils Demo</string>
2829

2930
<!--Activity相关-->

‎update_log.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 17/06/20 优化ToastUtil，SnackbarUtils新增设置底边距
12
* 17/06/17 删除HandlerUtils
23
* 17/06/16 新增insight.io的bandage
34
* 17/06/14 发布1.7.1版本，LogUtils优化回退栈

‎utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import android.content.pm.ResolveInfo;
99
import android.os.Build;
1010
import android.os.Bundle;
11+
import android.support.annotation.AnimRes;
12+
import android.support.annotation.NonNull;
1113
import android.util.ArrayMap;
1214

1315
import java.lang.reflect.Field;
@@ -36,7 +38,7 @@ private ActivityUtils() {
3638
* @param className activity全路径类名
3739
* @return {@code true}: 是<br>{@code false}: 否
3840
*/
39-
public static boolean isActivityExists(String packageName, String className) {
41+
public static boolean isActivityExists(@NonNull final String packageName, @NonNull final String className) {
4042
Intent intent = new Intent();
4143
intent.setClassName(packageName, className);
4244
return !(Utils.getContext().getPackageManager().resolveActivity(intent, 0) == null ||
@@ -50,7 +52,7 @@ public static boolean isActivityExists(String packageName, String className) {
5052
* @param activity activity
5153
* @param cls activity类
5254
*/
53-
public static void startActivity(Activity activity, Class<?> cls) {
55+
public static void startActivity(@NonNull final Activity activity, @NonNull final Class<?> cls) {
5456
startActivity(activity, null, activity.getPackageName(), cls.getName(), null);
5557
}
5658

@@ -61,7 +63,7 @@ public static void startActivity(Activity activity, Class<?> cls) {
6163
* @param activity activity
6264
* @param cls activity类
6365
*/
64-
public static void startActivity(Bundle extras, Activity activity, Class<?> cls) {
66+
public static void startActivity(@NonNull final Bundle extras, @NonNull final Activity activity, @NonNull final Class<?> cls) {
6567
startActivity(activity, extras, activity.getPackageName(), cls.getName(), null);
6668
}
6769

@@ -73,7 +75,7 @@ public static void startActivity(Bundle extras, Activity activity, Class<?> cls)
7375
* @param enterAnim 入场动画
7476
* @param exitAnim 出场动画
7577
*/
76-
public static void startActivity(Activity activity, Class<?> cls, int enterAnim, int exitAnim) {
78+
public static void startActivity(@NonNull final Activity activity, @NonNull final Class<?> cls, @AnimRes final int enterAnim, @AnimRes final int exitAnim) {
7779
startActivity(activity, null, activity.getPackageName(), cls.getName(), null);
7880
activity.overridePendingTransition(enterAnim, exitAnim);
7981
}
@@ -87,7 +89,7 @@ public static void startActivity(Activity activity, Class<?> cls, int enterAnim,
8789
* @param enterAnim 入场动画
8890
* @param exitAnim 出场动画
8991
*/
90-
public static void startActivity(Bundle extras, Activity activity, Class<?> cls, int enterAnim, int exitAnim) {
92+
public static void startActivity(@NonNull final Bundle extras, @NonNull final Activity activity, @NonNull final Class<?> cls, @AnimRes final int enterAnim, @AnimRes final int exitAnim) {
9193
startActivity(activity, extras, activity.getPackageName(), cls.getName(), null);
9294
activity.overridePendingTransition(enterAnim, exitAnim);
9395
}
@@ -99,7 +101,7 @@ public static void startActivity(Bundle extras, Activity activity, Class<?> cls,
99101
* @param cls activity类
100102
* @param options 跳转动画
101103
*/
102-
public static void startActivity(Activity activity, Class<?> cls, Bundle options) {
104+
public static void startActivity(@NonNull final Activity activity, @NonNull final Class<?> cls, @NonNull final Bundle options) {
103105
startActivity(activity, null, activity.getPackageName(), cls.getName(), options);
104106
}
105107

@@ -111,7 +113,7 @@ public static void startActivity(Activity activity, Class<?> cls, Bundle options
111113
* @param cls activity类
112114
* @param options 跳转动画
113115
*/
114-
public static void startActivity(Bundle extras, Activity activity, Class<?> cls, Bundle options) {
116+
public static void startActivity(@NonNull final Bundle extras, @NonNull final Activity activity, Class<?> cls, @NonNull final Bundle options) {
115117
startActivity(activity, extras, activity.getPackageName(), cls.getName(), options);
116118
}
117119

@@ -121,7 +123,7 @@ public static void startActivity(Bundle extras, Activity activity, Class<?> cls,
121123
* @param pkg 包名
122124
* @param cls 全类名
123125
*/
124-
public static void startActivity(String pkg, String cls) {
126+
public static void startActivity(@NonNull final String pkg, @NonNull final String cls) {
125127
startActivity(Utils.getContext(), null, pkg, cls, null);
126128
}
127129

@@ -132,7 +134,7 @@ public static void startActivity(String pkg, String cls) {
132134
* @param pkg 包名
133135
* @param cls 全类名
134136
*/
135-
public static void startActivity(Bundle extras, String pkg, String cls) {
137+
public static void startActivity(@NonNull final Bundle extras, @NonNull final String pkg, @NonNull final String cls) {
136138
startActivity(Utils.getContext(), extras, pkg, cls, extras);
137139
}
138140

@@ -143,7 +145,7 @@ public static void startActivity(Bundle extras, String pkg, String cls) {
143145
* @param cls 全类名
144146
* @param options 动画
145147
*/
146-
public static void startActivity(String pkg, String cls, Bundle options) {
148+
public static void startActivity(@NonNull final String pkg, @NonNull final String cls, @NonNull final Bundle options) {
147149
startActivity(Utils.getContext(), null, pkg, cls, options);
148150
}
149151

@@ -155,7 +157,7 @@ public static void startActivity(String pkg, String cls, Bundle options) {
155157
* @param cls 全类名
156158
* @param options 动画
157159
*/
158-
public static void startActivity(Bundle extras, String pkg, String cls, Bundle options) {
160+
public static void startActivity(@NonNull final Bundle extras, @NonNull final String pkg, @NonNull final String cls, @NonNull final Bundle options) {
159161
startActivity(Utils.getContext(), extras, pkg, cls, options);
160162
}
161163

@@ -179,7 +181,7 @@ private static void startActivity(Context context, Bundle extras, String pkg, St
179181
* @param packageName 包名
180182
* @return launcher activity
181183
*/
182-
public static String getLauncherActivity(String packageName) {
184+
public static String getLauncherActivity(@NonNull final String packageName) {
183185
Intent intent = new Intent(Intent.ACTION_MAIN, null);
184186
intent.addCategory(Intent.CATEGORY_LAUNCHER);
185187
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

0 commit comments

Comments
 (0)