bridge interface discussion

android/app/src/main/java/com/reactnativenavigation/activities/BaseReactActivity.java

@@ -35,7 +35,7 @@ import com.reactnativenavigation.core.objects.Button;
 import com.reactnativenavigation.core.objects.Drawer;
 import com.reactnativenavigation.core.objects.Screen;
 import com.reactnativenavigation.modal.RnnModal;
-import com.reactnativenavigation.packages.RnnPackage;
+import com.reactnativenavigation.bridge.NavigationReactPackage;
 import com.reactnativenavigation.utils.ContextProvider;
 import com.reactnativenavigation.utils.StyleHelper;
 import com.reactnativenavigation.views.RnnToolBar;
@@ -139,7 +139,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
     public List<ReactPackage> getPackages() {
         return Arrays.asList(
                 new MainReactPackage(),
-                new RnnPackage()
+                new NavigationReactPackage()
         );
     }
 

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java

@@ -0,0 +1,170 @@
+package com.reactnativenavigation.bridge;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableNativeMap;
+import com.reactnativenavigation.activities.BaseReactActivity;
+import com.reactnativenavigation.activities.BottomTabActivity;
+import com.reactnativenavigation.activities.RootActivity;
+import com.reactnativenavigation.activities.SingleScreenActivity;
+import com.reactnativenavigation.controllers.ModalController;
+import com.reactnativenavigation.core.objects.Drawer;
+import com.reactnativenavigation.core.objects.Screen;
+import com.reactnativenavigation.utils.BridgeUtils;
+import com.reactnativenavigation.utils.ContextProvider;
+
+import java.util.ArrayList;
+
+/**
+ * The basic abstract components we will expose:
+ * BottomTabs
+ * TopBar
+ * - TitleBar
+ * - TopTabs (segmented control / view pager)
+ * DeviceStatusBar
+ * AndroidNavigationBar
+ * SideMenu
+ */
+public class NavigationReactModule extends ReactContextBaseJavaModule {
+    public static final String NAME = "NavigationReactModule";
+
+    public NavigationReactModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    @Override
+    public String getName() {
+        return NAME;
+    }
+
+    @ReactMethod
+    public void startTabBasedApp(ReadableArray screens, ReadableMap style, ReadableMap drawerParams) {
+        Activity context = ContextProvider.getActivityContext();
+        if (context != null && !context.isFinishing()) {
+            Intent intent = new Intent(context, BottomTabActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            Bundle extras = new Bundle();
+            extras.putSerializable(BottomTabActivity.EXTRA_SCREENS, createScreens(screens));
+            if (drawerParams != null) {
+                extras.putSerializable(BottomTabActivity.DRAWER_PARAMS, new Drawer(drawerParams));
+            }
+            if (style != null) {
+                BridgeUtils.addMapToBundle(((ReadableNativeMap) style).toHashMap(), extras);
+            }
+            intent.putExtras(extras);
+
+            context.startActivity(intent);
+            //TODO add abstract isRoot() instead of instanceof?
+            if (ContextProvider.getActivityContext() instanceof RootActivity) {
+                context.overridePendingTransition(0, 0);
+            }
+
+            // Dismiss modals associated with previous activity
+            ModalController.getInstance().dismissAllModals();
+        }
+    }
+
+    private ArrayList<Screen> createScreens(ReadableArray screens) {
+        ArrayList<Screen> ret = new ArrayList<>();
+        for (int i = 0; i < screens.size(); i++) {
+            ret.add(new Screen(screens.getMap(i)));
+        }
+        return ret;
+    }
+
+    @ReactMethod
+    public void startSingleScreenApp(ReadableMap screen, ReadableMap drawerParams) {
+        BaseReactActivity context = ContextProvider.getActivityContext();
+        if (context != null && !context.isFinishing()) {
+            Intent intent = new Intent(context, SingleScreenActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            Bundle extras = new Bundle();
+            extras.putSerializable(SingleScreenActivity.EXTRA_SCREEN, new Screen(screen));
+            if (drawerParams != null) {
+                extras.putSerializable(SingleScreenActivity.DRAWER_PARAMS, new Drawer(drawerParams));
+            }
+            intent.putExtras(extras);
+
+            context.startActivity(intent);
+            if (ContextProvider.getActivityContext() instanceof RootActivity) {
+                context.overridePendingTransition(0, 0);
+            }
+
+            // Dismiss modals associated with previous activity
+            ModalController.getInstance().dismissAllModals();
+        }
+    }
+
+    @ReactMethod
+    public void setScreenTitleBarTitle(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void setScreenTitleBarButtons(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void setTabBadge(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void selectBottomTab(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void toggleSideMenuVisible(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void toggleTopBarVisible(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void setTopBarVisible(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void toggleBottomTabsVisible(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void setBottomTabsVisible(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void push(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void pop(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void popToRoot(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void newStack(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void showModal(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void dismissAllModals(final ReadableMap params) {
+    }
+
+    @ReactMethod
+    public void dismissTopModal() {
+    }
+}

android/app/src/main/java/com/reactnativenavigation/packages/RnnPackage.java → android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactPackage.java

@@ -1,22 +1,21 @@
-package com.reactnativenavigation.packages;
+package com.reactnativenavigation.bridge;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.reactnativenavigation.modules.RctActivityModule;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-public class RnnPackage implements ReactPackage {
+public class NavigationReactPackage implements ReactPackage {
 
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         return Arrays.<NativeModule>asList(
-                new RctActivityModule(reactContext)
+                new NavigationReactModule(reactContext)
         );
     }
 

android/app/src/main/java/com/reactnativenavigation/core/objects/Screen.java

@@ -57,7 +57,7 @@ public class Screen extends JsonObject implements Serializable {
     public final boolean backButtonHidden;
     public HashMap<String, Object> passedProps = new HashMap<>();
 
-    // Navigation styling
+    // NavigationReactModule styling
     @Nullable @ColorInt public Integer toolBarColor;
     @Nullable public Boolean toolBarHidden;
     @Nullable @ColorInt public Integer statusBarColor;

android/app/src/main/java/com/reactnativenavigation/modules/RctActivityModule.java

@@ -1,346 +0,0 @@
-package com.reactnativenavigation.modules;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableNativeMap;
-import com.reactnativenavigation.activities.BaseReactActivity;
-import com.reactnativenavigation.activities.BottomTabActivity;
-import com.reactnativenavigation.activities.RootActivity;
-import com.reactnativenavigation.activities.SingleScreenActivity;
-import com.reactnativenavigation.controllers.ModalController;
-import com.reactnativenavigation.core.objects.Drawer;
-import com.reactnativenavigation.core.objects.Screen;
-import com.reactnativenavigation.modal.RnnModal;
-import com.reactnativenavigation.utils.BridgeUtils;
-import com.reactnativenavigation.utils.ContextProvider;
-
-import java.util.ArrayList;
-
-public class RctActivityModule extends ReactContextBaseJavaModule {
-    public static final String REACT_CLASS = "RctActivity";
-    private static final String KEY_NAVIGATOR_ID = "navigatorID";
-
-    public RctActivityModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @ReactMethod
-    public void startTabBasedApp(ReadableArray screens, ReadableMap style, ReadableMap drawerParams) {
-        Activity context = ContextProvider.getActivityContext();
-        if (context != null && !context.isFinishing()) {
-            Intent intent = new Intent(context, BottomTabActivity.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-
-            Bundle extras = new Bundle();
-            extras.putSerializable(BottomTabActivity.EXTRA_SCREENS, createScreens(screens));
-            if (drawerParams != null) {
-                extras.putSerializable(BottomTabActivity.DRAWER_PARAMS, new Drawer(drawerParams));
-            }
-            if (style != null) {
-                BridgeUtils.addMapToBundle(((ReadableNativeMap) style).toHashMap(), extras);
-            }
-            intent.putExtras(extras);
-
-            context.startActivity(intent);
-            //TODO add abstract isRoot() instead of instanceof?
-            if (ContextProvider.getActivityContext() instanceof RootActivity) {
-                context.overridePendingTransition(0, 0);
-            }
-
-            // Dismiss modals associated with previous activity
-            ModalController.getInstance().dismissAllModals();
-        }
-    }
-
-    private ArrayList<Screen> createScreens(ReadableArray screens) {
-        ArrayList<Screen> ret = new ArrayList<>();
-        for (int i = 0; i < screens.size(); i++) {
-            ret.add(new Screen(screens.getMap(i)));
-        }
-        return ret;
-    }
-
-    @ReactMethod
-    public void startSingleScreenApp(ReadableMap screen, ReadableMap drawerParams) {
-        BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context != null && !context.isFinishing()) {
-            Intent intent = new Intent(context, SingleScreenActivity.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-
-            Bundle extras = new Bundle();
-            extras.putSerializable(SingleScreenActivity.EXTRA_SCREEN, new Screen(screen));
-            if (drawerParams != null) {
-                extras.putSerializable(SingleScreenActivity.DRAWER_PARAMS, new Drawer(drawerParams));
-            }
-            intent.putExtras(extras);
-
-            context.startActivity(intent);
-            if (ContextProvider.getActivityContext() instanceof RootActivity) {
-                context.overridePendingTransition(0, 0);
-            }
-
-            // Dismiss modals associated with previous activity
-            ModalController.getInstance().dismissAllModals();
-        }
-    }
-
-    @ReactMethod
-    public void setNavigatorButtons(final ReadableMap buttons) {
-        final BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context == null || context.isFinishing()) {
-            return;
-        }
-        context.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                context.setNavigationButtons(buttons);
-            }
-        });
-    }
-
-    @ReactMethod
-    public void setNavigatorTitle(final ReadableMap title) {
-        final BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context == null || context.isFinishing()) {
-            return;
-        }
-        context.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                context.setNavigationTitle(title);
-            }
-        });
-    }
-
-    @ReactMethod
-    public void setTabBadge(final ReadableMap params) {
-        final BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context == null || context.isFinishing()) {
-            return;
-        }
-        context.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                ((BottomTabActivity) context).setTabBadge(params);
-            }
-        });
-    }
-
-    @ReactMethod
-    public void switchToTab(final ReadableMap params) {
-        final BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context == null || context.isFinishing()) {
-            return;
-        }
-        context.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                ((BottomTabActivity) context).switchToTab(params);
-            }
-        });
-    }
-
-    @ReactMethod
-    public void toggleDrawer(final ReadableMap params) {
-        final BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context == null || context.isFinishing()) {
-            return;
-        }
-        context.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                context.toggleDrawer(params);
-            }
-        });
-    }
-
-    @ReactMethod
-    public void toggleNavigationBar(final ReadableMap params) {
-        final BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context == null || context.isFinishing()) {
-            return;
-        }
-        context.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                context.toggleNavigationBar(params);
-            }
-        });
-    }
-
-    @ReactMethod
-    public void toggleNavigatorTabs(final ReadableMap params) {
-        final BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context == null || context.isFinishing()) {
-            return;
-        }
-        context.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                ((BottomTabActivity) context).toggleTabs(params);
-            }
-        });
-    }
-
-    @ReactMethod
-    public void navigatorPush(final ReadableMap skreen) {
-        final Screen screen = new Screen(skreen);
-        final BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context == null || context.isFinishing()) {
-            return;
-        }
-
-        // First, check if the screen should be pushed to a Modal
-        ModalController modalController = ModalController.getInstance();
-        if (modalController.isModalDisplayed()) {
-            final RnnModal modal = modalController.get();
-            if (modal != null) {
-                context.runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        modal.push(screen);
-                    }
-                });
-            }
-            return;
-        }
-
-        // No Modal is displayed, Push to activity
-        context.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                context.push(screen);
-            }
-        });
-    }
-
-    @ReactMethod
-    public void navigatorPop(final ReadableMap navigator) {
-        final String navigatorId = navigator.getString(KEY_NAVIGATOR_ID);
-        final BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context == null || context.isFinishing()) {
-            return;
-        }
-
-        // First, check if the screen should be popped from a Modal
-        ModalController modalController = ModalController.getInstance();
-        if (modalController.isModalDisplayed()) {
-            final RnnModal modal = modalController.get();
-            if (modal != null) {
-                context.runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        modal.pop();
-                    }
-                });
-            }
-            return;
-        } else {
-            context.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    context.pop(navigatorId);
-                }
-            });
-        }
-    }
-
-    @ReactMethod
-    public void navigatorPopToRoot(final ReadableMap params) {
-        final BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context == null || context.isFinishing()) {
-            return;
-        }
-
-        final String navigatorID = params.getString(KEY_NAVIGATOR_ID);
-        context.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                context.popToRoot(navigatorID);
-            }
-        });
-    }
-
-    @ReactMethod
-    public void navigatorResetTo(final ReadableMap skreen) {
-        final BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context == null || context.isFinishing()) {
-            return;
-        }
-
-        final Screen screen = new Screen(skreen);
-        context.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                context.resetTo(screen);
-            }
-        });
-    }
-
-    @ReactMethod
-    public void showModal(final ReadableMap screen) {
-        final BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context != null && !context.isFinishing()) {
-            context.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    new RnnModal(context, new Screen(screen)).show();
-                }
-            });
-        }
-    }
-
-    @ReactMethod
-    public void dismissAllModals(final ReadableMap params) {
-        final BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context != null && !context.isFinishing()) {
-            context.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    ModalController modalController = ModalController.getInstance();
-                    if (modalController.isModalDisplayed()) {
-                        modalController.dismissAllModals();
-                    }
-                }
-            });
-        }
-    }
-
-    /**
-     * Dismisses the top modal (the last modal pushed).
-     */
-    @ReactMethod
-    public void dismissModal() {
-        ModalController modalController = ModalController.getInstance();
-        if (modalController.isModalDisplayed()) {
-            modalController.dismissModal();
-        }
-    }
-
-    @ReactMethod
-    public void showFAB(final ReadableMap params) {
-        final BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context == null || context.isFinishing()) {
-            return;
-        }
-        context.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                context.showFAB(params);
-            }
-        });
-    }
-
-}