BaseLayout

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

@@ -0,0 +1,68 @@
+package com.reactnativenavigation.layouts;
+
+import android.content.Context;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+import android.widget.FrameLayout;
+
+import com.reactnativenavigation.R;
+import com.reactnativenavigation.core.objects.Screen;
+import com.reactnativenavigation.views.RctView;
+import com.reactnativenavigation.views.RnnToolBar;
+import com.reactnativenavigation.views.ScreenStack;
+
+public abstract class BaseLayout extends FrameLayout implements Layout {
+
+    private OnScreenPoppedListener onScreenPoppedListener;
+
+    private RnnToolBar toolBar;
+    private ScreenStack screenStack;
+
+    public BaseLayout(Context context, Screen initialScreen) {
+        super(context);
+        toolBar = (RnnToolBar) findViewById(R.id.toolbar);
+        screenStack = (ScreenStack) findViewById(R.id.screenStack);
+
+        toolBar.update(initialScreen);
+        addInitialScreen(initialScreen);
+    }
+
+    private void addInitialScreen(Screen screen) {
+        screenStack.push(screen, new RctView.OnDisplayedListener() {
+            @Override
+            public void onDisplayed() {
+                Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.slide_up);
+                setAnimation(animation);
+                animate();
+            }
+        });
+    }
+
+    @Override
+    public void push(Screen screen) {
+        screenStack.push(screen);
+    }
+
+    @Override
+    public Screen pop() {
+        Screen popped = screenStack.pop();
+        if (onScreenPoppedListener != null) {
+            onScreenPoppedListener.onScreenPopped(popped);
+        }
+        return popped;
+    }
+
+    @Override
+    public int getScreenCount() {
+        return screenStack.getStackSize();
+    }
+
+    @Override
+    public void removeAllReactViews() {
+        screenStack.removeAllReactViews();
+    }
+
+    public void setOnScreenPoppedListener(OnScreenPoppedListener onScreenPoppedListener) {
+        this.onScreenPoppedListener = onScreenPoppedListener;
+    }
+}

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

@@ -1,9 +1,17 @@
 package com.reactnativenavigation.layouts;
 
+import com.reactnativenavigation.core.objects.Screen;
+
 public interface Layout {
     boolean onBackPressed();
 
     void onDestroy();
 
     void removeAllReactViews();
+
+    void push(Screen screen);
+
+    Screen pop();
+
+    int getScreenCount();
 }

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

@@ -0,0 +1,8 @@
+package com.reactnativenavigation.layouts;
+
+import com.reactnativenavigation.core.objects.Screen;
+
+public interface OnScreenPoppedListener {
+
+    void onScreenPopped(Screen popped);
+}

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

@@ -0,0 +1,22 @@
+package com.reactnativenavigation.layouts;
+
+import android.content.Context;
+
+import com.reactnativenavigation.core.objects.Screen;
+
+public class SomethingLayout extends BaseLayout {
+
+    public SomethingLayout(Context context, Screen initialScreen) {
+        super(context, initialScreen);
+    }
+
+    @Override
+    public boolean onBackPressed() {
+        return false;
+    }
+
+    @Override
+    public void onDestroy() {
+
+    }
+}

android/app/src/main/java/com/reactnativenavigation/modal/RnnModal.java

@@ -5,77 +5,58 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
 
 import com.reactnativenavigation.R;
 import com.reactnativenavigation.activities.BaseReactActivity;
 import com.reactnativenavigation.controllers.ModalController;
 import com.reactnativenavigation.core.objects.Screen;
+import com.reactnativenavigation.layouts.Layout;
+import com.reactnativenavigation.layouts.OnScreenPoppedListener;
 import com.reactnativenavigation.utils.ContextProvider;
 import com.reactnativenavigation.utils.SdkSupports;
 import com.reactnativenavigation.utils.StyleHelper;
-import com.reactnativenavigation.views.RctView;
-import com.reactnativenavigation.views.RnnToolBar;
-import com.reactnativenavigation.views.ScreenStack;
 
-public class RnnModal extends Dialog implements DialogInterface.OnDismissListener {
+public class RnnModal extends Dialog implements DialogInterface.OnDismissListener, OnScreenPoppedListener {
 
-    private ScreenStack mScreenStack;
-    private View mContentView;
-    private RnnToolBar mToolBar;
+    private Layout contentView;
 
-    public RnnModal(BaseReactActivity context, Screen screen) {
+    public RnnModal(Context context, ModalController modalController, Screen screen) {
         super(context, R.style.Modal);
-        ModalController.getInstance().add(this);
+        modalController.add(this);
         init(context, screen);
     }
 
     @SuppressLint("InflateParams")
     private void init(final Context context, Screen screen) {
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        mContentView = LayoutInflater.from(context).inflate(R.layout.modal_layout, null, false);
-        mToolBar = (RnnToolBar) mContentView.findViewById(R.id.toolbar);
-        mScreenStack = (ScreenStack) mContentView.findViewById(R.id.screenStack);
-        setContentView(mContentView);
-        mToolBar.update(screen);
-        mScreenStack.push(screen, new RctView.OnDisplayedListener() {
-            @Override
-            public void onDisplayed() {
-                Animation animation = AnimationUtils.loadAnimation(context, R.anim.slide_up);
-                mContentView.setAnimation(animation);
-                mContentView.animate();
-            }
-        });
+        contentView = null;
+        setContentView((View) contentView);
 
-        // Set navigation colors
-        if (SdkSupports.lollipop()) {
-            Window window = getWindow();
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            StyleHelper.setWindowStyle(window, context.getApplicationContext(), screen);
-        }
+//        // Set navigation colors
+//        if (SdkSupports.lollipop()) {
+//            Window window = getWindow();
+//            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+//            StyleHelper.setWindowStyle(window, context.getApplicationContext(), screen);
+//        }
         setOnDismissListener(this);
     }
 
     public void push(Screen screen) {
-        mScreenStack.push(screen);
-        mToolBar.update(screen);
+        contentView.push(screen);
     }
 
     public Screen pop() {
-        Screen popped = mScreenStack.pop();
-        if (mScreenStack.isEmpty()) {
+        return contentView.pop();
+    }
+
+    @Override
+    public void onScreenPopped(Screen popped) {
+        if (contentView.getScreenCount() == 0) {
             dismiss();
         }
-        Screen currentScreen = getCurrentScreen();
-        if (currentScreen != null) {
-            mToolBar.update(currentScreen);
-        }
-        return popped;
     }
 
     @Nullable