working on modals

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

@@ -1,26 +1,49 @@
 package com.reactnativenavigation.controllers;
 
+import android.app.Activity;
 import android.app.Dialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.view.Window;
 
 import com.reactnativenavigation.R;
+import com.reactnativenavigation.layouts.Layout;
+import com.reactnativenavigation.layouts.SingleScreenLayout;
 import com.reactnativenavigation.params.ScreenParams;
 
 public class Modal extends Dialog implements DialogInterface.OnDismissListener {
+    private final ModalController modalController;
     private final ScreenParams screenParams;
+    private Layout layout;
 
-    public Modal(Context context, ScreenParams screenParams) {
-        super(context, R.style.Modal);
+    public Modal(Activity activity, ModalController modalController, ScreenParams screenParams) {
+        super(activity, R.style.Modal);
+        this.modalController = modalController;
         this.screenParams = screenParams;
+        createContent();
+    }
+
+    private void createContent() {
         setCancelable(true);
+        setOnDismissListener(this);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
+        layout = new SingleScreenLayout(getContext(), screenParams);
+        setContentView(layout.asView());
+    }
 
+    public void push(ScreenParams params) {
+        layout.push(params);
     }
 
     @Override
-    public void onDismiss(DialogInterface dialog) {
+    public void onBackPressed() {
+        if (!layout.onBackPressed()) {
+            super.onBackPressed();
+        }
+    }
 
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        layout.removeAllReactViews();
+        modalController.modalDismissed(this);
     }
 }

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

@@ -14,13 +14,16 @@ public class ModalController {
         this.activity = activity;
     }
 
-
     public void showModal(ScreenParams screenParams) {
-        Modal modal = new Modal(activity, screenParams);
+        Modal modal = new Modal(activity, this, screenParams);
         modal.show();
         stack.add(modal);
     }
 
+    public void dismissModal() {
+
+    }
+
     public boolean onBackPressed() {
         return false;
     }
@@ -28,42 +31,16 @@ public class ModalController {
     public void onDestroy() {
 
     }
-    //    public void add(RnnModal modal) {
-//        modals.add(modal);
-//    }
-//
-//    public boolean isModalDisplayed() {
-//        return !modals.isEmpty();
-//    }
-//
-//    @Nullable
-//    public RnnModal get() {
-//        return isModalDisplayed() ? modals.peek() : null;
-//    }
-//
-//    public void remove() {
-//        if (isModalDisplayed()) {
-//            modals.pop();
-//        }
-//    }
-//
-//    public void dismissAllModals() {
-//        while (isModalDisplayed()) {
-//            dismissModal();
-//        }
-//    }
-//
-//    public void dismissModal() {
-//        if (isModalDisplayed()) {
-//            modals.pop().dismiss();
-//        }
-//    }
-//
-//    public void onDestroy() {
-//
-//    }
-//
-//    public boolean onBackPressed() {
-//        return false;
-//    }
+
+    public boolean isShowing() {
+        return !stack.empty();
+    }
+
+    public void modalDismissed(Modal modal) {
+        stack.remove(modal);
+    }
+
+    public void push(ScreenParams params) {
+        stack.peek().push(params);
+    }
 }

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

@@ -4,7 +4,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
-import android.view.View;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.reactnativenavigation.NavigationApplication;
@@ -52,7 +51,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
     private void createLayout() {
         layout = LayoutFactory.create(this, activityParams);
-        setContentView((View) layout);
+        setContentView(layout.asView());
     }
 
     @Override
@@ -115,7 +114,11 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     }
 
     void push(ScreenParams params) {
-        layout.push(params);
+        if (modalController.isShowing()) {
+            modalController.push(params);
+        } else {
+            layout.push(params);
+        }
     }
 
     void pop(ScreenParams params) {

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

@@ -1,11 +1,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 {
+    View asView();
+
     boolean onBackPressed();
 
     void onDestroy();

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

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.layouts;
 
 import android.content.Context;
+import android.view.View;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.params.ScreenParams;
@@ -80,6 +81,11 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
         stack.setTitleBarTitle(screenInstanceId, title);
     }
 
+    @Override
+    public View asView() {
+        return this;
+    }
+
     @Override
     public void setTitleBarButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
         stack.setTitleBarButtons(screenInstanceId, navigatorEventId, titleBarButtons);