ScreenStackContainer + modals

android/app/src/main/java/com/reactnativenavigation/controllers/Modal.java

@@ -8,17 +8,24 @@ import android.view.Window;
 
 import com.reactnativenavigation.R;
 import com.reactnativenavigation.layouts.Layout;
+import com.reactnativenavigation.layouts.ScreenStackContainer;
 import com.reactnativenavigation.layouts.SingleScreenLayout;
 import com.reactnativenavigation.params.ScreenParams;
 
-public class Modal extends Dialog implements DialogInterface.OnDismissListener {
-    private final ModalController modalController;
+public class Modal extends Dialog implements DialogInterface.OnDismissListener, ScreenStackContainer {
+
+    private final OnModalDismissedListener onModalDismissedListener;
+
+    public interface OnModalDismissedListener {
+        void onModalDismissed(Modal modal);
+    }
+
     private final ScreenParams screenParams;
     private Layout layout;
 
-    public Modal(Activity activity, ModalController modalController, ScreenParams screenParams) {
+    public Modal(Activity activity, OnModalDismissedListener onModalDismissedListener, ScreenParams screenParams) {
         super(activity, R.style.Modal);
-        this.modalController = modalController;
+        this.onModalDismissedListener = onModalDismissedListener;
         this.screenParams = screenParams;
         createContent();
     }
@@ -31,10 +38,31 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener {
         setContentView(layout.asView());
     }
 
+    @Override
     public void push(ScreenParams params) {
         layout.push(params);
     }
 
+    @Override
+    public void pop(ScreenParams screenParams) {
+        layout.pop(screenParams);
+    }
+
+    @Override
+    public void popToRoot(ScreenParams params) {
+        layout.popToRoot(params);
+    }
+
+    @Override
+    public void newStack(ScreenParams params) {
+        layout.newStack(params);
+    }
+
+    @Override
+    public void destroy() {
+        layout.destroy();
+    }
+
     @Override
     public void onBackPressed() {
         Log.d("LOG", "Modal.onBackPressed ");
@@ -45,7 +73,7 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener {
 
     @Override
     public void onDismiss(DialogInterface dialog) {
-        layout.removeAllReactViews();
-        modalController.modalDismissed(this);
+        destroy();
+        onModalDismissedListener.onModalDismissed(this);
     }
 }

android/app/src/main/java/com/reactnativenavigation/controllers/ModalController.java

@@ -3,11 +3,12 @@ package com.reactnativenavigation.controllers;
 import android.app.Activity;
 import android.util.Log;
 
+import com.reactnativenavigation.layouts.ScreenStackContainer;
 import com.reactnativenavigation.params.ScreenParams;
 
 import java.util.Stack;
 
-public class ModalController {
+public class ModalController implements ScreenStackContainer, Modal.OnModalDismissedListener {
     private final Activity activity;
     private Stack<Modal> stack = new Stack<>();
 
@@ -22,7 +23,7 @@ public class ModalController {
     }
 
     public void dismissModal() {
-
+        stack.pop().destroy();
     }
 
     public boolean onBackPressed() {
@@ -30,19 +31,39 @@ public class ModalController {
         return false;
     }
 
-    public void onDestroy() {
+    public boolean isShowing() {
+        return !stack.empty();
+    }
 
+    public void push(ScreenParams params) {
+        stack.peek().push(params);
     }
 
-    public boolean isShowing() {
-        return !stack.empty();
+    @Override
+    public void pop(ScreenParams screenParams) {
+        stack.peek().pop(screenParams);
     }
 
-    public void modalDismissed(Modal modal) {
-        stack.remove(modal);
+    @Override
+    public void popToRoot(ScreenParams params) {
+        stack.peek().popToRoot(params);
     }
 
-    public void push(ScreenParams params) {
-        stack.peek().push(params);
+    @Override
+    public void newStack(ScreenParams params) {
+        stack.peek().newStack(params);
+    }
+
+    @Override
+    public void destroy() {
+        for (Modal modal : stack) {
+            modal.destroy();
+        }
+        stack.clear();
+    }
+
+    @Override
+    public void onModalDismissed(Modal modal) {
+        stack.remove(modal);
     }
 }

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

@@ -71,7 +71,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     @Override
     protected void onDestroy() {
         modalController.onDestroy();
-        layout.onDestroy();
+        layout.destroy();
         super.onDestroy();
         if (currentActivity == null || currentActivity.isFinishing()) {
             getNavigationReactInstance().onHostDestroy();
@@ -80,7 +80,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
     @Override
     public void onJsDevReload() {
-        layout.removeAllReactViews();
+        layout.destroy();
     }
 
     @Override

android/app/src/main/java/com/reactnativenavigation/layouts/Layout.java

@@ -2,28 +2,15 @@ package com.reactnativenavigation.layouts;
 
 import android.view.View;
 
-import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 
 import java.util.List;
 
-public interface Layout {
+public interface Layout extends ScreenStackContainer {
     View asView();
 
     boolean onBackPressed();
 
-    void onDestroy();
-
-    void removeAllReactViews();
-
-    void push(ScreenParams params);
-
-    void pop(ScreenParams params);
-
-    void popToRoot(ScreenParams params);
-
-    void newStack(ScreenParams params);
-
     void setTopBarVisible(String screenInstanceId, boolean hidden, boolean animated);
 
     void setTitleBarTitle(String screenInstanceId, String title);

android/app/src/main/java/com/reactnativenavigation/layouts/ScreenStackContainer.java

@@ -0,0 +1,15 @@
+package com.reactnativenavigation.layouts;
+
+import com.reactnativenavigation.params.ScreenParams;
+
+public interface ScreenStackContainer {
+    void push(ScreenParams screenParams);
+
+    void pop(ScreenParams screenParams);
+
+    void popToRoot(ScreenParams params);
+
+    void newStack(ScreenParams params);
+
+    void destroy();
+}

android/app/src/main/java/com/reactnativenavigation/layouts/SingleScreenLayout.java

@@ -43,12 +43,7 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
     }
 
     @Override
-    public void onDestroy() {
-        stack.destroy();
-    }
-
-    @Override
-    public void removeAllReactViews() {
+    public void destroy() {
         stack.destroy();
     }