Title bar visibility bug (#1346)

* Fix title bar not displayed if it was initially hidden

Also cleaned up VisibilityAnimator.

* Move visibility animator into topBar

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

@@ -1,27 +1,23 @@
 package com.reactnativenavigation.animation;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.support.v4.view.animation.LinearOutSlowInInterpolator;
 import android.view.View;
 
 public class VisibilityAnimator {
 
+    private final LinearOutSlowInInterpolator interpolator = new LinearOutSlowInInterpolator();
+    private ObjectAnimator animator;
+
     public enum HideDirection {
         Up, Down
     }
 
-    private enum VisibilityState {
-        Hidden, AnimateHide, Shown, AnimateShow
-    }
-
     private static final int SHOW_END_VALUE = 0;
     private static final int DURATION = 300;
 
     private final View view;
     private final int hiddenEndValue;
-    private VisibilityState visibilityState = VisibilityState.Shown;
 
     public VisibilityAnimator(View view, HideDirection hideDirection, int height) {
         this.view = view;
@@ -29,56 +25,48 @@ public class VisibilityAnimator {
     }
 
     public void setVisible(boolean visible, boolean animate) {
-        if (visible && isHiding()) {
+        cancelAnimator();
+        if (visible) {
             show(animate);
-        } else if (!visible && isShowing()) {
+        } else {
             hide(animate);
         }
     }
 
+    private void cancelAnimator() {
+        if (animator != null && animator.isRunning()) {
+            view.clearAnimation();
+            animator.cancel();
+        }
+    }
+
     private void show(boolean animate) {
         if (animate) {
-            ObjectAnimator animator = createAnimator(true);
+            animator = createAnimator(true);
             animator.start();
         } else {
-            visibilityState = VisibilityState.Shown;
+            view.setTranslationY(SHOW_END_VALUE);
+            view.setY(SHOW_END_VALUE);
             view.setVisibility(View.VISIBLE);
         }
     }
 
     private void hide(boolean animate) {
         if (animate) {
-            ObjectAnimator animator = createAnimator(false);
+            animator = createAnimator(false);
             animator.start();
         } else {
-            visibilityState = VisibilityState.Hidden;
+            view.setTranslationY(hiddenEndValue);
+            view.setY(hiddenEndValue);
             view.setVisibility(View.GONE);
         }
     }
 
-    private boolean isShowing() {
-        return visibilityState == VisibilityState.Shown || visibilityState == VisibilityState.AnimateShow;
-    }
-
-    private boolean isHiding() {
-        return visibilityState == VisibilityState.Hidden || visibilityState == VisibilityState.AnimateHide;
-    }
-
     private ObjectAnimator createAnimator(final boolean show) {
-        ObjectAnimator animator = ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, show ? SHOW_END_VALUE : hiddenEndValue);
+        view.setVisibility(View.VISIBLE);
+        final ObjectAnimator animator = ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, show ? SHOW_END_VALUE : hiddenEndValue);
         animator.setDuration(DURATION);
-        animator.setInterpolator(new LinearOutSlowInInterpolator());
-        animator.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-                visibilityState = show ? VisibilityState.AnimateShow : VisibilityState.AnimateHide;
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                visibilityState = show ? VisibilityState.Shown : VisibilityState.Hidden;
-            }
-        });
+        animator.setInterpolator(interpolator);
         return animator;
     }
 }

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

@@ -11,7 +11,6 @@ import android.widget.RelativeLayout;
 
 import com.facebook.react.bridge.Callback;
 import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.animation.VisibilityAnimator;
 import com.reactnativenavigation.controllers.NavigationActivity;
 import com.reactnativenavigation.events.ContextualMenuHiddenEvent;
 import com.reactnativenavigation.events.Event;
@@ -27,7 +26,6 @@ import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.params.parsers.StyleParamsParser;
-import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.ContentView;
 import com.reactnativenavigation.views.LeftButtonOnClickListener;
 import com.reactnativenavigation.views.TopBar;
@@ -50,7 +48,6 @@ public abstract class Screen extends RelativeLayout implements Subscriber {
     protected final ScreenParams screenParams;
     protected TopBar topBar;
     private final LeftButtonOnClickListener leftButtonOnClickListener;
-    private VisibilityAnimator topBarVisibilityAnimator;
     private ScreenAnimator screenAnimator;
     protected StyleParams styleParams;
     public final SharedElements sharedElements;
@@ -149,23 +146,9 @@ public abstract class Screen extends RelativeLayout implements Subscriber {
     }
 
     private void addTopBar() {
-        createTopBarVisibilityAnimator();
         addView(topBar, new LayoutParams(MATCH_PARENT, WRAP_CONTENT));
     }
 
-    private void createTopBarVisibilityAnimator() {
-        ViewUtils.runOnPreDraw(topBar, new Runnable() {
-            @Override
-            public void run() {
-                if (topBarVisibilityAnimator == null) {
-                    topBarVisibilityAnimator = new VisibilityAnimator(topBar,
-                            VisibilityAnimator.HideDirection.Up,
-                            topBar.getHeight());
-                }
-            }
-        });
-    }
-
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     private void setStatusBarColor(StyleParams.Color statusBarColor) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
@@ -209,7 +192,7 @@ public abstract class Screen extends RelativeLayout implements Subscriber {
 
     public void setTopBarVisible(boolean visible, boolean animate) {
         screenParams.styleParams.titleBarHidden = !visible;
-        topBarVisibilityAnimator.setVisible(visible, animate);
+        topBar.setVisible(visible, animate);
     }
 
     public void setTitleBarTitle(String title) {

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

@@ -32,11 +32,6 @@ public class TitleBar extends Toolbar {
         super(context);
     }
 
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        super.onLayout(changed, l, t, r, b);
-    }
-
     @Override
     public void onViewAdded(View child) {
         super.onViewAdded(child);
@@ -76,7 +71,7 @@ public class TitleBar extends Toolbar {
     }
 
     public void setStyle(StyleParams params) {
-        setVisibility(params.titleBarHidden ? GONE : VISIBLE);
+        setVisibility(params.titleBarHidden);
         setTitleTextColor(params);
         setTitleTextFont(params);
         setSubtitleTextColor(params);
@@ -85,6 +80,10 @@ public class TitleBar extends Toolbar {
         centerTitle(params);
     }
 
+    public void setVisibility(boolean titleBarHidden) {
+        setVisibility(titleBarHidden ? GONE : VISIBLE);
+    }
+
     private void centerTitle(final StyleParams params) {
         final View titleView = getTitleView();
         if (titleView == null) {

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

@@ -8,6 +8,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.facebook.react.bridge.Callback;
+import com.reactnativenavigation.animation.VisibilityAnimator;
 import com.reactnativenavigation.params.BaseScreenParams;
 import com.reactnativenavigation.params.ContextualMenuParams;
 import com.reactnativenavigation.params.StyleParams;
@@ -25,13 +26,26 @@ public class TopBar extends AppBarLayout {
     private ContextualMenu contextualMenu;
     protected FrameLayout titleBarAndContextualMenuContainer;
     protected TopTabs topTabs;
+    private VisibilityAnimator visibilityAnimator;
 
     public TopBar(Context context) {
         super(context);
         setId(ViewUtils.generateViewId());
+        createTopBarVisibilityAnimator();
         createLayout();
     }
 
+    private void createTopBarVisibilityAnimator() {
+        ViewUtils.runOnPreDraw(this, new Runnable() {
+            @Override
+            public void run() {
+                visibilityAnimator = new VisibilityAnimator(TopBar.this,
+                        VisibilityAnimator.HideDirection.Up,
+                        getHeight());
+            }
+        });
+    }
+
     protected void createLayout() {
         titleBarAndContextualMenuContainer = new FrameLayout(getContext());
         addView(titleBarAndContextualMenuContainer);
@@ -163,4 +177,9 @@ public class TopBar extends AppBarLayout {
     public void onViewPagerScreenChanged(BaseScreenParams screenParams) {
         titleBar.onViewPagerScreenChanged(screenParams);
     }
+
+    public void setVisible(boolean visible, boolean animate) {
+        titleBar.setVisibility(!visible);
+        visibilityAnimator.setVisible(visible, animate);
+    }
 }