passProps android

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

@@ -18,7 +18,6 @@ public class ScreenParams {
     public String tabLabel;
     public Drawable tabIcon;
 
-    // TODO navigationParams should be a terminated. destroyed. annihilated. disintegrated. banished from existence. + abolished, eradicated, exterminated...
     public String screenInstanceId;
     public String navigatorEventId;
     public Bundle navigationParams;

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

@@ -8,16 +8,14 @@ import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.widget.FrameLayout;
 
+import com.reactnativenavigation.R;
 import com.reactnativenavigation.params.ScreenParams;
-import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.ContentView;
 import com.reactnativenavigation.views.TitleBarBackButtonListener;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import com.reactnativenavigation.R;
-
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
 @SuppressWarnings("ResourceType")
@@ -91,7 +89,7 @@ public class FragmentScreen extends Screen {
             String className = screenParams.fragmentCreatorClassName;
             Class<?> fragmentCreatorClass = Class.forName(className);
             Method method = fragmentCreatorClass.getMethod(CONTRACT_GET_FRAGMENT, Bundle.class);
-            return (android.app.Fragment) method.invoke(null, "TODO");
+            return (android.app.Fragment) method.invoke(null, new Bundle());
         } catch (NoSuchMethodException noSuchMethod) {
             return null;
         }
@@ -103,7 +101,7 @@ public class FragmentScreen extends Screen {
             String className = screenParams.fragmentCreatorClassName;
             Class<?> fragmentCreatorClass = Class.forName(className);
             Method method = fragmentCreatorClass.getMethod(CONTRACT_GET_SUPPORT_FRAGMENT, Bundle.class);
-            return (android.support.v4.app.Fragment) method.invoke(null, "TODO");
+            return (android.support.v4.app.Fragment) method.invoke(null, new Bundle());
         } catch (NoSuchMethodException noSuchMethod) {
             return null;
         }

src/Navigation.js

@@ -29,7 +29,7 @@ function _registerComponentNoRedux(screenID, generator) {
 
       constructor(props) {
         super(props);
-        this.allProps = {...props, ...PropRegistry.load(this.navigator.screenInstanceID)};
+        this.allProps = {...props, ...PropRegistry.load(props.screenInstanceID)};
       }
 
       render() {
@@ -52,7 +52,7 @@ function _registerComponentRedux(screenID, generator, store, Provider) {
 
       constructor(props) {
         super(props);
-        this.allProps = {...props, ...PropRegistry.load(this.navigator.screenInstanceID)};
+        this.allProps = {...props, ...PropRegistry.load(props.screenInstanceID)};
       }
 
       render() {

src/deprecated/platformSpecificDeprecated.android.js

@@ -4,8 +4,6 @@ import _ from 'lodash';
 
 import Navigation from './../Navigation';
 
-import PropRegistry from '../PropRegistry';
-
 const resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource');
 
 import * as newPlatformSpecific from './../platformSpecific';
@@ -20,7 +18,6 @@ function startSingleScreenApp(params) {
   addNavigatorButtons(screen);
   addNavigationStyleParams(screen);
   screen.passProps = params.passProps;
-  PropRegistry.save(screen.screenInstanceID, screen.passProps);
   //const drawer = setupDrawer(params.drawer);
 
   /*

src/platformSpecific.android.js

@@ -1,13 +1,17 @@
 import React, {Component} from 'react';
 import {AppRegistry, NativeModules} from 'react-native';
 
+import PropRegistry from './PropRegistry';
+
 const NativeReactModule = NativeModules.NavigationReactModule;
 
 function startApp(activityParams) {
+  PropRegistry.save(activityParams.screen.navigationParams.screenInstanceID, activityParams.screen.passProps);
   NativeReactModule.startApp(activityParams);
 }
 
 function push(screenParams) {
+  PropRegistry.save(screenParams.navigationParams.screenInstanceID, screenParams.passProps);
   NativeReactModule.push(screenParams);
 }
 
@@ -20,6 +24,7 @@ function popToRoot(screenParams) {
 }
 
 function newStack(screenParams) {
+  PropRegistry.save(screenParams.navigationParams.screenInstanceID, screenParams.passProps);
   NativeReactModule.newStack(screenParams);
 }
 
@@ -40,6 +45,7 @@ function setScreenTitleBarButtons(screenInstanceID, navigatorEventID, rightButto
 }
 
 function showModal(screenParams) {
+  PropRegistry.save(screenParams.navigationParams.screenInstanceID, screenParams.passProps);
   NativeReactModule.showModal(screenParams);
 }