Animate screen into place after hiding navBar (#2095)

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

@@ -1,6 +1,9 @@
 package com.reactnativenavigation.animation;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
+import android.support.annotation.Nullable;
 import android.support.v4.view.animation.LinearOutSlowInInterpolator;
 import android.view.View;
 
@@ -24,12 +27,12 @@ public class VisibilityAnimator {
         this.hiddenEndValue = hideDirection == HideDirection.Up ? -height : height;
     }
 
-    public void setVisible(boolean visible, boolean animate) {
+    public void setVisible(boolean visible, boolean animate, @Nullable Runnable onAnimationEnd) {
         cancelAnimator();
         if (visible) {
-            show(animate);
+            show(animate, onAnimationEnd);
         } else {
-            hide(animate);
+            hide(animate, onAnimationEnd);
         }
     }
 
@@ -40,31 +43,39 @@ public class VisibilityAnimator {
         }
     }
 
-    private void show(boolean animate) {
+    private void show(boolean animate, @Nullable Runnable onAnimationEnd) {
         if (animate) {
-            animator = createAnimator(true);
+            animator = createAnimator(true, onAnimationEnd);
             animator.start();
         } else {
             view.setTranslationY(SHOW_END_VALUE);
             view.setVisibility(View.VISIBLE);
+            if (onAnimationEnd != null) onAnimationEnd.run();
         }
     }
 
-    private void hide(boolean animate) {
+    private void hide(boolean animate, @Nullable Runnable onAnimationEnd) {
         if (animate) {
-            animator = createAnimator(false);
+            animator = createAnimator(false, onAnimationEnd);
             animator.start();
         } else {
             view.setTranslationY(hiddenEndValue);
             view.setVisibility(View.GONE);
+            if (onAnimationEnd != null) onAnimationEnd.run();
         }
     }
 
-    private ObjectAnimator createAnimator(final boolean show) {
+    private ObjectAnimator createAnimator(final boolean show, @Nullable final Runnable onAnimationEnd) {
         view.setVisibility(View.VISIBLE);
         final ObjectAnimator animator = ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, show ? SHOW_END_VALUE : hiddenEndValue);
         animator.setDuration(DURATION);
         animator.setInterpolator(interpolator);
+        animator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                if (onAnimationEnd != null) onAnimationEnd.run();
+            }
+        });
         return animator;
     }
 }

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

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.screens;
 
+import android.animation.LayoutTransition;
 import android.annotation.TargetApi;
 import android.content.res.Configuration;
 import android.graphics.Color;
@@ -239,6 +240,12 @@ public abstract class Screen extends RelativeLayout implements Subscriber {
 
     public void setTopBarVisible(boolean visible, boolean animate) {
         screenParams.styleParams.titleBarHidden = !visible;
+        if (animate && styleParams.drawScreenBelowTopBar) {
+            setLayoutTransition(new LayoutTransition());
+            getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING);
+        } else {
+            setLayoutTransition(null);
+        }
         topBar.setVisible(visible, animate);
     }
 

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

@@ -86,7 +86,7 @@ public class BottomTabs extends AHBottomNavigation {
 
     public void setVisibility(boolean hidden, boolean animated) {
         if (visibilityAnimator != null) {
-            visibilityAnimator.setVisible(!hidden, animated);
+            visibilityAnimator.setVisible(!hidden, animated, null);
         } else {
             setVisibility(hidden);
         }

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

@@ -261,7 +261,16 @@ public class TopBar extends AppBarLayout {
     }
 
     public void setVisible(boolean visible, boolean animate) {
-        titleBar.setVisibility(!visible);
-        visibilityAnimator.setVisible(visible, animate);
+        if (visible) {
+            titleBar.setVisibility(false);
+            visibilityAnimator.setVisible(true, animate, null);
+        } else {
+            visibilityAnimator.setVisible(false, animate, new Runnable() {
+                @Override
+                public void run() {
+                    titleBar.setVisibility(true);
+                }
+            });
+        }
     }
 }