Hide AppBar on scroll

android/app/src/main/java/com/reactnativenavigation/animation/HideOnScrollAnimator.java → android/app/src/main/java/com/reactnativenavigation/animation/OnScrollAnimator.java

@@ -8,7 +8,7 @@ import android.view.View;
 
 import com.reactnativenavigation.views.ScrollDirectionListener;
 
-public class HideOnScrollAnimator {
+public class OnScrollAnimator {
 
     public enum HideDirection {
         Up, Down
@@ -25,7 +25,7 @@ public class HideOnScrollAnimator {
     private final int shownEndValue = 0;
     private State state = State.Shown;
 
-    public HideOnScrollAnimator(View view, HideDirection hideDirection, int height) {
+    public OnScrollAnimator(View view, HideDirection hideDirection, int height) {
         this.view = view;
         this.hideDirection = hideDirection;
         this.hiddenEndValue = hideDirection == HideDirection.Up ? -height : height;
@@ -50,10 +50,10 @@ public class HideOnScrollAnimator {
     }
 
     private void handleUpHidingViews(ScrollDirectionListener.Direction scrollDirection) {
-        if (scrollUp(scrollDirection) && !hiding()) {
-            hide();
-        } else if (scrollDown(scrollDirection) && !showing()) {
+        if (scrollUp(scrollDirection) && !showing()) {
             show();
+        } else if (scrollDown(scrollDirection) && !hiding()) {
+            hide();
         }
     }
 

android/app/src/main/java/com/reactnativenavigation/layouts/ScreenImpl.java

@@ -10,7 +10,7 @@ import android.view.View;
 import android.view.Window;
 import android.widget.LinearLayout;
 
-import com.reactnativenavigation.animation.HideOnScrollAnimator;
+import com.reactnativenavigation.animation.OnScrollAnimator;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.ScreenStyleParams;
 import com.reactnativenavigation.utils.SdkSupports;
@@ -26,7 +26,7 @@ public class ScreenImpl extends LinearLayout implements Screen, ScrollDirectionL
     private final ScreenParams screenParams;
     private ContentView contentView;
     private TopBar topBar;
-    private HideOnScrollAnimator scrollAnimator;
+    private OnScrollAnimator scrollAnimator;
 
     public ScreenImpl(Context context, ScreenParams screenParams) {
         super(context);
@@ -107,7 +107,7 @@ public class ScreenImpl extends LinearLayout implements Screen, ScrollDirectionL
     public void onScrollChanged(ScrollDirectionListener.Direction direction) {
         Log.d("TAG", "onScrollChanged: ");
         if (scrollAnimator == null) {
-            scrollAnimator = new HideOnScrollAnimator(topBar, HideOnScrollAnimator.HideDirection.Up, topBar.getHeight());
+            scrollAnimator = new OnScrollAnimator(topBar, OnScrollAnimator.HideDirection.Up, topBar.getHeight());
         }
         scrollAnimator.onScrollChanged(direction);
     }

android/app/src/main/java/com/reactnativenavigation/views/ScrollDirectionListener.java

@@ -29,12 +29,12 @@ public class ScrollDirectionListener implements ViewTreeObserver.OnScrollChanged
 
         final int scrollY = view.getScrollY();
         if (isScrollPositionChanged(scrollY) && !isTopOverscroll(scrollY) && !isBottomOverscroll(scrollY)) {
+            onChanged.onScrollChanged(getScrollDirection(scrollY));
             lastScrollY = scrollY;
-            onChanged.onScrollChanged(getDirection(scrollY));
         }
     }
 
-    private Direction getDirection(int scrollY) {
+    private Direction getScrollDirection(int scrollY) {
         return scrollY > lastScrollY ? Direction.Down : Direction.Up;
     }
 

android/app/src/main/java/com/reactnativenavigation/views/TitleBar.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 
-import com.reactnativenavigation.animation.HideOnScrollAnimator;
+import com.reactnativenavigation.animation.OnScrollAnimator;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 
 import java.util.List;
@@ -12,7 +12,7 @@ import java.util.List;
 public class TitleBar extends Toolbar {
 
     private boolean hideOnScroll = false;
-    private HideOnScrollAnimator hideOnScrollAnimator;
+    private OnScrollAnimator onScrollAnimator;
 
     public TitleBar(Context context) {
         super(context);
@@ -36,14 +36,14 @@ public class TitleBar extends Toolbar {
 
     public void onScrollChanged(ScrollDirectionListener.Direction direction) {
         if (hideOnScroll) {
-            if (hideOnScrollAnimator == null) {
+            if (onScrollAnimator == null) {
                 createScrollAnimator();
             }
-            hideOnScrollAnimator.onScrollChanged(direction);
+            onScrollAnimator.onScrollChanged(direction);
         }
     }
 
     private void createScrollAnimator() {
-        hideOnScrollAnimator = new HideOnScrollAnimator(this, HideOnScrollAnimator.HideDirection.Up, getHeight());
+        onScrollAnimator = new OnScrollAnimator(this, OnScrollAnimator.HideDirection.Up, getHeight());
     }
 }