Add previous screen to heirarchy before pop

lib/android/app/src/main/java/com/reactnativenavigation/anim/TopBarAnimator.java

@@ -7,7 +7,6 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.TimeInterpolator;
 import android.view.View;
-import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.LinearInterpolator;
 
@@ -21,13 +20,12 @@ public class TopBarAnimator {
     private static final int DEFAULT_COLLAPSE_DURATION = 100;
     private static final int DURATION_TOPBAR = 300;
     private final DecelerateInterpolator decelerateInterpolator = new DecelerateInterpolator();
-    private final AccelerateInterpolator accelerateInterpolator = new AccelerateInterpolator();
     private final LinearInterpolator linearInterpolator = new LinearInterpolator();
 
     private TopBar topBar;
     private String stackId;
-    private AnimatorSet hideAnimator;
-    private AnimatorSet showAnimator;
+    private Animator hideAnimator;
+    private Animator showAnimator;
 
     public TopBarAnimator(TopBar topBar) {
         this.topBar = topBar;
@@ -75,13 +73,13 @@ public class TopBarAnimator {
         if (options.hasValue() && (!options.id.hasValue() || options.id.get().equals(stackId))) {
             hideAnimator = options.getAnimation(topBar);
         } else {
-            hideAnimator = getDefaultHideAnimator(0, accelerateInterpolator, DURATION_TOPBAR);
+            hideAnimator = getDefaultHideAnimator(0, linearInterpolator, DURATION_TOPBAR);
         }
         hide(onAnimationEnd);
     }
 
     void hide(float startTranslation) {
-        hideAnimator = getDefaultHideAnimator(startTranslation, null, DEFAULT_COLLAPSE_DURATION);
+        hideAnimator = getDefaultHideAnimator(startTranslation, linearInterpolator, DEFAULT_COLLAPSE_DURATION);
         hide(() -> {});
     }
 
@@ -96,12 +94,18 @@ public class TopBarAnimator {
         hideAnimator.start();
     }
 
-    private AnimatorSet getDefaultHideAnimator(float startTranslation, TimeInterpolator interpolator, int duration) {
+    private Animator getDefaultHideAnimator(float startTranslation, TimeInterpolator interpolator, int duration) {
         ObjectAnimator hideAnimator = ObjectAnimator.ofFloat(topBar, View.TRANSLATION_Y, startTranslation, -1 * topBar.getMeasuredHeight());
         hideAnimator.setInterpolator(interpolator);
         hideAnimator.setDuration(duration);
-        AnimatorSet set = new AnimatorSet();
-        set.play(hideAnimator);
-        return set;
+        return hideAnimator;
+    }
+
+    public boolean isAnimatingHide() {
+        return hideAnimator != null && hideAnimator.isRunning();
+    }
+
+    public boolean isAnimatingShow() {
+         return showAnimator != null && showAnimator.isRunning();
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/presentation/OptionsPresenter.java

@@ -3,7 +3,6 @@ package com.reactnativenavigation.presentation;
 import android.app.Activity;
 import android.graphics.Color;
 
-import com.reactnativenavigation.interfaces.ChildDisappearListener;
 import com.reactnativenavigation.parse.AnimationsOptions;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.OrientationOptions;
@@ -105,16 +104,13 @@ public class OptionsPresenter {
         if (topTabOptions.fontFamily != null) topBar.setTopTabFontFamily(topTabOptions.tabIndex, topTabOptions.fontFamily);
     }
 
-    public void onChildWillDisappear(Options disappearing, Options appearing, ChildDisappearListener childDisappearListener) {
+    public void onChildWillDisappear(Options disappearing, Options appearing) {
         if (disappearing.topBarOptions.visible.isTrueOrUndefined() && appearing.topBarOptions.visible.isFalse()) {
             if (disappearing.topBarOptions.animate.isTrueOrUndefined()) {
-                topBar.hideAnimate(disappearing.animationsOptions.pop.topBar, childDisappearListener::childDisappear);
+                topBar.hideAnimate(disappearing.animationsOptions.pop.topBar);
             } else {
                 topBar.hide();
-                childDisappearListener.childDisappear();
             }
-        } else {
-            childDisappearListener.childDisappear();
         }
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackController.java

@@ -140,9 +140,8 @@ public class StackController extends ParentController<StackLayout> {
         final ViewController appearing = stack.peek();
         disappearing.onViewWillDisappear();
         appearing.onViewWillAppear();
-        getView().onChildWillDisappear(disappearing.options, appearing.options, () ->
-                getView().addView(appearing.getView())
-        );
+        getView().addView(appearing.getView(), 0);
+        getView().onChildWillDisappear(disappearing.options, appearing.options);
 
         if (disappearing.options.animated.isTrueOrUndefined()) {
             animator.pop(disappearing.getView(), () -> finishPopping(disappearing, listener));

lib/android/app/src/main/java/com/reactnativenavigation/views/StackLayout.java

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.widget.RelativeLayout;
 
-import com.reactnativenavigation.interfaces.ChildDisappearListener;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.OptionsPresenter;
 import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
@@ -41,8 +40,8 @@ public class StackLayout extends RelativeLayout {
         optionsPresenter.applyChildOptions(options, child);
     }
 
-    public void onChildWillDisappear(Options disappearing, Options appearing, ChildDisappearListener childDisappearListener) {
-        optionsPresenter.onChildWillDisappear(disappearing, appearing, childDisappearListener);
+    public void onChildWillDisappear(Options disappearing, Options appearing) {
+        optionsPresenter.onChildWillDisappear(disappearing, appearing);
     }
 
     public void mergeChildOptions(Options options, Component child) {

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

@@ -1,6 +1,5 @@
 package com.reactnativenavigation.views.topbar;
 
-import android.animation.Animator.AnimatorListener;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Typeface;
@@ -180,7 +179,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
     }
 
     public void show() {
-        if (visible()) return;
+        if (visible() || animator.isAnimatingShow()) return;
         setVisibility(View.VISIBLE);
     }
 
@@ -189,12 +188,14 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
     }
 
     public void showAnimate(AnimationOptions options) {
-        if (visible()) return;
+        if (visible() || animator.isAnimatingShow()) return;
         animator.show(options);
     }
 
     public void hide() {
-        setVisibility(View.GONE);
+        if (!animator.isAnimatingHide()) {
+            setVisibility(View.GONE);
+        }
     }
 
     public void hideAnimate(AnimationOptions options) {

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/OptionsApplyingTest.java

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
+import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.view.View;
@@ -23,6 +24,9 @@ import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
+import com.reactnativenavigation.views.StackLayout;
+import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
+import com.reactnativenavigation.views.topbar.TopBar;
 import com.reactnativenavigation.views.topbar.TopBarBackgroundView;
 
 import org.json.JSONObject;
@@ -53,9 +57,17 @@ public class OptionsApplyingTest extends BaseTest {
                 (activity1, componentId, componentName) -> view,
                 initialNavigationOptions
         );
-        stackController =
-                new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()), new TopBarController(), "stack", new Options());
+        TopBarController topBarController = new TopBarController() {
+            @Override
+            protected TopBar createTopBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener topBarButtonClickListener, StackLayout stackLayout) {
+                TopBar topBar = super.createTopBar(context, buttonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarButtonClickListener, stackLayout);
+                return topBar;
+            }
+        };
+        stackController = new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()), topBarController, "stack", new Options());
         stackController.ensureViewIsCreated();
+        stackController.getView().layout(0, 0, 1000, 1000);
+        stackController.getTopBar().layout(0, 0, 1000, 100);
         uut.setParentController(stackController);
     }
 
@@ -169,13 +181,13 @@ public class OptionsApplyingTest extends BaseTest {
         uut.options.topBarOptions.title.text = new Text("the title");
         uut.options.topBarOptions.drawBehind = new Bool(false);
         uut.ensureViewIsCreated();
+        stackController.ensureViewIsCreated();
         stackController.push(uut, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 uut.onViewAppeared();
-                RelativeLayout.LayoutParams uutLayoutParams =
-                        (RelativeLayout.LayoutParams) uut.getComponent().asView().getLayoutParams();
-                assertThat(uutLayoutParams.getRule(BELOW)).isNotEqualTo(0);
+                RelativeLayout.LayoutParams uutLayoutParams = (RelativeLayout.LayoutParams) uut.getComponent().asView().getLayoutParams();
+                assertThat(uutLayoutParams.topMargin).isNotEqualTo(0);
 
                 Options opts = new Options();
                 opts.topBarOptions.drawBehind = new Bool(true);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/StackControllerTest.java

@@ -152,8 +152,7 @@ public class StackControllerTest extends BaseTest {
                 uut.pop(new CommandListenerAdapter() {
                     @Override
                     public void onSuccess(String childId) {
-                        verify(stackLayout[0], times(1)).onChildWillDisappear(child2.options, child1.options, () -> {
-                        });
+                        verify(stackLayout[0], times(1)).onChildWillDisappear(child2.options, child1.options);
                     }
                 });
             }
@@ -471,11 +470,15 @@ public class StackControllerTest extends BaseTest {
         child1.onViewAppeared();
 
         assertThat(uut.getTopBar().getVisibility()).isEqualTo(View.GONE);
-        uut.push(child2, new CommandListenerAdapter());
-        uut.pop(new CommandListenerAdapter() {
+        uut.push(child2, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
-                verify(uut.getTopBar(), times(1)).hide();
+                uut.pop(new CommandListenerAdapter() {
+                    @Override
+                    public void onSuccess(String childId) {
+                        verify(uut.getTopBar(), times(1)).hide();
+                    }
+                });
             }
         });
     }