Modal refactor

Add previous view (modal or root) back to hierarchy in ModalPresenter.
Later on this will be controlled by modalPresentationStyle

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

@@ -65,14 +65,12 @@ public class Navigator extends ParentController {
     @Override
     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);
-        });
+        return modalStack.handleBack(listener, root);
     }
 
     @Override
     public void destroy() {
-        modalStack.dismissAllModals(new CommandListenerAdapter(), () -> {});
+        modalStack.dismissAllModals(new CommandListenerAdapter(), root);
         super.destroy();
     }
 
@@ -176,18 +174,11 @@ public class Navigator extends ParentController {
     }
 
     public void dismissModal(final String componentId, CommandListener listener) {
-        modalStack.dismissModal(componentId,
-                () -> {
-                    if (modalStack.size() == 1) contentLayout.addView(root.getView());
-                },
-                listener
-        );
+        modalStack.dismissModal(componentId, root, listener);
     }
 
     public void dismissAllModals(CommandListener listener) {
-        modalStack.dismissAllModals(listener, () -> {
-            if (!modalStack.isEmpty()) contentLayout.addView(root.getView(), 0);
-        });
+        modalStack.dismissAllModals(listener, root);
     }
 
     public void showOverlay(ViewController overlay) {

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

@@ -9,8 +9,6 @@ import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
-import javax.annotation.Nullable;
-
 public class ModalPresenter {
 
     private ViewGroup content;
@@ -43,8 +41,8 @@ public class ModalPresenter {
         listener.onSuccess(toAdd.getId());
     }
 
-    public void dismissModal(ViewController toDismiss, @Nullable ViewController toAdd, CommandListener listener) {
-        if (toAdd != null) content.addView(toAdd.getView(), 0);
+    public void dismissModal(ViewController toDismiss, ViewController toAdd, CommandListener listener) {
+        content.addView(toAdd.getView(), 0);
         if (toDismiss.options.animations.dismissModal.enable.isTrueOrUndefined()) {
             animator.dismiss(toDismiss.getView(), new AnimatorListenerAdapter() {
                 @Override

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

@@ -29,11 +29,10 @@ public class ModalStack {
         presenter.showModal(viewController, toRemove, listener);
     }
 
-    public void dismissModal(String componentId, Runnable onModalWilDismiss, CommandListener listener) {
+    public void dismissModal(String componentId, ViewController root, CommandListener listener) {
         ViewController toDismiss = findModalByComponentId(componentId);
         if (toDismiss != null) {
-            onModalWilDismiss.run();
-            ViewController toAdd = isTop(toDismiss) ? get(size() - 2) : null;
+            ViewController toAdd = isTop(toDismiss) ? get(size() - 2) : root;
             modals.remove(toDismiss);
             presenter.dismissModal(toDismiss, toAdd, listener);
         } else {
@@ -41,7 +40,7 @@ public class ModalStack {
         }
     }
 
-    public void dismissAllModals(CommandListener listener, Runnable onModalWilDismiss) {
+    public void dismissAllModals(CommandListener listener, ViewController root) {
         if (modals.isEmpty()) {
             listener.onError("Nothing to dismiss");
             return;
@@ -49,7 +48,7 @@ public class ModalStack {
 
         while (!modals.isEmpty()) {
             if (modals.size() == 1) {
-                dismissModal(modals.get(0).getId(), onModalWilDismiss, listener);
+                dismissModal(modals.get(0).getId(), root, listener);
             } else {
                 modals.get(0).destroy();
                 modals.remove(0);
@@ -57,12 +56,12 @@ public class ModalStack {
         }
     }
 
-    public boolean handleBack(CommandListener listener, Runnable onModalWillDismiss) {
+    public boolean handleBack(CommandListener listener, ViewController root) {
         if (isEmpty()) return false;
         if (peek().handleBack(listener)) {
             return true;
         }
-        dismissModal(peek().getId(), onModalWillDismiss, listener);
+        dismissModal(peek().getId(), root, listener);
         return true;
     }
 

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

@@ -412,23 +412,6 @@ public class NavigatorTest extends BaseTest {
         verify(parentController, times(2)).onViewAppeared();
     }
 
-    @Test
-    public void dismissModal_rootIsAttachedBeforeModalIsDismissed() {
-        disableShowModalAnimation(child1, child2);
-        disableDismissModalAnimation(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();
-
-        uut.dismissModal(child1.getId(), new CommandListenerAdapter());
-        assertThat(parentController.getView().getParent()).isNotNull();
-        verify(parentController, times(2)).onViewAppeared();
-    }
-
     @Test
     public void dismissAllModals_onViewAppearedInvokedOnRoot() {
         disableShowModalAnimation(child1);

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

@@ -121,7 +121,7 @@ public class ModalPresenterTest extends BaseTest {
     }
 
     @Test
-    public void dismissModal_previousModalIsAddedAtIndex0() {
+    public void dismissModal_previousViewIsAddedAtIndex0() {
         FrameLayout spy = spy(new FrameLayout(newActivity()));
         uut.setContentLayout(spy);
         uut.dismissModal(modal1, modal2, new CommandListenerAdapter());

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

@@ -87,16 +87,9 @@ public class ModalStackTest extends BaseTest {
     public void dismissModal() {
         uut.showModal(modal1, rootController, new CommandListenerAdapter());
         CommandListener listener = new CommandListenerAdapter();
-        Runnable onModalWillDismiss = spy(new Runnable() {
-            @Override
-            public void run() {
-                assertThat(modal1.getView().getParent()).isNotNull();
-            }
-        });
-        uut.dismissModal(modal1.getId(), onModalWillDismiss, listener);
+        uut.dismissModal(modal1.getId(), rootController, listener);
         assertThat(findModal(modal1.getId())).isNull();
-        verify(onModalWillDismiss, times(1)).run();
-        verify(presenter, times(1)).dismissModal(modal1, null, listener);
+        verify(presenter, times(1)).dismissModal(modal1, rootController, listener);
     }
 
     @SuppressWarnings("Convert2Lambda")
@@ -109,7 +102,7 @@ public class ModalStackTest extends BaseTest {
 
             }
         });
-        uut.dismissModal(MODAL_ID_1, onModalWillDismiss, listener);
+        uut.dismissModal(MODAL_ID_1, rootController, listener);
         verify(onModalWillDismiss, times(0)).run();
         verify(listener, times(1)).onError(anyString());
         verifyZeroInteractions(listener);
@@ -127,7 +120,7 @@ public class ModalStackTest extends BaseTest {
                 assertThat(uut.isEmpty()).isTrue();
             }
         });
-        uut.dismissAllModals(listener, () -> {});
+        uut.dismissAllModals(listener, rootController);
         verify(listener, times(1)).onSuccess(anyString());
         verifyZeroInteractions(listener);
     }
@@ -135,7 +128,7 @@ public class ModalStackTest extends BaseTest {
     @Test
     public void dismissAllModals_rejectIfEmpty() {
         CommandListener spy = spy(new CommandListenerAdapter());
-        uut.dismissAllModals(spy, () -> {});
+        uut.dismissAllModals(spy, rootController);
         verify(spy, times(1)).onError(any());
     }
 
@@ -148,15 +141,8 @@ public class ModalStackTest extends BaseTest {
         ViewGroup view1 = modal1.getView();
         ViewGroup view2 = modal2.getView();
         CommandListener listener = spy(new CommandListenerAdapter());
-        Runnable onModalWillDismiss = spy(new Runnable() {
-            @Override
-            public void run() {
-
-            }
-        });
-        uut.dismissAllModals(listener, onModalWillDismiss);
-        verify(onModalWillDismiss, times(1)).run();
-        verify(presenter, times(1)).dismissModal(modal2, null, listener);
+        uut.dismissAllModals(listener, rootController);
+        verify(presenter, times(1)).dismissModal(modal2, rootController, listener);
         verify(animator, times(0)).dismiss(eq(view1), any());
         verify(animator, times(1)).dismiss(eq(view2), any());
         assertThat(uut.size()).isEqualTo(0);
@@ -167,7 +153,7 @@ public class ModalStackTest extends BaseTest {
         uut.showModal(modal1, rootController, new CommandListenerAdapter());
         uut.showModal(modal2, rootController, new CommandListenerAdapter());
 
-        uut.dismissAllModals(new CommandListenerAdapter(), () -> {});
+        uut.dismissAllModals(new CommandListenerAdapter(), rootController);
 
         verify(modal1, times(1)).destroy();
         verify(modal1, times(1)).onViewDisappear();
@@ -179,7 +165,7 @@ public class ModalStackTest extends BaseTest {
         assertThat(uut.isEmpty()).isTrue();
         uut.showModal(modal1, rootController, new CommandListenerAdapter());
         assertThat(uut.isEmpty()).isFalse();
-        uut.dismissAllModals(new CommandListenerAdapter(), () -> {});
+        uut.dismissAllModals(new CommandListenerAdapter(), rootController);
         assertThat(uut.isEmpty()).isTrue();
     }
 
@@ -201,7 +187,7 @@ public class ModalStackTest extends BaseTest {
 
         uut.showModal(modal1, rootController, new CommandListenerAdapter());
         uut.showModal(modal2, rootController, new CommandListenerAdapter());
-        uut.dismissModal(modal2.getId(), () -> {}, new CommandListenerAdapter());
+        uut.dismissModal(modal2.getId(), rootController, new CommandListenerAdapter());
         verify(modal1, times(2)).onViewAppeared();
     }
 
@@ -214,7 +200,7 @@ public class ModalStackTest extends BaseTest {
         uut.showModal(modal2, rootController, new CommandListenerAdapter());
         uut.showModal(modal3, rootController, new CommandListenerAdapter());
 
-        uut.dismissModal(modal2.getId(), () -> {}, new CommandListenerAdapter());
+        uut.dismissModal(modal2.getId(), rootController, new CommandListenerAdapter());
         assertThat(uut.size()).isEqualTo(2);
         verify(modal2, times(1)).onViewDisappear();
         verify(modal2, times(1)).destroy();
@@ -224,14 +210,14 @@ public class ModalStackTest extends BaseTest {
     @Test
     public void handleBack_doesNothingIfModalStackIsEmpty() {
         assertThat(uut.isEmpty()).isTrue();
-        assertThat(uut.handleBack(new CommandListenerAdapter(), () -> {})).isFalse();
+        assertThat(uut.handleBack(new CommandListenerAdapter(), rootController)).isFalse();
     }
 
     @Test
     public void handleBack_dismissModal() {
         disableDismissModalAnimation(modal1);
         uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        assertThat(uut.handleBack(new CommandListenerAdapter(), () -> {})).isTrue();
+        assertThat(uut.handleBack(new CommandListenerAdapter(), rootController)).isTrue();
         verify(modal1, times(1)).onViewDisappear();
 
     }