Skip to content

Commit f63ca15

Browse files
author
cmj
committed
see 10/31 log
1 parent 3a70360 commit f63ca15

5 files changed

Lines changed: 18 additions & 14 deletions

File tree

‎utilcode/src/main/java/com/blankj/utilcode/utils/BarUtils.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public StatusBarView(Context context) {
4949
* @param activity 需要设置的 activity
5050
* @param color 状态栏颜色值
5151
*/
52-
public static void setColor(Activity activity, @ColorInt int color) {
52+
public static void setColor(Activity activity, int color) {
5353
setColor(activity, color, DEFAULT_STATUS_BAR_ALPHA);
5454
}
5555

@@ -61,7 +61,7 @@ public static void setColor(Activity activity, @ColorInt int color) {
6161
* @param statusBarAlpha 状态栏透明度
6262
*/
6363

64-
public static void setColor(Activity activity, @ColorInt int color, int statusBarAlpha) {
64+
public static void setColor(Activity activity, int color, int statusBarAlpha) {
6565
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
6666
activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
6767
activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
@@ -86,7 +86,7 @@ public static void setColor(Activity activity, @ColorInt int color, int statusBa
8686
* @param activity 需要设置的activity
8787
* @param color 状态栏颜色值
8888
*/
89-
public static void setColorForSwipeBack(Activity activity, @ColorInt int color) {
89+
public static void setColorForSwipeBack(Activity activity, int color) {
9090
setColorForSwipeBack(activity, color, DEFAULT_STATUS_BAR_ALPHA);
9191
}
9292

@@ -97,7 +97,7 @@ public static void setColorForSwipeBack(Activity activity, @ColorInt int color)
9797
* @param color 状态栏颜色值
9898
* @param statusBarAlpha 状态栏透明度
9999
*/
100-
public static void setColorForSwipeBack(Activity activity, @ColorInt int color, int statusBarAlpha) {
100+
public static void setColorForSwipeBack(Activity activity, int color, int statusBarAlpha) {
101101
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
102102
ViewGroup contentView = ((ViewGroup) activity.findViewById(android.R.id.content));
103103
contentView.setPadding(0, getStatusBarHeight(activity), 0, 0);
@@ -112,7 +112,7 @@ public static void setColorForSwipeBack(Activity activity, @ColorInt int color,
112112
* @param activity 需要设置的 activity
113113
* @param color 状态栏颜色值
114114
*/
115-
public static void setColorNoTranslucent(Activity activity, @ColorInt int color) {
115+
public static void setColorNoTranslucent(Activity activity, int color) {
116116
setColor(activity, color, 0);
117117
}
118118

@@ -123,7 +123,7 @@ public static void setColorNoTranslucent(Activity activity, @ColorInt int color)
123123
* @param color 状态栏颜色值
124124
*/
125125
@Deprecated
126-
public static void setColorDiff(Activity activity, @ColorInt int color) {
126+
public static void setColorDiff(Activity activity, int color) {
127127
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
128128
return;
129129
}
@@ -219,7 +219,7 @@ public static void setTranslucentDiff(Activity activity) {
219219
* @param drawerLayout DrawerLayout
220220
* @param color 状态栏颜色值
221221
*/
222-
public static void setColorForDrawerLayout(Activity activity, DrawerLayout drawerLayout, @ColorInt int color) {
222+
public static void setColorForDrawerLayout(Activity activity, DrawerLayout drawerLayout, int color) {
223223
setColorForDrawerLayout(activity, drawerLayout, color, DEFAULT_STATUS_BAR_ALPHA);
224224
}
225225

@@ -230,7 +230,7 @@ public static void setColorForDrawerLayout(Activity activity, DrawerLayout drawe
230230
* @param drawerLayout DrawerLayout
231231
* @param color 状态栏颜色值
232232
*/
233-
public static void setColorNoTranslucentForDrawerLayout(Activity activity, DrawerLayout drawerLayout, @ColorInt int color) {
233+
public static void setColorNoTranslucentForDrawerLayout(Activity activity, DrawerLayout drawerLayout, int color) {
234234
setColorForDrawerLayout(activity, drawerLayout, color, 0);
235235
}
236236

@@ -242,7 +242,7 @@ public static void setColorNoTranslucentForDrawerLayout(Activity activity, Drawe
242242
* @param color 状态栏颜色值
243243
* @param statusBarAlpha 状态栏透明度
244244
*/
245-
public static void setColorForDrawerLayout(Activity activity, DrawerLayout drawerLayout, @ColorInt int color,
245+
public static void setColorForDrawerLayout(Activity activity, DrawerLayout drawerLayout, int color,
246246
int statusBarAlpha) {
247247
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
248248
return;
@@ -287,7 +287,7 @@ public static void setColorForDrawerLayout(Activity activity, DrawerLayout drawe
287287
* @param color 状态栏颜色值
288288
*/
289289
@Deprecated
290-
public static void setColorForDrawerLayoutDiff(Activity activity, DrawerLayout drawerLayout, @ColorInt int color) {
290+
public static void setColorForDrawerLayoutDiff(Activity activity, DrawerLayout drawerLayout, int color) {
291291
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
292292
activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
293293
// 生成一个状态栏大小的矩形
@@ -517,7 +517,7 @@ private static StatusBarView createStatusBarView(Activity activity, int color) {
517517
* @param alpha 透明值
518518
* @return 状态栏矩形条
519519
*/
520-
private static StatusBarView createStatusBarView(Activity activity, @ColorInt int color, int alpha) {
520+
private static StatusBarView createStatusBarView(Activity activity, int color, int alpha) {
521521
// 绘制一个和状态栏一样高的矩形
522522
StatusBarView statusBarView = new StatusBarView(activity);
523523
LinearLayout.LayoutParams params =
@@ -616,6 +616,7 @@ private static int calculateStatusColor(int color, int alpha) {
616616
return 0xff << 24 | red << 16 | green << 8 | blue;
617617
}
618618

619+
/*--------------------------------old--------------------------------*/
619620

620621
/**
621622
* 设置透明状态栏(api大于19方可使用)

‎utilcode/src/main/java/com/blankj/utilcode/utils/NetworkUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public static boolean getWifiEnabled(Context context) {
170170

171171
/**
172172
* 打开或关闭wifi
173-
* <p>需添加权限 { <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>}</p>
173+
* <p>需添加权限 {@code <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>}</p>
174174
*
175175
* @param context 上下文
176176
* @param enabled {@code true}: 打开<br>{@code false}: 关闭

‎utilcode/src/main/java/com/blankj/utilcode/utils/ProcessUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ private ProcessUtils() {
3232

3333
/**
3434
* 获取前台线程包名
35-
* <p>当不是查看当前App，且SDK >= 22时，
35+
* <p>当不是查看当前App，且SDK大于21时，
3636
* 需添加权限 {@code <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>}</p>
3737
*
3838
* @param context 上下文

‎utilcode/src/main/java/com/blankj/utilcode/utils/SnackbarUtils.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ public static void showLongSnackbar(View parent, CharSequence text, int textColo
7373
* @param text 文本
7474
* @param textColor 文本颜色
7575
* @param bgColor 背景色
76+
* @param actionText 事件文本
77+
* @param actionTextColor 事件文本颜色
78+
* @param listener 监听器
7679
*/
7780
public static void showLongSnackbar(View parent, CharSequence text, int textColor, int bgColor,
7881
CharSequence actionText, int actionTextColor, View.OnClickListener listener) {

‎utilcode/src/main/java/com/blankj/utilcode/utils/StringUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static boolean isSpace(String s) {
4141
*
4242
* @param a 待校验字符串a
4343
* @param b 待校验字符串b
44-
* @return @return {@code true}: 相等<br>{@code false}: 不相等
44+
* @return {@code true}: 相等<br>{@code false}: 不相等
4545
*/
4646
public static boolean equals(CharSequence a, CharSequence b) {
4747
if (a == b) return true;

0 commit comments

Comments
 (0)