Modal as layout (#3094)

[Breaking[ Modal refactor

* [Breaking] Showing modal removes the previously visible ViewController from hierarchy
* Modal implementation does not rely on Dialog
* Modal view is added to `content` layout
* Overlay is added to `root` layout, on top of the application's content
* Introduce StackControllerBuilder
* Show modal with animation
* Dismiss modal with animation
* Add previous modal at index 0
* Add root at index 0
* dismissAllModals dismisses only top modal with animation

e2e/ScreenStack.test.js

@@ -16,7 +16,7 @@ describe('screen stack', () => {
     await expect(elementById(testIDs.WELCOME_SCREEN_HEADER)).toBeVisible();
   });
 
-  it(':android: push and pop screen with out animation', async () => {
+  it(':android: push and pop screen without animation', async () => {
     await elementById(testIDs.PUSH_OPTIONS_BUTTON).tap();
     await expect(elementById(testIDs.OPTIONS_SCREEN_HEADER)).toBeVisible();
     Android.pressBack();

lib/android/app/src/main/java/com/reactnativenavigation/NavigationActivity.java

@@ -6,6 +6,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
+import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.Navigator;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler {
@@ -40,7 +41,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
 	@Override
 	public void invokeDefaultOnBackPressed() {
-		if (!navigator.handleBack()) {
+		if (!navigator.handleBack(new CommandListenerAdapter())) {
 			super.onBackPressed();
 		}
 	}

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

@@ -33,9 +33,8 @@ class BaseAnimator {
 
         AnimatorSet set = new AnimatorSet();
         ObjectAnimator translationY = ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, this.translationY, 0);
-        translationY.setInterpolator(DECELERATE_INTERPOLATOR);
-        translationY.setDuration(DURATION);
-        alpha.setDuration(DURATION);
+        set.setInterpolator(DECELERATE_INTERPOLATOR);
+        set.setDuration(DURATION);
         set.playTogether(translationY, alpha);
         return set;
     }

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

@@ -6,7 +6,6 @@ import android.animation.AnimatorSet;
 import android.content.Context;
 import android.view.View;
 
-import com.reactnativenavigation.parse.AnimationOptions;
 import com.reactnativenavigation.parse.AnimationsOptions;
 
 public class ModalAnimator extends BaseAnimator {

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

@@ -0,0 +1,34 @@
+package com.reactnativenavigation.anim;
+
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.content.Context;
+import android.view.View;
+
+import com.reactnativenavigation.parse.AnimationOptions;
+
+public class ModalAnimator2 extends BaseAnimator {
+
+    private Animator animator;
+
+    public ModalAnimator2(Context context) {
+        super(context);
+    }
+
+    public void show(View view, AnimationOptions animation, AnimatorListenerAdapter listener) {
+        animator = animation.getAnimation(view, getDefaultPushAnimation(view));
+        animator.addListener(listener);
+        animator.start();
+    }
+
+    public void dismiss(View view, AnimatorListenerAdapter listener) {
+        animator = options.dismissModal.getAnimation(view, getDefaultPopAnimation(view));
+        animator.addListener(listener);
+        animator.start();
+    }
+
+    public boolean isRunning() {
+        return animator != null && animator.isRunning();
+    }
+}

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

@@ -6,8 +6,11 @@ import android.animation.AnimatorSet;
 import android.util.Property;
 import android.view.View;
 
+import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.params.NullBool;
 import com.reactnativenavigation.parse.params.NullText;
 import com.reactnativenavigation.parse.params.Text;
+import com.reactnativenavigation.parse.parsers.BoolParser;
 import com.reactnativenavigation.parse.parsers.TextParser;
 
 import org.json.JSONObject;
@@ -26,10 +29,15 @@ public class AnimationOptions {
         options.hasValue = true;
         for (Iterator<String> it = json.keys(); it.hasNext(); ) {
             String key = it.next();
-            if ("id".equals(key)) {
-                options.id = TextParser.parse(json, key);
-            } else {
-                options.valueOptions.add(ValueAnimationOptions.parse(json.optJSONObject(key), getAnimProp(key)));
+            switch (key) {
+                case "id":
+                    options.id = TextParser.parse(json, key);
+                    break;
+                case "enable":
+                    options.enable = BoolParser.parse(json, key);
+                    break;
+                default:
+                    options.valueOptions.add(ValueAnimationOptions.parse(json.optJSONObject(key), getAnimProp(key)));
             }
         }
 
@@ -39,6 +47,7 @@ public class AnimationOptions {
     private boolean hasValue = false;
 
     public Text id = new NullText();
+    public Bool enable = new NullBool();
     private HashSet<ValueAnimationOptions> valueOptions = new HashSet<>();
 
     void mergeWith(AnimationOptions other) {

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

@@ -9,6 +9,7 @@ import com.reactnativenavigation.utils.TypefaceLoader;
 import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 import com.reactnativenavigation.viewcontrollers.SideMenuController;
 import com.reactnativenavigation.viewcontrollers.StackController;
+import com.reactnativenavigation.viewcontrollers.StackControllerBuilder;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabsController;
 import com.reactnativenavigation.viewcontrollers.externalcomponent.ExternalComponentCreator;
@@ -123,14 +124,14 @@ public class LayoutFactory {
     }
 
 	private ViewController createStack(LayoutNode node) {
-        StackController stackController = new StackController(activity,
-                new TitleBarButtonCreator(reactInstanceManager),
-                new TitleBarReactViewCreator(reactInstanceManager),
-                new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreator(reactInstanceManager)),
-                new TopBarController(),
-                node.id,
-                getOptions(node)
-        );
+        StackController stackController = new StackControllerBuilder(activity)
+                .setTopBarButtonCreator(new TitleBarButtonCreator(reactInstanceManager))
+                .setTitleBarReactViewCreator(new TitleBarReactViewCreator(reactInstanceManager))
+                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreator(reactInstanceManager)))
+                .setTopBarController(new TopBarController())
+                .setId(node.id)
+                .setInitialOptions(getOptions(node))
+                .createStackController();
         addChildrenToStack(node.children, stackController);
         return stackController;
 	}

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -98,7 +98,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		final LayoutNode layoutTree = LayoutNodeParser.parse(new JSONObject(rawLayoutTree.toHashMap()));
 		handle(() -> {
             final ViewController viewController = newLayoutFactory().create(layoutTree);
-            navigator().showModal(viewController, promise);
+            navigator().showModal(viewController, new CommandListenerAdapter(promise));
         });
 	}
 

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

@@ -2,7 +2,6 @@ package com.reactnativenavigation.viewcontrollers;
 
 import android.support.annotation.Nullable;
 
-import com.facebook.react.bridge.Promise;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.Task;
 import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
@@ -24,21 +23,17 @@ class ModalStack implements ModalListener {
         this.modalListener = modalListener;
     }
 
-    void showModal(final ViewController viewController, Promise promise) {
+    void showModal(final ViewController viewController, CommandListener listener) {
         Modal modal = creator.create(viewController, this);
         modals.add(modal);
         modal.show();
-        promise.resolve(viewController.getId());
+        listener.onSuccess(viewController.getId());
     }
 
     void dismissModal(final String componentId, CommandListener listener) {
         applyOnModal(componentId, (modal) -> modal.dismiss(listener), () -> listener.onError("Nothing to dismiss"));
     }
 
-    void dismissAll() {
-        dismissAll(new CommandListenerAdapter());
-    }
-
     void dismissAll(CommandListener listener) {
         for (Modal modal : modals) {
             modal.dismiss(size() == 1 ? listener : new CommandListenerAdapter());
@@ -90,8 +85,8 @@ class ModalStack implements ModalListener {
         return isEmpty() ? null : modals.get(modals.size() - 1);
     }
 
-    public boolean handleBack() {
-        return !modals.isEmpty() && peek().handleBack();
+    public boolean handleBack(CommandListener listener) {
+        return !modals.isEmpty() && peek().handleBack(listener);
     }
 
     private void applyOnModal(String componentId, Task<Modal> accept, Runnable reject) {

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

@@ -5,20 +5,21 @@ import android.animation.AnimatorListenerAdapter;
 import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.facebook.react.bridge.Promise;
+import com.reactnativenavigation.anim.ModalAnimator2;
 import com.reactnativenavigation.anim.NavigationAnimator;
-import com.reactnativenavigation.parse.AnimationsOptions;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.presentation.OverlayManager;
+import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.viewcontrollers.modal.Modal;
-import com.reactnativenavigation.viewcontrollers.modal.ModalCreator;
 import com.reactnativenavigation.viewcontrollers.modal.ModalListener;
+import com.reactnativenavigation.viewcontrollers.modal.ModalPresenter;
+import com.reactnativenavigation.viewcontrollers.modal.ModalStack2;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -31,20 +32,32 @@ public class Navigator extends ParentController implements ModalListener {
         void onError(String message);
     }
 
-    private final ModalStack modalStack;
+//    private final ModalStack modalStack;
+    private final ModalStack2 modalStack;
     private ViewController root;
+    private FrameLayout rootLayout;
+    private FrameLayout contentLayout;
     private OverlayManager overlayManager = new OverlayManager();
     private Options defaultOptions = new Options();
 
     public Navigator(final Activity activity) {
         super(activity, "navigator" + CompatUtils.generateViewId(), new Options());
-        modalStack = new ModalStack(new ModalCreator(), this);
+//        modalStack = new ModalStack(new ModalCreator(), this);
+        modalStack = new ModalStack2(new ModalPresenter(new ModalAnimator2(activity)));
+    }
+
+    public FrameLayout getContentLayout() {
+        return contentLayout;
     }
 
     @NonNull
     @Override
     protected ViewGroup createView() {
-        return new FrameLayout(getActivity());
+        rootLayout = new FrameLayout(getActivity());
+        contentLayout = new FrameLayout(getActivity());
+        rootLayout.addView(contentLayout);
+        modalStack.setContentLayout(contentLayout);
+        return rootLayout;
     }
 
     @NonNull
@@ -54,13 +67,16 @@ public class Navigator extends ParentController implements ModalListener {
     }
 
     @Override
-    public boolean handleBack() {
-        return modalStack.isEmpty() ? root.handleBack() : modalStack.handleBack();
+    public boolean handleBack(CommandListener listener) {
+        if (modalStack.isEmpty()) return root.handleBack(listener);
+        return modalStack.handleBack(listener, () -> {
+            if (modalStack.size() == 1) contentLayout.addView(root.getView(), 0);
+        });
     }
 
     @Override
     public void destroy() {
-        modalStack.dismissAll();
+        modalStack.dismissAllModals(new CommandListenerAdapter());
         super.destroy();
     }
 
@@ -75,13 +91,11 @@ public class Navigator extends ParentController implements ModalListener {
         }
 
         root = viewController;
-        View view = viewController.getView();
 
-        AnimationsOptions animationsOptions = viewController.options.animations;
-        getView().addView(view);
-        if (animationsOptions.startApp.hasValue()) {
-            new NavigationAnimator(viewController.getActivity(), animationsOptions)
-                    .animateStartApp(view, new AnimatorListenerAdapter() {
+        contentLayout.addView(viewController.getView());
+        if (viewController.options.animations.startApp.hasValue()) {
+            new NavigationAnimator(viewController.getActivity(), viewController.options.animations)
+                    .animateStartApp(viewController.getView(), new AnimatorListenerAdapter() {
                         @Override
                         public void onAnimationEnd(Animator animation) {
                             promise.resolve(viewController.getId());
@@ -126,7 +140,7 @@ public class Navigator extends ParentController implements ModalListener {
         }
     }
 
-    void pop(final String fromId, CommandListener listener) {
+    public void pop(final String fromId, CommandListener listener) {
         ViewController from = findControllerById(fromId);
         if (from != null) {
             from.performOnParentStack(stack -> ((StackController) stack).pop(listener));
@@ -158,12 +172,34 @@ public class Navigator extends ParentController implements ModalListener {
         }
     }
 
-    public void showModal(final ViewController viewController, Promise promise) {
-        modalStack.showModal(viewController, promise);
+    public void showModal(final ViewController viewController, CommandListener listener) {
+        modalStack.showModal(viewController, new CommandListenerAdapter() {
+            @Override
+            public void onSuccess(String childId) {
+                contentLayout.removeView(root.getView());
+                listener.onSuccess(childId);
+            }
+
+            @Override
+            public void onError(String message) {
+                listener.onError(message);
+            }
+        });
     }
 
     public void dismissModal(final String componentId, CommandListener listener) {
-        modalStack.dismissModal(componentId, listener);
+        modalStack.dismissModal(componentId, new CommandListener() {
+            @Override
+            public void onSuccess(String childId) {
+                if (modalStack.size() == 0) contentLayout.addView(root.getView());
+                listener.onSuccess(childId);
+            }
+
+            @Override
+            public void onError(String message) {
+                listener.onError(message);
+            }
+        });
     }
 
     @Override
@@ -173,7 +209,6 @@ public class Navigator extends ParentController implements ModalListener {
         }
     }
 
-
     @Override
     public void onModalDismiss(Modal modal) {
         if (modalStack.isEmpty()) {
@@ -182,11 +217,12 @@ public class Navigator extends ParentController implements ModalListener {
     }
 
     public void dismissAllModals(CommandListener listener) {
-        modalStack.dismissAll(listener);
+        if (!modalStack.isEmpty()) contentLayout.addView(root.getView(), 0);
+        modalStack.dismissAllModals(listener);
     }
 
     public void showOverlay(ViewController overlay) {
-        overlayManager.show(getView(), overlay);
+        overlayManager.show(rootLayout, overlay);
     }
 
     public void dismissOverlay(final String componentId) {

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

@@ -31,13 +31,13 @@ public class StackController extends ParentController<StackLayout> {
     private TopBarBackgroundViewController topBarBackgroundViewController;
     private TopBarController topBarController;
 
-    public StackController(final Activity activity, ReactViewCreator topBarButtonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarController topBarController, String id, Options initialOptions) {
+    public StackController(final Activity activity, ReactViewCreator topBarButtonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarController topBarController, NavigationAnimator animator, String id, Options initialOptions) {
         super(activity, id, initialOptions);
         this.topBarController = topBarController;
-        animator = createAnimator();
         this.topBarButtonCreator = topBarButtonCreator;
         this.titleBarReactViewCreator = titleBarReactViewCreator;
         this.topBarBackgroundViewController = topBarBackgroundViewController;
+        this.animator = animator;
     }
 
     public void applyOptions(Options options) {
@@ -220,9 +220,9 @@ public class StackController extends ParentController<StackLayout> {
     }
 
     @Override
-    public boolean handleBack() {
+    public boolean handleBack(CommandListener listener) {
         if (canPop()) {
-            pop(new CommandListenerAdapter());
+            pop(listener);
             return true;
         }
         return false;
@@ -259,10 +259,6 @@ public class StackController extends ParentController<StackLayout> {
         topBarController.clearTopTabs();
     }
 
-     NavigationAnimator createAnimator() {
-        return new NavigationAnimator(getActivity());
-    }
-
     @RestrictTo(RestrictTo.Scope.TESTS)
     TopBar getTopBar() {
         return topBarController.getView();

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

@@ -0,0 +1,64 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.app.Activity;
+
+import com.reactnativenavigation.anim.NavigationAnimator;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
+import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
+import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
+
+public class StackControllerBuilder {
+    private Activity activity;
+    private ReactViewCreator topBarButtonCreator;
+    private TitleBarReactViewCreator titleBarReactViewCreator;
+    private TopBarBackgroundViewController topBarBackgroundViewController;
+    private TopBarController topBarController;
+    private String id;
+    private Options initialOptions = new Options();
+    private NavigationAnimator animator;
+
+    public StackControllerBuilder(Activity activity) {
+        this.activity = activity;
+        animator = new NavigationAnimator(activity);
+    }
+
+    public StackControllerBuilder setTopBarButtonCreator(ReactViewCreator topBarButtonCreator) {
+        this.topBarButtonCreator = topBarButtonCreator;
+        return this;
+    }
+
+    public StackControllerBuilder setTitleBarReactViewCreator(TitleBarReactViewCreator titleBarReactViewCreator) {
+        this.titleBarReactViewCreator = titleBarReactViewCreator;
+        return this;
+    }
+
+    public StackControllerBuilder setTopBarBackgroundViewController(TopBarBackgroundViewController topBarBackgroundViewController) {
+        this.topBarBackgroundViewController = topBarBackgroundViewController;
+        return this;
+    }
+
+    public StackControllerBuilder setTopBarController(TopBarController topBarController) {
+        this.topBarController = topBarController;
+        return this;
+    }
+
+    public StackControllerBuilder setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public StackControllerBuilder setInitialOptions(Options initialOptions) {
+        this.initialOptions = initialOptions;
+        return this;
+    }
+
+    public StackControllerBuilder setAnimator(NavigationAnimator animator) {
+        this.animator = animator;
+        return this;
+    }
+
+    public StackController createStackController() {
+        return new StackController(activity, topBarButtonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarController, animator, id, initialOptions);
+    }
+}

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

@@ -62,7 +62,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         getView();
     }
 
-    public boolean handleBack() {
+    public boolean handleBack(Navigator.CommandListener listener) {
         return false;
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java

@@ -13,6 +13,7 @@ import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.BottomTabsOptionsPresenter;
 import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.utils.ImageLoader;
+import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
 import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.views.BottomTabs;
@@ -76,8 +77,8 @@ public class BottomTabsController extends ParentController implements AHBottomNa
     }
 
     @Override
-	public boolean handleBack() {
-		return !tabs.isEmpty() && tabs.get(bottomTabs.getCurrentItem()).handleBack();
+	public boolean handleBack(CommandListener listener) {
+		return !tabs.isEmpty() && tabs.get(bottomTabs.getCurrentItem()).handleBack(listener);
 	}
 
     @Override

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/Modal.java

@@ -89,8 +89,8 @@ public class Modal implements DialogInterface.OnKeyListener, DialogInterface.OnD
         modalListener.onModalDisplay(this);
     }
 
-    public boolean handleBack() {
-        if (!viewController.handleBack()) {
+    public boolean handleBack(CommandListener listener) {
+        if (!viewController.handleBack(listener)) {
             dialog.dismiss();
         }
         return true;

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenter.java

@@ -0,0 +1,63 @@
+package com.reactnativenavigation.viewcontrollers.modal;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.view.ViewGroup;
+
+import com.reactnativenavigation.anim.ModalAnimator2;
+import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
+import com.reactnativenavigation.viewcontrollers.ViewController;
+
+import javax.annotation.Nullable;
+
+public class ModalPresenter {
+
+    private ViewGroup content;
+    private ModalAnimator2 animator;
+
+    public ModalPresenter(ModalAnimator2 animator) {
+        this.animator = animator;
+    }
+
+    public void setContentLayout(ViewGroup contentLayout) {
+        this.content = contentLayout;
+    }
+
+    public void showModal(ViewController toAdd, @Nullable ViewController toRemove, CommandListener listener) {
+        content.addView(toAdd.getView());
+        if (toAdd.options.animations.showModal.enable.isTrueOrUndefined()) {
+            animator.show(toAdd.getView(), toAdd.options.animations.showModal, new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    onShowModalEnd(toRemove, listener, toAdd);
+                }
+            });
+        } else {
+            onShowModalEnd(toRemove, listener, toAdd);
+        }
+    }
+
+    private void onShowModalEnd(@Nullable ViewController toRemove, CommandListener listener, ViewController toAdd) {
+        if (toRemove != null) content.removeView(toRemove.getView());
+        listener.onSuccess(toAdd.getId());
+    }
+
+    public void dismissModal(ViewController toDismiss, @Nullable ViewController toAdd, CommandListener listener) {
+        if (toAdd != null) content.addView(toAdd.getView(), 0);
+        if (toDismiss.options.animations.dismissModal.enable.isTrueOrUndefined()) {
+            animator.dismiss(toDismiss.getView(), new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    onDismissEnd(toDismiss, listener);
+                }
+            });
+        } else {
+            onDismissEnd(toDismiss, listener);
+        }
+    }
+
+    private void onDismissEnd(ViewController toDismiss, CommandListener listener) {
+        toDismiss.destroy();
+        listener.onSuccess(toDismiss.getId());
+    }
+}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack2.java

@@ -0,0 +1,111 @@
+package com.reactnativenavigation.viewcontrollers.modal;
+
+import android.view.ViewGroup;
+
+import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
+import com.reactnativenavigation.viewcontrollers.ViewController;
+
+import java.util.ArrayList;
+import java.util.EmptyStackException;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+public class ModalStack2 {
+    private List<ViewController> modals = new ArrayList<>();
+    private final ModalPresenter presenter;
+
+    public ModalStack2(ModalPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public void setContentLayout(ViewGroup contentLayout) {
+        presenter.setContentLayout(contentLayout);
+    }
+
+    public void showModal(ViewController viewController, CommandListener listener) {
+        ViewController toRemove = isEmpty() ? null : peek();
+        modals.add(viewController);
+        presenter.showModal(viewController, toRemove, listener);
+    }
+
+    public void dismissModal(String componentId, CommandListener listener) {
+        ViewController toDismiss = findModalByComponentId(componentId);
+        if (toDismiss != null) {
+            ViewController toAdd = isTop(toDismiss) ? get(size() - 2) : null;
+            modals.remove(toDismiss);
+            presenter.dismissModal(toDismiss, toAdd, listener);
+        } else {
+            listener.onError("Nothing to dismiss");
+        }
+    }
+
+    public void dismissAllModals(CommandListener listener) {
+        if (modals.isEmpty()) {
+            listener.onError("Nothing to dismiss");
+            return;
+        }
+
+        while (!modals.isEmpty()) {
+            if (modals.size() == 1) {
+                dismissModal(modals.get(0).getId(), listener);
+            } else {
+                modals.get(0).destroy();
+                modals.remove(0);
+            }
+        }
+    }
+
+    public boolean handleBack(CommandListener listener, Runnable onModalWillDismiss) {
+        if (isEmpty()) return false;
+        if (peek().handleBack(listener)) {
+            return true;
+        }
+        onModalWillDismiss.run();
+        dismissModal(peek().getId(), listener);
+        return true;
+    }
+
+    public ViewController peek() {
+        if (modals.isEmpty()) throw new EmptyStackException();
+        return modals.get(modals.size() - 1);
+    }
+
+    public ViewController get(int index) {
+        return modals.get(index);
+    }
+
+    public boolean isEmpty() {
+        return modals.isEmpty();
+    }
+
+    public int size() {
+        return modals.size();
+    }
+
+    private boolean isTop(ViewController modal) {
+        return size() > 1 && peek().equals(modal);
+    }
+
+    @Nullable
+    private ViewController findModalByComponentId(String componentId) {
+        for (ViewController modal : modals) {
+            if (modal.findControllerById(componentId) != null) {
+                return modal;
+            }
+        }
+        return null;
+    }
+
+
+    @Nullable
+    public ViewController findControllerById(String componentId) {
+        for (ViewController modal : modals) {
+            ViewController controllerById = modal.findControllerById(componentId);
+            if (controllerById != null) {
+                return controllerById;
+            }
+        }
+        return null;
+    }
+}

lib/android/app/src/main/java/com/reactnativenavigation/views/titlebar/TitleBar.java

@@ -160,7 +160,7 @@ public class TitleBar extends Toolbar {
             button.destroy();
         }
         rightButtonControllers.clear();
-        getMenu().clear();
+        if (getMenu().size() > 0) getMenu().clear();
     }
 
     public void setLeftButtons(List<Button> leftButtons) {

lib/android/app/src/test/java/com/reactnativenavigation/BaseTest.java

@@ -50,7 +50,23 @@ public abstract class BaseTest {
         }
     }
 
+    protected void disableShowModalAnimation(ViewController... modals) {
+        for (ViewController modal : modals) {
+            modal.options.animations.showModal.enable = new Bool(false);
+        }
+    }
+
+    protected void disableDismissModalAnimation(ViewController... modals) {
+        for (ViewController modal : modals) {
+            modal.options.animations.dismissModal.enable = new Bool(false);
+        }
+    }
+
     protected void dispatchPreDraw(View view) {
         view.getViewTreeObserver().dispatchOnPreDraw();
     }
+
+    protected void dispatchOnGlobalLayout(View view) {
+        view.getViewTreeObserver().dispatchOnGlobalLayout();
+    }
 }

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

@@ -30,6 +30,7 @@ import java.util.Collections;
 import java.util.List;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -113,19 +114,19 @@ public class BottomTabsControllerTest extends BaseTest {
 
     @Test
     public void handleBack_DelegatesToSelectedChild() {
-        assertThat(uut.handleBack()).isFalse();
+        assertThat(uut.handleBack(new CommandListenerAdapter())).isFalse();
 
         List<ViewController> tabs = createTabs();
         ViewController spy = spy(tabs.get(2));
         tabs.set(2, spy);
-        when(spy.handleBack()).thenReturn(true);
+        when(spy.handleBack(any())).thenReturn(true);
         uut.setTabs(tabs);
 
-        assertThat(uut.handleBack()).isFalse();
+        assertThat(uut.handleBack(new CommandListenerAdapter())).isFalse();
         uut.selectTabAtIndex(2);
-        assertThat(uut.handleBack()).isTrue();
+        assertThat(uut.handleBack(new CommandListenerAdapter())).isTrue();
 
-        verify(spy, times(1)).handleBack();
+        verify(spy, times(1)).handleBack(any());
     }
 
     @Test
@@ -175,13 +176,13 @@ public class BottomTabsControllerTest extends BaseTest {
     }
 
     private StackController createStack(String id) {
-        return new StackController(activity,
-                new TopBarButtonCreatorMock(),
-                new TitleBarReactViewCreatorMock(),
-                new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()),
-                new TopBarController(),
-                id,
-                tabOptions
-        );
+        return new StackControllerBuilder(activity)
+                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
+                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                .setTopBarController(new TopBarController())
+                .setId(id)
+                .setInitialOptions(tabOptions)
+                .createStackController();
     }
 }

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

@@ -30,7 +30,14 @@ public class ComponentViewControllerTest extends BaseTest {
         super.beforeEach();
         Activity activity = newActivity();
         view = spy(new TestComponentLayout(activity, new TestReactView(activity)));
-        ParentController<StackLayout> parentController = new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()), new TopBarController(), "stack", new Options());
+        ParentController<StackLayout> parentController = new StackControllerBuilder(activity)
+                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
+                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                .setTopBarController(new TopBarController())
+                .setId("stack")
+                .setInitialOptions(new Options())
+                .createStackController();
         uut = new ComponentViewController(activity, "componentId1", "componentName", (activity1, componentId, componentName) -> view, new Options());
         uut.setParentController(parentController);
         parentController.ensureViewIsCreated();

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

@@ -37,7 +37,14 @@ public class FloatingActionButtonTest extends BaseTest {
     public void beforeEach() {
         super.beforeEach();
         activity = newActivity();
-        stackController = new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()), new TopBarController(), "stackController", new Options());
+        stackController = new StackControllerBuilder(activity)
+                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
+                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                .setTopBarController(new TopBarController())
+                .setId("stackController")
+                .setInitialOptions(new Options())
+                .createStackController();
         Options options = getOptionsWithFab();
         childFab = new SimpleViewController(activity, "child1", options);
         childNoFab = new SimpleViewController(activity, "child2", new Options());

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

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.mocks.MockPromise;
 import com.reactnativenavigation.mocks.ModalCreatorMock;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
@@ -11,8 +10,6 @@ import com.reactnativenavigation.viewcontrollers.modal.ModalListener;
 
 import org.junit.Test;
 
-import javax.annotation.Nullable;
-
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.spy;
@@ -50,15 +47,15 @@ public class ModalStackTest extends BaseTest {
 
     @Test
     public void modalRefIsSaved() {
-        uut.showModal(viewController, new MockPromise());
+        uut.showModal(viewController, new CommandListenerAdapter());
         assertThat(findModal(CONTROLLER_ID)).isNotNull();
     }
 
     @Test
     public void modalIsShown() {
-        uut.showModal(viewController, new MockPromise() {
+        uut.showModal(viewController, new CommandListenerAdapter() {
             @Override
-            public void resolve(@Nullable Object value) {
+            public void onSuccess(String childId) {
                 verify(findModal(CONTROLLER_ID), times(1)).show();
                 verify(modalListener, times(1)).onModalDisplay(any());
             }
@@ -67,7 +64,7 @@ public class ModalStackTest extends BaseTest {
 
     @Test
     public void modalIsDismissed() {
-        uut.showModal(viewController, new MockPromise());
+        uut.showModal(viewController, new CommandListenerAdapter());
         final Modal modal = findModal(CONTROLLER_ID);
         assertThat(modal).isNotNull();
         uut.dismissModal(CONTROLLER_ID, new CommandListenerAdapter() {
@@ -81,8 +78,8 @@ public class ModalStackTest extends BaseTest {
 
     @Test
     public void dismissAllModals() {
-        uut.showModal(new SimpleViewController(newActivity(), "1", new Options()), new MockPromise());
-        uut.showModal(new SimpleViewController(newActivity(), "2", new Options()), new MockPromise());
+        uut.showModal(new SimpleViewController(newActivity(), "1", new Options()), new CommandListenerAdapter());
+        uut.showModal(new SimpleViewController(newActivity(), "2", new Options()), new CommandListenerAdapter());
         uut.dismissAll(new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
@@ -94,7 +91,7 @@ public class ModalStackTest extends BaseTest {
     @Test
     public void isEmpty() {
         assertThat(uut.isEmpty()).isTrue();
-        uut.showModal(viewController, new MockPromise());
+        uut.showModal(viewController, new CommandListenerAdapter());
         assertThat(uut.isEmpty()).isFalse();
         uut.dismissAll(new CommandListenerAdapter());
         assertThat(uut.isEmpty()).isTrue();
@@ -102,8 +99,8 @@ public class ModalStackTest extends BaseTest {
 
     @Test
     public void onDismiss() {
-        uut.showModal(viewController, new MockPromise());
-        uut.showModal(new SimpleViewController(newActivity(), "otherComponent", new Options()), new MockPromise());
+        uut.showModal(viewController, new CommandListenerAdapter());
+        uut.showModal(new SimpleViewController(newActivity(), "otherComponent", new Options()), new CommandListenerAdapter());
         uut.dismissAll(new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
@@ -115,8 +112,8 @@ public class ModalStackTest extends BaseTest {
     @Test
     public void onDismiss_onViewAppearedInvokedOnPreviousModal() {
         SimpleViewController viewController = spy(new SimpleViewController(newActivity(), "otherComponent", new Options()));
-        uut.showModal(viewController, new MockPromise());
-        uut.showModal(this.viewController, new MockPromise());
+        uut.showModal(viewController, new CommandListenerAdapter());
+        uut.showModal(this.viewController, new CommandListenerAdapter());
         uut.dismissModal(CONTROLLER_ID, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {

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

@@ -29,6 +29,7 @@ import java.util.Arrays;
 import javax.annotation.Nullable;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -59,20 +60,21 @@ public class NavigatorTest extends BaseTest {
         child3 = new SimpleViewController(activity, "child3", tabOptions);
         child4 = new SimpleViewController(activity, "child4", tabOptions);
         child5 = new SimpleViewController(activity, "child5", tabOptions);
+        activity.setContentView(uut.getView());
     }
 
     @Test
     public void setRoot_AddsChildControllerView() {
-        assertThat(uut.getView().getChildCount()).isZero();
+        assertThat(uut.getContentLayout().getChildCount()).isZero();
         uut.setRoot(child1, new MockPromise());
-        assertIsChild(uut.getView(), child1.getView());
+        assertIsChild(uut.getContentLayout(), child1.getView());
     }
 
     @Test
     public void setRoot_ReplacesExistingChildControllerViews() {
         uut.setRoot(child1, new MockPromise());
         uut.setRoot(child2, new MockPromise());
-        assertIsChild(uut.getView(), child2.getView());
+        assertIsChild(uut.getContentLayout(), child2.getView());
     }
 
     @Test
@@ -229,17 +231,17 @@ public class NavigatorTest extends BaseTest {
     public void handleBack_DelegatesToRoot() {
         ViewController root = spy(child1);
         uut.setRoot(root, new MockPromise());
-        when(root.handleBack()).thenReturn(true);
-        assertThat(uut.handleBack()).isTrue();
-        verify(root, times(1)).handleBack();
+        when(root.handleBack(any(Navigator.CommandListener.class))).thenReturn(true);
+        assertThat(uut.handleBack(new CommandListenerAdapter())).isTrue();
+        verify(root, times(1)).handleBack(any());
     }
 
     @Test
     public void handleBack_modalTakePrecedenceOverRoot() {
         ViewController root = spy(child1);
         uut.setRoot(root, new MockPromise());
-        uut.showModal(child2, new MockPromise());
-        verify(root, times(0)).handleBack();
+        uut.showModal(child2, new CommandListenerAdapter());
+        verify(root, times(0)).handleBack(new CommandListenerAdapter());
     }
 
     @Test
@@ -268,8 +270,14 @@ public class NavigatorTest extends BaseTest {
 
     @NonNull
     private StackController newStack() {
-        return new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()), new TopBarController(),
-                "stack" + CompatUtils.generateViewId(), tabOptions);
+        return new StackControllerBuilder(activity)
+                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
+                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                .setTopBarController(new TopBarController())
+                .setId("stack" + CompatUtils.generateViewId())
+                .setInitialOptions(tabOptions)
+                .createStackController();
     }
 
     @Test
@@ -339,7 +347,7 @@ public class NavigatorTest extends BaseTest {
         uut.setRoot(parentController, new MockPromise());
         StackController stackController = newStack();
         stackController.push(child1, new CommandListenerAdapter());
-        uut.showModal(stackController, new MockPromise());
+        uut.showModal(stackController, new CommandListenerAdapter());
         uut.push(stackController.getId(), child2, new CommandListenerAdapter());
         assertIsChild(stackController.getView(), child2.getView());
     }
@@ -371,28 +379,72 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void showModal_onViewDisappearIsInvokedOnRoot() {
-        uut.setRoot(parentController, new MockPromise());
-        uut.showModal(child1, new MockPromise() {
+        uut.setRoot(parentController, new MockPromise() {
             @Override
             public void resolve(@Nullable Object value) {
-                verify(parentController, times(1)).onViewLostFocus();
+                uut.showModal(child1, new CommandListenerAdapter() {
+                    @Override
+                    public void onSuccess(String childId) {
+                        assertThat(parentController.getView().getParent()).isNull();
+                        verify(parentController, times(1)).onViewDisappear();
+                    }
+                });
             }
         });
     }
 
     @Test
     public void dismissModal_onViewAppearedInvokedOnRoot() {
+        disableShowModalAnimation(child1, child2);
+        disableDismissModalAnimation(child1, child2);
+
+        uut.setRoot(parentController, new MockPromise());
+        uut.showModal(child1, new CommandListenerAdapter());
+        uut.showModal(child2, new CommandListenerAdapter());
+
+        uut.dismissModal(child2.getId(), new CommandListenerAdapter());
+        assertThat(parentController.getView().getParent()).isNull();
+        verify(parentController, times(1)).onViewAppeared();
+
+        uut.dismissModal(child1.getId(), new CommandListenerAdapter());
+        assertThat(parentController.getView().getParent()).isNotNull();
+
+        verify(parentController, times(2)).onViewAppeared();
+    }
+
+    @Test
+    public void dismissAllModals_onViewAppearedInvokedOnRoot() {
+        disableShowModalAnimation(child1);
+
+        uut.dismissAllModals(new CommandListenerAdapter());
+        verify(parentController, times(0)).onViewAppeared();
+
         uut.setRoot(parentController, new MockPromise());
-        uut.showModal(child1, new MockPromise() {
+        verify(parentController, times(1)).onViewAppeared();
+        uut.showModal(child1, new CommandListenerAdapter());
+        uut.dismissAllModals(new CommandListenerAdapter());
+
+        verify(parentController, times(2)).onViewAppeared();
+    }
+
+    @Test
+    public void handleBack_onViewAppearedInvokedOnRoot() {
+        disableShowModalAnimation(child1, child2);
+
+        uut.setRoot(parentController, new MockPromise());
+        uut.showModal(child1, new CommandListenerAdapter());
+        uut.showModal(child2, new CommandListenerAdapter());
+
+        uut.handleBack(new CommandListenerAdapter());
+        verify(parentController, times(1)).onViewAppeared();
+
+        uut.handleBack(new CommandListenerAdapter() {
             @Override
-            public void resolve(@Nullable Object value) {
-                uut.dismissModal("child1", new CommandListenerAdapter() {
-                    @Override
-                    public void onSuccess(String childId) {
-                        verify(parentController, times(1)).onViewRegainedFocus();
-                    }
-                });
+            public void onSuccess(String childId) {
+                assertThat(parentController.getView().getParent()).isNotNull();
+                verify(parentController, times(2)).onViewAppeared();
             }
         });
     }
+
 }

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

@@ -53,7 +53,14 @@ 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());
+        stackController = new StackControllerBuilder(activity)
+                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
+                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                .setTopBarController(new TopBarController())
+                .setId("stack")
+                .setInitialOptions(new Options())
+                .createStackController();
         stackController.ensureViewIsCreated();
         stackController.getView().layout(0, 0, 1000, 1000);
         stackController.getTopBar().layout(0, 0, 1000, 100);
@@ -73,7 +80,14 @@ public class OptionsApplyingTest extends BaseTest {
     public void initialOptionsAppliedOnAppear() {
         uut.options.topBar.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());
+                new StackControllerBuilder(activity)
+                        .setTopBarButtonCreator(new TopBarButtonCreatorMock())
+                        .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                        .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                        .setTopBarController(new TopBarController())
+                        .setId("stackId")
+                        .setInitialOptions(new Options())
+                        .createStackController();
         stackController.push(uut, new CommandListenerAdapter());
         assertThat(stackController.getTopBar().getTitle()).isEmpty();
 

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

@@ -155,14 +155,13 @@ public class ParentControllerTest extends BaseTest {
     }
 
     private StackController createStack() {
-        return new StackController(
-                activity,
-                new TopBarButtonCreatorMock(),
-                new TitleBarReactViewCreatorMock(),
-                new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()),
-                new TopBarController(),
-                "stack",
-                new Options()
-        );
+        return new StackControllerBuilder(activity)
+                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
+                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                .setTopBarController(new TopBarController())
+                .setId("stack")
+                .setInitialOptions(new Options())
+                .createStackController();
     }
 }

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

@@ -2,7 +2,6 @@ package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.view.View;
 
 import com.reactnativenavigation.BaseTest;
@@ -53,6 +52,7 @@ public class StackControllerTest extends BaseTest {
     @Override
     public void beforeEach() {
         super.beforeEach();
+        animator = Mockito.mock(NavigationAnimator.class);
         activity = newActivity();
         uut = createStackController();
         child1 = spy(new SimpleViewController(activity, "child1", new Options()));
@@ -140,14 +140,14 @@ public class StackControllerTest extends BaseTest {
     public void pop_layoutHandlesChildWillDisappear() {
         final StackLayout[] stackLayout = new StackLayout[1];
         uut =
-                new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()), new TopBarController(), "uut", new Options()) {
-                    @NonNull
-                    @Override
-                    protected StackLayout createView() {
-                        stackLayout[0] = spy(super.createView());
-                        return stackLayout[0];
-                    }
-                };
+                new StackControllerBuilder(activity)
+                        .setTopBarButtonCreator(new TopBarButtonCreatorMock())
+                        .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                        .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                        .setTopBarController(new TopBarController())
+                        .setId("uut")
+                        .setInitialOptions(new Options())
+                        .createStackController();
         uut.push(child1, new CommandListenerAdapter());
         uut.push(child2, new CommandListenerAdapter() {
             @Override
@@ -176,20 +176,20 @@ public class StackControllerTest extends BaseTest {
     @Test
     public void handleBack_PopsUnlessSingleChild() {
         assertThat(uut.isEmpty()).isTrue();
-        assertThat(uut.handleBack()).isFalse();
+        assertThat(uut.handleBack(new CommandListenerAdapter())).isFalse();
 
         uut.push(child1, new CommandListenerAdapter());
         assertThat(uut.size()).isEqualTo(1);
-        assertThat(uut.handleBack()).isFalse();
+        assertThat(uut.handleBack(new CommandListenerAdapter())).isFalse();
 
         uut.push(child2, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 assertThat(uut.size()).isEqualTo(2);
-                assertThat(uut.handleBack()).isTrue();
+                assertThat(uut.handleBack(new CommandListenerAdapter())).isTrue();
 
                 assertThat(uut.size()).isEqualTo(1);
-                assertThat(uut.handleBack()).isFalse();
+                assertThat(uut.handleBack(new CommandListenerAdapter())).isFalse();
             }
         });
     }
@@ -636,34 +636,30 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void mergeChildOptions_updatesViewWithNewOptions() {
-        final StackLayout[] stackLayout = new StackLayout[1];
-        StackController uut =
-                new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()), new TopBarController(), "stack", new Options()) {
-                    @NonNull
-                    @Override
-                    protected StackLayout createView() {
-                        stackLayout[0] = spy(super.createView());
-                        return stackLayout[0];
-                    }
-                };
+        StackController uut = spy(new StackControllerBuilder(activity)
+                        .setTopBarButtonCreator(new TopBarButtonCreatorMock())
+                        .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                        .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                        .setTopBarController(new TopBarController())
+                        .setId("stack")
+                        .setInitialOptions(new Options())
+                        .createStackController());
         Options optionsToMerge = new Options();
         Component component = mock(Component.class);
         uut.mergeChildOptions(optionsToMerge, component);
-        verify(stackLayout[0], times(1)).mergeChildOptions(optionsToMerge, component);
+        verify(uut, times(1)).mergeChildOptions(optionsToMerge, component);
     }
 
     @Test
     public void mergeChildOptions_updatesParentControllerWithNewOptions() {
-        final StackLayout[] stackLayout = new StackLayout[1];
-        StackController uut =
-                new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()), new TopBarController(), "stack", new Options()) {
-                    @NonNull
-                    @Override
-                    protected StackLayout createView() {
-                        stackLayout[0] = spy(super.createView());
-                        return stackLayout[0];
-                    }
-                };
+        StackController uut = new StackControllerBuilder(activity)
+                        .setTopBarButtonCreator(new TopBarButtonCreatorMock())
+                        .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                        .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                        .setTopBarController(new TopBarController())
+                        .setId("stack")
+                        .setInitialOptions(new Options())
+                        .createStackController();
         ParentController parentController = Mockito.mock(ParentController.class);
         uut.setParentController(parentController);
         Options optionsToMerge = new Options();
@@ -731,18 +727,14 @@ public class StackControllerTest extends BaseTest {
                 return topBar;
             }
         });
-        return new StackController(activity,
-                new TopBarButtonCreatorMock(),
-                new TitleBarReactViewCreatorMock(),
-                new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()),
-                topBarController,
-                id,
-                new Options()) {
-            @Override
-            NavigationAnimator createAnimator() {
-                animator = Mockito.mock(NavigationAnimator.class);
-                return animator;
-            }
-        };
+        return new StackControllerBuilder(activity)
+                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
+                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                .setTopBarController(topBarController)
+                .setAnimator(animator)
+                .setId(id)
+                .setInitialOptions(new Options())
+                .createStackController();
     }
 }

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

@@ -44,13 +44,14 @@ public class TopBarButtonControllerTest extends BaseTest {
         final Activity activity = newActivity();
 
         TopBarButtonCreatorMock buttonCreatorMock = new TopBarButtonCreatorMock();
-        stackController = spy(new StackController(activity,
-                buttonCreatorMock,
-                new TitleBarReactViewCreatorMock(),
-                new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()),
-                new TopBarController(),
-                "stack",
-                new Options())
+        stackController = spy(new StackControllerBuilder(activity)
+                .setTopBarButtonCreator(buttonCreatorMock)
+                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                .setTopBarController(new TopBarController())
+                .setId("stack")
+                .setInitialOptions(new Options())
+                .createStackController()
         );
         stackController.getView().layout(0, 0, 1080, 1920);
         stackController.getTopBar().layout(0, 0, 1080, 200);

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

@@ -70,7 +70,14 @@ public class TopTabsViewControllerTest extends BaseTest {
 
     @NonNull
     private StackController createStackController(String id) {
-        return new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()), new TopBarController(), id, new Options());
+        return new StackControllerBuilder(activity)
+                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
+                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                .setTopBarController(new TopBarController())
+                .setId(id)
+                .setInitialOptions(new Options())
+                .createStackController();
     }
 
     @NonNull

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

@@ -70,14 +70,21 @@ public class ViewControllerTest extends BaseTest {
     @Test
     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());
+        StackController nav = new StackControllerBuilder(activity)
+                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
+                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                .setTopBarController(new TopBarController())
+                .setId("stack")
+                .setInitialOptions(new Options())
+                .createStackController();
         nav.push(uut, new CommandListenerAdapter());
         assertThat(uut.getParentController()).isEqualTo(nav);
     }
 
     @Test
     public void handleBackDefaultFalse() {
-        assertThat(uut.handleBack()).isFalse();
+        assertThat(uut.handleBack(new CommandListenerAdapter())).isFalse();
     }
 
     @Test

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalAnimatorMock.java

@@ -0,0 +1,37 @@
+package com.reactnativenavigation.viewcontrollers.modal;
+
+import android.animation.AnimatorListenerAdapter;
+import android.content.Context;
+import android.view.View;
+
+import com.reactnativenavigation.anim.ModalAnimator2;
+import com.reactnativenavigation.parse.AnimationOptions;
+
+public class ModalAnimatorMock extends ModalAnimator2 {
+
+    ModalAnimatorMock(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void show(View view, AnimationOptions animation, AnimatorListenerAdapter listener) {
+        try {
+            listener.onAnimationStart(null);
+            Thread.sleep(10);
+            listener.onAnimationEnd(null);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void dismiss(View view, AnimatorListenerAdapter listener) {
+        try {
+            listener.onAnimationStart(null);
+            Thread.sleep(10);
+            listener.onAnimationEnd(null);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenterTest.java

@@ -0,0 +1,142 @@
+package com.reactnativenavigation.viewcontrollers.modal;
+
+import android.app.Activity;
+import android.widget.FrameLayout;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.anim.ModalAnimator2;
+import com.reactnativenavigation.mocks.SimpleViewController;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.utils.CommandListenerAdapter;
+import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
+import com.reactnativenavigation.viewcontrollers.ViewController;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+public class ModalPresenterTest extends BaseTest {
+    private static final String MODAL_ID_1 = "modalId1";
+    private static final String MODAL_ID_2 = "modalId2";
+
+    private ViewController modal1;
+    private ViewController modal2;
+    private ModalPresenter uut;
+    private FrameLayout contentLayout;
+    private ModalAnimator2 animator;
+
+    @Override
+    public void beforeEach() {
+        Activity activity = newActivity();
+        animator = spy(new ModalAnimator2(activity));
+        uut = new ModalPresenter(animator);
+        contentLayout = new FrameLayout(activity);
+        activity.setContentView(contentLayout);
+        uut.setContentLayout(contentLayout);
+        modal1 = spy(new SimpleViewController(activity, MODAL_ID_1, new Options()));
+        modal2 = spy(new SimpleViewController(activity, MODAL_ID_2, new Options()));
+    }
+
+    @Test
+    public void showModal_noAnimation() {
+        disableShowModalAnimation(modal1);
+        CommandListener listener = spy(new CommandListenerAdapter() {
+            @Override
+            public void onSuccess(String childId) {
+                assertThat(modal1.getView().getParent()).isEqualTo(contentLayout);
+                verify(modal1, times(1)).onViewAppeared();
+            }
+        });
+        uut.showModal(modal1, null, listener);
+        verify(animator, times(0)).show(
+                eq(modal1.getView()),
+                eq(modal1.options.animations.showModal),
+                any()
+        );
+        verify(listener, times(1)).onSuccess(MODAL_ID_1);
+    }
+
+    @Test
+    public void showModal_previousModalIsRemovedFromHierarchy() {
+        uut.showModal(modal1, null, new CommandListenerAdapter() {
+            @Override
+            public void onSuccess(String childId) {
+                uut.showModal(modal2, modal1, new CommandListenerAdapter() {
+                    @Override
+                    public void onSuccess(String childId) {
+                        assertThat(modal1.getView().getParent()).isNull();
+                        verify(modal1, times(1)).onViewDisappear();
+                    }
+                });
+                assertThat(modal1.getView().getParent()).isEqualTo(modal2.getView().getParent());
+            }
+        });
+    }
+
+    @Test
+    public void showModal_animatesByDefault() {
+        uut.showModal(modal1, null, new CommandListenerAdapter() {
+            @Override
+            public void onSuccess(String childId) {
+                verify(animator, times(1)).show(
+                        eq(modal1.getView()),
+                        eq(modal1.options.animations.showModal),
+                        any()
+                );
+                assertThat(animator.isRunning()).isFalse();
+            }
+        });
+    }
+
+    @Test
+    public void dismissModal_animatesByDefault() {
+        disableShowModalAnimation(modal1);
+
+        uut.showModal(modal1, null, new CommandListenerAdapter());
+        uut.dismissModal(modal1, null, new CommandListenerAdapter() {
+            @Override
+            public void onSuccess(String childId) {
+                verify(modal1, times(1)).onViewDisappear();
+                verify(modal1, times(1)).destroy();
+            }
+        });
+
+        verify(animator, times(1)).dismiss(eq(modal1.getView()), any());
+    }
+
+    @Test
+    public void dismissModal_previousModalIsAddedAtIndex0() {
+        FrameLayout spy = spy(new FrameLayout(newActivity()));
+        uut.setContentLayout(spy);
+        uut.dismissModal(modal1, modal2, new CommandListenerAdapter());
+        verify(spy, times(1)).addView(modal2.getView(), 0);
+    }
+
+    @Test
+    public void dismissModal_noAnimation() {
+        disableShowModalAnimation(modal1);
+        disableDismissModalAnimation(modal1);
+
+        uut.showModal(modal1, null, new CommandListenerAdapter());
+        uut.dismissModal(modal1, null, new CommandListenerAdapter());
+        verify(modal1, times(1)).onViewDisappear();
+        verify(modal1, times(1)).destroy();
+        verify(animator, times(0)).dismiss(any(), any());
+    }
+
+    @Test
+    public void dismissModal_previousModalIsAddedBackToHierarchy() {
+        disableShowModalAnimation(modal1, modal2);
+
+        uut.showModal(modal1, null, new CommandListenerAdapter());
+        uut.showModal(modal2, modal1, new CommandListenerAdapter());
+        assertThat(modal1.getView().getParent()).isNull();
+        uut.dismissModal(modal2, modal1, new CommandListenerAdapter());
+        verify(modal1, times(2)).onViewAppeared();
+    }
+}

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest2.java

@@ -0,0 +1,223 @@
+package com.reactnativenavigation.viewcontrollers.modal;
+
+import android.app.Activity;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.anim.ModalAnimator2;
+import com.reactnativenavigation.mocks.SimpleViewController;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.utils.CommandListenerAdapter;
+import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
+import com.reactnativenavigation.viewcontrollers.ViewController;
+
+import org.junit.Test;
+
+import java.util.EmptyStackException;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
+public class ModalStackTest2 extends BaseTest {
+    private static final String MODAL_ID_1 = "modalId1";
+    private static final String MODAL_ID_2 = "modalId2";
+    private static final String MODAL_ID_3 = "modalId3";
+
+    private ModalStack2 uut;
+    private ViewController modal1;
+    private ViewController modal2;
+    private ViewController modal3;
+    private Activity activity;
+    private ModalPresenter presenter;
+    private ModalAnimator2 animator;
+
+    @Override
+    public void beforeEach() {
+        activity = newActivity();
+        ViewGroup root = new FrameLayout(activity);
+        activity.setContentView(root);
+        animator = spy(new ModalAnimatorMock(activity));
+        presenter = spy(new ModalPresenter(animator));
+        uut = new ModalStack2(presenter);
+        uut.setContentLayout(root);
+        modal1 = spy(new SimpleViewController(activity, MODAL_ID_1, new Options()));
+        modal2 = spy(new SimpleViewController(activity, MODAL_ID_2, new Options()));
+        modal3 = spy(new SimpleViewController(activity, MODAL_ID_3, new Options()));
+    }
+
+    @Test
+    public void modalRefIsSaved() {
+        disableShowModalAnimation(modal1);
+        CommandListener listener = spy(new CommandListenerAdapter());
+        uut.showModal(modal1, listener);
+        verify(listener, times(1)).onSuccess(modal1.getId());
+        assertThat(findModal(MODAL_ID_1)).isNotNull();
+    }
+
+    @Test
+    public void showModal() {
+        CommandListener listener = spy(new CommandListenerAdapter());
+        uut.showModal(modal1, listener);
+        verify(listener, times(1)).onSuccess(modal1.getId());
+        assertThat(uut.size()).isOne();
+        verify(presenter, times(1)).showModal(modal1, null, listener);
+        assertThat(findModal(MODAL_ID_1)).isNotNull();
+    }
+
+    @Test
+    public void dismissModal() {
+        uut.showModal(modal1, new CommandListenerAdapter());
+        CommandListener listener = new CommandListenerAdapter();
+        uut.dismissModal(modal1.getId(), listener);
+        assertThat(findModal(modal1.getId())).isNull();
+        verify(presenter, times(1)).dismissModal(modal1, null, listener);
+    }
+
+    @Test
+    public void dismissModal_rejectIfModalNotFound() {
+        CommandListener listener = spy(new CommandListenerAdapter());
+        uut.dismissModal(MODAL_ID_1, listener);
+        verify(listener, times(1)).onError(anyString());
+        verifyZeroInteractions(listener);
+    }
+
+    @Test
+    public void dismissAllModals() {
+        uut.showModal(modal1, new CommandListenerAdapter());
+        uut.showModal(modal2, new CommandListenerAdapter());
+        CommandListener listener = spy(new CommandListenerAdapter() {
+            @Override
+            public void onSuccess(String childId) {
+                assertThat(findModal(modal1.getId())).isNull();
+                assertThat(findModal(modal2.getId())).isNull();
+                assertThat(uut.isEmpty()).isTrue();
+            }
+        });
+        uut.dismissAllModals(listener);
+        verify(listener, times(1)).onSuccess(anyString());
+        verifyZeroInteractions(listener);
+    }
+
+    @Test
+    public void dismissAllModals_rejectIfEmpty() {
+        CommandListener spy = spy(new CommandListenerAdapter());
+        uut.dismissAllModals(spy);
+        verify(spy, times(1)).onError(any());
+    }
+
+    @Test
+    public void dismissAllModals_onlyTopModalIsAnimated() {
+        uut.showModal(modal1, new CommandListenerAdapter());
+        uut.showModal(modal2, new CommandListenerAdapter());
+
+        ViewGroup view1 = modal1.getView();
+        ViewGroup view2 = modal2.getView();
+        CommandListener listener = spy(new CommandListenerAdapter());
+        uut.dismissAllModals(listener);
+
+        verify(presenter, times(1)).dismissModal(modal2, null, listener);
+        verify(animator, times(0)).dismiss(eq(view1), any());
+        verify(animator, times(1)).dismiss(eq(view2), any());
+        assertThat(uut.size()).isEqualTo(0);
+    }
+
+    @Test
+    public void dismissAllModals_bottomModalsAreDestroyed() {
+        uut.showModal(modal1, new CommandListenerAdapter());
+        uut.showModal(modal2, new CommandListenerAdapter());
+
+        uut.dismissAllModals(new CommandListenerAdapter());
+
+        verify(modal1, times(1)).destroy();
+        verify(modal1, times(1)).onViewDisappear();
+        assertThat(uut.size()).isEqualTo(0);
+    }
+
+    @Test
+    public void isEmpty() {
+        assertThat(uut.isEmpty()).isTrue();
+        uut.showModal(modal1, new CommandListenerAdapter());
+        assertThat(uut.isEmpty()).isFalse();
+        uut.dismissAllModals(new CommandListenerAdapter());
+        assertThat(uut.isEmpty()).isTrue();
+    }
+
+    @Test
+    public void peek() {
+        assertThat(uut.isEmpty()).isTrue();
+        assertThatThrownBy(() -> uut.peek()).isInstanceOf(EmptyStackException.class);
+        uut.showModal(modal1, new CommandListenerAdapter() {
+            @Override
+            public void onSuccess(String childId) {
+                assertThat(uut.peek()).isEqualTo(modal1);
+            }
+        });
+    }
+
+    @Test
+    public void onDismiss_onViewAppearedInvokedOnPreviousModal() {
+        disableShowModalAnimation(modal1, modal2);
+
+        uut.showModal(modal1, new CommandListenerAdapter());
+        uut.showModal(modal2, new CommandListenerAdapter());
+        uut.dismissModal(modal2.getId(), new CommandListenerAdapter());
+        verify(modal1, times(2)).onViewAppeared();
+    }
+
+    @Test
+    public void onDismiss_dismissModalInTheMiddleOfStack() {
+        disableShowModalAnimation(modal1, modal2, modal3);
+        disableDismissModalAnimation(modal1, modal2, modal3);
+
+        uut.showModal(modal1, new CommandListenerAdapter());
+        uut.showModal(modal2, new CommandListenerAdapter());
+        uut.showModal(modal3, new CommandListenerAdapter());
+
+        uut.dismissModal(modal2.getId(), new CommandListenerAdapter());
+        assertThat(uut.size()).isEqualTo(2);
+        verify(modal2, times(1)).onViewDisappear();
+        verify(modal2, times(1)).destroy();
+        assertThat(modal1.getView().getParent()).isNull();
+    }
+
+    @Test
+    public void handleBack_doesNothingIfModalStackIsEmpty() {
+        assertThat(uut.isEmpty()).isTrue();
+        assertThat(uut.handleBack(new CommandListenerAdapter(), () -> {})).isFalse();
+    }
+
+    @Test
+    public void handleBack_dismissModal() {
+        disableDismissModalAnimation(modal1);
+        uut.showModal(modal1, new CommandListenerAdapter());
+        assertThat(uut.handleBack(new CommandListenerAdapter(), () -> {})).isTrue();
+        verify(modal1, times(1)).onViewDisappear();
+
+    }
+
+    @Test
+    public void handleBack_ViewControllerTakesPrecedenceOverModal() {
+        ViewController backHandlingModal = spy(new SimpleViewController(activity, "stack", new Options()){
+            @Override
+            public boolean handleBack(CommandListener listener) {
+                return true;
+            }
+        });
+        uut.showModal(backHandlingModal, new CommandListenerAdapter());
+        assertThat(uut.handleBack(new CommandListenerAdapter(), any())).isTrue();
+        verify(backHandlingModal, times(1)).handleBack(any());
+        verify(backHandlingModal, times(0)).onViewDisappear();
+    }
+
+    private ViewController findModal(String id) {
+        return uut.findControllerById(id);
+    }
+}