Skip to content

Commit 0291442

Browse files
BlankjBlankj
committed
see 07/31 log
1 parent d3ce9ca commit 0291442

File tree

7 files changed

+70
-40
lines changed

7 files changed

+70
-40
lines changed

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

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -128,21 +128,12 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
128128
};
129129

130130
private void updateStatusBar() {
131-
BarUtils.setStatusBarAlpha(this, 0);
132-
// BarUtils.setStatusBarColor4Drawer(this, rootLayout, fakeStatusBar, mColor, mAlpha, true);
133-
134-
// if (!cbAlpha.isChecked()) {
135-
//// BarUtils.setStatusBarColor(this, mColor, mAlpha);
136-
// BarUtils.setFakeStatusBarColor(fakeStatusBar, mColor, mAlpha);
137-
// findViewById(R.id.activity_container).setFitsSystemWindows(false);
138-
// findViewById(R.id.nav_view).setFitsSystemWindows(false);
139-
//// rootLayout.setFitsSystemWindows(false);
140-
// } else {
141-
// BarUtils.hideStatusBarView(this);
142-
//// fakeStatusBar.setVisibility(View.GONE);
143-
//// rootLayout.setFitsSystemWindows(true);
144-
// }
145-
//// BarUtils.setStatusBarAlpha(this, mAlpha, true);
131+
if (cbAlpha.isChecked()) {
132+
133+
} else {
134+
BarUtils.setStatusBarColor4Drawer(this, rootLayout, fakeStatusBar, mColor, mAlpha, true);
135+
136+
}
146137

147138
}
148139
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
android:layout_height="wrap_content" />
1717

1818
<android.support.design.widget.NavigationView
19-
android:fitsSystemWindows="false"
2019
android:id="@+id/nav_view"
2120
android:layout_width="wrap_content"
2221
android:layout_height="match_parent"
2322
android:layout_gravity="start"
2423
android:background="@color/white"
24+
android:fitsSystemWindows="false"
2525
app:headerLayout="@layout/nav_header"
2626
app:menu="@menu/activity_main_drawer" />
2727

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
android:layout_width="match_parent"
1717
android:layout_height="match_parent"
1818
app:contentScrim="@color/colorPrimary"
19-
app:expandedTitleMarginStart="@dimen/spacing_24"
2019
app:layout_scrollFlags="scroll|exitUntilCollapsed">
2120

2221
<ImageView

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.design.widget.CoordinatorLayout
3-
xmlns:android="http://schemas.android.com/apk/res/android"
4-
xmlns:app="http://schemas.android.com/apk/res-auto"
5-
android:layout_width="match_parent"
6-
android:layout_height="match_parent">
7-
<LinearLayout
2+
<FrameLayout
83
xmlns:android="http://schemas.android.com/apk/res/android"
94
android:layout_width="match_parent"
105
android:layout_height="wrap_content"
@@ -62,5 +57,4 @@
6257
android:text="@string/status_bar_set_transparent" />
6358

6459
</LinearLayout>
65-
</LinearLayout>
66-
</android.support.design.widget.CoordinatorLayout>
60+
</FrameLayout>

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

Lines changed: 52 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,40 +238,85 @@ public static void setFakeStatusBarAlpha(@NonNull final View fakeStatusBar,
238238
fakeStatusBar.setBackgroundColor(Color.argb(alpha, 0, 0, 0));
239239
}
240240

241+
/**
242+
* 为DrawerLayout设置状态栏颜色
243+
*
244+
* @param activity activity
245+
* @param drawer drawerLayout
246+
* @param fakeStatusBar 伪造状态栏
247+
* @param color 状态栏颜色值
248+
* @param isShowAlphaInDrawer 是否在drawerLayout显示透明度
249+
*/
250+
public static void setStatusBarColor4Drawer(@NonNull final Activity activity,
251+
@NonNull final DrawerLayout drawer,
252+
@NonNull final View fakeStatusBar,
253+
@ColorInt final int color,
254+
final boolean isShowAlphaInDrawer) {
255+
setStatusBarColor4Drawer(activity, drawer, fakeStatusBar, color, DEFAULT_ALPHA, isShowAlphaInDrawer);
256+
}
257+
258+
/**
259+
* 为DrawerLayout设置状态栏颜色
260+
*
261+
* @param activity activity
262+
* @param drawer drawerLayout
263+
* @param fakeStatusBar 伪造状态栏
264+
* @param color 状态栏颜色值
265+
* @param alpha 状态栏透明度，此透明度并非颜色中的透明度
266+
* @param isShowAlphaInDrawer 是否在drawerLayout显示透明度
267+
*/
241268
public static void setStatusBarColor4Drawer(@NonNull final Activity activity,
242269
@NonNull final DrawerLayout drawer,
243270
@NonNull final View fakeStatusBar,
244271
@ColorInt final int color,
245272
@IntRange(from = 0, to = 255) final int alpha,
246-
final boolean isShowShaderInDrawer) {
273+
final boolean isShowAlphaInDrawer) {
247274
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
275+
drawer.setFitsSystemWindows(false);
248276
transparentStatusBar(activity);
249-
setFakeStatusBarColor(fakeStatusBar, color, alpha);
277+
// setFakeStatusBarColor(fakeStatusBar, color, alpha);
250278
for (int i = 0, len = drawer.getChildCount(); i < len; i++) {
251279
drawer.getChildAt(i).setFitsSystemWindows(false);
252280
}
253-
if (isShowShaderInDrawer) addStatusBarAlpha(activity, alpha, false);
281+
if (isShowAlphaInDrawer) addStatusBarAlpha(activity, alpha, false);
254282
}
255283

284+
/**
285+
* 为DrawerLayout设置状态栏透明度
286+
*
287+
* @param activity activity
288+
* @param drawer drawerLayout
289+
* @param fakeStatusBar 伪造状态栏
290+
* @param isShowAlphaInDrawer 是否在drawerLayout显示透明度
291+
*/
256292
public static void setStatusBarAlpha4Drawer(@NonNull final Activity activity,
257293
@NonNull final DrawerLayout drawer,
258294
@NonNull final View fakeStatusBar,
259-
final boolean isShowShaderInDrawer) {
260-
setStatusBarAlpha4Drawer(activity, drawer, fakeStatusBar, DEFAULT_ALPHA, isShowShaderInDrawer);
295+
final boolean isShowAlphaInDrawer) {
296+
setStatusBarAlpha4Drawer(activity, drawer, fakeStatusBar, DEFAULT_ALPHA, isShowAlphaInDrawer);
261297
}
262298

299+
/**
300+
* 为DrawerLayout设置状态栏透明度
301+
*
302+
* @param activity activity
303+
* @param drawer drawerLayout
304+
* @param fakeStatusBar 伪造状态栏
305+
* @param alpha 状态栏透明度
306+
* @param isShowAlphaInDrawer 是否在drawerLayout显示透明度
307+
*/
263308
public static void setStatusBarAlpha4Drawer(@NonNull final Activity activity,
264309
@NonNull final DrawerLayout drawer,
265310
@NonNull final View fakeStatusBar,
266311
@IntRange(from = 0, to = 255) final int alpha,
267-
final boolean isShowShaderInDrawer) {
312+
final boolean isShowAlphaInDrawer) {
268313
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
269314
transparentStatusBar(activity);
270315
setFakeStatusBarAlpha(fakeStatusBar, alpha);
271316
for (int i = 0, len = drawer.getChildCount(); i < len; i++) {
272317
drawer.getChildAt(i).setFitsSystemWindows(false);
273318
}
274-
if (isShowShaderInDrawer) addStatusBarAlpha(activity, alpha, false);
319+
if (isShowAlphaInDrawer) addStatusBarAlpha(activity, alpha, false);
275320
}
276321

277322

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -507,11 +507,13 @@ public static String readFile2String(final File file, final String charsetName)
507507
reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), charsetName));
508508
}
509509
String line;
510-
while ((line = reader.readLine()) != null) {
511-
sb.append(line).append(LINE_SEP);
510+
if ((line = reader.readLine()) != null) {
511+
sb.append(line);
512+
while ((line = reader.readLine()) != null) {
513+
sb.append(LINE_SEP).append(line);
514+
}
512515
}
513-
// delete the last line separator
514-
return sb.delete(sb.length() - LINE_SEP.length(), sb.length()).toString();
516+
return sb.toString();
515517
} catch (IOException e) {
516518
e.printStackTrace();
517519
return null;

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -906,9 +906,6 @@ private void updateCharCharSequence() {
906906
if (backgroundColor != DEFAULT_COLOR) {
907907
mBuilder.setSpan(new BackgroundColorSpan(backgroundColor), start, end, flag);
908908
}
909-
if (lineHeight != -1) {
910-
mBuilder.setSpan(new CustomLineHeightSpan(lineHeight, alignLine), start, end, flag);
911-
}
912909
if (first != -1) {
913910
mBuilder.setSpan(new LeadingMarginSpan.Standard(first, rest), start, end, flag);
914911
}
@@ -929,7 +926,6 @@ private void updateCharCharSequence() {
929926
mBuilder.setSpan(new CustomIconMarginSpan(Utils.getContext(), iconMarginResourceId, iconMarginGapWidth, alignIconMargin), start, end, flag);
930927
}
931928
}
932-
933929
if (fontSize != -1) {
934930
mBuilder.setSpan(new AbsoluteSizeSpan(fontSize, fontSizeIsDp), start, end, flag);
935931
}
@@ -939,6 +935,9 @@ private void updateCharCharSequence() {
939935
if (xProportion != -1) {
940936
mBuilder.setSpan(new ScaleXSpan(xProportion), start, end, flag);
941937
}
938+
if (lineHeight != -1) {
939+
mBuilder.setSpan(new CustomLineHeightSpan(lineHeight, alignLine), start, end, flag);
940+
}
942941
if (isStrikethrough) {
943942
mBuilder.setSpan(new StrikethroughSpan(), start, end, flag);
944943
}

0 commit comments

Comments
 (0)