From 1f48171bc2bfe07a3bfa78a73e9015e70dac10b2 Mon Sep 17 00:00:00 2001 From: Blankj <625783482@qq.com> Date: Tue, 1 Aug 2017 18:32:25 +0800 Subject: [PATCH] see 08/01 log --- README-CN.md | 48 +-- README.md | 56 +-- app/src/main/AndroidManifest.xml | 16 +- .../com/blankj/androidutilcode/Config.java | 4 + .../androidutilcode/activity/BarActivity.java | 16 +- .../activity/BarNavActivity.java | 64 ++++ ...ivity.java => BarStatusAlphaActivity.java} | 8 +- ...ivity.java => BarStatusColorActivity.java} | 6 +- ...vity.java => BarStatusDrawerActivity.java} | 30 +- ...ty.java => BarStatusFragmentActivity.java} | 18 +- ...y.java => BarStatusImageViewActivity.java} | 8 +- ...y.java => BarStatusSwipeBackActivity.java} | 23 +- .../base/BaseDrawerActivity.java | 7 +- ...gment.java => BarStatusAlphaFragment.java} | 12 +- ...gment.java => BarStatusColorFragment.java} | 12 +- ...t.java => BarStatusImageViewFragment.java} | 12 +- app/src/main/res/layout/activity_activity.xml | 3 +- app/src/main/res/layout/activity_bar.xml | 32 +- app/src/main/res/layout/activity_bar_nav.xml | 16 + ...lpha.xml => activity_bar_status_alpha.xml} | 2 +- ...olor.xml => activity_bar_status_color.xml} | 4 +- ...wer.xml => activity_bar_status_drawer.xml} | 18 +- ...t.xml => activity_bar_status_fragment.xml} | 0 ...xml => activity_bar_status_image_view.xml} | 2 +- ...xml => activity_bar_status_swipe_back.xml} | 19 +- app/src/main/res/layout/activity_drawer.xml | 1 + ...lpha.xml => fragment_bar_status_alpha.xml} | 2 +- ...olor.xml => fragment_bar_status_color.xml} | 4 +- ...xml => fragment_bar_status_image_view.xml} | 2 +- app/src/main/res/menu/navigation.xml | 6 +- app/src/main/res/values/strings.xml | 28 +- app/src/main/res/values/styles.xml | 5 +- update_log.md | 6 + utilcode/build.gradle | 2 +- .../com/blankj/utilcode/util/BarUtils.java | 327 +++++------------- .../com/blankj/utilcode/util/ScreenUtils.java | 59 ++-- .../com/blankj/utilcode/util/TestUtils.java | 2 +- 37 files changed, 426 insertions(+), 454 deletions(-) create mode 100644 app/src/main/java/com/blankj/androidutilcode/activity/BarNavActivity.java rename app/src/main/java/com/blankj/androidutilcode/activity/{StatusBarAlphaActivity.java => BarStatusAlphaActivity.java} (90%) rename app/src/main/java/com/blankj/androidutilcode/activity/{StatusBarColorActivity.java => BarStatusColorActivity.java} (94%) rename app/src/main/java/com/blankj/androidutilcode/activity/{StatusBarDrawerActivity.java => BarStatusDrawerActivity.java} (73%) rename app/src/main/java/com/blankj/androidutilcode/activity/{StatusBarFragmentActivity.java => BarStatusFragmentActivity.java} (85%) rename app/src/main/java/com/blankj/androidutilcode/activity/{StatusBarImageViewActivity.java => BarStatusImageViewActivity.java} (89%) rename app/src/main/java/com/blankj/androidutilcode/activity/{StatusBarSwipeBackActivity.java => BarStatusSwipeBackActivity.java} (83%) rename app/src/main/java/com/blankj/androidutilcode/fragment/{StatusBarAlphaFragment.java => BarStatusAlphaFragment.java} (85%) rename app/src/main/java/com/blankj/androidutilcode/fragment/{StatusBarColorFragment.java => BarStatusColorFragment.java} (87%) rename app/src/main/java/com/blankj/androidutilcode/fragment/{StatusBarImageViewFragment.java => BarStatusImageViewFragment.java} (84%) create mode 100644 app/src/main/res/layout/activity_bar_nav.xml rename app/src/main/res/layout/{activity_status_bar_alpha.xml => activity_bar_status_alpha.xml} (95%) rename app/src/main/res/layout/{activity_status_bar_color.xml => activity_bar_status_color.xml} (92%) rename app/src/main/res/layout/{activity_status_bar_drawer.xml => activity_bar_status_drawer.xml} (76%) rename app/src/main/res/layout/{activity_status_bar_fragment.xml => activity_bar_status_fragment.xml} (100%) rename app/src/main/res/layout/{activity_status_bar_image_view.xml => activity_bar_status_image_view.xml} (95%) rename app/src/main/res/layout/{activity_status_bar_swipe_back.xml => activity_bar_status_swipe_back.xml} (69%) rename app/src/main/res/layout/{fragment_status_bar_alpha.xml => fragment_bar_status_alpha.xml} (95%) rename app/src/main/res/layout/{fragment_status_bar_color.xml => fragment_bar_status_color.xml} (92%) rename app/src/main/res/layout/{fragment_status_bar_image_view.xml => fragment_bar_status_image_view.xml} (95%) diff --git a/README-CN.md b/README-CN.md index 1c78e849..173c8b12 100644 --- a/README-CN.md +++ b/README-CN.md @@ -43,15 +43,18 @@ cleanAppData : 清除App所有数据 * ### 栏相关→[BarUtils.java][bar.java] ``` -setStatusBarColor : 设置状态栏颜色 -setStatusBarAlpha : 设置状态栏透明度 -setTransparentStatusBar: 设置透明状态栏（api大于19方可使用） -hideStatusBar : 隐藏状态栏 -getStatusBarHeight : 获取状态栏高度 -isStatusBarExists : 判断状态栏是否存在 -getActionBarHeight : 获取ActionBar高度 -showNotificationBar : 显示通知栏 -hideNotificationBar : 隐藏通知栏 +getStatusBarHeight : 获取状态栏高度(px) +addMarginTopEqualStatusBarHeight : 为view增加MarginTop为状态栏高度 +subtractMarginTopEqualStatusBarHeight: 为view减少MarginTop为状态栏高度 +setStatusBarColor : 设置状态栏颜色 +setStatusBarAlpha : 设置状态栏透明度 +setStatusBarColor4Drawer : 为DrawerLayout设置状态栏颜色 +setStatusBarAlpha4Drawer : 为DrawerLayout设置状态栏透明度 +getActionBarHeight : 获取ActionBar高度 +showNotificationBar : 显示通知栏 +hideNotificationBar : 隐藏通知栏 +getNavBarHeight : 获取导航栏高度 +hideNavBar : 隐藏导航栏 ``` * ### 缓存相关→[CacheUtils.java][cache.java]→[Test][cache.test] @@ -409,16 +412,19 @@ getReplaceAll : 替换所有正则匹配的部分 * ### 屏幕相关→[ScreenUtils.java][screen.java] ``` -getScreenWidth : 获取屏幕的宽度（单位：px） -getScreenHeight : 获取屏幕的高度（单位：px） -setLandscape : 设置屏幕为横屏 -setPortrait : 设置屏幕为竖屏 -isLandscape : 判断是否横屏 -isPortrait : 判断是否竖屏 -getScreenRotation : 获取屏幕旋转角度 -captureWithStatusBar : 获取当前屏幕截图，包含状态栏 -captureWithoutStatusBar: 获取当前屏幕截图，不包含状态栏 -isScreenLock : 判断是否锁屏 +getScreenWidth : 获取屏幕的宽度（单位：px） +getScreenHeight : 获取屏幕的高度（单位：px） +setFullScreen : 设置屏幕为全屏 +setLandscape : 设置屏幕为横屏 +setPortrait : 设置屏幕为竖屏 +isLandscape : 判断是否横屏 +isPortrait : 判断是否竖屏 +getScreenRotation: 获取屏幕旋转角度 +screenShot : 截屏 +isScreenLock : 判断是否锁屏 +setSleepDuration : 设置进入休眠时长 +getSleepDuration : 获取进入休眠时长 +isTablet : 判断是否是平板 ``` * ### SD卡相关→[SDCardUtils.java][sdcard.java]→[Demo][sdcard.demo] @@ -621,7 +627,7 @@ getEntries : 获取压缩文件中的文件对象 Gradle: ``` groovy -compile 'com.blankj:utilcode:1.7.1' +compile 'com.blankj:utilcode:1.8.0' ``` @@ -644,7 +650,7 @@ Utils.init(context); [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png -[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.7.1-brightgreen.svg +[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.8.0-brightgreen.svg [auc]: https://github.com/Blankj/AndroidUtilCode [apisvg]: https://img.shields.io/badge/API-15+-brightgreen.svg diff --git a/README.md b/README.md index 2b929f89..2c14f505 100644 --- a/README.md +++ b/README.md @@ -43,15 +43,18 @@ cleanAppData * ### About Bar→[BarUtils.java][bar.java] ``` +getStatusBarHeight +addMarginTopEqualStatusBarHeight +subtractMarginTopEqualStatusBarHeight setStatusBarColor setStatusBarAlpha -setTransparentStatusBar -hideStatusBar -getStatusBarHeight -isStatusBarExists +setStatusBarColor4Drawer +setStatusBarAlpha4Drawer getActionBarHeight showNotificationBar hideNotificationBar +getNavBarHeight +hideNavBar ``` * ### About Cache→[CacheUtils.java][cache.java]→[Test][cache.test] @@ -380,16 +383,6 @@ getContactNum getAllSMS ``` -* ### About Pinyin→[PinyinUtils.java][pinyin.java]→[Test][pinyin.test] -``` -ccs2Pinyin -ccs2Pinyin -getPinyinFirstLetter -getPinyinFirstLetters -getSurnamePinyin -getSurnameFirstLetter -``` - * ### About Process→[ProcessUtils.java][process.java]→[Demo][process.demo] ``` getForegroundProcessName @@ -421,14 +414,17 @@ getReplaceAll ``` getScreenWidth getScreenHeight +setFullScreen setLandscape setPortrait isLandscape isPortrait getScreenRotation -captureWithStatusBar -captureWithoutStatusBar +screenShot isScreenLock +setSleepDuration +getSleepDuration +isTablet ``` * ### About SDCard→[SDCardUtils.java][sdcard.java]→[Demo][sdcard.demo] @@ -552,25 +548,6 @@ toDBC toSBC ``` -* ### About ThreadPool→[ThreadPoolUtils.java][thread_pool.java] -``` -ThreadPoolUtils -execute -execute -shutDown -shutDownNow -isShutDown -isTerminated -awaitTermination -submit -submit -invokeAll, invokeAny -schedule -schedule -scheduleWithFixedRate -scheduleWithFixedDelay -``` - * ### About Time→[TimeUtils.java][time.java]→[Test][time.test] ``` millis2String @@ -650,7 +627,7 @@ getEntries Gradle: ``` groovy -compile 'com.blankj:utilcode:1.7.1' +compile 'com.blankj:utilcode:1.8.0' ``` @@ -673,7 +650,7 @@ Utils.init(context); [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png -[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.7.1-brightgreen.svg +[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.8.0-brightgreen.svg [auc]: https://github.com/Blankj/AndroidUtilCode [apisvg]: https://img.shields.io/badge/API-15+-brightgreen.svg @@ -767,9 +744,6 @@ Utils.init(context); [phone.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/PhoneUtils.java [phone.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/PhoneActivity.java -[pinyin.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/PinyinUtils.java -[pinyin.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/PinyinUtilsTest.java - [process.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ProcessUtils.java [process.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/ProcessActivity.java @@ -799,8 +773,6 @@ Utils.init(context); [string.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/StringUtils.java [string.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/StringUtilsTest.java -[thread_pool.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ThreadPoolUtils.java - [time.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/TimeUtils.java [time.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/TimeUtilsTest.java diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d7757552..8b827e8f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,9 @@ + + + @@ -52,6 +55,13 @@ + + + + + + + @@ -75,12 +85,6 @@ - - - - - - + * author: Blankj + * blog : http://blankj.com + * time : 2016/10/13 + * desc : Activity工具类Demo + * + */ +public class BarNavActivity extends BaseBackActivity { + + private TextView tvAboutNav; + + public static void start(Context context) { + Intent starter = new Intent(context, BarNavActivity.class); + context.startActivity(starter); + } + + @Override + public void initData(Bundle bundle) { + + } + + @Override + public int bindLayout() { + return R.layout.activity_bar_nav; + } + + + @Override + public void initView(Bundle savedInstanceState, View view) { + getToolBar().setTitle(getString(R.string.demo_bar)); + + tvAboutNav = (TextView) findViewById(R.id.tv_about_nav); + tvAboutNav.setText(String.valueOf(BarUtils.getNavBarHeight())); + } + + @Override + public void doBusiness(Context context) { + + } + + @Override + public void onWidgetClick(View view) { + + } + + @Override + public void onWindowFocusChanged(boolean hasFocus) { + super.onWindowFocusChanged(hasFocus); + BarUtils.hideNavBar(this); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarAlphaActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/BarStatusAlphaActivity.java similarity index 90% rename from app/src/main/java/com/blankj/androidutilcode/activity/StatusBarAlphaActivity.java rename to app/src/main/java/com/blankj/androidutilcode/activity/BarStatusAlphaActivity.java index 76f55245..7608290e 100644 --- a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarAlphaActivity.java +++ b/app/src/main/java/com/blankj/androidutilcode/activity/BarStatusAlphaActivity.java @@ -19,7 +19,7 @@ import com.blankj.utilcode.util.BarUtils; * desc : Bar工具类Demo * */ -public class StatusBarAlphaActivity extends BaseActivity { +public class BarStatusAlphaActivity extends BaseActivity { private int mAlpha; @@ -27,7 +27,7 @@ public class StatusBarAlphaActivity extends BaseActivity { private SeekBar sbChangeAlpha; public static void start(Context context) { - Intent starter = new Intent(context, StatusBarAlphaActivity.class); + Intent starter = new Intent(context, BarStatusAlphaActivity.class); context.startActivity(starter); } @@ -38,7 +38,7 @@ public class StatusBarAlphaActivity extends BaseActivity { @Override public int bindLayout() { - return R.layout.activity_status_bar_alpha; + return R.layout.activity_bar_status_alpha; } @Override @@ -86,7 +86,7 @@ public class StatusBarAlphaActivity extends BaseActivity { }; private void updateStatusBar() { - BarUtils.setStatusBarAlpha(StatusBarAlphaActivity.this, mAlpha); + BarUtils.setStatusBarAlpha(BarStatusAlphaActivity.this, mAlpha); BarUtils.addMarginTopEqualStatusBarHeight(mTvStatusAlpha); } } diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarColorActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/BarStatusColorActivity.java similarity index 94% rename from app/src/main/java/com/blankj/androidutilcode/activity/StatusBarColorActivity.java rename to app/src/main/java/com/blankj/androidutilcode/activity/BarStatusColorActivity.java index 31846cee..3d6ca718 100644 --- a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarColorActivity.java +++ b/app/src/main/java/com/blankj/androidutilcode/activity/BarStatusColorActivity.java @@ -24,7 +24,7 @@ import java.util.Random; * desc : Bar工具类Demo * */ -public class StatusBarColorActivity extends BaseActivity { +public class BarStatusColorActivity extends BaseActivity { private Random mRandom; private int mColor; @@ -34,7 +34,7 @@ public class StatusBarColorActivity extends BaseActivity { private SeekBar sbChangeAlpha; public static void start(Context context) { - Intent starter = new Intent(context, StatusBarColorActivity.class); + Intent starter = new Intent(context, BarStatusColorActivity.class); context.startActivity(starter); } @@ -47,7 +47,7 @@ public class StatusBarColorActivity extends BaseActivity { @Override public int bindLayout() { - return R.layout.activity_status_bar_color; + return R.layout.activity_bar_status_color; } @Override diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarDrawerActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/BarStatusDrawerActivity.java similarity index 73% rename from app/src/main/java/com/blankj/androidutilcode/activity/StatusBarDrawerActivity.java rename to app/src/main/java/com/blankj/androidutilcode/activity/BarStatusDrawerActivity.java index c835a697..0828b751 100644 --- a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarDrawerActivity.java +++ b/app/src/main/java/com/blankj/androidutilcode/activity/BarStatusDrawerActivity.java @@ -28,7 +28,7 @@ import java.util.Random; * desc : Bar工具类Demo * */ -public class StatusBarDrawerActivity extends BaseDrawerActivity { +public class BarStatusDrawerActivity extends BaseDrawerActivity { private Random mRandom; private int mColor; @@ -36,12 +36,13 @@ public class StatusBarDrawerActivity extends BaseDrawerActivity { private View fakeStatusBar; private CheckBox cbAlpha; + private CheckBox cbFront; private TextView tvStatusAlpha; private SeekBar sbChangeAlpha; private Button btnRandomColor; public static void start(Context context) { - Intent starter = new Intent(context, StatusBarDrawerActivity.class); + Intent starter = new Intent(context, BarStatusDrawerActivity.class); context.startActivity(starter); } @@ -54,24 +55,27 @@ public class StatusBarDrawerActivity extends BaseDrawerActivity { @Override public int bindLayout() { - return R.layout.activity_status_bar_drawer; + return R.layout.activity_bar_status_drawer; } @Override public void initView(Bundle savedInstanceState, View view) { fakeStatusBar = findViewById(R.id.fake_status_bar); cbAlpha = (CheckBox) findViewById(R.id.cb_alpha); + cbFront = (CheckBox) findViewById(R.id.cb_front); btnRandomColor = (Button) findViewById(R.id.btn_random_color); tvStatusAlpha = (TextView) findViewById(R.id.tv_status_alpha); sbChangeAlpha = (SeekBar) findViewById(R.id.sb_change_alpha); - cbAlpha.setOnCheckedChangeListener(mCheckedChangeListener); + cbAlpha.setOnCheckedChangeListener(mAlphaCheckedChangeListener); + cbFront.setOnCheckedChangeListener(mFrontCheckedChangeListener); btnRandomColor.setOnClickListener(this); findViewById(R.id.btn_set_transparent).setOnClickListener(this); sbChangeAlpha.setOnSeekBarChangeListener(mColorListener); tvStatusAlpha.setText(String.valueOf(mAlpha)); + BarUtils.addMarginTopEqualStatusBarHeight(cbAlpha); updateStatusBar(); } @@ -113,26 +117,32 @@ public class StatusBarDrawerActivity extends BaseDrawerActivity { } }; - CompoundButton.OnCheckedChangeListener mCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() { + CompoundButton.OnCheckedChangeListener mAlphaCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { btnRandomColor.setVisibility(View.GONE); - rootLayout.setBackgroundResource(R.drawable.bg_bar); + flActivityContainer.setBackgroundResource(R.drawable.bg_bar); } else { btnRandomColor.setVisibility(View.VISIBLE); - rootLayout.setBackgroundColor(Color.WHITE); + flActivityContainer.setBackgroundColor(Color.WHITE); } updateStatusBar(); } }; + CompoundButton.OnCheckedChangeListener mFrontCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + updateStatusBar(); + } + }; + private void updateStatusBar() { if (cbAlpha.isChecked()) { - + BarUtils.setStatusBarAlpha4Drawer(BarStatusDrawerActivity.this, rootLayout, fakeStatusBar, mAlpha, cbFront.isChecked()); } else { - BarUtils.setStatusBarColor4Drawer(this, rootLayout, fakeStatusBar, mColor, mAlpha, true); - + BarUtils.setStatusBarColor4Drawer(BarStatusDrawerActivity.this, rootLayout, fakeStatusBar, mColor, mAlpha, cbFront.isChecked()); } } diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarFragmentActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/BarStatusFragmentActivity.java similarity index 85% rename from app/src/main/java/com/blankj/androidutilcode/activity/StatusBarFragmentActivity.java rename to app/src/main/java/com/blankj/androidutilcode/activity/BarStatusFragmentActivity.java index b17e2048..388d4b35 100644 --- a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarFragmentActivity.java +++ b/app/src/main/java/com/blankj/androidutilcode/activity/BarStatusFragmentActivity.java @@ -13,9 +13,9 @@ import android.view.View; import com.blankj.androidutilcode.R; import com.blankj.androidutilcode.base.BaseActivity; -import com.blankj.androidutilcode.fragment.StatusBarAlphaFragment; -import com.blankj.androidutilcode.fragment.StatusBarColorFragment; -import com.blankj.androidutilcode.fragment.StatusBarImageViewFragment; +import com.blankj.androidutilcode.fragment.BarStatusAlphaFragment; +import com.blankj.androidutilcode.fragment.BarStatusColorFragment; +import com.blankj.androidutilcode.fragment.BarStatusImageViewFragment; import java.util.ArrayList; @@ -27,7 +27,7 @@ import java.util.ArrayList; * desc : Bar工具类Demo * */ -public class StatusBarFragmentActivity extends BaseActivity { +public class BarStatusFragmentActivity extends BaseActivity { private int[] itemIds = new int[]{R.id.navigation_color, R.id.navigation_alpha, R.id.navigation_image_view}; @@ -36,7 +36,7 @@ public class StatusBarFragmentActivity extends BaseActivity { private ArrayList mFragmentList = new ArrayList<>(); public static void start(Context context) { - Intent starter = new Intent(context, StatusBarFragmentActivity.class); + Intent starter = new Intent(context, BarStatusFragmentActivity.class); context.startActivity(starter); } @@ -52,7 +52,7 @@ public class StatusBarFragmentActivity extends BaseActivity { @Override public int bindLayout() { - return R.layout.activity_status_bar_fragment; + return R.layout.activity_bar_status_fragment; } @Override @@ -60,9 +60,9 @@ public class StatusBarFragmentActivity extends BaseActivity { mVpHome = (ViewPager) findViewById(R.id.vp_home); navigation = (BottomNavigationView) findViewById(R.id.navigation); - mFragmentList.add(StatusBarColorFragment.newInstance()); - mFragmentList.add(StatusBarAlphaFragment.newInstance()); - mFragmentList.add(StatusBarImageViewFragment.newInstance()); + mFragmentList.add(BarStatusColorFragment.newInstance()); + mFragmentList.add(BarStatusAlphaFragment.newInstance()); + mFragmentList.add(BarStatusImageViewFragment.newInstance()); mVpHome.setAdapter(new FragmentPagerAdapter(getSupportFragmentManager()) { diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarImageViewActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/BarStatusImageViewActivity.java similarity index 89% rename from app/src/main/java/com/blankj/androidutilcode/activity/StatusBarImageViewActivity.java rename to app/src/main/java/com/blankj/androidutilcode/activity/BarStatusImageViewActivity.java index 18c417a9..2b0be7a1 100644 --- a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarImageViewActivity.java +++ b/app/src/main/java/com/blankj/androidutilcode/activity/BarStatusImageViewActivity.java @@ -19,7 +19,7 @@ import com.blankj.utilcode.util.BarUtils; * desc : Bar工具类Demo * */ -public class StatusBarImageViewActivity extends BaseActivity { +public class BarStatusImageViewActivity extends BaseActivity { private int mAlpha; @@ -27,7 +27,7 @@ public class StatusBarImageViewActivity extends BaseActivity { private SeekBar sbChangeAlpha; public static void start(Context context) { - Intent starter = new Intent(context, StatusBarImageViewActivity.class); + Intent starter = new Intent(context, BarStatusImageViewActivity.class); context.startActivity(starter); } @@ -38,7 +38,7 @@ public class StatusBarImageViewActivity extends BaseActivity { @Override public int bindLayout() { - return R.layout.activity_status_bar_image_view; + return R.layout.activity_bar_status_image_view; } @Override @@ -86,6 +86,6 @@ public class StatusBarImageViewActivity extends BaseActivity { }; private void updateStatusBar() { - BarUtils.setStatusBarAlpha(StatusBarImageViewActivity.this, mAlpha, true); + BarUtils.setStatusBarAlpha(BarStatusImageViewActivity.this, mAlpha, true); } } diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarSwipeBackActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/BarStatusSwipeBackActivity.java similarity index 83% rename from app/src/main/java/com/blankj/androidutilcode/activity/StatusBarSwipeBackActivity.java rename to app/src/main/java/com/blankj/androidutilcode/activity/BarStatusSwipeBackActivity.java index ba0de974..8f904320 100644 --- a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarSwipeBackActivity.java +++ b/app/src/main/java/com/blankj/androidutilcode/activity/BarStatusSwipeBackActivity.java @@ -9,13 +9,15 @@ import android.view.View; import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; +import android.widget.LinearLayout; import android.widget.SeekBar; import android.widget.TextView; import com.blankj.androidutilcode.R; import com.blankj.androidutilcode.UtilsApp; -import com.blankj.androidutilcode.base.BaseBackActivity; +import com.blankj.androidutilcode.base.BaseActivity; import com.blankj.utilcode.util.BarUtils; +import com.r0adkll.slidr.Slidr; import java.util.Random; @@ -28,19 +30,20 @@ import java.util.Random; * desc : Bar工具类Demo * */ -public class StatusBarSwipeBackActivity extends BaseBackActivity { +public class BarStatusSwipeBackActivity extends BaseActivity { private Random mRandom; private int mColor; private int mAlpha; + private LinearLayout llContainer; private CheckBox cbAlpha; private TextView tvStatusAlpha; private SeekBar sbChangeAlpha; private Button btnRandomColor; public static void start(Context context) { - Intent starter = new Intent(context, StatusBarSwipeBackActivity.class); + Intent starter = new Intent(context, BarStatusSwipeBackActivity.class); context.startActivity(starter); } @@ -53,11 +56,14 @@ public class StatusBarSwipeBackActivity extends BaseBackActivity { @Override public int bindLayout() { - return R.layout.activity_status_bar_swipe_back; + return R.layout.activity_bar_status_swipe_back; } @Override public void initView(Bundle savedInstanceState, View view) { + Slidr.attach(this); + + llContainer = (LinearLayout) findViewById(R.id.ll_container); cbAlpha = (CheckBox) findViewById(R.id.cb_alpha); btnRandomColor = (Button) findViewById(R.id.btn_random_color); tvStatusAlpha = (TextView) findViewById(R.id.tv_status_alpha); @@ -70,9 +76,6 @@ public class StatusBarSwipeBackActivity extends BaseBackActivity { tvStatusAlpha.setText(String.valueOf(mAlpha)); - abl.setVisibility(View.GONE); - BarUtils.subtractMarginTopEqualStatusBarHeight(rootLayout); - BarUtils.addMarginTopEqualStatusBarHeight(cbAlpha); updateStatusBar(); } @@ -119,10 +122,10 @@ public class StatusBarSwipeBackActivity extends BaseBackActivity { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { btnRandomColor.setVisibility(View.GONE); - rootLayout.setBackgroundResource(R.drawable.bg_bar); + llContainer.setBackgroundResource(R.drawable.bg_bar); } else { btnRandomColor.setVisibility(View.VISIBLE); - rootLayout.setBackgroundColor(Color.WHITE); + llContainer.setBackgroundColor(Color.WHITE); } updateStatusBar(); } @@ -131,8 +134,10 @@ public class StatusBarSwipeBackActivity extends BaseBackActivity { private void updateStatusBar() { if (cbAlpha.isChecked()) { BarUtils.setStatusBarAlpha(this, mAlpha); + BarUtils.addMarginTopEqualStatusBarHeight(cbAlpha); } else { BarUtils.setStatusBarColor(this, mColor, mAlpha); + BarUtils.addMarginTopEqualStatusBarHeight(cbAlpha); } } } diff --git a/app/src/main/java/com/blankj/androidutilcode/base/BaseDrawerActivity.java b/app/src/main/java/com/blankj/androidutilcode/base/BaseDrawerActivity.java index 5a304fae..c2ea4e9d 100644 --- a/app/src/main/java/com/blankj/androidutilcode/base/BaseDrawerActivity.java +++ b/app/src/main/java/com/blankj/androidutilcode/base/BaseDrawerActivity.java @@ -9,6 +9,7 @@ import android.view.LayoutInflater; import android.view.MenuItem; import android.widget.FrameLayout; +import com.blankj.androidutilcode.Config; import com.blankj.androidutilcode.R; @@ -23,17 +24,17 @@ import com.blankj.androidutilcode.R; public abstract class BaseDrawerActivity extends BaseActivity { protected DrawerLayout rootLayout; - protected FrameLayout flActivityContainer; + protected FrameLayout flActivityContainer; NavigationView.OnNavigationItemSelectedListener mListener = new NavigationView.OnNavigationItemSelectedListener() { @Override public boolean onNavigationItemSelected(@NonNull MenuItem item) { switch (item.getItemId()) { case R.id.action_git_hub: - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/Blankj/AndroidUtilCode"))); + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Config.GITHUB))); break; case R.id.action_blog: - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.jianshu.com/u/46702d5c6978"))); + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Config.BLOG))); break; } return false; diff --git a/app/src/main/java/com/blankj/androidutilcode/fragment/StatusBarAlphaFragment.java b/app/src/main/java/com/blankj/androidutilcode/fragment/BarStatusAlphaFragment.java similarity index 85% rename from app/src/main/java/com/blankj/androidutilcode/fragment/StatusBarAlphaFragment.java rename to app/src/main/java/com/blankj/androidutilcode/fragment/BarStatusAlphaFragment.java index 386b0ff3..bc2456c8 100644 --- a/app/src/main/java/com/blankj/androidutilcode/fragment/StatusBarAlphaFragment.java +++ b/app/src/main/java/com/blankj/androidutilcode/fragment/BarStatusAlphaFragment.java @@ -7,7 +7,7 @@ import android.widget.SeekBar; import android.widget.TextView; import com.blankj.androidutilcode.R; -import com.blankj.androidutilcode.activity.StatusBarFragmentActivity; +import com.blankj.androidutilcode.activity.BarStatusFragmentActivity; import com.blankj.androidutilcode.base.BaseFragment; import com.blankj.utilcode.util.BarUtils; @@ -19,7 +19,7 @@ import com.blankj.utilcode.util.BarUtils; * desc : Bar工具类Demo * */ -public class StatusBarAlphaFragment extends BaseFragment { +public class BarStatusAlphaFragment extends BaseFragment { private int mAlpha; @@ -28,8 +28,8 @@ public class StatusBarAlphaFragment extends BaseFragment */ -public class StatusBarColorFragment extends BaseFragment { +public class BarStatusColorFragment extends BaseFragment { private Random mRandom; private int mColor; @@ -33,8 +33,8 @@ public class StatusBarColorFragment extends BaseFragment */ -public class StatusBarImageViewFragment extends BaseFragment { +public class BarStatusImageViewFragment extends BaseFragment { private int mAlpha; @@ -27,8 +27,8 @@ public class StatusBarImageViewFragment extends BaseFragment + android:layout_height="wrap_content" />