Skip to content

Commit 9f989ab

Browse files
committed
see 07/29 log
1 parent 80f66e7 commit 9f989ab

31 files changed

+173
-166
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void initView(Bundle savedInstanceState, View view) {
5858
ImageView ivAddImageWatermark = (ImageView) findViewById(R.id.iv_add_image_watermark);
5959
ImageView ivGray = (ImageView) findViewById(R.id.iv_gray);
6060

61-
Bitmap src = ImageUtils.getBitmap(R.drawable.lena);
61+
Bitmap src = ImageUtils.getBitmap(R.drawable.img_lena);
6262
Bitmap watermark = ImageUtils.getBitmap(R.mipmap.ic_launcher);
6363

6464
SizeUtils.forceGetViewSize(ivSrc, new SizeUtils.onGetSizeListener() {
@@ -71,7 +71,7 @@ public void onGetSize(View view) {
7171
ivRoundCorner.setImageBitmap(ImageUtils.toRoundCorner(src, 60));
7272
ivFastBlur.setImageBitmap(ImageUtils.fastBlur(src, 0.1f, 5));
7373
ivRenderScriptBlur.setImageBitmap(ImageUtils.renderScriptBlur(src, 10));
74-
src = ImageUtils.getBitmap(R.drawable.lena);
74+
src = ImageUtils.getBitmap(R.drawable.img_lena);
7575
ivStackBlur.setImageBitmap(ImageUtils.stackBlur(src, 10, false));
7676
ivAddFrame.setImageBitmap(ImageUtils.addFrame(src, 16, Color.GREEN));
7777
ivAddReflection.setImageBitmap(ImageUtils.addReflection(src, 80));

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22

33
import android.content.Context;
44
import android.content.Intent;
5+
import android.graphics.Color;
56
import android.os.Bundle;
6-
import android.support.v4.widget.DrawerLayout;
7+
import android.support.design.widget.CollapsingToolbarLayout;
78
import android.support.v7.app.ActionBarDrawerToggle;
89
import android.support.v7.widget.Toolbar;
910
import android.view.View;
1011

1112
import com.blankj.androidutilcode.R;
1213
import com.blankj.androidutilcode.base.BaseDrawerActivity;
14+
import com.blankj.utilcode.util.BarUtils;
1315

1416
/**
1517
* <pre>
@@ -33,13 +35,20 @@ public int bindLayout() {
3335

3436
@Override
3537
public void initView(Bundle savedInstanceState, View view) {
36-
DrawerLayout mDrawerLayout = (DrawerLayout) findViewById(R.id.root_layout);
3738
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
38-
39+
CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) findViewById(R.id.ctl);
40+
collapsingToolbarLayout.setExpandedTitleColor(Color.parseColor("#00FFFFFF"));
3941
setSupportActionBar(toolbar);
40-
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, mDrawerLayout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
41-
mDrawerLayout.addDrawerListener(toggle);
42+
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this,
43+
rootLayout,
44+
toolbar,
45+
R.string.navigation_drawer_open,
46+
R.string.navigation_drawer_close);
47+
rootLayout.addDrawerListener(toggle);
4248
toggle.syncState();
49+
50+
BarUtils.setStatusBarAlpha(this, 0);
51+
BarUtils.addMarginTopEqualStatusBarHeight(toolbar);
4352
}
4453

4554
@Override

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,6 @@ public void onStopTrackingTouch(SeekBar seekBar) {
102102

103103
private void updateStatusBar() {
104104
BarUtils.setStatusBarColor(this, mColor, mAlpha);
105+
BarUtils.addMarginTopEqualStatusBarHeight(mTvStatusAlpha);
105106
}
106107
}

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

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public void initView(Bundle savedInstanceState, View view) {
7272

7373
tvStatusAlpha.setText(String.valueOf(mAlpha));
7474

75+
7576
updateStatusBar();
7677
}
7778

@@ -128,32 +129,19 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
128129
};
129130

130131
private void updateStatusBar() {
131-
// ViewGroup childAt = (ViewGroup) rootLayout.getChildAt(0);
132-
//
133-
// rootLayout.setFitsSystemWindows(false);
134-
// childAt.setFitsSystemWindows(false);
135-
// childAt.setClipToPadding(true);
136-
//
137-
// BarUtils.transparentStatusBar(this);
138-
// BarUtils.addStatusBarColor( childAt, mColor, mAlpha);
139-
140-
// BarUtils.transparentStatusBar(this);
141-
142-
143-
// rootLayout.setFitsSystemWindows(true);
144-
145-
146-
// BarUtils.addMarginTopEqualStatusBarHeight(cbAlpha);
147-
// BarUtils.addStatusBarColor((ViewGroup) rootLayout.getChildAt(0), mColor, mAlpha);
148-
149-
150-
if (!cbAlpha.isChecked()) {
151-
BarUtils.setFakeStatusBarColor(fakeStatusBar, mColor, mAlpha);
152-
BarUtils.setStatusBarAlpha(this, mAlpha);
153-
rootLayout.setFitsSystemWindows(false);
154-
} else {
155-
BarUtils.setStatusBarAlpha(this, mAlpha);
156-
}
132+
BarUtils.setStatusBarAlpha(this, mAlpha);
133+
// if (!cbAlpha.isChecked()) {
134+
//// BarUtils.setStatusBarColor(this, mColor, mAlpha);
135+
// BarUtils.setFakeStatusBarColor(fakeStatusBar, mColor, mAlpha);
136+
// findViewById(R.id.activity_container).setFitsSystemWindows(false);
137+
// findViewById(R.id.nav_view).setFitsSystemWindows(false);
138+
//// rootLayout.setFitsSystemWindows(false);
139+
// } else {
140+
// BarUtils.hideStatusBarView(this);
141+
//// fakeStatusBar.setVisibility(View.GONE);
142+
//// rootLayout.setFitsSystemWindows(true);
143+
// }
144+
//// BarUtils.setStatusBarAlpha(this, mAlpha, true);
157145

158146
}
159147
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,6 @@ public void onStopTrackingTouch(SeekBar seekBar) {
8686
};
8787

8888
private void updateStatusBar() {
89-
BarUtils.setStatusBarAlpha(StatusBarImageViewActivity.this, mAlpha);
89+
BarUtils.setStatusBarAlpha(StatusBarImageViewActivity.this, mAlpha, true);
9090
}
9191
}

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ public int bindLayout() {
5858

5959
@Override
6060
public void initView(Bundle savedInstanceState, View view) {
61-
getToolBar().setTitle(getString(R.string.demo_bar));
62-
6361
cbAlpha = (CheckBox) findViewById(R.id.cb_alpha);
6462
btnRandomColor = (Button) findViewById(R.id.btn_random_color);
6563
tvStatusAlpha = (TextView) findViewById(R.id.tv_status_alpha);
@@ -72,6 +70,9 @@ public void initView(Bundle savedInstanceState, View view) {
7270

7371
tvStatusAlpha.setText(String.valueOf(mAlpha));
7472

73+
abl.setVisibility(View.GONE);
74+
BarUtils.subtractMarginTopEqualStatusBarHeight(rootLayout);
75+
BarUtils.addMarginTopEqualStatusBarHeight(cbAlpha);
7576
updateStatusBar();
7677
}
7778

@@ -118,26 +119,20 @@ public void onStopTrackingTouch(SeekBar seekBar) {
118119
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
119120
if (isChecked) {
120121
btnRandomColor.setVisibility(View.GONE);
121-
getToolBar().hide();
122122
rootLayout.setBackgroundResource(R.drawable.bg_bar);
123123
} else {
124124
btnRandomColor.setVisibility(View.VISIBLE);
125-
getToolBar().show();
126125
rootLayout.setBackgroundColor(Color.WHITE);
127126
}
128127
updateStatusBar();
129128
}
130129
};
131130

132131
private void updateStatusBar() {
133-
if (!cbAlpha.isChecked()) {
134-
BarUtils.setStatusBarColor(this, mColor, mAlpha);
135-
136-
BarUtils.subtractMarginTopEqualStatusBarHeight(cbAlpha);
137-
} else {
132+
if (cbAlpha.isChecked()) {
138133
BarUtils.setStatusBarAlpha(this, mAlpha);
139-
140-
BarUtils.addMarginTopEqualStatusBarHeight(cbAlpha);
134+
} else {
135+
BarUtils.setStatusBarColor(this, mColor, mAlpha);
141136
}
142137
}
143138
}

app/src/main/java/com/blankj/androidutilcode/base/BaseBackActivity.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
package com.blankj.androidutilcode.base;
22

3+
import android.support.design.widget.AppBarLayout;
34
import android.support.design.widget.CoordinatorLayout;
5+
import android.support.v4.content.ContextCompat;
46
import android.support.v7.app.ActionBar;
57
import android.support.v7.widget.Toolbar;
68
import android.view.LayoutInflater;
79
import android.view.MenuItem;
810
import android.widget.FrameLayout;
911

1012
import com.blankj.androidutilcode.R;
13+
import com.blankj.androidutilcode.UtilsApp;
14+
import com.blankj.utilcode.util.BarUtils;
1115
import com.r0adkll.slidr.Slidr;
1216

1317

@@ -23,18 +27,24 @@ public abstract class BaseBackActivity extends BaseActivity {
2327

2428
protected CoordinatorLayout rootLayout;
2529
protected Toolbar mToolbar;
30+
protected AppBarLayout abl;
31+
protected FrameLayout flActivityContainer;
2632

2733
@Override
2834
protected void setBaseView() {
2935
Slidr.attach(this);
3036
contentView = LayoutInflater.from(this).inflate(R.layout.activity_back, null);
3137
setContentView(contentView);
3238
rootLayout = (CoordinatorLayout) findViewById(R.id.root_layout);
33-
FrameLayout flActivityContainer = (FrameLayout) findViewById(R.id.activity_container);
34-
flActivityContainer.addView(LayoutInflater.from(this).inflate(bindLayout(), flActivityContainer, false));
39+
abl = (AppBarLayout) findViewById(R.id.abl);
3540
mToolbar = (Toolbar) findViewById(R.id.toolbar);
41+
flActivityContainer = (FrameLayout) findViewById(R.id.activity_container);
42+
flActivityContainer.addView(LayoutInflater.from(this).inflate(bindLayout(), flActivityContainer, false));
3643
setSupportActionBar(mToolbar);
3744
getToolBar().setDisplayHomeAsUpEnabled(true);
45+
46+
BarUtils.setStatusBarColor(this, ContextCompat.getColor(UtilsApp.getInstance(), R.color.colorPrimary), 0);
47+
BarUtils.addMarginTopEqualStatusBarHeight(rootLayout);
3848
}
3949

4050

10.2 KB
Loading
-37 KB
Binary file not shown.

app/src/main/res/drawable/ic_menu_blog.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
android:viewportWidth="508.52">
77

88
<path
9-
android:fillColor="#000000"
9+
android:fillColor="@color/light_black"
1010
android:pathData="M254.26,0C113.845,0,0,113.845,0,254.26s113.845,254.26,254.26,254.26
1111
s254.26-113.845,254.26-254.26C508.52,113.813,394.675,0,254.26,0z
1212
M412.727,310.451c0,56.509-45.989,102.308-102.943,102.308
1313
H198.831c-56.891,0-103.102-45.735-103.102-102.308V198.132c0.032-56.541,46.18-102.371,103.102-102.371h51.964
1414
c56.954,0,102.53,42.525,102.53,99.066c0.731,10.584,10.298,19.8,21.167,19.8h17.766c11.378,0,20.5,11.95,20.5,23.233
1515
L412.727,310.451L412.727,310.451z" />
1616
<path
17-
android:fillColor="#010002"
17+
android:fillColor="@color/light_black"
1818
android:pathData="M313.693,293.893H194.827c-10.901,0-19.8,8.899-19.8,19.801c0,10.87,8.931,19.8,19.8,19.8
1919
h118.866c10.901,0,19.8-8.931,19.8-19.8C333.494,302.792,324.594,293.893,313.693,293.893z" />
2020
<path
21-
android:fillColor="#010002"
21+
android:fillColor="@color/light_black"
2222
android:pathData="M194.827,214.627h59.433c10.901,0,19.8-8.931,19.8-19.8c0-10.901-8.931-19.8-19.8-19.8h-59.433
2323
c-10.901,0-19.8,8.931-19.8,19.8C174.994,205.728,183.925,214.627,194.827,214.627z" />
2424
</vector>

0 commit comments

Comments
 (0)