BANDURU

android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -27,8 +27,8 @@ public abstract class NavigationApplication extends Application {
         navigationReactInstance.startReactContextOnceInBackgroundAndExecuteJS();
     }
 
-    public Handler getMainHandler() {
-        return handler;
+    public void runOnMainThread(Runnable runnable) {
+        handler.post(runnable);
     }
 
     public NavigationReactInstance getNavigationReactInstance() {

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

@@ -1,14 +1,10 @@
 package com.reactnativenavigation.bridge;
 
-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.ReadableMap;
-import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.controllers.NavigationActivity;
+import com.reactnativenavigation.controllers.NavigationCommandsHandler;
 
 /**
  * The basic abstract components we will expose:
@@ -34,14 +30,7 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void startApp(final ReadableMap params) {
-        NavigationApplication context = NavigationApplication.instance;
-        Intent intent = new Intent(context, NavigationActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-
-        Bundle paramsBundle = BundleConverter.toBundle(params);
-
-        intent.putExtra(NavigationActivity.PARAMS_BUNDLE, paramsBundle);
-        context.startActivity(intent);
+        NavigationCommandsHandler.startApp(BundleConverter.toBundle(params));
     }
 
     @ReactMethod
@@ -82,6 +71,7 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void push(final ReadableMap params) {
+        NavigationCommandsHandler.push(BundleConverter.toBundle(params));
     }
 
     @ReactMethod

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

@@ -1,6 +1,5 @@
 package com.reactnativenavigation.controllers;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
@@ -12,35 +11,34 @@ import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.layouts.Layout;
 import com.reactnativenavigation.layouts.LayoutFactory;
 import com.reactnativenavigation.params.ActivityParams;
-import com.reactnativenavigation.params.parsers.ActivityParamsParser;
+import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.react.JsDevReloadHandler;
 import com.reactnativenavigation.react.NavigationReactInstance;
 import com.reactnativenavigation.react.RedboxPermission;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, NavigationReactInstance.OnJsDevReloadListener {
 
-    public static final String PARAMS_BUNDLE = "PARAMS_BUNDLE";
     /**
      * Although we start multiple activities, we make sure to pass Intent.CLEAR_TASK | Intent.NEW_TASK
      * So that we actually have only 1 instance of the activity running at one time.
-     * We hold the currentActivity (resume->pause) so we know when we need to destroy the javascript context.
-     * This is somewhat weird, and in the future either fully support multiple activities,
-     * OR a single activity with changing contentView similar to ReactNative impl.
+     * We hold the currentActivity (resume->pause) so we know when we need to destroy the javascript context
+     * (when currentActivity is null, ie pause and destroy was called without resume).
+     * This is somewhat weird, and in the future we better use a single activity with changing contentView similar to ReactNative impl.
+     * Along with that, we should handle commands from the bridge using onNewIntent
      */
-    private static Activity currentActivity;
+    static NavigationActivity currentActivity;
+
+    private final ModalController modalController = new ModalController();
     private ActivityParams activityParams;
-    private ModalController modalController;
     private Layout layout;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        RedboxPermission.permissionToShowRedboxIfNeeded(this);
 
-        activityParams = ActivityParamsParser.parse(getIntent().getBundleExtra(PARAMS_BUNDLE));
-
-        modalController = new ModalController();
+        activityParams = NavigationCommandsHandler.getActivityParams(getIntent());
 
-        RedboxPermission.permissionToShowRedboxIfNeeded(this);
         createLayout();
     }
 
@@ -107,4 +105,8 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     private NavigationReactInstance getNavigationReactInstance() {
         return NavigationApplication.instance.getNavigationReactInstance();
     }
+
+    void push(ScreenParams params) {
+        layout.push(params);
+    }
 }

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

@@ -0,0 +1,46 @@
+package com.reactnativenavigation.controllers;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.params.ActivityParams;
+import com.reactnativenavigation.params.ScreenParams;
+import com.reactnativenavigation.params.parsers.ActivityParamsParser;
+import com.reactnativenavigation.params.parsers.ScreenParamsParser;
+
+public class NavigationCommandsHandler {
+
+    private static final String ACTIVITY_PARAMS_BUNDLE = "ACTIVITY_PARAMS_BUNDLE";
+
+    /**
+     * start a new activity with CLEAR_TASK | NEW_TASK
+     *
+     * @param params ActivityParams as bundle
+     */
+    public static void startApp(Bundle params) {
+        Intent intent = new Intent(NavigationApplication.instance, NavigationActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra(ACTIVITY_PARAMS_BUNDLE, params);
+        NavigationApplication.instance.startActivity(intent);
+    }
+
+    public static void push(Bundle screenParams) {
+        final NavigationActivity currentActivity = NavigationActivity.currentActivity;
+        if (currentActivity == null) {
+            return;
+        }
+
+        final ScreenParams params = ScreenParamsParser.parse(screenParams);
+        NavigationApplication.instance.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                currentActivity.push(params);
+            }
+        });
+    }
+
+    static ActivityParams getActivityParams(Intent intent) {
+        return ActivityParamsParser.parse(intent.getBundleExtra(NavigationCommandsHandler.ACTIVITY_PARAMS_BUNDLE));
+    }
+}

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

@@ -1,9 +1,13 @@
 package com.reactnativenavigation.layouts;
 
+import com.reactnativenavigation.params.ScreenParams;
+
 public interface Layout {
     boolean onBackPressed();
 
     void onDestroy();
 
     void removeAllReactViews();
+
+    void push(ScreenParams params);
 }

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

@@ -45,4 +45,9 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
     public void removeAllReactViews() {
         stack.destroy();
     }
+
+    @Override
+    public void push(ScreenParams params) {
+        stack.push(params);
+    }
 }

android/app/src/main/java/com/reactnativenavigation/react/RedboxPermission.java

@@ -14,8 +14,8 @@ public class RedboxPermission {
 
     public static void permissionToShowRedboxIfNeeded(Context context) {
         if (NavigationApplication.instance.isDebug() &&
-            Build.VERSION.SDK_INT >= 23 &&
-            !Settings.canDrawOverlays(context)) {
+                Build.VERSION.SDK_INT >= 23 &&
+                !Settings.canDrawOverlays(context)) {
             Intent serviceIntent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
             context.startActivity(serviceIntent);
             String msg = "Overlay permissions needs to be granted in order for react native apps to run in dev mode";

android/app/src/test/java/com/reactnativenavigation/FirstTest.java

@@ -7,13 +7,11 @@ import org.robolectric.RobolectricTestRunner;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
+//TODO test the shit out of this project
 @RunWith(RobolectricTestRunner.class)
 public class FirstTest {
-
     @Test
     public void woohoo() {
-        assertThat(1+2, is(3));
+        assertThat(1 + 2, is(3));
     }
-
-
 }

src/platformSpecific.ios.js

@@ -1,3 +1,7 @@
+/**
+ * copy paste from deprecated - for now
+ */
+
 import utils from './utils';
 import Navigation from './../Navigation';
 import Controllers, {Modal, Notification} from 'react-native-controllers';