params passed to activity and passed from there"

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

@@ -8,6 +8,7 @@ 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.bridge.parsers.BundleConverter;
 import com.reactnativenavigation.controllers.NavigationActivity;
 
 /**
@@ -38,9 +39,9 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
         Intent intent = new Intent(context, NavigationActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
 
-        Bundle extras = new Bundle();
+        Bundle paramsBundle = BundleConverter.toBundle(params);
 
-        intent.putExtras(extras);
+        intent.putExtra(NavigationActivity.PARAMS_BUNDLE, paramsBundle);
         context.startActivity(intent);
     }
 

android/app/src/main/java/com/reactnativenavigation/bridge/parsers/ActivityParamsParser.java

@@ -1,11 +1,13 @@
 package com.reactnativenavigation.bridge.parsers;
 
-import com.facebook.react.bridge.ReadableMap;
+import android.os.Bundle;
+
 import com.reactnativenavigation.controllers.ActivityParams;
 
-public class ActivityParamsParser implements ParamsParser<ActivityParams> {
-    @Override
-    public ActivityParams parse(ReadableMap params) {
-        return null;
+public class ActivityParamsParser {
+    public ActivityParams parse(Bundle params) {
+        ActivityParams result = new ActivityParams();
+        result.screenParams = new ScreenParamsParser().parse(params);
+        return result;
     }
 }

android/app/src/main/java/com/reactnativenavigation/bridge/parsers/ParamsParser.java

@@ -1,7 +0,0 @@
-package com.reactnativenavigation.bridge.parsers;
-
-import com.facebook.react.bridge.ReadableMap;
-
-public interface ParamsParser<T> {
-    T parse(ReadableMap params);
-}

android/app/src/main/java/com/reactnativenavigation/bridge/parsers/ScreenParamsParser.java

@@ -1,16 +1,15 @@
 package com.reactnativenavigation.bridge.parsers;
 
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableNativeMap;
+import android.os.Bundle;
+
 import com.reactnativenavigation.controllers.ScreenParams;
 
-public class ScreenParamsParser implements ParamsParser<ScreenParams> {
+public class ScreenParamsParser {
     private static final String KEY_TITLE = "title";
-    private static final String KEY_SCREEN = "screen";
-    private static final String KEY_LABEL = "tabLabel";
+    private static final String KEY_SCREEN_ID = "screenId";
     private static final String KEY_SCREEN_INSTANCE_ID = "screenInstanceID";
-    private static final String KEY_NAVIGATOR_ID = "navigatorID";
-    private static final String KEY_NAVIGATOR_EVENT_ID = "navigatorEventID";
+    private static final String KEY_PROPS = "passProps";
+    private static final String KEY_LABEL = "tabLabel";
     private static final String KEY_ICON = "tabIcon";
     private static final String KEY_NAVIGATOR_BUTTONS = "navigatorButtons";
     private static final String KEY_RIGHT_BUTTONS = "rightButtons";
@@ -27,23 +26,15 @@ public class ScreenParamsParser implements ParamsParser<ScreenParams> {
     private static final String KEY_TAB_INDICATOR_COLOR = "tabIndicatorColor";
     private static final String KEY_BOTTOM_TABS_HIDDEN = "tabBarHidden";
     private static final String KEY_BOTTOM_TABS_HIDDEN_ON_SCROLL = "bottomTabsHiddenOnScroll";
-    private static final String KEY_PROPS = "passProps";
 
-    @Override
-    public ScreenParams parse(ReadableMap params) {
+    public ScreenParams parse(Bundle params) {
         ScreenParams result = new ScreenParams();
-        result.title = params.getString(KEY_TITLE);
-        result.tabLabel = params.getString(KEY_LABEL);
-        result.screenId = params.getString(KEY_SCREEN);
+        result.screenId = params.getString(KEY_SCREEN_ID);
         result.screenInstanceId = params.getString(KEY_SCREEN_INSTANCE_ID);
-        result.navigatorId = params.getString(KEY_NAVIGATOR_ID);
-        result.navigatorEventId = params.getString(KEY_NAVIGATOR_EVENT_ID);
-        result.tabIcon = getString(KEY_ICON);
-        if (screen.hasKey(KEY_PROPS)) {
-            passedProps = ((ReadableNativeMap) screen.getMap(KEY_PROPS)).toHashMap();
-        }
-        result.buttons = getButtons(screen);
-        result.backButtonHidden = getBoolean(screen, KEY_BACK_BUTTON_HIDDEN);
+        result.passProps = params.getBundle(KEY_PROPS);
+        result.buttons = null;
+        result.title = params.getString(KEY_TITLE);
+        result.styleParams = null;
         return result;
     }
 

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

@@ -1,10 +1,5 @@
 package com.reactnativenavigation.controllers;
 
-import java.io.Serializable;
-
-public class ActivityParams implements Serializable {
-
-    String screenName;
-
-
+public class ActivityParams {
+    public ScreenParams screenParams;
 }

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

@@ -10,6 +10,7 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.shell.MainReactPackage;
 import com.reactnativenavigation.bridge.NavigationReactPackage;
+import com.reactnativenavigation.bridge.parsers.ActivityParamsParser;
 import com.reactnativenavigation.layouts.Layout;
 import com.reactnativenavigation.layouts.ScreenLayout;
 import com.reactnativenavigation.react.JsDevReloadHandler;
@@ -22,6 +23,7 @@ import java.util.List;
 
 public class NavigationActivity extends AppCompatActivity implements NavigationReactInstance.ReactContextCreator, DefaultHardwareBackBtnHandler {
 
+    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.
@@ -51,6 +53,9 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        ActivityParams params = new ActivityParamsParser().parse(getIntent().getBundleExtra(PARAMS_BUNDLE));
+
         modalController = new ModalController();
         navigationReactInstance = new NavigationReactInstance(this);
         navigationReactInstance.startReactContextOnceInBackgroundAndExecuteJS();

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

@@ -1,6 +1,5 @@
 package com.reactnativenavigation.controllers;
 
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 
 import com.reactnativenavigation.views.TitleBarButton;
@@ -13,7 +12,7 @@ public class ScreenParams {
     public Bundle passProps;
     public ArrayList<TitleBarButton.Params> buttons;
     public String title;
-    public String tabLabel;
-    public Drawable tabIcon;
     public ScreenStyleParams styleParams;
+    //    public String tabLabel; TODO when tabs are supported move to TabParams
+    //    public Drawable tabIcon;
 }