Consolidate push and animatePush

Screen presentation logic in stack should be moved to a dedicated presenter

lib/android/app/src/main/java/com/reactnativenavigation/parse/Options.java

@@ -3,6 +3,9 @@ package com.reactnativenavigation.parse;
 import android.support.annotation.CheckResult;
 import android.support.annotation.NonNull;
 
+import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.params.NullBool;
+import com.reactnativenavigation.parse.parsers.BoolParser;
 import com.reactnativenavigation.utils.TypefaceLoader;
 
 import org.json.JSONObject;
@@ -27,8 +30,9 @@ public class Options {
         result.bottomTabsOptions = BottomTabsOptions.parse(json.optJSONObject("bottomTabs"));
         result.overlayOptions = OverlayOptions.parse(json.optJSONObject("overlay"));
         result.fabOptions = FabOptions.parse(json.optJSONObject("fab"));
-        result.animationsOptions = AnimationsOptions.parse(json.optJSONObject("animations"));
         result.sideMenuRootOptions = SideMenuRootOptions.parse(json.optJSONObject("sideMenu"));
+        result.animationsOptions = AnimationsOptions.parse(json.optJSONObject("animations"));
+        result.animated = BoolParser.parse(json, "animated");
 
         return result.withDefaultOptions(defaultOptions);
     }
@@ -43,6 +47,7 @@ public class Options {
     @NonNull public FabOptions fabOptions = new FabOptions();
     @NonNull public AnimationsOptions animationsOptions = new AnimationsOptions();
     @NonNull public SideMenuRootOptions sideMenuRootOptions = new SideMenuRootOptions();
+    @NonNull public Bool animated = new NullBool();
 
     void setTopTabIndex(int i) {
         topTabOptions.tabIndex = i;
@@ -59,8 +64,9 @@ public class Options {
         result.bottomTabsOptions.mergeWith(bottomTabsOptions);
         result.overlayOptions = overlayOptions;
         result.fabOptions.mergeWith(fabOptions);
-        result.animationsOptions.mergeWith(animationsOptions);
         result.sideMenuRootOptions.mergeWith(sideMenuRootOptions);
+        result.animationsOptions.mergeWith(animationsOptions);
+        result.animated = animated;
         return result;
     }
 
@@ -76,19 +82,21 @@ public class Options {
         result.fabOptions.mergeWith(other.fabOptions);
         result.animationsOptions.mergeWith(other.animationsOptions);
         result.sideMenuRootOptions.mergeWith(other.sideMenuRootOptions);
+        if (other.animated.hasValue()) result.animated = other.animated;
         return result;
     }
 
-    Options withDefaultOptions(final Options other) {
-        orientationOptions.mergeWithDefault(other.orientationOptions);
-        topBarOptions.mergeWithDefault(other.topBarOptions);
-        topTabOptions.mergeWithDefault(other.topTabOptions);
-        topTabsOptions.mergeWithDefault(other.topTabsOptions);
-        bottomTabOptions.mergeWithDefault(other.bottomTabOptions);
-        bottomTabsOptions.mergeWithDefault(other.bottomTabsOptions);
-        fabOptions.mergeWithDefault(other.fabOptions);
-        animationsOptions.mergeWithDefault(other.animationsOptions);
-        sideMenuRootOptions.mergeWithDefault(other.sideMenuRootOptions);
+    Options withDefaultOptions(final Options defaultOptions) {
+        orientationOptions.mergeWithDefault(defaultOptions.orientationOptions);
+        topBarOptions.mergeWithDefault(defaultOptions.topBarOptions);
+        topTabOptions.mergeWithDefault(defaultOptions.topTabOptions);
+        topTabsOptions.mergeWithDefault(defaultOptions.topTabsOptions);
+        bottomTabOptions.mergeWithDefault(defaultOptions.bottomTabOptions);
+        bottomTabsOptions.mergeWithDefault(defaultOptions.bottomTabsOptions);
+        fabOptions.mergeWithDefault(defaultOptions.fabOptions);
+        animationsOptions.mergeWithDefault(defaultOptions.animationsOptions);
+        sideMenuRootOptions.mergeWithDefault(defaultOptions.sideMenuRootOptions);
+        if (!animated.hasValue()) animated = defaultOptions.animated;
         return this;
     }
 

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

@@ -107,7 +107,7 @@ public class Navigator extends ParentController implements ModalListener {
     public void push(final String fromId, final ViewController viewController, CommandListener listener) {
         ViewController from = findControllerById(fromId);
         if (from != null) {
-            from.performOnParentStack(stack -> ((StackController) stack).animatePush(viewController, listener));
+            from.performOnParentStack(stack -> ((StackController) stack).push(viewController, listener));
         } else {
             listener.onError("Could not push component: " + viewController.getId() + ". Stack with id " + fromId + " was not found.");
         }

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

@@ -99,44 +99,25 @@ public class StackController extends ParentController<StackLayout> {
 
     public void push(ViewController child, CommandListener listener) {
         final ViewController toRemove = stack.peek();
-
         child.setParentController(this);
         stack.push(child.getId(), child);
-        View enteringView = child.getView();
-        getView().addView(enteringView, MATCH_PARENT, MATCH_PARENT);
+        getView().addView(child.getView(), MATCH_PARENT, MATCH_PARENT);
 
         if (toRemove != null) {
-            getView().removeView(toRemove.getView());
-        }
-        listener.onSuccess(child.getId());
-    }
-
-    public void animatePush(final ViewController child, CommandListener listener) {
-        final ViewController toRemove = stack.peek();
-
-        child.setParentController(this);
-        stack.push(child.getId(), child);
-        View enteringView = child.getView();
-        getView().addView(enteringView, MATCH_PARENT, MATCH_PARENT);
-
-        if (toRemove != null) {
-            animator.animatePush(enteringView, () -> {
+            if (child.options.animated.isTrueOrUndefined()) {
+                animator.animatePush(child.getView(), () -> {
+                    getView().removeView(toRemove.getView());
+                    listener.onSuccess(child.getId());
+                });
+            } else {
                 getView().removeView(toRemove.getView());
                 listener.onSuccess(child.getId());
-            });
-        } else {
-            listener.onSuccess(child.getId());
+            }
         }
     }
 
     public void setRoot(ViewController child, CommandListener listener) {
-        push(child);
-        removeChildrenBellowTop();
-        listener.onSuccess(child.getId());
-    }
-
-    public void animateSetRoot(ViewController child, CommandListener listener) {
-        animatePush(child, new CommandListenerAdapter() {
+        push(child, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 removeChildrenBellowTop();

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

@@ -105,7 +105,7 @@ public class BottomTabsControllerTest extends BaseTest {
         assertThat(uut.findControllerById("123")).isNull();
         assertThat(uut.findControllerById(uut.getId())).isEqualTo(uut);
         StackController inner = createStack("inner");
-        inner.animatePush(child1, new CommandListenerAdapter());
+        inner.push(child1, new CommandListenerAdapter());
         assertThat(uut.findControllerById(child1.getId())).isNull();
         uut.setTabs(Collections.singletonList(inner));
         assertThat(uut.findControllerById(child1.getId())).isEqualTo(child1);

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

@@ -13,6 +13,7 @@ import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.FabOptions;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
@@ -46,6 +47,7 @@ public class FloatingActionButtonTest extends BaseTest {
     @NonNull
     private Options getOptionsWithFab() {
         Options options = new Options();
+        options.animated = new Bool(false);
         FabOptions fabOptions = new FabOptions();
         fabOptions.id = new Text("FAB");
         options.fabOptions = fabOptions;
@@ -109,6 +111,9 @@ public class FloatingActionButtonTest extends BaseTest {
 
     @Test
     public void showOnPop() {
+        childFab.options.animated = new Bool(false);
+        childNoFab.options.animated = new Bool(false);
+
         stackController.push(childFab);
         stackController.push(childNoFab);
         childNoFab.onViewAppeared();

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

@@ -12,6 +12,7 @@ import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.CompatUtils;
@@ -83,7 +84,7 @@ public class NavigatorTest extends BaseTest {
     @Test
     public void push() {
         StackController stackController = newStack();
-        stackController.animatePush(child1, new CommandListenerAdapter());
+        stackController.push(child1, new CommandListenerAdapter());
         uut.setRoot(stackController, new MockPromise());
 
         assertIsChildById(uut.getView(), stackController.getView());
@@ -107,8 +108,8 @@ public class NavigatorTest extends BaseTest {
         BottomTabsController bottomTabsController = newTabs();
         StackController stack1 = newStack();
         StackController stack2 = newStack();
-        stack1.animatePush(child1, new CommandListenerAdapter());
-        stack2.animatePush(child2, new CommandListenerAdapter());
+        stack1.push(child1, new CommandListenerAdapter());
+        stack2.push(child2, new CommandListenerAdapter());
         bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new MockPromise());
 
@@ -134,12 +135,12 @@ public class NavigatorTest extends BaseTest {
         StackController stack2 = newStack();
         bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new MockPromise());
-        stack1.animatePush(child1, new CommandListenerAdapter());
-        stack2.animatePush(child2, new CommandListenerAdapter());
-        stack2.animatePush(child3, new CommandListenerAdapter() {
+        stack1.push(child1, new CommandListenerAdapter());
+        stack2.push(child2, new CommandListenerAdapter());
+        stack2.push(child3, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
-                stack2.animatePush(child4, new CommandListenerAdapter() {
+                stack2.push(child4, new CommandListenerAdapter() {
                             @Override
                             public void onSuccess(String childId) {
                                 uut.pop("child4", new MockPromise());
@@ -156,10 +157,10 @@ public class NavigatorTest extends BaseTest {
         BottomTabsController bottomTabsController = newTabs();
         StackController stack1 = newStack();
         StackController stack2 = newStack();
-        stack1.animatePush(child1, new CommandListenerAdapter());
-        stack2.animatePush(child2, new CommandListenerAdapter());
-        stack2.animatePush(child3, new CommandListenerAdapter());
-        stack2.animatePush(child4, new CommandListenerAdapter());
+        stack1.push(child1, new CommandListenerAdapter());
+        stack2.push(child2, new CommandListenerAdapter());
+        stack2.push(child3, new CommandListenerAdapter());
+        stack2.push(child4, new CommandListenerAdapter());
         bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new MockPromise());
 
@@ -176,11 +177,11 @@ public class NavigatorTest extends BaseTest {
         bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new MockPromise());
 
-        stack1.animatePush(child1, new CommandListenerAdapter());
-        stack2.animatePush(child2, new CommandListenerAdapter());
-        stack2.animatePush(child3, new CommandListenerAdapter());
-        stack2.animatePush(child4, new CommandListenerAdapter());
-        stack2.animatePush(child5, new CommandListenerAdapter() {
+        stack1.push(child1, new CommandListenerAdapter());
+        stack2.push(child2, new CommandListenerAdapter());
+        stack2.push(child3, new CommandListenerAdapter());
+        stack2.push(child4, new CommandListenerAdapter());
+        stack2.push(child5, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 uut.popTo(child2.getId(), new MockPromise());
@@ -197,11 +198,11 @@ public class NavigatorTest extends BaseTest {
         bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new MockPromise());
 
-        stack1.animatePush(child1, new CommandListenerAdapter());
-        stack2.animatePush(child2, new CommandListenerAdapter());
-        stack2.animatePush(child3, new CommandListenerAdapter());
-        stack2.animatePush(child4, new CommandListenerAdapter());
-        stack2.animatePush(child5, new CommandListenerAdapter() {
+        stack1.push(child1, new CommandListenerAdapter());
+        stack2.push(child2, new CommandListenerAdapter());
+        stack2.push(child3, new CommandListenerAdapter());
+        stack2.push(child4, new CommandListenerAdapter());
+        stack2.push(child5, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 uut.popToRoot(child3.getId(), new MockPromise());
@@ -212,11 +213,15 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void setStackRoot() {
+        child1.options.animated = new Bool(false);
+        child2.options.animated = new Bool(false);
+        child3.options.animated = new Bool(false);
+
         StackController stack = newStack();
         uut.setRoot(stack, new MockPromise());
 
-        stack.animatePush(child1, new CommandListenerAdapter());
-        stack.animatePush(child2, new CommandListenerAdapter());
+        stack.push(child1, new CommandListenerAdapter());
+        stack.push(child2, new CommandListenerAdapter());
         stack.setRoot(child3, new CommandListenerAdapter());
 
         assertThat(stack.getChildControllers()).containsOnly(child3);
@@ -272,7 +277,7 @@ public class NavigatorTest extends BaseTest {
     @Test
     public void push_Promise() {
         final StackController stackController = newStack();
-        stackController.animatePush(child1, new CommandListenerAdapter());
+        stackController.push(child1, new CommandListenerAdapter());
         uut.setRoot(stackController, new MockPromise());
 
         assertIsChildById(uut.getView(), stackController.getView());
@@ -319,10 +324,10 @@ public class NavigatorTest extends BaseTest {
         bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new MockPromise());
 
-        stack1.animatePush(child1, new CommandListenerAdapter());
-        stack2.animatePush(child2, new CommandListenerAdapter());
-        stack2.animatePush(child3, new CommandListenerAdapter());
-        stack2.animatePush(child4, new CommandListenerAdapter() {
+        stack1.push(child1, new CommandListenerAdapter());
+        stack2.push(child2, new CommandListenerAdapter());
+        stack2.push(child3, new CommandListenerAdapter());
+        stack2.push(child4, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 uut.pop("child4", new MockPromise());
@@ -343,6 +348,8 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void pushedStackCanBePopped() {
+        child1.options.animated = new Bool(false);
+        child2.options.animated = new Bool(false);
         StackController parent = newStack();
         parent.ensureViewIsCreated();
         uut.setRoot(parent, new MockPromise());

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

@@ -73,7 +73,7 @@ public class OptionsApplyingTest extends BaseTest {
         uut.options.topBarOptions.title.text = new Text("the title");
         StackController stackController =
                 new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()), new TopBarController(), "stackId", new Options());
-        stackController.animatePush(uut, new CommandListenerAdapter());
+        stackController.push(uut, new CommandListenerAdapter());
         assertThat(stackController.getTopBar().getTitle()).isEmpty();
 
         uut.onViewAppeared();
@@ -118,7 +118,7 @@ public class OptionsApplyingTest extends BaseTest {
     @Test
     public void appliesTopBarTextColor() {
         assertThat(uut.initialOptions).isSameAs(initialNavigationOptions);
-        stackController.animatePush(uut, new CommandListenerAdapter() {
+        stackController.push(uut, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 Options opts = new Options();
@@ -169,7 +169,7 @@ public class OptionsApplyingTest extends BaseTest {
         uut.options.topBarOptions.title.text = new Text("the title");
         uut.options.topBarOptions.drawBehind = new Bool(false);
         uut.ensureViewIsCreated();
-        stackController.animatePush(uut, new CommandListenerAdapter() {
+        stackController.push(uut, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 uut.onViewAppeared();

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

@@ -95,8 +95,8 @@ public class ParentControllerTest extends BaseTest {
         StackController stackController = createStack();
         SimpleViewController child1 = new SimpleViewController(activity, "child1", new Options());
         SimpleViewController child2 = new SimpleViewController(activity, "child2", new Options());
-        stackController.animatePush(child1, new CommandListenerAdapter());
-        stackController.animatePush(child2, new CommandListenerAdapter());
+        stackController.push(child1, new CommandListenerAdapter());
+        stackController.push(child2, new CommandListenerAdapter());
         children.add(stackController);
 
         assertThat(uut.findControllerById("child2")).isEqualTo(child2);
@@ -116,7 +116,7 @@ public class ParentControllerTest extends BaseTest {
     public void optionsAreClearedWhenChildIsAppeared() {
         StackController stackController = spy(createStack());
         SimpleViewController child1 = new SimpleViewController(activity, "child1", new Options());
-        stackController.animatePush(child1, new CommandListenerAdapter());
+        stackController.push(child1, new CommandListenerAdapter());
 
         child1.onViewAppeared();
         verify(stackController, times(1)).clearOptions();

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

@@ -66,9 +66,9 @@ public class StackControllerTest extends BaseTest {
     @Test
     public void holdsAStackOfViewControllers() {
         assertThat(uut.isEmpty()).isTrue();
-        uut.animatePush(child1, new CommandListenerAdapter());
-        uut.animatePush(child2, new CommandListenerAdapter());
-        uut.animatePush(child3, new CommandListenerAdapter());
+        uut.push(child1, new CommandListenerAdapter());
+        uut.push(child2, new CommandListenerAdapter());
+        uut.push(child3, new CommandListenerAdapter());
         assertThat(uut.peek()).isEqualTo(child3);
         assertContainsOnlyId(child1.getId(), child2.getId(), child3.getId());
     }
@@ -76,7 +76,7 @@ public class StackControllerTest extends BaseTest {
     @Test
     public void push() {
         assertThat(uut.isEmpty()).isTrue();
-        uut.animatePush(child1, new CommandListenerAdapter());
+        uut.push(child1, new CommandListenerAdapter());
         assertContainsOnlyId(child1.getId());
     }
 
@@ -85,7 +85,7 @@ public class StackControllerTest extends BaseTest {
         assertThat(uut.isEmpty()).isTrue();
         uut.push(child1, new CommandListenerAdapter());
         uut.push(child2, new CommandListenerAdapter());
-        uut.animateSetRoot(child3, new CommandListenerAdapter() {
+        uut.setRoot(child3, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 assertContainsOnlyId(child3.getId());
@@ -108,8 +108,8 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void pop() {
-        uut.animatePush(child1, new CommandListenerAdapter());
-        uut.animatePush(child2, new CommandListenerAdapter() {
+        uut.push(child1, new CommandListenerAdapter());
+        uut.push(child2, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 assertContainsOnlyId(child2.getId(), child1.getId());
@@ -121,8 +121,8 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void pop_appliesOptionsAfterPop() {
-        uut.animatePush(child1, new CommandListenerAdapter());
-        uut.animatePush(child2, new CommandListenerAdapter() {
+        uut.push(child1, new CommandListenerAdapter());
+        uut.push(child2, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 uut.pop(new MockPromise());
@@ -144,7 +144,7 @@ public class StackControllerTest extends BaseTest {
                     }
                 };
         uut.push(child1, new CommandListenerAdapter());
-        uut.animatePush(child2, new CommandListenerAdapter() {
+        uut.push(child2, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 uut.animatePop(new MockPromise() {
@@ -163,7 +163,7 @@ public class StackControllerTest extends BaseTest {
         assertThat(uut.peek()).isNull();
         assertThat(uut.size()).isZero();
         assertThat(uut.isEmpty()).isTrue();
-        uut.animatePush(child1, new CommandListenerAdapter());
+        uut.push(child1, new CommandListenerAdapter());
         assertThat(uut.peek()).isEqualTo(child1);
         assertThat(uut.size()).isEqualTo(1);
         assertThat(uut.isEmpty()).isFalse();
@@ -172,11 +172,11 @@ public class StackControllerTest extends BaseTest {
     @Test
     public void pushAssignsRefToSelfOnPushedController() {
         assertThat(child1.getParentController()).isNull();
-        uut.animatePush(child1, new CommandListenerAdapter());
+        uut.push(child1, new CommandListenerAdapter());
         assertThat(child1.getParentController()).isEqualTo(uut);
 
         StackController anotherNavController = createStackController("another");
-        anotherNavController.animatePush(child2, new CommandListenerAdapter());
+        anotherNavController.push(child2, new CommandListenerAdapter());
         assertThat(child2.getParentController()).isEqualTo(anotherNavController);
     }
 
@@ -185,11 +185,11 @@ public class StackControllerTest extends BaseTest {
         assertThat(uut.isEmpty()).isTrue();
         assertThat(uut.handleBack()).isFalse();
 
-        uut.animatePush(child1, new CommandListenerAdapter());
+        uut.push(child1, new CommandListenerAdapter());
         assertThat(uut.size()).isEqualTo(1);
         assertThat(uut.handleBack()).isFalse();
 
-        uut.animatePush(child2, new CommandListenerAdapter() {
+        uut.push(child2, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 assertThat(uut.size()).isEqualTo(2);
@@ -207,7 +207,7 @@ public class StackControllerTest extends BaseTest {
         uut.pop(new MockPromise());
         assertThat(uut.isEmpty()).isTrue();
 
-        uut.animatePush(child1, new CommandListenerAdapter());
+        uut.push(child1, new CommandListenerAdapter());
         uut.pop(new MockPromise());
         assertContainsOnlyId(child1.getId());
     }
@@ -216,10 +216,10 @@ public class StackControllerTest extends BaseTest {
     public void canPopWhenSizeIsMoreThanOne() {
         assertThat(uut.isEmpty()).isTrue();
         assertThat(uut.canPop()).isFalse();
-        uut.animatePush(child1, new CommandListenerAdapter());
+        uut.push(child1, new CommandListenerAdapter());
         assertContainsOnlyId(child1.getId());
         assertThat(uut.canPop()).isFalse();
-        uut.animatePush(child2, new CommandListenerAdapter());
+        uut.push(child2, new CommandListenerAdapter());
         assertContainsOnlyId(child1.getId(), child2.getId());
         assertThat(uut.canPop()).isTrue();
     }
@@ -227,16 +227,16 @@ public class StackControllerTest extends BaseTest {
     @Test
     public void pushAddsToViewTree() {
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
-        uut.animatePush(child1, new CommandListenerAdapter());
+        uut.push(child1, new CommandListenerAdapter());
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNotNull();
     }
 
     @Test
     public void pushRemovesPreviousFromTree() {
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
-        uut.animatePush(child1, new CommandListenerAdapter());
+        uut.push(child1, new CommandListenerAdapter());
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNotNull();
-        uut.animatePush(child2, new CommandListenerAdapter() {
+        uut.push(child2, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
@@ -250,8 +250,8 @@ public class StackControllerTest extends BaseTest {
         final View child2View = child2.getView();
         final View child1View = child1.getView();
 
-        uut.animatePush(child1, new CommandListenerAdapter());
-        uut.animatePush(child2, new CommandListenerAdapter() {
+        uut.push(child1, new CommandListenerAdapter());
+        uut.push(child2, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 assertIsChildById(uut.getView(), child2View);
@@ -265,8 +265,8 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void popSpecificWhenTopIsRegularPop() {
-        uut.animatePush(child1, new CommandListenerAdapter());
-        uut.animatePush(child2, new CommandListenerAdapter() {
+        uut.push(child1, new CommandListenerAdapter());
+        uut.push(child2, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 uut.popSpecific(child2, new MockPromise() {
@@ -282,8 +282,8 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void popSpecificDeepInStack() {
-        uut.animatePush(child1, new CommandListenerAdapter());
-        uut.animatePush(child2, new CommandListenerAdapter());
+        uut.push(child1, new CommandListenerAdapter());
+        uut.push(child2, new CommandListenerAdapter());
         assertIsChildById(uut.getView(), child2.getView());
         uut.popSpecific(child1, new MockPromise());
         assertContainsOnlyId(child2.getId());
@@ -292,9 +292,9 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void popTo_PopsTopUntilControllerIsNewTop() {
-        uut.animatePush(child1, new CommandListenerAdapter());
-        uut.animatePush(child2, new CommandListenerAdapter());
-        uut.animatePush(child3, new CommandListenerAdapter() {
+        uut.push(child1, new CommandListenerAdapter());
+        uut.push(child2, new CommandListenerAdapter());
+        uut.push(child3, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 assertThat(uut.size()).isEqualTo(3);
@@ -310,8 +310,8 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void popTo_NotAChildOfThisStack_DoesNothing() {
-        uut.animatePush(child1, new CommandListenerAdapter());
-        uut.animatePush(child3, new CommandListenerAdapter());
+        uut.push(child1, new CommandListenerAdapter());
+        uut.push(child3, new CommandListenerAdapter());
         assertThat(uut.size()).isEqualTo(2);
         uut.popTo(child2, new MockPromise());
         assertThat(uut.size()).isEqualTo(2);
@@ -319,9 +319,12 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void popToRoot_PopsEverythingAboveFirstController() {
-        uut.animatePush(child1, new CommandListenerAdapter());
-        uut.animatePush(child2, new CommandListenerAdapter());
-        uut.animatePush(child3, new CommandListenerAdapter() {
+        child1.options.animated = new Bool(false);
+        child2.options.animated = new Bool(false);
+
+        uut.push(child1, new CommandListenerAdapter());
+        uut.push(child2, new CommandListenerAdapter());
+        uut.push(child3, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 assertThat(uut.size()).isEqualTo(3);
@@ -349,15 +352,15 @@ public class StackControllerTest extends BaseTest {
     public void findControllerById_ReturnsSelfOrChildrenById() {
         assertThat(uut.findControllerById("123")).isNull();
         assertThat(uut.findControllerById(uut.getId())).isEqualTo(uut);
-        uut.animatePush(child1, new CommandListenerAdapter());
+        uut.push(child1, new CommandListenerAdapter());
         assertThat(uut.findControllerById(child1.getId())).isEqualTo(child1);
     }
 
     @Test
     public void findControllerById_Deeply() {
         StackController stack = createStackController("another");
-        stack.animatePush(child2, new CommandListenerAdapter());
-        uut.animatePush(stack, new CommandListenerAdapter());
+        stack.push(child2, new CommandListenerAdapter());
+        uut.push(stack, new CommandListenerAdapter());
         assertThat(uut.findControllerById(child2.getId())).isEqualTo(child2);
     }
 
@@ -366,9 +369,9 @@ public class StackControllerTest extends BaseTest {
         child1 = spy(child1);
         child2 = spy(child2);
         child3 = spy(child3);
-        uut.animatePush(child1, new CommandListenerAdapter());
-        uut.animatePush(child2, new CommandListenerAdapter());
-        uut.animatePush(child3, new CommandListenerAdapter() {
+        uut.push(child1, new CommandListenerAdapter());
+        uut.push(child2, new CommandListenerAdapter());
+        uut.push(child3, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 verify(child3, times(0)).destroy();
@@ -380,6 +383,8 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void pop_callWillAppearWillDisappear() {
+        child1.options.animated = new Bool(false);
+        child2.options.animated = new Bool(false);
         child1 = spy(child1);
         child2 = spy(child2);
         uut.push(child1, new CommandListenerAdapter());
@@ -414,9 +419,9 @@ public class StackControllerTest extends BaseTest {
         child1 = spy(child1);
         child2 = spy(child2);
         child3 = spy(child3);
-        uut.animatePush(child1, new CommandListenerAdapter());
-        uut.animatePush(child2, new CommandListenerAdapter());
-        uut.animatePush(child3, new CommandListenerAdapter());
+        uut.push(child1, new CommandListenerAdapter());
+        uut.push(child2, new CommandListenerAdapter());
+        uut.push(child3, new CommandListenerAdapter());
 
         verify(child2, times(0)).destroy();
         uut.popSpecific(child2, new MockPromise());
@@ -428,9 +433,9 @@ public class StackControllerTest extends BaseTest {
         child1 = spy(child1);
         child2 = spy(child2);
         child3 = spy(child3);
-        uut.animatePush(child1, new CommandListenerAdapter());
-        uut.animatePush(child2, new CommandListenerAdapter());
-        uut.animatePush(child3, new CommandListenerAdapter() {
+        uut.push(child1, new CommandListenerAdapter());
+        uut.push(child2, new CommandListenerAdapter());
+        uut.push(child3, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 verify(child2, times(0)).destroy();

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

@@ -12,6 +12,7 @@ import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.ViewHelper;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
@@ -232,6 +233,8 @@ public class TopTabsViewControllerTest extends BaseTest {
                 new TestComponentViewCreator(),
                 new Options()
         );
+        first.options.animated = new Bool(false);
+        uut.options.animated = new Bool(false);
         stackController.push(first);
         stackController.push(uut);
 

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

@@ -71,7 +71,7 @@ public class ViewControllerTest extends BaseTest {
     public void holdsAReferenceToStackControllerOrNull() {
         assertThat(uut.getParentController()).isNull();
         StackController nav = new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()), new TopBarController(), "stack", new Options());
-        nav.animatePush(uut, new CommandListenerAdapter());
+        nav.push(uut, new CommandListenerAdapter());
         assertThat(uut.getParentController()).isEqualTo(nav);
     }