Attach root to rootLayout after modal dismiss

When dismissing a modal the root layout was added to modalsLayout instead of rootLayout.

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

@@ -2,7 +2,6 @@ package com.reactnativenavigation.viewcontrollers.modal;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 
@@ -14,7 +13,8 @@ import com.reactnativenavigation.viewcontrollers.ViewController;
 
 public class ModalPresenter {
 
-    private ViewGroup modalsContainer;
+    private ViewGroup rootLayout;
+    private ViewGroup modalsLayout;
     private ModalAnimator animator;
     private Options defaultOptions = new Options();
 
@@ -22,22 +22,26 @@ public class ModalPresenter {
         this.animator = animator;
     }
 
-    public void setModalsContainer(ViewGroup modalsLayout) {
-        this.modalsContainer = modalsLayout;
+    public void setRootLayout(ViewGroup rootLayout) {
+        this.rootLayout = rootLayout;
+    }
+
+    void setModalsLayout(ViewGroup modalsLayout) {
+        this.modalsLayout = modalsLayout;
     }
 
     public void setDefaultOptions(Options defaultOptions) {
         this.defaultOptions = defaultOptions;
     }
 
-    public void showModal(ViewController toAdd, ViewController toRemove, CommandListener listener) {
-        if (modalsContainer == null) {
+    void showModal(ViewController toAdd, ViewController toRemove, CommandListener listener) {
+        if (modalsLayout == null) {
             listener.onError("Can not show modal before activity is created");
             return;
         }
         Options options = toAdd.resolveCurrentOptions(defaultOptions);
         toAdd.setWaitForRender(options.animations.showModal.waitForRender);
-        modalsContainer.addView(toAdd.getView());
+        modalsLayout.addView(toAdd.getView());
         if (options.animations.showModal.enabled.isTrueOrUndefined()) {
             if (options.animations.showModal.waitForRender.isTrue()) {
                 toAdd.setOnAppearedListener(() -> animateShow(toAdd, toRemove, listener, options));
@@ -69,22 +73,15 @@ public class ModalPresenter {
         listener.onSuccess(toAdd.getId());
     }
 
-    public void dismissTopModal(ViewController toDismiss, @NonNull ViewController toAdd, CommandListener listener) {
-        if (modalsContainer == null) {
-            listener.onError("Can not dismiss modal before activity is created");
-            return;
-        }
-        toAdd.attachView(modalsContainer, 0);
-        dismissModal(toDismiss, listener);
-    }
-
-    public void dismissModal(ViewController toDismiss, CommandListener listener) {
-        if (modalsContainer == null) {
+    void dismissModal(ViewController toDismiss, @Nullable ViewController toAdd, ViewController root, CommandListener listener) {
+        if (modalsLayout == null) {
             listener.onError("Can not dismiss modal before activity is created");
             return;
         }
-        if (toDismiss.options.animations.dismissModal.enabled.isTrueOrUndefined()) {
-            animator.dismiss(toDismiss.getView(), toDismiss.options.animations.dismissModal, new AnimatorListenerAdapter() {
+        if (toAdd != null) toAdd.attachView(toAdd == root ? rootLayout : modalsLayout, 0);
+        Options options = toDismiss.resolveCurrentOptions(defaultOptions);
+        if (options.animations.dismissModal.enabled.isTrueOrUndefined()) {
+            animator.dismiss(toDismiss.getView(), options.animations.dismissModal, new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
                     onDismissEnd(toDismiss, listener);

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

@@ -35,8 +35,12 @@ public class ModalStack {
         this.presenter = presenter;
     }
 
-    public void setModalsContainer(ViewGroup modalsLayout) {
-        presenter.setModalsContainer(modalsLayout);
+    public void setModalsLayout(ViewGroup modalsLayout) {
+        presenter.setModalsLayout(modalsLayout);
+    }
+
+    public void setRootLayout(ViewGroup rootLayout) {
+        presenter.setRootLayout(rootLayout);
     }
 
     public void setDefaultOptions(Options defaultOptions) {
@@ -52,9 +56,9 @@ public class ModalStack {
     public boolean dismissModal(String componentId, @Nullable ViewController root, CommandListener listener) {
         ViewController toDismiss = findModalByComponentId(componentId);
         if (toDismiss != null) {
-            boolean isTop = isTop(toDismiss);
+            boolean isDismissingTopModal = isTop(toDismiss);
             modals.remove(toDismiss);
-            @Nullable ViewController toAdd = isEmpty() ? root : isTop ? get(size() - 1) : null;
+            @Nullable ViewController toAdd = isEmpty() ? root : isDismissingTopModal ? get(size() - 1) : null;
             CommandListenerAdapter onDismiss = new CommandListenerAdapter(listener) {
                 @Override
                 public void onSuccess(String childId) {
@@ -62,15 +66,13 @@ public class ModalStack {
                     super.onSuccess(childId);
                 }
             };
-            if (isTop) {
+            if (isDismissingTopModal) {
                 if (toAdd == null) {
                     listener.onError("Could not dismiss modal");
                     return false;
                 }
-                presenter.dismissTopModal(toDismiss, toAdd, onDismiss);
-            } else {
-                presenter.dismissModal(toDismiss, onDismiss);
             }
+            presenter.dismissModal(toDismiss, toAdd, root, onDismiss);
             return true;
         } else {
             listener.onError("Nothing to dismiss");
@@ -113,7 +115,7 @@ public class ModalStack {
         return dismissModal(peek().getId(), root, listener);
     }
 
-    public ViewController peek() {
+    ViewController peek() {
         if (modals.isEmpty()) throw new EmptyStackException();
         return modals.get(modals.size() - 1);
     }

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

@@ -72,7 +72,8 @@ public class Navigator extends ParentController {
     }
 
     public void bindViews() {
-        modalStack.setModalsContainer(modalsLayout);
+        modalStack.setModalsLayout(modalsLayout);
+        modalStack.setRootLayout(rootLayout);
         rootPresenter.setRootContainer(rootLayout);
     }
 

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

@@ -36,9 +36,9 @@ public class ModalPresenterTest extends BaseTest {
     private ChildController modal1;
     private ChildController modal2;
     private ModalPresenter uut;
-    private FrameLayout contentLayout;
     private ModalAnimator animator;
     private ViewController root;
+    private FrameLayout modalsLayout;
 
     @Override
     public void beforeEach() {
@@ -46,13 +46,18 @@ public class ModalPresenterTest extends BaseTest {
         ChildControllersRegistry childRegistry = new ChildControllersRegistry();
 
         root = spy(new SimpleViewController(activity, childRegistry, "root", new Options()));
-        contentLayout = new FrameLayout(activity);
-        contentLayout.addView(root.getView());
+        FrameLayout contentLayout = new FrameLayout(activity);
+        FrameLayout rootLayout = new FrameLayout(activity);
+        rootLayout.addView(root.getView());
+        modalsLayout = new FrameLayout(activity);
+        contentLayout.addView(rootLayout);
+        contentLayout.addView(modalsLayout);
         activity.setContentView(contentLayout);
 
         animator = spy(new ModalAnimator(activity));
         uut = new ModalPresenter(animator);
-        uut.setModalsContainer(contentLayout);
+        uut.setModalsLayout(modalsLayout);
+        uut.setRootLayout(rootLayout);
         modal1 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_1, new Options()));
         modal2 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_2, new Options()));
     }
@@ -73,7 +78,7 @@ public class ModalPresenterTest extends BaseTest {
         CommandListener listener = spy(new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
-                assertThat(modal1.getView().getParent()).isEqualTo(contentLayout);
+                assertThat(modal1.getView().getParent()).isEqualTo(modalsLayout);
                 verify(modal1, times(1)).onViewAppeared();
             }
         });
@@ -139,7 +144,7 @@ public class ModalPresenterTest extends BaseTest {
 
     @Test
     public void showModal_rejectIfContentIsNull() {
-        uut.setModalsContainer(null);
+        uut.setModalsLayout(null);
         CommandListenerAdapter listener = Mockito.mock(CommandListenerAdapter.class);
         uut.showModal(modal1, modal2, listener);
         verify(listener).onError(any());
@@ -150,7 +155,7 @@ public class ModalPresenterTest extends BaseTest {
         disableShowModalAnimation(modal1);
 
         uut.showModal(modal1, root, new CommandListenerAdapter());
-        uut.dismissTopModal(modal1, root, new CommandListenerAdapter() {
+        uut.dismissModal(modal1, root, root, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 verify(modal1, times(1)).onViewDisappear();
@@ -158,16 +163,19 @@ public class ModalPresenterTest extends BaseTest {
             }
         });
 
-        verify(animator, times(1)).dismiss(eq(modal1.getView()), eq(modal1.options.animations.dismissModal), any());
+        verify(animator).dismiss(eq(modal1.getView()), any(), any());
     }
 
     @Test
     public void dismissModal_previousViewIsAddedAtIndex0() {
-        modal2.ensureViewIsCreated();
+        disableShowModalAnimation(modal1);
         FrameLayout spy = spy(new FrameLayout(newActivity()));
-        uut.setModalsContainer(spy);
-        uut.dismissTopModal(modal1, modal2, new CommandListenerAdapter());
-        verify(spy, times(1)).addView(modal2.getView(), 0);
+        uut.setRootLayout(spy);
+
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        uut.dismissModal(modal1, root, root, new CommandListenerAdapter());
+
+        verify(spy).addView(root.getView(), 0);
     }
 
     @Test
@@ -176,7 +184,7 @@ public class ModalPresenterTest extends BaseTest {
         disableDismissModalAnimation(modal1);
 
         uut.showModal(modal1, root, new CommandListenerAdapter());
-        uut.dismissTopModal(modal1, root, new CommandListenerAdapter());
+        uut.dismissModal(modal1, root, root, new CommandListenerAdapter());
         verify(modal1, times(1)).onViewDisappear();
         verify(modal1, times(1)).destroy();
         verify(animator, times(0)).dismiss(any(), eq(modal1.options.animations.dismissModal), any());
@@ -187,9 +195,11 @@ public class ModalPresenterTest extends BaseTest {
         disableShowModalAnimation(modal1, modal2);
 
         uut.showModal(modal1, root, new CommandListenerAdapter());
+        verify(modal1).onViewAppeared();
         uut.showModal(modal2, modal1, new CommandListenerAdapter());
         assertThat(modal1.getView().getParent()).isNull();
-        uut.dismissTopModal(modal2, modal1, new CommandListenerAdapter());
+        uut.dismissModal(modal2, modal1, root, new CommandListenerAdapter());
+        assertThat(modal1.getView().getParent()).isNotNull();
         verify(modal1, times(2)).onViewAppeared();
     }
 
@@ -203,10 +213,10 @@ public class ModalPresenterTest extends BaseTest {
         assertThat(modal1.getView().getParent()).isNull();
         assertThat(root.getView().getParent()).isNull();
 
-        uut.dismissModal(modal1, new CommandListenerAdapter());
+        uut.dismissModal(modal1, null, root, new CommandListenerAdapter());
         assertThat(root.getView().getParent()).isNull();
 
-        uut.dismissTopModal(modal2, root, new CommandListenerAdapter());
+        uut.dismissModal(modal2, root, root, new CommandListenerAdapter());
         assertThat(root.getView().getParent()).isNotNull();
     }
 
@@ -220,19 +230,11 @@ public class ModalPresenterTest extends BaseTest {
         verify(root, times(0)).onViewDisappear();
     }
 
-    @Test
-    public void dismissTopModal_rejectIfContentIsNull() {
-        uut.setModalsContainer(null);
-        CommandListenerAdapter listener = Mockito.mock(CommandListenerAdapter.class);
-        uut.dismissTopModal(modal1, modal2, listener);
-        verify(listener).onError(any());
-    }
-
     @Test
     public void dismissModal_rejectIfContentIsNull() {
-        uut.setModalsContainer(null);
+        uut.setModalsLayout(null);
         CommandListenerAdapter listener = Mockito.mock(CommandListenerAdapter.class);
-        uut.dismissModal(modal1, listener);
+        uut.dismissModal(modal1, root, root, listener);
         verify(listener).onError(any());
     }
 }

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

@@ -28,6 +28,7 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 public class ModalStackTest extends BaseTest {
     private static final String MODAL_ID_1 = "modalId1";
@@ -42,22 +43,26 @@ public class ModalStackTest extends BaseTest {
     private ChildControllersRegistry childRegistry;
     private ModalPresenter presenter;
     private ModalAnimator animator;
-    private ViewController rootController;
+    private ViewController root;
 
     @Override
     public void beforeEach() {
         activity = newActivity();
         childRegistry = new ChildControllersRegistry();
+        root = new SimpleViewController(activity, childRegistry, "root", new Options());
 
-        this.rootController = new SimpleViewController(activity, childRegistry, "root", new Options());
-        FrameLayout activityContentView = new FrameLayout(activity);
-        activityContentView.addView(rootController.getView());
-        activity.setContentView(activityContentView);
+        FrameLayout rootLayout = new FrameLayout(activity);
+        FrameLayout modalsLayout = new FrameLayout(activity);
+        FrameLayout contentLayout = new FrameLayout(activity);
+        contentLayout.addView(rootLayout);
+        contentLayout.addView(modalsLayout);
+        activity.setContentView(contentLayout);
 
         animator = spy(new ModalAnimatorMock(activity));
         presenter = spy(new ModalPresenter(animator));
         uut = new ModalStack(presenter);
-        uut.setModalsContainer(activityContentView);
+        uut.setModalsLayout(modalsLayout);
+        uut.setRootLayout(rootLayout);
         uut.setEventEmitter(Mockito.mock(EventEmitter.class));
         modal1 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_1, new Options()));
         modal2 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_2, new Options()));
@@ -68,7 +73,7 @@ public class ModalStackTest extends BaseTest {
     public void modalRefIsSaved() {
         disableShowModalAnimation(modal1);
         CommandListener listener = spy(new CommandListenerAdapter());
-        uut.showModal(modal1, rootController, listener);
+        uut.showModal(modal1, root, listener);
         verify(listener, times(1)).onSuccess(modal1.getId());
         assertThat(findModal(MODAL_ID_1)).isNotNull();
     }
@@ -76,21 +81,21 @@ public class ModalStackTest extends BaseTest {
     @Test
     public void showModal() {
         CommandListener listener = spy(new CommandListenerAdapter());
-        uut.showModal(modal1, rootController, listener);
+        uut.showModal(modal1, root, listener);
         verify(listener, times(1)).onSuccess(modal1.getId());
         assertThat(uut.size()).isOne();
-        verify(presenter, times(1)).showModal(modal1, rootController, listener);
+        verify(presenter, times(1)).showModal(modal1, root, listener);
         assertThat(findModal(MODAL_ID_1)).isNotNull();
     }
 
     @SuppressWarnings("Convert2Lambda")
     @Test
     public void dismissModal() {
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        uut.showModal(modal1, root, new CommandListenerAdapter());
         CommandListener listener = spy(new CommandListenerAdapter());
-        uut.dismissModal(modal1.getId(), rootController, listener);
+        uut.dismissModal(modal1.getId(), root, listener);
         assertThat(findModal(modal1.getId())).isNull();
-        verify(presenter, times(1)).dismissTopModal(eq(modal1), eq(rootController), any());
+        verify(presenter, times(1)).dismissModal(eq(modal1), eq(root), eq(root), any());
         verify(listener).onSuccess(modal1.getId());
     }
 
@@ -104,7 +109,7 @@ public class ModalStackTest extends BaseTest {
 
             }
         });
-        uut.dismissModal(MODAL_ID_1, rootController, listener);
+        uut.dismissModal(MODAL_ID_1, root, listener);
         verify(onModalWillDismiss, times(0)).run();
         verify(listener, times(1)).onError(anyString());
         verifyZeroInteractions(listener);
@@ -115,24 +120,24 @@ public class ModalStackTest extends BaseTest {
         disableShowModalAnimation(modal1, modal2, modal3);
         disableDismissModalAnimation(modal1, modal2, modal3);
 
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        uut.showModal(modal2, rootController, new CommandListenerAdapter());
-        uut.showModal(modal3, rootController, new CommandListenerAdapter());
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        uut.showModal(modal2, root, new CommandListenerAdapter());
+        uut.showModal(modal3, root, new CommandListenerAdapter());
 
-        assertThat(rootController.getView().getParent()).isNull();
-        uut.dismissModal(modal1.getId(), rootController, new CommandListenerAdapter());
-        assertThat(rootController.getView().getParent()).isNull();
+        assertThat(root.getView().getParent()).isNull();
+        uut.dismissModal(modal1.getId(), root, new CommandListenerAdapter());
+        assertThat(root.getView().getParent()).isNull();
 
-        uut.dismissModal(modal3.getId(), rootController, new CommandListenerAdapter());
-        uut.dismissModal(modal2.getId(), rootController, new CommandListenerAdapter());
-        assertThat(rootController.getView().getParent()).isNotNull();
-        assertThat(rootController.getView().isShown()).isTrue();
+        uut.dismissModal(modal3.getId(), root, new CommandListenerAdapter());
+        uut.dismissModal(modal2.getId(), root, new CommandListenerAdapter());
+        assertThat(root.getView().getParent()).isNotNull();
+        assertThat(root.getView().isShown()).isTrue();
     }
 
     @Test
     public void dismissAllModals() {
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        uut.showModal(modal2, rootController, new CommandListenerAdapter());
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        uut.showModal(modal2, root, new CommandListenerAdapter());
         CommandListener listener = spy(new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
@@ -141,7 +146,7 @@ public class ModalStackTest extends BaseTest {
                 assertThat(uut.isEmpty()).isTrue();
             }
         });
-        uut.dismissAllModals(rootController, Options.EMPTY, listener);
+        uut.dismissAllModals(root, Options.EMPTY, listener);
         verify(listener, times(1)).onSuccess(anyString());
         verifyZeroInteractions(listener);
     }
@@ -149,18 +154,18 @@ public class ModalStackTest extends BaseTest {
     @Test
     public void dismissAllModals_rejectIfEmpty() {
         CommandListener spy = spy(new CommandListenerAdapter());
-        uut.dismissAllModals(rootController, Options.EMPTY, spy);
+        uut.dismissAllModals(root, Options.EMPTY, spy);
         verify(spy, times(1)).onError(any());
     }
 
     @Test
     public void dismissAllModals_optionsAreMergedOnTopModal() {
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        uut.showModal(modal2, rootController, new CommandListenerAdapter());
-        uut.showModal(modal3, rootController, new CommandListenerAdapter());
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        uut.showModal(modal2, root, new CommandListenerAdapter());
+        uut.showModal(modal3, root, new CommandListenerAdapter());
 
         Options mergeOptions = new Options();
-        uut.dismissAllModals(rootController, mergeOptions, new CommandListenerAdapter());
+        uut.dismissAllModals(root, mergeOptions, new CommandListenerAdapter());
         verify(modal3).mergeOptions(mergeOptions);
         verify(modal1, times(0)).mergeOptions(mergeOptions);
         verify(modal2, times(0)).mergeOptions(mergeOptions);
@@ -169,26 +174,31 @@ public class ModalStackTest extends BaseTest {
     @SuppressWarnings("Convert2Lambda")
     @Test
     public void dismissAllModals_onlyTopModalIsAnimated() {
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        uut.showModal(modal2, rootController, new CommandListenerAdapter());
+        modal2 = spy(modal2);
+        Options defaultOptions = new Options();
+        uut.setDefaultOptions(defaultOptions);
+        Options resolvedOptions = new Options();
+        when(modal2.resolveCurrentOptions(defaultOptions)).then(invocation -> resolvedOptions);
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        uut.showModal(modal2, root, new CommandListenerAdapter());
 
         ViewGroup view1 = modal1.getView();
         ViewGroup view2 = modal2.getView();
         CommandListener listener = spy(new CommandListenerAdapter());
-        uut.dismissAllModals(rootController, Options.EMPTY, listener);
-        verify(presenter, times(1)).dismissTopModal(eq(modal2), eq(rootController), any());
+        uut.dismissAllModals(root, Options.EMPTY, listener);
+        verify(presenter).dismissModal(eq(modal2), eq(root), eq(root), any());
         verify(listener).onSuccess(modal2.getId());
         verify(animator, times(0)).dismiss(eq(view1), eq(modal1.options.animations.dismissModal), any());
-        verify(animator, times(1)).dismiss(eq(view2), eq(modal2.options.animations.dismissModal), any());
+        verify(animator).dismiss(eq(view2), eq(resolvedOptions.animations.dismissModal), any());
         assertThat(uut.size()).isEqualTo(0);
     }
 
     @Test
     public void dismissAllModals_bottomModalsAreDestroyed() {
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        uut.showModal(modal2, rootController, new CommandListenerAdapter());
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        uut.showModal(modal2, root, new CommandListenerAdapter());
 
-        uut.dismissAllModals(rootController, Options.EMPTY, new CommandListenerAdapter());
+        uut.dismissAllModals(root, Options.EMPTY, new CommandListenerAdapter());
 
         verify(modal1, times(1)).destroy();
         verify(modal1, times(1)).onViewDisappear();
@@ -198,9 +208,9 @@ public class ModalStackTest extends BaseTest {
     @Test
     public void isEmpty() {
         assertThat(uut.isEmpty()).isTrue();
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        uut.showModal(modal1, root, new CommandListenerAdapter());
         assertThat(uut.isEmpty()).isFalse();
-        uut.dismissAllModals(rootController, Options.EMPTY, new CommandListenerAdapter());
+        uut.dismissAllModals(root, Options.EMPTY, new CommandListenerAdapter());
         assertThat(uut.isEmpty()).isTrue();
     }
 
@@ -208,7 +218,7 @@ public class ModalStackTest extends BaseTest {
     public void peek() {
         assertThat(uut.isEmpty()).isTrue();
         assertThatThrownBy(() -> uut.peek()).isInstanceOf(EmptyStackException.class);
-        uut.showModal(modal1, rootController, new CommandListenerAdapter() {
+        uut.showModal(modal1, root, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 assertThat(uut.peek()).isEqualTo(modal1);
@@ -220,9 +230,9 @@ public class ModalStackTest extends BaseTest {
     public void onDismiss_onViewAppearedInvokedOnPreviousModal() {
         disableShowModalAnimation(modal1, modal2);
 
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        uut.showModal(modal2, rootController, new CommandListenerAdapter());
-        uut.dismissModal(modal2.getId(), rootController, new CommandListenerAdapter());
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        uut.showModal(modal2, root, new CommandListenerAdapter());
+        uut.dismissModal(modal2.getId(), root, new CommandListenerAdapter());
         verify(modal1, times(2)).onViewAppeared();
     }
 
@@ -231,11 +241,11 @@ public class ModalStackTest extends BaseTest {
         disableShowModalAnimation(modal1, modal2, modal3);
         disableDismissModalAnimation(modal1, modal2, modal3);
 
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        uut.showModal(modal2, rootController, new CommandListenerAdapter());
-        uut.showModal(modal3, rootController, new CommandListenerAdapter());
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        uut.showModal(modal2, root, new CommandListenerAdapter());
+        uut.showModal(modal3, root, new CommandListenerAdapter());
 
-        uut.dismissModal(modal2.getId(), rootController, new CommandListenerAdapter());
+        uut.dismissModal(modal2.getId(), root, new CommandListenerAdapter());
         assertThat(uut.size()).isEqualTo(2);
         verify(modal2, times(1)).onViewDisappear();
         verify(modal2, times(1)).destroy();
@@ -245,14 +255,14 @@ public class ModalStackTest extends BaseTest {
     @Test
     public void handleBack_doesNothingIfModalStackIsEmpty() {
         assertThat(uut.isEmpty()).isTrue();
-        assertThat(uut.handleBack(new CommandListenerAdapter(), rootController)).isFalse();
+        assertThat(uut.handleBack(new CommandListenerAdapter(), root)).isFalse();
     }
 
     @Test
     public void handleBack_dismissModal() {
         disableDismissModalAnimation(modal1);
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        assertThat(uut.handleBack(new CommandListenerAdapter(), rootController)).isTrue();
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        assertThat(uut.handleBack(new CommandListenerAdapter(), root)).isTrue();
         verify(modal1, times(1)).onViewDisappear();
 
     }
@@ -265,9 +275,9 @@ public class ModalStackTest extends BaseTest {
                 return true;
             }
         });
-        uut.showModal(backHandlingModal, rootController, new CommandListenerAdapter());
+        uut.showModal(backHandlingModal, root, new CommandListenerAdapter());
 
-        rootController.getView().getViewTreeObserver().dispatchOnGlobalLayout();
+        root.getView().getViewTreeObserver().dispatchOnGlobalLayout();
 
         assertThat(uut.handleBack(new CommandListenerAdapter(), any())).isTrue();
         verify(backHandlingModal, times(1)).handleBack(any());
@@ -301,6 +311,6 @@ public class ModalStackTest extends BaseTest {
 
     private void showModalWithoutAnimation(ViewController modal) {
         disableShowModalAnimation(modal);
-        uut.showModal(modal, rootController, new CommandListenerAdapter());
+        uut.showModal(modal, root, new CommandListenerAdapter());
     }
 }

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

@@ -109,7 +109,7 @@ public class NavigatorTest extends BaseTest {
     @Test
     public void bindViews() {
         verify(rootPresenter).setRootContainer(uut.getRootLayout());
-        verify(modalStack).setModalsContainer(uut.getModalsLayout());
+        verify(modalStack).setModalsLayout(uut.getModalsLayout());
     }
 
     @Test