Consolidate pop and animatePop

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

@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.support.annotation.RestrictTo;
 import android.support.v4.view.ViewPager;
-import android.view.View;
 
 import com.reactnativenavigation.anim.NavigationAnimator;
 import com.reactnativenavigation.parse.Options;
@@ -128,8 +127,7 @@ public class StackController extends ParentController<StackLayout> {
         while (stack.size() > 1) {
             ViewController controller = stack.get(iterator.next());
             if (!stack.isTop(controller.getId())) {
-                stack.remove(controller.getId());
-                controller.destroy();
+                removeAndDestroyController(controller);
             }
         }
     }
@@ -140,53 +138,35 @@ public class StackController extends ParentController<StackLayout> {
             return;
         }
 
-        final ViewController exitingController = stack.pop();
-        final ViewController enteringController = stack.peek();
-        popInternal(exitingController, enteringController);
-
-        finishPopping(exitingController.getView(), exitingController, listener);
-    }
-
-    void animatePop(CommandListener listener) {
-        if (!canPop()) {
-            listener.onError("Nothing to pop");
-            return;
-        }
-
-        final ViewController exitingController = stack.pop();
-        final ViewController enteringController = stack.peek();
-        popInternal(exitingController, enteringController);
-
-        animator.animatePop(
-                exitingController.getView(),
-                () -> finishPopping(exitingController.getView(), exitingController, listener)
-        );
-    }
-
-    private void popInternal(ViewController disappearing, ViewController appearing) {
+        final ViewController disappearing = stack.pop();
+        final ViewController appearing = stack.peek();
         disappearing.onViewWillDisappear();
         appearing.onViewWillAppear();
         getView().onChildWillDisappear(disappearing.options, appearing.options, () ->
                 getView().addView(appearing.getView(), getView().indexOfChild(disappearing.getView()))
         );
-    }
 
-    boolean canPop() {
-        return stack.size() > 1;
+        if (disappearing.options.animated.isTrueOrUndefined()) {
+            animator.animatePop(
+                    disappearing.getView(),
+                    () -> finishPopping(disappearing, listener)
+            );
+        } else {
+            finishPopping(disappearing, listener);
+        }
     }
 
-    private void finishPopping(View exitingView, ViewController poppedTop, CommandListener listener) {
-        getView().removeView(exitingView);
-        poppedTop.destroy();
-        listener.onSuccess(poppedTop.getId());
+    private void finishPopping(ViewController disappearing, CommandListener listener) {
+        getView().removeView(disappearing.getView());
+        disappearing.destroy();
+        listener.onSuccess(disappearing.getId());
     }
 
-    void popSpecific(final ViewController childController, CommandListener listener) {
+    void popSpecific(ViewController childController, CommandListener listener) {
         if (stack.isTop(childController.getId())) {
-            animatePop(listener);
+            pop(listener);
         } else {
-            stack.remove(childController.getId());
-            childController.destroy();
+            removeAndDestroyController(childController);
             listener.onSuccess(childController.getId());
         }
     }
@@ -203,9 +183,9 @@ public class StackController extends ParentController<StackLayout> {
             String nextControlId = iterator.next();
             boolean animate = nextControlId.equals(viewController.getId());
             if (animate) {
-                animatePop(listener);
+                pop(listener);
             } else {
-                pop(new CommandListenerAdapter());
+                removeAndDestroyController(stack.get(currentControlId));
             }
             currentControlId = nextControlId;
         }
@@ -221,12 +201,16 @@ public class StackController extends ParentController<StackLayout> {
         while (stack.size() > 2) {
             ViewController controller = stack.get(iterator.next());
             if (!stack.isTop(controller.getId())) {
-                stack.remove(controller.getId());
-                controller.destroy();
+                removeAndDestroyController(controller);
             }
         }
 
-        animatePop(listener);
+        pop(listener);
+    }
+
+    private void removeAndDestroyController(ViewController controller) {
+        stack.remove(controller.getId());
+        controller.destroy();
     }
 
     ViewController peek() {
@@ -244,12 +228,16 @@ public class StackController extends ParentController<StackLayout> {
     @Override
     public boolean handleBack() {
         if (canPop()) {
-            animatePop(new CommandListenerAdapter());
+            pop(new CommandListenerAdapter());
             return true;
         }
         return false;
     }
 
+    boolean canPop() {
+        return stack.size() > 1;
+    }
+
     @Override
     public void sendOnNavigationButtonPressed(String buttonId) {
         peek().sendOnNavigationButtonPressed(buttonId);

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

@@ -145,7 +145,7 @@ public class StackControllerTest extends BaseTest {
         uut.push(child2, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
-                uut.animatePop(new CommandListenerAdapter() {
+                uut.pop(new CommandListenerAdapter() {
                     @Override
                     public void onSuccess(String childId) {
                         verify(stackLayout[0], times(1)).onChildWillDisappear(child2.options, child1.options, () -> {
@@ -343,16 +343,20 @@ public class StackControllerTest extends BaseTest {
     public void popToRoot_onlyTopChildIsAnimated() {
         child1.options.animated = new Bool(false);
         child2.options.animated = new Bool(false);
-        child3.options.animated = new Bool(false);
 
         uut.push(child1, new CommandListenerAdapter());
         uut.push(child2, new CommandListenerAdapter());
-        uut.push(child3, new CommandListenerAdapter());
-
-        uut.popToRoot(new CommandListenerAdapter() {
+        uut.push(child3, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
-                verify(animator, times(1)).animatePop(eq(child3.getView()), any());
+                child1.options.animated = new Bool(true);
+                child2.options.animated = new Bool(true);
+                uut.popToRoot(new CommandListenerAdapter() {
+                    @Override
+                    public void onSuccess(String childId) {
+                        verify(animator, times(1)).animatePop(eq(child3.getView()), any());
+                    }
+                });
             }
         });
     }
@@ -444,7 +448,7 @@ public class StackControllerTest extends BaseTest {
 
         assertThat(uut.getTopBar().getVisibility()).isEqualTo(View.GONE);
         uut.push(child2, new CommandListenerAdapter());
-        uut.animatePop(new CommandListenerAdapter() {
+        uut.pop(new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 verify(uut.getTopBar(), times(1)).hide();

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

@@ -241,7 +241,7 @@ public class TopTabsViewControllerTest extends BaseTest {
         uut.onViewAppeared();
 
         assertThat(ViewHelper.isVisible(stackController.getTopBar().getTopTabs())).isTrue();
-        stackController.animatePop(new CommandListenerAdapter() {
+        stackController.pop(new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 assertThat(ViewHelper.isVisible(stackController.getTopBar().getTopTabs())).isFalse();