see 07/27 log

Blankj · Blankj · commit 1cd41d700dfb · 2017-07-27T18:54:41.000+08:00
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/ActivityActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/ActivityActivity.java
@@ -41,7 +41,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_activity));
+        getToolBar().setTitle(getString(R.string.demo_activity));
 
         findViewById(R.id.btn_launch_image_activity).setOnClickListener(this);
         TextView tvAboutActivity = (TextView) findViewById(R.id.tv_about_activity);
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/AppActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/AppActivity.java
@@ -41,7 +41,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_app));
+        getToolBar().setTitle(getString(R.string.demo_app));
 
         findViewById(R.id.btn_install_app).setOnClickListener(this);
         findViewById(R.id.btn_install_app_silent).setOnClickListener(this);
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/BarActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/BarActivity.java
@@ -35,7 +35,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_bar));
+        getToolBar().setTitle(getString(R.string.demo_bar));
 
         findViewById(R.id.btn_status_bar_color).setOnClickListener(this);
         findViewById(R.id.btn_status_bar_alpha).setOnClickListener(this);
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/CleanActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/CleanActivity.java
@@ -40,7 +40,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_clean));
+        getToolBar().setTitle(getString(R.string.demo_clean));
 
         Button btnCleanInternalCache = (Button) findViewById(R.id.btn_clean_internal_cache);
         Button btnCleanInternalFiles = (Button) findViewById(R.id.btn_clean_internal_files);
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/DeviceActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/DeviceActivity.java
@@ -37,7 +37,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_device));
+        getToolBar().setTitle(getString(R.string.demo_device));
 
         findViewById(R.id.btn_shutdown).setOnClickListener(this);
         findViewById(R.id.btn_reboot).setOnClickListener(this);
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/FragmentActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/FragmentActivity.java
@@ -42,7 +42,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_fragment));
+        getToolBar().setTitle(getString(R.string.demo_fragment));
     }
 
     @Override
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/ImageActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/ImageActivity.java
@@ -43,7 +43,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_image));
+        getToolBar().setTitle(getString(R.string.demo_image));
 
         ivSrc = (ImageView) findViewById(R.id.iv_src);
         ivView2Bitmap = (ImageView) findViewById(R.id.iv_view2Bitmap);
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/KeyboardActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/KeyboardActivity.java
@@ -49,7 +49,8 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_keyboard));
+        getToolBar().setTitle(getString(R.string.demo_keyboard));
+
         etInput = (EditText) findViewById(R.id.et_input);
         findViewById(R.id.btn_hide_soft_input).setOnClickListener(this);
         findViewById(R.id.btn_show_soft_input).setOnClickListener(this);
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/LogActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/LogActivity.java
@@ -91,7 +91,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_log));
+        getToolBar().setTitle(getString(R.string.demo_log));
 
         findViewById(R.id.btn_toggle_log).setOnClickListener(this);
         findViewById(R.id.btn_toggle_console).setOnClickListener(this);
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/MainActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/MainActivity.java
@@ -33,7 +33,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        DrawerLayout mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+        DrawerLayout mDrawerLayout = (DrawerLayout) findViewById(R.id.root_layout);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
 
         setSupportActionBar(toolbar);
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/NetworkActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/NetworkActivity.java
@@ -39,7 +39,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_network));
+        getToolBar().setTitle(getString(R.string.demo_network));
 
         tvAboutNetwork = (TextView) findViewById(R.id.tv_about_network);
         findViewById(R.id.btn_open_wireless_settings).setOnClickListener(this);
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/PhoneActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/PhoneActivity.java
@@ -37,7 +37,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_phone));
+        getToolBar().setTitle(getString(R.string.demo_phone));
 
         findViewById(R.id.btn_dial).setOnClickListener(this);
         findViewById(R.id.btn_call).setOnClickListener(this);
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/PinyinActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/PinyinActivity.java
@@ -37,7 +37,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_pinyin));
+        getToolBar().setTitle(getString(R.string.demo_pinyin));
 
         TextView tvAboutPinyin = (TextView) findViewById(R.id.tv_about_pinyin);
         tvAboutPinyin.setText("测试拼音工具类"
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/ProcessActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/ProcessActivity.java
@@ -42,7 +42,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_process));
+        getToolBar().setTitle(getString(R.string.demo_process));
 
         findViewById(R.id.btn_kill_all_background_processes).setOnClickListener(this);
         tvAboutProcess = (TextView) findViewById(R.id.tv_about_process);
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/SDCardActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/SDCardActivity.java
@@ -37,7 +37,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_sdcard));
+        getToolBar().setTitle(getString(R.string.demo_sdcard));
 
         TextView tvAboutSdcard = (TextView) findViewById(R.id.tv_about_sdcard);
         tvAboutSdcard.setText("isSDCardEnable: " + SDCardUtils.isSDCardEnable()
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/SnackbarActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/SnackbarActivity.java
@@ -45,7 +45,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_snackbar));
+        getToolBar().setTitle(getString(R.string.demo_snackbar));
 
         snackBarRootView = findViewById(android.R.id.content);
         findViewById(R.id.btn_short_snackbar).setOnClickListener(this);
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/SpanActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/SpanActivity.java
@@ -84,7 +84,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_span));
+        getToolBar().setTitle(getString(R.string.demo_span));
 
         ClickableSpan clickableSpan = new ClickableSpan() {
             @Override
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarAlphaActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarAlphaActivity.java
@@ -8,7 +8,7 @@
 import android.widget.TextView;
 
 import com.blankj.androidutilcode.R;
-import com.blankj.androidutilcode.base.BaseBackActivity;
+import com.blankj.androidutilcode.base.BaseActivity;
 import com.blankj.utilcode.util.BarUtils;
 
 /**
@@ -19,7 +19,7 @@
  *     desc  : Bar工具类Demo
  * </pre>
  */
-public class StatusBarAlphaActivity extends BaseBackActivity {
+public class StatusBarAlphaActivity extends BaseActivity {
 
     private int mAlpha;
 
@@ -86,6 +86,7 @@ public void onStopTrackingTouch(SeekBar seekBar) {
     };
 
     private void updateStatusBar() {
-        BarUtils.setStatusBarAlpha(StatusBarAlphaActivity.this, mAlpha, mTvStatusAlpha);
+        BarUtils.setStatusBarAlpha(StatusBarAlphaActivity.this, mAlpha);
+        BarUtils.addMarginTopEqualStatusBarHeight(mTvStatusAlpha);
     }
 }
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarDrawerActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarDrawerActivity.java
@@ -2,10 +2,13 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.DrawerLayout;
 import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
@@ -31,11 +34,13 @@ public class StatusBarDrawerActivity extends BaseDrawerActivity {
     private int    mColor;
     private int    mAlpha;
 
-    private TextView mTvStatusAlpha;
+    private CheckBox cbAlpha;
+    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, StatusBarSwipeBackActivity.class);
         context.startActivity(starter);
     }
 
@@ -48,11 +53,23 @@ public void initData(Bundle bundle) {
 
     @Override
     public int bindLayout() {
-        return R.layout.activity_status_bar_drawer;
+        return R.layout.activity_status_bar_swipe_back;
     }
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
+        cbAlpha = (CheckBox) findViewById(R.id.cb_alpha);
+        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);
+        btnRandomColor.setOnClickListener(this);
+        findViewById(R.id.btn_set_transparent).setOnClickListener(this);
+        sbChangeAlpha.setOnSeekBarChangeListener(mColorListener);
+
+        tvStatusAlpha.setText(String.valueOf(mAlpha));
+
         updateStatusBar();
     }
 
@@ -75,11 +92,11 @@ public void onWidgetClick(View view) {
         }
     }
 
-    private SeekBar.OnSeekBarChangeListener colorListener = new SeekBar.OnSeekBarChangeListener() {
+    private SeekBar.OnSeekBarChangeListener mColorListener = new SeekBar.OnSeekBarChangeListener() {
         @Override
         public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
             mAlpha = progress;
-            mTvStatusAlpha.setText(String.valueOf(mAlpha));
+            tvStatusAlpha.setText(String.valueOf(mAlpha));
             updateStatusBar();
         }
 
@@ -94,7 +111,21 @@ public void onStopTrackingTouch(SeekBar seekBar) {
         }
     };
 
+    CompoundButton.OnCheckedChangeListener mCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            if (isChecked) {
+                btnRandomColor.setVisibility(View.GONE);
+                rootLayout.setBackgroundResource(R.drawable.bg_bar);
+            } else {
+                btnRandomColor.setVisibility(View.VISIBLE);
+                rootLayout.setBackgroundColor(Color.WHITE);
+            }
+            updateStatusBar();
+        }
+    };
+
     private void updateStatusBar() {
-        BarUtils.setColorForDrawerLayout(StatusBarDrawerActivity.this, (DrawerLayout) findViewById(R.id.drawer_layout), mColor, mAlpha);
+        BarUtils.setStatusBarColor(mActivity, mColor, mAlpha);
     }
 }
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarSwipeBackActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/StatusBarSwipeBackActivity.java
@@ -2,10 +2,13 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
@@ -31,9 +34,10 @@ public class StatusBarSwipeBackActivity extends BaseBackActivity {
     private int    mColor;
     private int    mAlpha;
 
-    protected Toolbar mToolbar;
-    private TextView mTvStatusAlpha;
+    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);
@@ -54,14 +58,19 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_bar));
+        getToolBar().setTitle(getString(R.string.demo_bar));
 
-        findViewById(R.id.btn_random_color).setOnClickListener(this);
-        findViewById(R.id.btn_set_transparent).setOnClickListener(this);
-        mTvStatusAlpha = (TextView) findViewById(R.id.tv_status_alpha);
+        cbAlpha = (CheckBox) findViewById(R.id.cb_alpha);
+        btnRandomColor = (Button) findViewById(R.id.btn_random_color);
+        tvStatusAlpha = (TextView) findViewById(R.id.tv_status_alpha);
         sbChangeAlpha = (SeekBar) findViewById(R.id.sb_change_alpha);
-        sbChangeAlpha.setOnSeekBarChangeListener(colorListener);
-        mTvStatusAlpha.setText(String.valueOf(mAlpha));
+
+        cbAlpha.setOnCheckedChangeListener(mCheckedChangeListener);
+        btnRandomColor.setOnClickListener(this);
+        findViewById(R.id.btn_set_transparent).setOnClickListener(this);
+        sbChangeAlpha.setOnSeekBarChangeListener(mColorListener);
+
+        tvStatusAlpha.setText(String.valueOf(mAlpha));
 
         updateStatusBar();
     }
@@ -85,11 +94,11 @@ public void onWidgetClick(View view) {
         }
     }
 
-    private SeekBar.OnSeekBarChangeListener colorListener = new SeekBar.OnSeekBarChangeListener() {
+    private SeekBar.OnSeekBarChangeListener mColorListener = new SeekBar.OnSeekBarChangeListener() {
         @Override
         public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
             mAlpha = progress;
-            mTvStatusAlpha.setText(String.valueOf(mAlpha));
+            tvStatusAlpha.setText(String.valueOf(mAlpha));
             updateStatusBar();
         }
 
@@ -104,7 +113,29 @@ public void onStopTrackingTouch(SeekBar seekBar) {
         }
     };
 
+    CompoundButton.OnCheckedChangeListener mCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            if (isChecked) {
+                btnRandomColor.setVisibility(View.GONE);
+                getToolBar().hide();
+                rootLayout.setBackgroundResource(R.drawable.bg_bar);
+            } else {
+                btnRandomColor.setVisibility(View.VISIBLE);
+                getToolBar().show();
+                rootLayout.setBackgroundColor(Color.WHITE);
+            }
+            updateStatusBar();
+        }
+    };
+
     private void updateStatusBar() {
-        BarUtils.setStatusBarColor(StatusBarSwipeBackActivity.this, mColor, mAlpha);
+        if (!cbAlpha.isChecked()) {
+            BarUtils.setStatusBarColor(StatusBarSwipeBackActivity.this, mColor, mAlpha);
+            BarUtils.subtractMarginTopEqualStatusBarHeight(cbAlpha);
+        } else {
+            BarUtils.setStatusBarAlpha(StatusBarSwipeBackActivity.this, mAlpha);
+            BarUtils.addMarginTopEqualStatusBarHeight(cbAlpha);
+        }
     }
 }
diff --git a/app/src/main/java/com/blankj/androidutilcode/activity/ToastActivity.java b/app/src/main/java/com/blankj/androidutilcode/activity/ToastActivity.java
@@ -39,7 +39,7 @@ public int bindLayout() {
 
     @Override
     public void initView(Bundle savedInstanceState, View view) {
-        getSupportActionBar().setTitle(getString(R.string.demo_toast));
+        getToolBar().setTitle(getString(R.string.demo_toast));
 
         view.findViewById(R.id.btn_show_short_toast_safe).setOnClickListener(this);
         view.findViewById(R.id.btn_show_short_toast).setOnClickListener(this);
diff --git a/app/src/main/java/com/blankj/androidutilcode/base/BaseBackActivity.java b/app/src/main/java/com/blankj/androidutilcode/base/BaseBackActivity.java
diff --git a/app/src/main/java/com/blankj/androidutilcode/base/BaseDrawerActivity.java b/app/src/main/java/com/blankj/androidutilcode/base/BaseDrawerActivity.java
diff --git a/app/src/main/res/layout/activity_back.xml b/app/src/main/res/layout/activity_back.xml
diff --git a/app/src/main/res/layout/activity_drawer.xml b/app/src/main/res/layout/activity_drawer.xml
diff --git a/app/src/main/res/layout/activity_status_bar_drawer.xml b/app/src/main/res/layout/activity_status_bar_drawer.xml
diff --git a/app/src/main/res/layout/activity_status_bar_swipe_back.xml b/app/src/main/res/layout/activity_status_bar_swipe_back.xml
diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public int bindLayout() {`
`42`	`42`
`43`	`43`	`@Override`
`44`	`44`	`public void initView(Bundle savedInstanceState, View view) {`
`45`		`- getSupportActionBar().setTitle(getString(R.string.demo_fragment));`
	`45`	`+ getToolBar().setTitle(getString(R.string.demo_fragment));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`@Override`