Save titleBarHidden in screenParams when toggling TitleBar (#840)

* Save titleBarHidden in screenParams when toggling TitleBar

* empty commit

android/app/src/main/java/com/reactnativenavigation/animation/VisibilityAnimator.java

@@ -6,8 +6,6 @@ import android.animation.ObjectAnimator;
 import android.support.v4.view.animation.LinearOutSlowInInterpolator;
 import android.view.View;
 
-import com.reactnativenavigation.views.ScrollDirectionListener;
-
 public class VisibilityAnimator {
 
     public enum HideDirection {
@@ -22,24 +20,14 @@ public class VisibilityAnimator {
     private static final int DURATION = 300;
 
     private final View view;
-    private final HideDirection hideDirection;
     private final int hiddenEndValue;
     private VisibilityState visibilityState = VisibilityState.Shown;
 
     public VisibilityAnimator(View view, HideDirection hideDirection, int height) {
         this.view = view;
-        this.hideDirection = hideDirection;
         this.hiddenEndValue = hideDirection == HideDirection.Up ? -height : height;
     }
 
-    public void onScrollChanged(ScrollDirectionListener.Direction scrollDirection) {
-        if (hideDirection == HideDirection.Down) {
-            handleDownHidingViews(scrollDirection);
-        } else {
-            handleUpHidingViews(scrollDirection);
-        }
-    }
-
     public void setVisible(boolean visible, boolean animate) {
         if (visible && isHiding()) {
             show(animate);
@@ -48,22 +36,6 @@ public class VisibilityAnimator {
         }
     }
 
-    private void handleUpHidingViews(ScrollDirectionListener.Direction scrollDirection) {
-        if (scrollUp(scrollDirection) && !isShowing()) {
-            show(true);
-        } else if (scrollDown(scrollDirection) && !isHiding()) {
-            hide(true);
-        }
-    }
-
-    private void handleDownHidingViews(ScrollDirectionListener.Direction scrollDirection) {
-        if (scrollDown(scrollDirection) && !isHiding()) {
-            hide(true);
-        } else if (scrollUp(scrollDirection) && !isShowing()) {
-            show(true);
-        }
-    }
-
     private void show(boolean animate) {
         if (animate) {
             ObjectAnimator animator = createAnimator(true);
@@ -84,14 +56,6 @@ public class VisibilityAnimator {
         }
     }
 
-    private boolean scrollUp(ScrollDirectionListener.Direction scrollDirection) {
-        return scrollDirection == ScrollDirectionListener.Direction.Up;
-    }
-
-    private boolean scrollDown(ScrollDirectionListener.Direction scrollDirection) {
-        return scrollDirection == ScrollDirectionListener.Direction.Down;
-    }
-
     private boolean isShowing() {
         return visibilityState == VisibilityState.Shown || visibilityState == VisibilityState.AnimateShow;
     }

android/app/src/main/java/com/reactnativenavigation/params/StyleParams.java

@@ -50,7 +50,6 @@ public class StyleParams {
     public Color topBarColor;
     public CollapsingTopBarParams collapsingTopBarParams;
     public boolean topBarCollapseOnScroll;
-    public boolean topBarHidden;
     public boolean topBarElevationShadowEnabled;
     public boolean topTabsHidden;
     public boolean drawScreenBelowTopBar;

android/app/src/main/java/com/reactnativenavigation/screens/Screen.java

@@ -171,6 +171,7 @@ public abstract class Screen extends RelativeLayout implements Subscriber {
     }
 
     public void setTopBarVisible(boolean visible, boolean animate) {
+        screenParams.styleParams.titleBarHidden = !visible;
         topBarVisibilityAnimator.setVisible(visible, animate);
     }
 

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

@@ -73,7 +73,6 @@ public class TopBar extends AppBarLayout {
         if (styleParams.topBarTransparent) {
             setTransparent();
         }
-        setVisibility(styleParams.topBarHidden ? GONE : VISIBLE);
         titleBar.setStyle(styleParams);
         setTopTabsStyle(styleParams);
         if (!styleParams.topBarElevationShadowEnabled) {

src/deprecated/platformSpecificDeprecated.android.js

@@ -358,7 +358,7 @@ function navigatorToggleDrawer(navigator, params) {
 
 function navigatorToggleNavBar(navigator, params) {
   const screenInstanceID = navigator.screenInstanceID;
-  const visible = params.to === 'shown';
+  const visible = params.to === 'shown' || params.to === 'show';
   const animated = !(params.animated === false);
 
   newPlatformSpecific.toggleTopBarVisible(