[Breaking] implement overCurrentContext

When modalPresentationStyle is overCurrentContext - previous view is not detached when showing modal.

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

@@ -116,6 +116,14 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         return view;
     }
 
+    public void detachView() {
+        ((ViewManager) view.getParent()).removeView(view);
+    }
+
+    public void attachView(ViewGroup parent, int index) {
+        if (view.getParent() == null) parent.addView(view, index);
+    }
+
     public String getId() {
         return id;
     }

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

@@ -3,9 +3,9 @@ package com.reactnativenavigation.viewcontrollers.modal;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.view.ViewGroup;
-import android.view.ViewManager;
 
 import com.reactnativenavigation.anim.ModalAnimator;
+import com.reactnativenavigation.parse.ModalPresentationStyle;
 import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
@@ -37,12 +37,14 @@ public class ModalPresenter {
     }
 
     private void onShowModalEnd(ViewController toAdd, ViewController toRemove, CommandListener listener) {
-        ((ViewManager) toRemove.getView().getParent()).removeView(toRemove.getView());
+        if (toAdd.options.modal.presentationStyle != ModalPresentationStyle.OverCurrentContext) {
+            toRemove.detachView();
+        }
         listener.onSuccess(toAdd.getId());
     }
 
     public void dismissModal(ViewController toDismiss, ViewController toAdd, CommandListener listener) {
-        content.addView(toAdd.getView(), 0);
+        toAdd.attachView(content, 0);
         if (toDismiss.options.animations.dismissModal.enable.isTrueOrUndefined()) {
             animator.dismiss(toDismiss.getView(), new AnimatorListenerAdapter() {
                 @Override

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

@@ -7,6 +7,7 @@ import android.widget.FrameLayout;
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.mocks.SimpleViewController;
+import com.reactnativenavigation.parse.ModalPresentationStyle;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
@@ -122,6 +123,7 @@ public class ModalPresenterTest extends BaseTest {
 
     @Test
     public void dismissModal_previousViewIsAddedAtIndex0() {
+        modal2.ensureViewIsCreated();
         FrameLayout spy = spy(new FrameLayout(newActivity()));
         uut.setContentLayout(spy);
         uut.dismissModal(modal1, modal2, new CommandListenerAdapter());
@@ -150,4 +152,14 @@ public class ModalPresenterTest extends BaseTest {
         uut.dismissModal(modal2, modal1, new CommandListenerAdapter());
         verify(modal1, times(2)).onViewAppeared();
     }
+
+    @Test
+    public void dismissModal_previousViewIsNotDetachedIfOverCurrentContext() {
+        modal1.options.modal.presentationStyle = ModalPresentationStyle.OverCurrentContext;
+        disableShowModalAnimation(modal1, modal2);
+
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        assertThat(rootController.getView().getParent()).isNotNull();
+        verify(rootController, times(0)).onViewDisappear();
+    }
 }