1. change minSdk to 14.

2. fix bug when change fragment rapidly.
niorgai · Jan 21, 2017 · 82b6335 · 82b6335
1 parent 94070bf
commit 82b6335
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Add the dependency
 ```groovy
 
 	dependencies {
-	        compile ('com.github.niorgai:StatusBarCompat:2.1.1', {
+	        compile ('com.github.niorgai:StatusBarCompat:2.1.2', {
                 exclude group: 'com.android.support'
             })
 	}

diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
 
     defaultConfig {
         applicationId "qiu.statusbarcompat"
-        minSdkVersion 15
+        minSdkVersion 14
         targetSdkVersion config.targetSdkVersion
         versionCode 1
         versionName "1.0"

diff --git a/library/build.gradle b/library/build.gradle
@@ -8,7 +8,7 @@ android {
     buildToolsVersion config.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 15
+        minSdkVersion 14
         targetSdkVersion config.targetSdkVersion
         versionCode 1
         versionName "1.0"

diff --git a/library/src/main/java/qiu/niorgai/StatusBarCompatKitKat.java b/library/src/main/java/qiu/niorgai/StatusBarCompatKitKat.java
@@ -6,6 +6,7 @@
 import android.os.Build;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.CollapsingToolbarLayout;
+import android.support.design.widget.CoordinatorLayout;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.Toolbar;
 import android.view.Gravity;
@@ -181,6 +182,19 @@ static void setStatusBarColorForCollapsingToolbar(Activity activity, final AppBa
         removeFakeStatusBarViewIfExist(activity);
         removeMarginTopOfContentChild(mContentChild, statusBarHeight);
         final View statusView = addFakeStatusBarView(activity, statusColor, statusBarHeight);
+
+        CoordinatorLayout.Behavior behavior = ((CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams()).getBehavior();
+        if (behavior != null && behavior instanceof AppBarLayout.Behavior) {
+            int verticalOffset = ((AppBarLayout.Behavior) behavior).getTopAndBottomOffset();
+            if (Math.abs(verticalOffset) > appBarLayout.getHeight() - collapsingToolbarLayout.getScrimVisibleHeightTrigger()) {
+                statusView.setAlpha(1f);
+            } else {
+                statusView.setAlpha(0f);
+            }
+        } else {
+            statusView.setAlpha(0f);
+        }
+
         appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
             @Override
             public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {

diff --git a/library/src/main/java/qiu/niorgai/StatusBarCompatLollipop.java b/library/src/main/java/qiu/niorgai/StatusBarCompatLollipop.java
@@ -8,6 +8,7 @@
 import android.os.Build;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.CollapsingToolbarLayout;
+import android.support.design.widget.CoordinatorLayout;
 import android.support.v4.view.OnApplyWindowInsetsListener;
 import android.support.v4.view.ViewCompat;
 import android.support.v4.view.WindowInsetsCompat;
@@ -92,10 +93,11 @@ static void translucentStatusBar(Activity activity, boolean hideStatusBarBackgro
      * compat for CollapsingToolbarLayout
      *
      * 1. change to full-screen mode(like translucentStatusBar).
-     * 2. set View's FitsSystemWindow to false.
-     * 3. adjust toolbar's height to layout.
-     * 4. cancel CollapsingToolbarLayout's WindowInsets, let it layout as normal(now setStatusBarScrimColor is useless).
+     * 2. cancel CollapsingToolbarLayout's WindowInsets, let it layout as normal(now setStatusBarScrimColor is useless).
+     * 3. set View's FitsSystemWindow to false.
+     * 4. adjust toolbar's height to layout.
      * 5. change statusBarColor by AppBarLayout's offset.
+     * 6. add Listener to change statusBarColor
      */
     static void setStatusBarColorForCollapsingToolbar(Activity activity, final AppBarLayout appBarLayout, final CollapsingToolbarLayout collapsingToolbarLayout,
                                                       Toolbar toolbar, final int statusColor) {
@@ -106,6 +108,13 @@ static void setStatusBarColorForCollapsingToolbar(Activity activity, final AppBa
         window.setStatusBarColor(Color.TRANSPARENT);
         window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
 
+        ViewCompat.setOnApplyWindowInsetsListener(collapsingToolbarLayout, new OnApplyWindowInsetsListener() {
+            @Override
+            public WindowInsetsCompat onApplyWindowInsets(View v, WindowInsetsCompat insets) {
+                return insets;
+            }
+        });
+
         ViewGroup mContentView = (ViewGroup) window.findViewById(Window.ID_ANDROID_CONTENT);
         View mChildView = mContentView.getChildAt(0);
         if (mChildView != null) {
@@ -124,12 +133,18 @@ static void setStatusBarColorForCollapsingToolbar(Activity activity, final AppBa
             toolbar.setTag(true);
         }
 
-        ViewCompat.setOnApplyWindowInsetsListener(collapsingToolbarLayout, new OnApplyWindowInsetsListener() {
-            @Override
-            public WindowInsetsCompat onApplyWindowInsets(View v, WindowInsetsCompat insets) {
-                return insets;
+        CoordinatorLayout.Behavior behavior = ((CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams()).getBehavior();
+        if (behavior != null && behavior instanceof AppBarLayout.Behavior) {
+            int verticalOffset = ((AppBarLayout.Behavior) behavior).getTopAndBottomOffset();
+            if (Math.abs(verticalOffset) > appBarLayout.getHeight() - collapsingToolbarLayout.getScrimVisibleHeightTrigger()) {
+                window.setStatusBarColor(statusColor);
+            } else {
+                window.setStatusBarColor(Color.TRANSPARENT);
             }
-        });
+        } else {
+            window.setStatusBarColor(Color.TRANSPARENT);
+        }
+
         collapsingToolbarLayout.setFitsSystemWindows(false);
         appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
             @Override