Fix Toolbar blinks when scrolling fast. #38

ksoichiro · Jan 14, 2015 · ec1e774 · ec1e774
1 parent 217f146
commit ec1e774
Showing 1 changed file with 43 additions and 17 deletions.
diff --git a/...github/ksoichiro/android/observablescrollview/samples/ToolbarControlListViewActivity.java b/...github/ksoichiro/android/observablescrollview/samples/ToolbarControlListViewActivity.java
@@ -74,11 +74,11 @@ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCoun
 
     @Override
     public void onScrollChanged(int scrollY, boolean firstScroll, boolean dragging) {
-        int toolbarHeight = mToolbarView.getHeight();
-        if (dragging || scrollY < toolbarHeight) {
+        if (dragging) {
+            int toolbarHeight = mToolbarView.getHeight();
             if (firstScroll) {
                 float currentHeaderTranslationY = ViewHelper.getTranslationY(mHeaderView);
-                if (-toolbarHeight < currentHeaderTranslationY && toolbarHeight < scrollY) {
+                if (-toolbarHeight < currentHeaderTranslationY) {
                     mBaseTranslationY = scrollY;
                 }
             }
@@ -96,22 +96,48 @@ public void onDownMotionEvent() {
     public void onUpOrCancelMotionEvent(ScrollState scrollState) {
         mBaseTranslationY = 0;
 
-        float headerTranslationY = ViewHelper.getTranslationY(mHeaderView);
-        int toolbarHeight = mToolbarView.getHeight();
-        if (scrollState == ScrollState.UP) {
-            if (toolbarHeight < mListView.getCurrentScrollY()) {
-                if (headerTranslationY != -toolbarHeight) {
-                    ViewPropertyAnimator.animate(mHeaderView).cancel();
-                    ViewPropertyAnimator.animate(mHeaderView).translationY(-toolbarHeight).setDuration(200).start();
-                }
+        if (scrollState == ScrollState.DOWN) {
+            showToolbar();
+        } else if (scrollState == ScrollState.UP) {
+            int toolbarHeight = mToolbarView.getHeight();
+            int scrollY = mListView.getCurrentScrollY();
+            if (toolbarHeight <= scrollY) {
+                hideToolbar();
+            } else {
+                showToolbar();
             }
-        } else if (scrollState == ScrollState.DOWN) {
-            if (toolbarHeight < mListView.getCurrentScrollY()) {
-                if (headerTranslationY != 0) {
-                    ViewPropertyAnimator.animate(mHeaderView).cancel();
-                    ViewPropertyAnimator.animate(mHeaderView).translationY(0).setDuration(200).start();
-                }
+        } else {
+            // Even if onScrollChanged occurs without scrollY changing, toolbar should be adjusted
+            if (!toolbarIsShown() && !toolbarIsHidden()) {
+                // Toolbar is moving but doesn't know which to move:
+                // you can change this to hideToolbar()
+                showToolbar();
             }
         }
     }
+
+    private boolean toolbarIsShown() {
+        return ViewHelper.getTranslationY(mHeaderView) == 0;
+    }
+
+    private boolean toolbarIsHidden() {
+        return ViewHelper.getTranslationY(mHeaderView) == -mToolbarView.getHeight();
+    }
+
+    private void showToolbar() {
+        float headerTranslationY = ViewHelper.getTranslationY(mHeaderView);
+        if (headerTranslationY != 0) {
+            ViewPropertyAnimator.animate(mHeaderView).cancel();
+            ViewPropertyAnimator.animate(mHeaderView).translationY(0).setDuration(200).start();
+        }
+    }
+
+    private void hideToolbar() {
+        float headerTranslationY = ViewHelper.getTranslationY(mHeaderView);
+        int toolbarHeight = mToolbarView.getHeight();
+        if (headerTranslationY != -toolbarHeight) {
+            ViewPropertyAnimator.animate(mHeaderView).cancel();
+            ViewPropertyAnimator.animate(mHeaderView).translationY(-toolbarHeight).setDuration(200).start();
+        }
+    }
 }