connected Modal

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

@@ -14,6 +14,7 @@ import com.reactnativenavigation.params.ScreenParams;
 
 public class Modal extends Dialog implements DialogInterface.OnDismissListener, ScreenStackContainer {
 
+    private final Activity activity;
     private final OnModalDismissedListener onModalDismissedListener;
 
     public interface OnModalDismissedListener {
@@ -25,16 +26,21 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
 
     public Modal(Activity activity, OnModalDismissedListener onModalDismissedListener, ScreenParams screenParams) {
         super(activity, R.style.Modal);
+        this.activity = activity;
         this.onModalDismissedListener = onModalDismissedListener;
         this.screenParams = screenParams;
         createContent();
     }
 
+    public Activity getActivity() {
+        return activity;
+    }
+
     private void createContent() {
         setCancelable(true);
         setOnDismissListener(this);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        layout = new SingleScreenLayout(getContext(), screenParams);
+        layout = new SingleScreenLayout(getActivity(), screenParams);
         setContentView(layout.asView());
     }
 

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

@@ -70,7 +70,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
     @Override
     protected void onDestroy() {
-        modalController.onDestroy();
+        modalController.destroy();
         layout.destroy();
         super.onDestroy();
         if (currentActivity == null || currentActivity.isFinishing()) {

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

@@ -1,6 +1,6 @@
 package com.reactnativenavigation.layouts;
 
-import android.content.Context;
+import android.app.Activity;
 import android.view.View;
 import android.widget.FrameLayout;
 
@@ -17,18 +17,18 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
     private final ScreenParams screenParams;
     private ScreenStack stack;
 
-    public SingleScreenLayout(Context context, ScreenParams screenParams) {
-        super(context);
+    public SingleScreenLayout(Activity activity, ScreenParams screenParams) {
+        super(activity);
         this.screenParams = screenParams;
-        createStack(context);
+        createStack();
     }
 
-    private void createStack(Context context) {
+    private void createStack() {
         if (stack != null) {
             stack.destroy();
             removeView(stack);
         }
-        stack = new ScreenStack(context, screenParams);
+        stack = new ScreenStack(getContext(), screenParams);
         addView(stack, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
     }
 
@@ -64,7 +64,7 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
 
     @Override
     public void newStack(ScreenParams params) {
-        createStack(getContext());
+        createStack();
     }
 
     @Override

android/app/src/main/java/com/reactnativenavigation/screens/TabbedScreen.java

@@ -21,9 +21,9 @@ public class TabbedScreen extends Screen {
 
     private List<ContentView> contentViews;
     private ViewPager viewPager;
-    private ViewPagerAdapter viewPagerAdapter;
+    private ContentViewPagerAdapter adapter;
 
-    public  TabbedScreen(Context context, ScreenParams screenParams) {
+    public TabbedScreen(Context context, ScreenParams screenParams) {
         super(context, screenParams);
     }
 
@@ -45,8 +45,8 @@ public class TabbedScreen extends Screen {
             contentViews.add(contentView);
         }
 
-        viewPagerAdapter = new ViewPagerAdapter(viewPager, contentViews, screenParams.topTabParams);
-        viewPager.setAdapter(viewPagerAdapter);
+        adapter = new ContentViewPagerAdapter(viewPager, contentViews, screenParams.topTabParams);
+        viewPager.setAdapter(adapter);
         tabLayout.setupWithViewPager(viewPager);
     }
 
@@ -61,26 +61,26 @@ public class TabbedScreen extends Screen {
 
     @Override
     public void ensureUnmountOnDetachedFromWindow() {
-        for (ContentView contentView: contentViews) {
+        for (ContentView contentView : contentViews) {
             contentView.ensureUnmountOnDetachedFromWindow();
         }
     }
 
     @Override
     public void preventUnmountOnDetachedFromWindow() {
-        for (ContentView contentView: contentViews) {
+        for (ContentView contentView : contentViews) {
             contentView.preventUnmountOnDetachedFromWindow();
         }
     }
 
 
-    public class ViewPagerAdapter extends PagerAdapter implements TabLayout.OnTabSelectedListener, ViewPager.OnPageChangeListener {
+    public class ContentViewPagerAdapter extends PagerAdapter implements TabLayout.OnTabSelectedListener, ViewPager.OnPageChangeListener {
 
         private ViewPager viewPager;
         private List<ContentView> contentViews;
         private List<TopTabParams> topTabParams;
 
-        public ViewPagerAdapter(ViewPager viewPager, List<ContentView> contentViews, List<TopTabParams> topTabParams) {
+        public ContentViewPagerAdapter(ViewPager viewPager, List<ContentView> contentViews, List<TopTabParams> topTabParams) {
             this.viewPager = viewPager;
             this.contentViews = contentViews;
             this.topTabParams = topTabParams;

src/deprecated/platformSpecificDeprecated.android.js

@@ -21,11 +21,10 @@ function startSingleScreenApp(params) {
   screen.passProps = params.passProps;
   //const drawer = setupDrawer(params.drawer);
 
-  screen.screenId = screen.screen;
-
   /*
    * adapt to new API
    */
+  screen.screenId = screen.screen;
   params.screen = adaptNavigationStyleToScreenStyle(screen);
   params.screen = adaptNavigationParams(screen);
 
@@ -139,14 +138,14 @@ function addTabIcon(tab) {
 
 function navigatorSetButtons(navigator, navigatorEventID, params) {
   if (params.rightButtons) {
-   params.rightButtons.forEach(function(button) {
-     if (button.icon) {
-       const icon = resolveAssetSource(button.icon);
-       if (icon) {
-         button.icon = icon.uri;
-       }
-     }
-   });
+    params.rightButtons.forEach(function(button) {
+      if (button.icon) {
+        const icon = resolveAssetSource(button.icon);
+        if (icon) {
+          button.icon = icon.uri;
+        }
+      }
+    });
   }
   newPlatformSpecific.setScreenTitleBarButtons(navigator.screenInstanceID, navigatorEventID, params.rightButtons);
 }
@@ -197,10 +196,18 @@ function navigatorToggleTabs(navigator, params) {
 }
 
 function showModal(params) {
-  //addNavigatorParams(params);
-  //addNavigatorButtons(params);
-  //addNavigationStyleParams(params);
-  //RctActivity.showModal(params);
+  addNavigatorParams(params);
+  addNavigatorButtons(params);
+  addNavigationStyleParams(params);
+
+  /*
+   * adapt to new API
+   */
+  params.screenId = params.screen;
+  let adapted = adaptNavigationStyleToScreenStyle(params);
+  adapted = adaptNavigationParams(adapted);
+
+  newPlatformSpecific.showModal(adapted);
 }
 
 function dismissModal() {

src/platformSpecific.android.js

@@ -4,6 +4,8 @@ import _ from 'lodash';
 
 import Navigation from './Navigation';
 
+NativeBridge = NativeModules.NavigationReactModule;
+
 const resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource');
 
 function startApp(activityParams) {
@@ -13,35 +15,39 @@ function startApp(activityParams) {
     return;
   }
 
-  NativeModules.NavigationReactModule.startApp(activityParams);
+  NativeBridge.startApp(activityParams);
 }
 
 function push(screenParams) {
-  NativeModules.NavigationReactModule.push(screenParams);
+  NativeBridge.push(screenParams);
 }
 
 function pop(screenParams) {
-  NativeModules.NavigationReactModule.pop(screenParams);
+  NativeBridge.pop(screenParams);
 }
 
 function popToRoot(screenParams) {
-  NativeModules.NavigationReactModule.popToRoot(screenParams);
+  NativeBridge.popToRoot(screenParams);
 }
 
 function newStack(screenParams) {
-  NativeModules.NavigationReactModule.newStack(screenParams);
+  NativeBridge.newStack(screenParams);
 }
 
 function toggleTopBarVisible(screenInstanceID, visible, animated) {
-  NativeModules.NavigationReactModule.setTopBarVisible(screenInstanceID, visible, animated);
+  NativeBridge.setTopBarVisible(screenInstanceID, visible, animated);
 }
 
 function setScreenTitleBarTitle(screenInstanceID, title) {
-  NativeModules.NavigationReactModule.setScreenTitleBarTitle(screenInstanceID, title);
+  NativeBridge.setScreenTitleBarTitle(screenInstanceID, title);
 }
 
 function setScreenTitleBarButtons(screenInstanceID, navigatorEventID, buttons) {
-  NativeModules.NavigationReactModule.setScreenTitleBarButtons(screenInstanceID, navigatorEventID, buttons);
+  NativeBridge.setScreenTitleBarButtons(screenInstanceID, navigatorEventID, buttons);
+}
+
+function showModal(screenParams) {
+  NativeBridge.showModal(screenParams);
 }
 
 module.exports = {
@@ -52,5 +58,6 @@ module.exports = {
   newStack,
   toggleTopBarVisible,
   setScreenTitleBarTitle,
-  setScreenTitleBarButtons
+  setScreenTitleBarButtons,
+  showModal
 };