Reset animation values when showing topBar

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

@@ -57,6 +57,7 @@ public class TopBarAnimator {
                 topBar.setVisibility(View.VISIBLE);
             }
         });
+        topBar.resetAnimationOptions();
         showAnimator.start();
     }
 

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

@@ -9,6 +9,7 @@ import com.reactnativenavigation.parse.OrientationOptions;
 import com.reactnativenavigation.parse.TopBarOptions;
 import com.reactnativenavigation.parse.TopTabOptions;
 import com.reactnativenavigation.parse.TopTabsOptions;
+import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.viewcontrollers.IReactView;
@@ -34,7 +35,7 @@ public class OptionsPresenter {
     public void applyChildOptions(Options options, Component child) {
         applyOrientation(options.orientationOptions);
         applyButtons(options.topBarOptions.leftButtons, options.topBarOptions.rightButtons);
-        applyTopBarOptions(options.topBarOptions, options.animationsOptions, child);
+        applyTopBarOptions(options.topBarOptions, options.animationsOptions, child, options.animated);
         applyTopTabsOptions(options.topTabsOptions);
         applyTopTabOptions(options.topTabOptions);
     }
@@ -43,7 +44,7 @@ public class OptionsPresenter {
         ((Activity) topBar.getContext()).setRequestedOrientation(options.getValue());
     }
 
-    private void applyTopBarOptions(TopBarOptions options, AnimationsOptions animationOptions, Component component) {
+    private void applyTopBarOptions(TopBarOptions options, AnimationsOptions animationOptions, Component component, Bool animated) {
         topBar.setTitle(options.title.text.get(""));
         if (options.title.component.hasValue()) topBar.setTitleComponent(options.title.component);
         topBar.setTitleFontSize(options.title.fontSize.get(defaultTitleFontSize));
@@ -62,14 +63,14 @@ public class OptionsPresenter {
         if (options.testId.hasValue()) topBar.setTestId(options.testId.get());
 
         if (options.visible.isFalse()) {
-            if (options.animate.isTrueOrUndefined()) {
+            if (options.animate.isTrueOrUndefined() && animated.isTrueOrUndefined()) {
                 topBar.hideAnimate(animationOptions.pop.topBar);
             } else {
                 topBar.hide();
             }
         }
         if (options.visible.isTrueOrUndefined()) {
-            if (options.animate.isTrueOrUndefined()) {
+            if (options.animate.isTrueOrUndefined() && animated.isTrueOrUndefined()) {
                 topBar.showAnimate(animationOptions.push.topBar);
             } else {
                 topBar.show();
@@ -106,7 +107,7 @@ public class OptionsPresenter {
 
     public void onChildWillDisappear(Options disappearing, Options appearing) {
         if (disappearing.topBarOptions.visible.isTrueOrUndefined() && appearing.topBarOptions.visible.isFalse()) {
-            if (disappearing.topBarOptions.animate.isTrueOrUndefined()) {
+            if (disappearing.topBarOptions.animate.isTrueOrUndefined() && disappearing.animated.isTrueOrUndefined()) {
                 topBar.hideAnimate(disappearing.animationsOptions.pop.topBar);
             } else {
                 topBar.hide();

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

@@ -180,6 +180,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
 
     public void show() {
         if (visible() || animator.isAnimatingShow()) return;
+        resetAnimationOptions();
         setVisibility(View.VISIBLE);
     }
 
@@ -240,4 +241,15 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
     public TextView getTitleTextView() {
         return titleBar.findTitleTextView();
     }
+
+    public void resetAnimationOptions() {
+        setTranslationY(0);
+        setTranslationX(0);
+        setAlpha(1);
+        setScaleY(1);
+        setScaleX(1);
+        setRotationX(0);
+        setRotationY(0);
+        setRotation(0);
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
+import android.content.Context;
 import android.support.annotation.NonNull;
 import android.view.View;
 
@@ -21,6 +22,8 @@ import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 import com.reactnativenavigation.views.Component;
 import com.reactnativenavigation.views.ReactComponent;
 import com.reactnativenavigation.views.StackLayout;
+import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
+import com.reactnativenavigation.views.topbar.TopBar;
 
 import org.assertj.core.api.iterable.Extractor;
 import org.json.JSONObject;
@@ -170,17 +173,6 @@ public class StackControllerTest extends BaseTest {
         assertThat(uut.isEmpty()).isFalse();
     }
 
-    @Test
-    public void pushAssignsRefToSelfOnPushedController() {
-        assertThat(child1.getParentController()).isNull();
-        uut.push(child1, new CommandListenerAdapter());
-        assertThat(child1.getParentController()).isEqualTo(uut);
-
-        StackController anotherNavController = createStackController("another");
-        anotherNavController.push(child2, new CommandListenerAdapter());
-        assertThat(child2.getParentController()).isEqualTo(anotherNavController);
-    }
-
     @Test
     public void handleBack_PopsUnlessSingleChild() {
         assertThat(uut.isEmpty()).isTrue();
@@ -226,14 +218,14 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void pushAddsToViewTree() {
+    public void push_addsToViewTree() {
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
         uut.push(child1, new CommandListenerAdapter());
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNotNull();
     }
 
     @Test
-    public void pushRemovesPreviousFromTree() {
+    public void push_removesPreviousFromTree() {
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
         uut.push(child1, new CommandListenerAdapter());
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNotNull();
@@ -247,7 +239,60 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void popReplacesViewWithPrevious() {
+    public void push_assignsRefToSelfOnPushedController() {
+        assertThat(child1.getParentController()).isNull();
+        uut.push(child1, new CommandListenerAdapter());
+        assertThat(child1.getParentController()).isEqualTo(uut);
+
+        StackController anotherNavController = createStackController("another");
+        anotherNavController.push(child2, new CommandListenerAdapter());
+        assertThat(child2.getParentController()).isEqualTo(anotherNavController);
+    }
+
+    @Test
+    public void push_doesNotAnimateTopBarIfScreenIsPushedWithoutAnimation() {
+        uut.ensureViewIsCreated();
+        child1.ensureViewIsCreated();
+
+        child1.options.topBarOptions.visible = new Bool(false);
+        child1.options.topBarOptions.animate = new Bool(false);
+        child1.options.animated = new Bool(false);
+        child2.options.animated = new Bool(false);
+
+        uut.push(child1, new CommandListenerAdapter() {
+            @Override
+            public void onSuccess(String childId) {
+                child1.onViewAppeared();
+                assertThat(uut.getTopBar().getVisibility()).isEqualTo(View.GONE);
+
+                uut.push(child2, new CommandListenerAdapter());
+                child2.onViewAppeared();
+                verify(uut.getTopBar(), times(0)).showAnimate(child2.options.animationsOptions.push.topBar);
+                assertThat(uut.getTopBar().getVisibility()).isEqualTo(View.VISIBLE);
+                verify(uut.getTopBar(), times(1)).resetAnimationOptions();
+            }
+        });
+    }
+
+    @Test
+    public void push_animatesAndClearsPreviousAnimationValues() {
+        uut.ensureViewIsCreated();
+
+        child1.options.topBarOptions.visible = new Bool(false);
+        child1.options.topBarOptions.animate = new Bool(false);
+        child1.options.animated = new Bool(false);
+
+        uut.push(child1, new CommandListenerAdapter());
+        uut.push(child2, new CommandListenerAdapter() {
+            @Override
+            public void onSuccess(String childId) {
+                verify(uut.getTopBar(), times(1)).resetAnimationOptions();
+            }
+        });
+    }
+
+    @Test
+    public void pop_replacesViewWithPrevious() {
         final View child2View = child2.getView();
         final View child1View = child1.getView();
 
@@ -265,7 +310,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void popSpecificWhenTopIsRegularPop() {
+    public void pop_specificWhenTopIsRegularPop() {
         uut.push(child1, new CommandListenerAdapter());
         uut.push(child2, new CommandListenerAdapter() {
             @Override
@@ -282,7 +327,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void popSpecificDeepInStack() {
+    public void popSpecific_deepInStack() {
         uut.push(child1, new CommandListenerAdapter());
         uut.push(child2, new CommandListenerAdapter());
         assertIsChildById(uut.getView(), child2.getView());
@@ -460,29 +505,52 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void pop_animatesTopBarIfNeeded() {
+    public void pop_animatesTopBar() {
         uut.ensureViewIsCreated();
 
         child1.options.topBarOptions.visible = new Bool(false);
-        child1.options.topBarOptions.animate = new Bool(false);
-        child2.options.topBarOptions.visible = new Bool(true);
-        uut.push(child1, new CommandListenerAdapter());
-        child1.onViewAppeared();
-
-        assertThat(uut.getTopBar().getVisibility()).isEqualTo(View.GONE);
-        uut.push(child2, new CommandListenerAdapter() {
+        child1.options.animated = new Bool(false);
+        child2.options.animated = new Bool(true);
+        uut.push(child1, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
-                uut.pop(new CommandListenerAdapter() {
+                child1.onViewAppeared();
+                assertThat(uut.getTopBar().getVisibility()).isEqualTo(View.GONE);
+                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)).hideAnimate(child2.options.animationsOptions.pop.topBar);
+                            }
+                        });
                     }
                 });
             }
         });
     }
 
+    @Test
+    public void pop_doesNotAnimateTopBarIfScreenIsPushedWithoutAnimation() {
+        uut.ensureViewIsCreated();
+
+        child1.options.topBarOptions.visible = new Bool(false);
+        child2.options.animated = new Bool(false);
+        child1.ensureViewIsCreated();
+        uut.push(child1, new CommandListenerAdapter() {
+            @Override
+            public void onSuccess(String childId) {
+                uut.push(child2, new CommandListenerAdapter());
+                assertThat(uut.getTopBar().getVisibility()).isEqualTo(View.VISIBLE);
+
+                uut.pop(new CommandListenerAdapter());
+                verify(uut.getTopBar(), times(0)).hideAnimate(child2.options.animationsOptions.pop.topBar);
+                assertThat(uut.getTopBar().getVisibility()).isEqualTo(View.GONE);
+            }
+        });
+    }
+
     @Test
     public void popSpecific_CallsDestroyOnPoppedChild() {
         child1 = spy(child1);
@@ -656,10 +724,20 @@ public class StackControllerTest extends BaseTest {
     }
 
     private StackController createStackController(String id) {
-        topBarController = spy(new TopBarController());
+        topBarController = spy(new TopBarController() {
+            @Override
+            protected TopBar createTopBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener topBarButtonClickListener, StackLayout stackLayout) {
+                TopBar topBar = spy(super.createTopBar(context, buttonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarButtonClickListener, stackLayout));
+                return topBar;
+            }
+        });
         return new StackController(activity,
-                new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()),
-                topBarController, id, new Options()) {
+                new TopBarButtonCreatorMock(),
+                new TitleBarReactViewCreatorMock(),
+                new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()),
+                topBarController,
+                id,
+                new Options()) {
             @Override
             NavigationAnimator createAnimator() {
                 animator = Mockito.mock(NavigationAnimator.class);