modalController

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

@@ -3,47 +3,33 @@ package com.reactnativenavigation.controllers;
 import android.support.annotation.Nullable;
 
 import com.reactnativenavigation.modal.RnnModal;
-import com.reactnativenavigation.utils.RefUtils;
 
-import java.lang.ref.WeakReference;
 import java.util.Stack;
 
-/**
- * Created by guyc on 06/05/16.
- */
 public class ModalController {
-    private static ModalController sInstance;
 
-    private final Stack<WeakReference<RnnModal>> mModals;
+    private final Stack<RnnModal> modals;
 
-    private ModalController() {
-        mModals = new Stack<>();
-    }
-
-    public static synchronized ModalController getInstance() {
-        if (sInstance == null) {
-            sInstance = new ModalController();
-        }
-
-        return sInstance;
+    public ModalController() {
+        modals = new Stack<>();
     }
 
     public void add(RnnModal modal) {
-        mModals.add(new WeakReference<>(modal));
+        modals.add(modal);
     }
 
     public boolean isModalDisplayed() {
-        return mModals.size() != 0;
+        return !modals.isEmpty();
     }
 
     @Nullable
     public RnnModal get() {
-        return isModalDisplayed() ? RefUtils.get(mModals.peek()) : null;
+        return isModalDisplayed() ? modals.peek() : null;
     }
 
     public void remove() {
         if (isModalDisplayed()) {
-            mModals.pop();
+            modals.pop();
         }
     }
 
@@ -54,10 +40,16 @@ public class ModalController {
     }
 
     public void dismissModal() {
-        WeakReference<RnnModal> ref = mModals.pop();
-        RnnModal modal = RefUtils.get(ref);
-        if (modal != null) {
-            modal.dismiss();
+        if (isModalDisplayed()) {
+            modals.pop().dismiss();
         }
     }
+
+    public void onDestroy() {
+
+    }
+
+    public boolean onBackPressed() {
+        return false;
+    }
 }

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

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.activities;
+package com.reactnativenavigation.controllers;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -34,10 +34,13 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
      * This is somewhat weird, and in the future either fully support multiple activities, OR a single activity with changing contentView ala ReactNative impl.
      */
     private static Activity currentActivity;
+    private ModalController modalController;
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        modalController = new ModalController();
         navigationReactInstance = new NavigationReactInstance(this);
         navigationReactInstance.startReactContextOnceInBackgroundAndExecuteJS();
         permissionToShowRedboxIfNeeded();
@@ -59,6 +62,8 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
 
     @Override
     protected void onDestroy() {
+        modalController.onDestroy();
+        layout.onDestroy();
         super.onDestroy();
         if (currentActivity == null || currentActivity.isFinishing()) {
             navigationReactInstance.onHostDestroy();