Skip to content

Commit 8b05af1

Browse files
BlankjBlankj
committed
see 07/23 log
1 parent e7c9ba3 commit 8b05af1

37 files changed

+691
-345
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,18 @@ public void initData(Bundle bundle) {
3131

3232
@Override
3333
public int bindLayout() {
34-
return R.layout.fragment_status_bar_alpha;
34+
return R.layout.activity_status_bar_alpha;
3535
}
3636

3737
@Override
3838
public void initView(Bundle savedInstanceState, View view) {
39+
BarUtils.setStatusBarAlpha(StatusBarAlphaActivity.this, mAlpha, findViewById(R.id.tv_status_alpha));
40+
3941
findViewById(R.id.btn_set_transparent).setOnClickListener(this);
4042
mTvStatusAlpha = (TextView) findViewById(R.id.tv_status_alpha);
4143
sbChangeAlpha = (SeekBar) findViewById(R.id.sb_change_alpha);
4244
sbChangeAlpha.setOnSeekBarChangeListener(translucentListener);
43-
sbChangeAlpha.setProgress(mAlpha);
45+
mTvStatusAlpha.setText(String.valueOf(mAlpha));
4446
}
4547

4648
@Override
@@ -61,8 +63,8 @@ public void onWidgetClick(View view) {
6163
@Override
6264
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
6365
mAlpha = progress;
64-
BarUtils.setStatusBar4Bg(StatusBarAlphaActivity.this, mAlpha);
6566
mTvStatusAlpha.setText(String.valueOf(mAlpha));
67+
BarUtils.setStatusBarAlpha(StatusBarAlphaActivity.this, mAlpha);
6668
}
6769

6870
@Override

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
import android.widget.TextView;
99

1010
import com.blankj.androidutilcode.R;
11-
import com.blankj.androidutilcode.base.BaseBackActivity;
11+
import com.blankj.androidutilcode.UtilsApp;
12+
import com.blankj.androidutilcode.base.BaseActivity;
1213
import com.blankj.utilcode.util.BarUtils;
1314

1415
import java.util.Random;
@@ -22,7 +23,7 @@
2223
* desc : Bar工具类Demo分支
2324
* </pre>
2425
*/
25-
public class StatusBarColorActivity extends BaseBackActivity {
26+
public class StatusBarColorActivity extends BaseActivity {
2627

2728
private Random mRandom;
2829
private int mColor;
@@ -33,7 +34,7 @@ public class StatusBarColorActivity extends BaseBackActivity {
3334
@Override
3435
public void initData(Bundle bundle) {
3536
mRandom = new Random();
36-
mColor = ContextCompat.getColor(this, R.color.colorPrimary);
37+
mColor = ContextCompat.getColor(UtilsApp.getInstance(), R.color.colorPrimary);
3738
mAlpha = 112;
3839
}
3940

@@ -44,15 +45,14 @@ public int bindLayout() {
4445

4546
@Override
4647
public void initView(Bundle savedInstanceState, View view) {
47-
getSupportActionBar().setTitle(getString(R.string.demo_bar));
48+
BarUtils.setStatusBarColor(StatusBarColorActivity.this, mColor, mAlpha);
4849

4950
findViewById(R.id.btn_random_color).setOnClickListener(this);
5051
findViewById(R.id.btn_set_transparent).setOnClickListener(this);
5152
mTvStatusAlpha = (TextView) findViewById(R.id.tv_status_alpha);
5253
sbChangeAlpha = (SeekBar) findViewById(R.id.sb_change_alpha);
5354
sbChangeAlpha.setOnSeekBarChangeListener(colorListener);
54-
sbChangeAlpha.setProgress(mAlpha);
55-
updateColorBar();
55+
mTvStatusAlpha.setText(String.valueOf(mAlpha));
5656
}
5757

5858

@@ -75,16 +75,15 @@ public void onWidgetClick(View view) {
7575
}
7676

7777
private void updateColorBar() {
78-
mToolbar.setBackgroundColor(mColor);
7978
BarUtils.setStatusBarColor(this, mColor, mAlpha);
8079
}
8180

8281
private SeekBar.OnSeekBarChangeListener colorListener = new SeekBar.OnSeekBarChangeListener() {
8382
@Override
8483
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
8584
mAlpha = progress;
86-
BarUtils.setStatusBarColor(StatusBarColorActivity.this, mColor, mAlpha);
8785
mTvStatusAlpha.setText(String.valueOf(mAlpha));
86+
BarUtils.setStatusBarColor(StatusBarColorActivity.this, mColor, mAlpha);
8887
}
8988

9089
@Override

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.blankj.androidutilcode.fragment.StatusBarAlphaFragment;
1616
import com.blankj.androidutilcode.fragment.StatusBarColorFragment;
1717
import com.blankj.androidutilcode.fragment.StatusBarImageViewFragment;
18+
import com.blankj.utilcode.util.BarUtils;
1819

1920
import java.util.ArrayList;
2021

@@ -28,9 +29,10 @@
2829
*/
2930
public class StatusBarFragmentActivity extends BaseActivity {
3031

31-
private ViewPager mVpHome;
32+
private ViewPager mVpHome;
3233
private BottomNavigationView navigation;
3334
private ArrayList<Fragment> mFragmentList = new ArrayList<>();
35+
3436
private int[] itemIds = new int[]{R.id.navigation_color, R.id.navigation_alpha, R.id.navigation_image_view};
3537

3638
@Override
@@ -45,12 +47,15 @@ public int bindLayout() {
4547

4648
@Override
4749
public void initView(Bundle savedInstanceState, View view) {
50+
BarUtils.initStatusBar4Fragment(this);
51+
4852
mVpHome = (ViewPager) findViewById(R.id.vp_home);
4953
navigation = (BottomNavigationView) findViewById(R.id.navigation);
5054

51-
mFragmentList.add(new StatusBarColorFragment());
52-
mFragmentList.add(new StatusBarAlphaFragment());
53-
mFragmentList.add(new StatusBarImageViewFragment());
55+
mFragmentList.add(StatusBarColorFragment.newInstance());
56+
mFragmentList.add(StatusBarAlphaFragment.newInstance());
57+
mFragmentList.add(StatusBarImageViewFragment.newInstance());
58+
5459

5560
mVpHome.setAdapter(new FragmentPagerAdapter(getSupportFragmentManager()) {
5661
@Override
@@ -73,6 +78,13 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
7378
@Override
7479
public void onPageSelected(int position) {
7580
navigation.setSelectedItemId(itemIds[position]);
81+
if (position == 0) {
82+
((StatusBarColorFragment)mFragmentList.get(0)).updateFakeStatusBar();
83+
} else if (position == 1) {
84+
((StatusBarAlphaFragment)mFragmentList.get(1)).updateFakeStatusBar();
85+
} else {
86+
((StatusBarImageViewFragment)mFragmentList.get(2)).updateFakeStatusBar();
87+
}
7688
}
7789

7890
@Override

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,13 @@ public int bindLayout() {
3636

3737
@Override
3838
public void initView(Bundle savedInstanceState, View view) {
39+
BarUtils.setStatusBarAlpha(StatusBarImageViewActivity.this, mAlpha);
40+
3941
findViewById(R.id.btn_set_transparent).setOnClickListener(this);
4042
mTvStatusAlpha = (TextView) findViewById(R.id.tv_status_alpha);
4143
sbChangeAlpha = (SeekBar) findViewById(R.id.sb_change_alpha);
4244
sbChangeAlpha.setOnSeekBarChangeListener(translucentListener);
43-
sbChangeAlpha.setProgress(mAlpha);
45+
mTvStatusAlpha.setText(String.valueOf(mAlpha));
4446
}
4547

4648
@Override
@@ -61,7 +63,7 @@ public void onWidgetClick(View view) {
6163
@Override
6264
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
6365
mAlpha = progress;
64-
BarUtils.setStatusBar4ImageView(StatusBarImageViewActivity.this, mAlpha, null);
66+
BarUtils.setStatusBarAlpha(StatusBarImageViewActivity.this, mAlpha);
6567
mTvStatusAlpha.setText(String.valueOf(mAlpha));
6668
}
6769

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

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

3-
import android.graphics.Color;
43
import android.support.v7.widget.Toolbar;
54
import android.view.LayoutInflater;
65
import android.view.MenuItem;
@@ -34,7 +33,6 @@ protected void setBaseView() {
3433
if (getSupportActionBar() != null) {
3534
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
3635
}
37-
contentView.setBackgroundColor(Color.WHITE);
3836
}
3937

4038
@Override

‎app/src/main/java/com/blankj/androidutilcode/base/BaseFragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* desc : Fragment－v4基类
1818
* </pre>
1919
*/
20-
public abstract class BaseFragment extends Fragment
20+
public abstract class BaseFragment<T extends BaseActivity> extends Fragment
2121
implements IBaseView, View.OnClickListener {
2222

2323
private static final String TAG = "BaseFragment";
@@ -32,7 +32,7 @@ public abstract class BaseFragment extends Fragment
3232
*/
3333
private long lastClick = 0;
3434

35-
protected BaseActivity mActivity;
35+
protected T mActivity;
3636

3737
@Override
3838
public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -70,7 +70,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
7070
@Override
7171
public void onActivityCreated(Bundle savedInstanceState) {
7272
super.onActivityCreated(savedInstanceState);
73-
mActivity = (BaseActivity) getActivity();
73+
mActivity = (T) getActivity();
7474
initView(savedInstanceState, contentView);
7575
doBusiness(mActivity);
7676
Log.d(TAG, "onActivityCreated: ");

‎app/src/main/java/com/blankj/androidutilcode/fragment/StatusBarAlphaFragment.java

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
import android.content.Context;
44
import android.os.Bundle;
55
import android.view.View;
6+
import android.widget.SeekBar;
7+
import android.widget.TextView;
68

79
import com.blankj.androidutilcode.R;
10+
import com.blankj.androidutilcode.activity.StatusBarFragmentActivity;
811
import com.blankj.androidutilcode.base.BaseFragment;
12+
import com.blankj.utilcode.util.BarUtils;
913

1014
/**
1115
* <pre>
@@ -15,10 +19,22 @@
1519
* desc :
1620
* </pre>
1721
*/
18-
public class StatusBarAlphaFragment extends BaseFragment {
22+
public class StatusBarAlphaFragment extends BaseFragment<StatusBarFragmentActivity> {
23+
24+
private int mAlpha;
25+
26+
private TextView mTvStatusAlpha;
27+
private SeekBar sbChangeAlpha;
28+
private View fakeStatusBar;
29+
30+
31+
public static StatusBarAlphaFragment newInstance() {
32+
return new StatusBarAlphaFragment();
33+
}
34+
1935
@Override
2036
public void initData(Bundle bundle) {
21-
37+
mAlpha = 112;
2238
}
2339

2440
@Override
@@ -28,7 +44,12 @@ public int bindLayout() {
2844

2945
@Override
3046
public void initView(Bundle savedInstanceState, View view) {
31-
47+
fakeStatusBar = view.findViewById(R.id.fake_status_bar);
48+
mTvStatusAlpha = (TextView) view.findViewById(R.id.tv_status_alpha);
49+
sbChangeAlpha = (SeekBar) view.findViewById(R.id.sb_change_alpha);
50+
view.findViewById(R.id.btn_set_transparent).setOnClickListener(this);
51+
sbChangeAlpha.setOnSeekBarChangeListener(translucentListener);
52+
mTvStatusAlpha.setText(String.valueOf(mAlpha));
3253
}
3354

3455
@Override
@@ -38,6 +59,33 @@ public void doBusiness(Context context) {
3859

3960
@Override
4061
public void onWidgetClick(View view) {
62+
switch (view.getId()) {
63+
case R.id.btn_set_transparent:
64+
sbChangeAlpha.setProgress(0);
65+
break;
66+
}
67+
}
68+
69+
private SeekBar.OnSeekBarChangeListener translucentListener = new SeekBar.OnSeekBarChangeListener() {
70+
@Override
71+
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
72+
mAlpha = progress;
73+
mTvStatusAlpha.setText(String.valueOf(mAlpha));
74+
updateFakeStatusBar();
75+
}
76+
77+
@Override
78+
public void onStartTrackingTouch(SeekBar seekBar) {
79+
80+
}
81+
82+
@Override
83+
public void onStopTrackingTouch(SeekBar seekBar) {
84+
85+
}
86+
};
4187

88+
public void updateFakeStatusBar() {
89+
BarUtils.setFakeStatusBarAlpha(fakeStatusBar, mAlpha);
4290
}
4391
}

0 commit comments

Comments
 (0)