From 7aa55b8d8b692b4df7db2dac37cb3c1015337585 Mon Sep 17 00:00:00 2001
From: Yedidya Kennard <yedidyak@wix.com>
Date: Wed, 25 May 2016 13:42:06 +0300
Subject: [PATCH 1/5] passing props works except for arrays

---
 .../core/objects/Screen.java                  | 13 ++++++++--
 .../reactnativenavigation/views/RctView.java  | 24 +++++++++++++++++++
 example-redux/src/app.js                      | 21 +++++++++++++---
 example-redux/src/screens/FirstTabScreen.js   | 20 +++++++++++++---
 example-redux/src/screens/LoginScreen.js      | 11 ++++++++-
 example-redux/src/screens/PushedScreen.js     |  8 ++++++-
 example-redux/src/screens/SecondTabScreen.js  |  9 ++++++-
 7 files changed, 95 insertions(+), 11 deletions(-)

diff --git a/android/app/src/main/java/com/reactnativenavigation/core/objects/Screen.java b/android/app/src/main/java/com/reactnativenavigation/core/objects/Screen.java
index dbfbec2aa0c..a94baacedb4 100644
--- a/android/app/src/main/java/com/reactnativenavigation/core/objects/Screen.java
+++ b/android/app/src/main/java/com/reactnativenavigation/core/objects/Screen.java
@@ -1,15 +1,18 @@
 package com.reactnativenavigation.core.objects;
 
+import android.os.Bundle;
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableNativeMap;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -35,6 +38,7 @@ public class Screen extends JsonObject implements Serializable {
     private static final String KEY_TAB_NORMAL_TEXT_COLOR = "tabNormalTextColor";
     private static final String KEY_TAB_SELECTED_TEXT_COLOR = "tabSelectedTextColor";
     private static final String KEY_TAB_INDICATOR_COLOR = "tabIndicatorColor";
+    public static final String KEY_PROPS = "passProps";
 
     public final String title;
     public final String label;
@@ -44,6 +48,7 @@ public class Screen extends JsonObject implements Serializable {
     public final String navigatorEventId;
     public final int icon;
     public final ArrayList<Button> buttons;
+    public final HashMap passedProps;
 
     // Navigation styling
     @Nullable @ColorInt public Integer toolBarColor;
@@ -68,15 +73,18 @@ public Screen(ReadableMap screen) {
         navigatorId = getString(screen, KEY_NAVIGATOR_ID);
         navigatorEventId = getString(screen, KEY_NAVIGATOR_EVENT_ID);
         icon = getInt(screen, KEY_ICON);
+        if(screen.hasKey(KEY_PROPS))
+            passedProps = ((ReadableNativeMap)screen.getMap(KEY_PROPS)).toHashMap();
+        else
+            passedProps = null;
 
         buttons = getButtons(screen);
         setToolbarStyle(screen);
     }
 
     private ArrayList<Button> getButtons(ReadableMap screen) {
-        ArrayList<Button> ret = null;
+        ArrayList<Button> ret = new ArrayList();
         if (screen.hasKey(KEY_RIGHT_BUTTONS)) {
-            ret = new ArrayList<>();
             ReadableArray rightButtons = screen.getArray(KEY_RIGHT_BUTTONS);
             for (int i = 0; i < rightButtons.size(); i++) {
                 ret.add(new Button(rightButtons.getMap(i)));
@@ -85,6 +93,7 @@ private ArrayList<Button> getButtons(ReadableMap screen) {
         return ret;
     }
 
+
     public void setToolbarStyle(ReadableMap screen) {
         ReadableMap style = getMap(screen, KEY_TOOL_BAR_STYLE);
         if (style != null) {
diff --git a/android/app/src/main/java/com/reactnativenavigation/views/RctView.java b/android/app/src/main/java/com/reactnativenavigation/views/RctView.java
index 78227b45a24..d4b3b033a2e 100644
--- a/android/app/src/main/java/com/reactnativenavigation/views/RctView.java
+++ b/android/app/src/main/java/com/reactnativenavigation/views/RctView.java
@@ -9,6 +9,8 @@
 import com.reactnativenavigation.activities.BaseReactActivity;
 import com.reactnativenavigation.core.objects.Screen;
 
+import java.util.HashMap;
+
 /**
  * Created by guyc on 10/03/16.
  */
@@ -47,6 +49,9 @@ public RctView(BaseReactActivity ctx, ReactInstanceManager rctInstanceManager, S
         passProps.putString(Screen.KEY_SCREEN_INSTANCE_ID, screen.screenInstanceId);
         passProps.putString(Screen.KEY_NAVIGATOR_ID, screen.navigatorId);
         passProps.putString(Screen.KEY_NAVIGATOR_EVENT_ID, screen.navigatorEventId);
+        if (screen.passedProps != null) {
+            spreadHashMap(screen.passedProps, passProps);
+        }
 
         mReactRootView.startReactApplication(rctInstanceManager, componentName, passProps);
 
@@ -62,5 +67,24 @@ public void onGlobalLayout() {
 
         addView(mReactRootView);
     }
+
+    private Bundle spreadHashMap(HashMap<String, Object> map, Bundle bundle) {
+        for (String key : map.keySet()) {
+            Object value = map.get(key);
+            if (value instanceof String) {
+                bundle.putString(key, (String) value);
+            } else if (value instanceof Integer) {
+                bundle.putInt(key, (Integer) value);
+            } else if (value instanceof Double) {
+                bundle.putDouble(key, ((Double) value).doubleValue());
+            } else if (value instanceof Boolean) {
+                bundle.putBoolean(key, (Boolean) value);
+            } else if (value instanceof HashMap) {
+                bundle.putBundle(key, spreadHashMap((HashMap<String, Object>) value, new Bundle()));
+                //TODO nulls and Arrays needed
+            }
+        }
+        return bundle;
+    }
 }
 
diff --git a/example-redux/src/app.js b/example-redux/src/app.js
index 8627246276c..de45bc941dd 100644
--- a/example-redux/src/app.js
+++ b/example-redux/src/app.js
@@ -39,7 +39,16 @@ export default class App {
           screen: {
             screen: 'example.LoginScreen',
             title: 'Login',
-            navigatorStyle: {}
+            navigatorStyle: {},
+            passProps: {
+              passed: 'This is a prop passed in \'startSingleScreenApp\'!',
+              deep: {
+                deepProp: 123,
+                deeper: {
+                  deeperProp: 'Deep!'
+                }
+              }
+            }
           }
         });
         return;
@@ -52,7 +61,10 @@ export default class App {
               icon: require('../img/one.png'),
               selectedIcon: require('../img/one_selected.png'),
               title: 'Screen One',
-              navigatorStyle: {}
+              navigatorStyle: {},
+              passProps: {
+                passed: 'This is a prop passed in \'startTabBasedApp\'!'
+  }
             },
             {
               label: 'Two',
@@ -60,7 +72,10 @@ export default class App {
               icon: require('../img/two.png'),
               selectedIcon: require('../img/two_selected.png'),
               title: 'Screen Two',
-              navigatorStyle: {}
+              navigatorStyle: {},
+              passProps: {
+                passed: 'This is a prop passed in \'startTabBasedApp\'!'
+              }
             }
           ],
           animationType: 'slide-down',
diff --git a/example-redux/src/screens/FirstTabScreen.js b/example-redux/src/screens/FirstTabScreen.js
index b0c12b5dff8..7e0ba38169b 100644
--- a/example-redux/src/screens/FirstTabScreen.js
+++ b/example-redux/src/screens/FirstTabScreen.js
@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, {Component, PropTypes} from 'react';
 import {
   Text,
   View,
@@ -36,11 +36,17 @@ class FirstTabScreen extends Component {
       }
     ]
   };
+
+  static propTypes = {
+    passed: PropTypes.string.isRequired
+  };
+
   constructor(props) {
     super(props);
     // if you want to listen on navigator events, set this up
     this.props.navigator.setOnNavigatorEvent(this.onNavigatorEvent.bind(this));
   }
+
   onNavigatorEvent(event) {
     switch (event.id) {
       case 'edit':
@@ -75,6 +81,8 @@ class FirstTabScreen extends Component {
         <TouchableOpacity onPress={ this.onShowModalPress.bind(this) }>
           <Text style={styles.button}>Modal Screen</Text>
         </TouchableOpacity>
+
+        <Text style={{fontWeight: '500'}}>{this.props.passed}</Text>
       </View>
     );
   }
@@ -86,14 +94,20 @@ class FirstTabScreen extends Component {
   onPushPress() {
     this.props.navigator.push({
       title: "More",
-      screen: "example.PushedScreen"
+      screen: "example.PushedScreen",
+      passProps: {
+        passed: 'This is a prop passed in \'navigator.push()\'!'
+      }
     });
   }
 
   onShowModalPress() {
     this.props.navigator.showModal({
       title: "Modal Screen",
-      screen: "example.PushedScreen"
+      screen: "example.PushedScreen",
+      passProps: {
+        passed: 'This is a prop passed in \'navigator.showModal()\'!'
+      }
     });
   }
 }
diff --git a/example-redux/src/screens/LoginScreen.js b/example-redux/src/screens/LoginScreen.js
index 28ef0731ac5..54e636bab11 100644
--- a/example-redux/src/screens/LoginScreen.js
+++ b/example-redux/src/screens/LoginScreen.js
@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, {Component, PropTypes} from 'react';
 import {
   Text,
   View,
@@ -12,9 +12,15 @@ import * as appActions from '../reducers/app/actions';
 
 // this is a traditional React component connected to the redux store
 class LoginScreen extends Component {
+
+  static propTypes = {
+    passed: PropTypes.string.isRequired
+  };
+
   constructor(props) {
     super(props);
   }
+
   render() {
     return (
       <View style={{flex: 1, padding: 20}}>
@@ -31,6 +37,9 @@ class LoginScreen extends Component {
           <Text style={styles.button}>Login</Text>
         </TouchableOpacity>
 
+
+        <Text style={{fontWeight: '500'}}>{this.props.passed}</Text>
+
       </View>
     );
   }
diff --git a/example-redux/src/screens/PushedScreen.js b/example-redux/src/screens/PushedScreen.js
index 1454de43161..e5da677d5b4 100644
--- a/example-redux/src/screens/PushedScreen.js
+++ b/example-redux/src/screens/PushedScreen.js
@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, {Component, PropTypes} from 'react';
 import {
   Text,
   View,
@@ -23,6 +23,10 @@ class PushedScreen extends Component {
     tabIndicatorColor: '#FF4081'
   };
 
+  static propTypes = {
+    passed: PropTypes.string.isRequired
+  };
+
   constructor(props) {
     super(props);
     this.bgColor = this.getRandomColor();
@@ -72,6 +76,8 @@ class PushedScreen extends Component {
 
         <TextInput style={{height: 40, borderColor: 'gray', borderWidth: 1}}/>
 
+        <Text style={{fontWeight: '500'}}>{this.props.passed}</Text>
+
       </View>
     );
   }
diff --git a/example-redux/src/screens/SecondTabScreen.js b/example-redux/src/screens/SecondTabScreen.js
index e972352faa2..9ab413cf480 100644
--- a/example-redux/src/screens/SecondTabScreen.js
+++ b/example-redux/src/screens/SecondTabScreen.js
@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, {Component, PropTypes} from 'react';
 import {
   Text,
   Image,
@@ -18,6 +18,11 @@ class SecondTabScreen extends Component {
     drawUnderTabBar: true,
     navBarTranslucent: true
   };
+
+  static propTypes = {
+    passed: PropTypes.string.isRequired
+  };
+
   constructor(props) {
     super(props);
     this.buttonsCounter = 0;
@@ -38,6 +43,8 @@ class SecondTabScreen extends Component {
             <Text style={styles.button}>Increment Counter</Text>
           </TouchableOpacity>
 
+          <Text style={{fontWeight: '500'}}>{this.props.passed}</Text>
+
         </View>
 
       </ScrollView>

From 47b77f07b59e4633edf7a25f1a2728bc509fdffc Mon Sep 17 00:00:00 2001
From: Yedidya Kennard <yedidyak@wix.com>
Date: Thu, 26 May 2016 12:37:41 +0300
Subject: [PATCH 2/5] Adds support for passing props in Android

Anything passed in a navigator event in a 'passProps' object will be serialized into the Java side Screen object as a HashMap<String, Object>. When RctView starts the React root the props are deserialized into the Bundle passed as props, along with the navigation info. Due to React and Java limitations, JS arrays of arrays are deserialized as dictionaries by index, and arrays of multiple types are not supported.
---
 .gitignore                                    |   3 +
 .../utils/BridgeUtils.java                    | 116 ++++++++++++++++++
 .../reactnativenavigation/views/RctView.java  |  25 +---
 3 files changed, 122 insertions(+), 22 deletions(-)
 create mode 100644 android/app/src/main/java/com/reactnativenavigation/utils/BridgeUtils.java

diff --git a/.gitignore b/.gitignore
index c0e8aa6bf3d..091021286c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,3 +145,6 @@ xcuserdata
 # UNKNOWN: recommended by others, but I can't discover what these files are
 #
 # ...none. Everything is now explained.:
+android/gradlew
+android/gradlew.bat
+android/local.properties
diff --git a/android/app/src/main/java/com/reactnativenavigation/utils/BridgeUtils.java b/android/app/src/main/java/com/reactnativenavigation/utils/BridgeUtils.java
new file mode 100644
index 00000000000..8eb5f5bb141
--- /dev/null
+++ b/android/app/src/main/java/com/reactnativenavigation/utils/BridgeUtils.java
@@ -0,0 +1,116 @@
+package com.reactnativenavigation.utils;
+
+import android.os.Bundle;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * Created by yedidyak on 26/05/2016.
+ */
+public class BridgeUtils {
+
+    @SuppressWarnings("unchecked")
+    public static Bundle addMapToBundle(HashMap<String, ?> map, Bundle bundle) {
+        for (String key : map.keySet()) {
+            Object value = map.get(key);
+            if (value instanceof String) {
+                bundle.putString(key, (String) value);
+            } else if (value instanceof Integer) {
+                bundle.putInt(key, (Integer) value);
+            } else if (value instanceof Double) {
+                bundle.putDouble(key, ((Double) value));
+            } else if (value instanceof Boolean) {
+                bundle.putBoolean(key, (Boolean) value);
+            } else if (value instanceof HashMap) {
+                bundle.putBundle(key, addMapToBundle((HashMap<String, Object>) value, new Bundle()));
+            } else if (value instanceof ArrayList) {
+                putArray(key, (ArrayList) value, bundle);
+            }
+        }
+        return bundle;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void putArray(String key, ArrayList arrayList, Bundle bundle) {
+        if (arrayList.size() == 0) {
+            bundle.putBooleanArray(key, new boolean[]{});
+        } else {
+            verifyArrayListIsSingleType(arrayList);
+            if (arrayList.get(0) instanceof String) {
+                bundle.putStringArray(key, toStringArray((ArrayList<String>) arrayList));
+            } else if (arrayList.get(0) instanceof Integer) {
+                bundle.putIntArray(key, toIntArray((ArrayList<Integer>) arrayList));
+            } else if (arrayList.get(0) instanceof Float) {
+                bundle.putFloatArray(key, toFloatArray((ArrayList<Float>) arrayList));
+            } else if (arrayList.get(0) instanceof Double) {
+                bundle.putDoubleArray(key, toDoubleArray((ArrayList<Double>) arrayList));
+            } else if (arrayList.get(0) instanceof Boolean) {
+                bundle.putBooleanArray(key, toBooleanArray((ArrayList<Boolean>) arrayList));
+            } else if (arrayList.get(0) instanceof HashMap) {
+                bundle.putParcelableArray(key, toBundleArray((ArrayList<HashMap>) arrayList));
+            } else if (arrayList.get(0) instanceof ArrayList) {
+                Log.w("RNNNavigation", "Arrays of arrays passed in props are converted to dictionaries with indexes as keys");
+                Bundle innerArray = new Bundle();
+                for (int i = 0; i < arrayList.size(); i++) {
+                    putArray(String.valueOf(i), (ArrayList) arrayList.get(i), innerArray);
+                }
+                bundle.putParcelable(key, innerArray);
+            }
+        }
+    }
+
+    private static void verifyArrayListIsSingleType(ArrayList arrayList) {
+        int i = 1;
+        while (i < arrayList.size()) {
+            if (!arrayList.get(i - 1).getClass().isInstance(arrayList.get(i)))
+                throw new IllegalArgumentException("Cannot pass array of multiple types via props");
+            i++;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Bundle[] toBundleArray(ArrayList<HashMap> arrayList) {
+        Bundle[] ret = new Bundle[arrayList.size()];
+        for (int i=0; i < ret.length; i++)
+            ret[i] = addMapToBundle(arrayList.get(i), new Bundle());
+        return ret;
+    }
+
+    private static int[] toIntArray(ArrayList<Integer> arrayList) {
+        int[] ret = new int[arrayList.size()];
+        for (int i=0; i < ret.length; i++)
+            ret[i] = arrayList.get(i);
+        return ret;
+    }
+
+    private static float[] toFloatArray(ArrayList<Float> arrayList) {
+        float[] ret = new float[arrayList.size()];
+        for (int i=0; i < ret.length; i++)
+            ret[i] = arrayList.get(i);
+        return ret;
+    }
+
+    private static double[] toDoubleArray(ArrayList<Double> arrayList) {
+        double[] ret = new double[arrayList.size()];
+        for (int i=0; i < ret.length; i++)
+            ret[i] = arrayList.get(i);
+        return ret;
+    }
+
+    private static boolean[] toBooleanArray(ArrayList<Boolean> arrayList) {
+        boolean[] ret = new boolean[arrayList.size()];
+        for (int i=0; i < ret.length; i++)
+            ret[i] = arrayList.get(i);
+        return ret;
+    }
+
+    private static String[] toStringArray(ArrayList<String> arrayList) {
+        String[] ret = new String[arrayList.size()];
+        for (int i=0; i < ret.length; i++)
+            ret[i] = arrayList.get(i);
+        return ret;
+    }
+
+}
diff --git a/android/app/src/main/java/com/reactnativenavigation/views/RctView.java b/android/app/src/main/java/com/reactnativenavigation/views/RctView.java
index d4b3b033a2e..a23fd66c249 100644
--- a/android/app/src/main/java/com/reactnativenavigation/views/RctView.java
+++ b/android/app/src/main/java/com/reactnativenavigation/views/RctView.java
@@ -8,8 +8,7 @@
 import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.activities.BaseReactActivity;
 import com.reactnativenavigation.core.objects.Screen;
-
-import java.util.HashMap;
+import com.reactnativenavigation.utils.BridgeUtils;
 
 /**
  * Created by guyc on 10/03/16.
@@ -36,6 +35,7 @@ public RctView(BaseReactActivity ctx, ReactInstanceManager rctInstanceManager, S
         this(ctx, rctInstanceManager, screen, null);
     }
 
+    @SuppressWarnings("unchecked")
     public RctView(BaseReactActivity ctx, ReactInstanceManager rctInstanceManager, Screen screen,
                    final OnDisplayedListener onDisplayedListener) {
         super(ctx);
@@ -50,7 +50,7 @@ public RctView(BaseReactActivity ctx, ReactInstanceManager rctInstanceManager, S
         passProps.putString(Screen.KEY_NAVIGATOR_ID, screen.navigatorId);
         passProps.putString(Screen.KEY_NAVIGATOR_EVENT_ID, screen.navigatorEventId);
         if (screen.passedProps != null) {
-            spreadHashMap(screen.passedProps, passProps);
+            BridgeUtils.addMapToBundle(screen.passedProps, passProps);
         }
 
         mReactRootView.startReactApplication(rctInstanceManager, componentName, passProps);
@@ -67,24 +67,5 @@ public void onGlobalLayout() {
 
         addView(mReactRootView);
     }
-
-    private Bundle spreadHashMap(HashMap<String, Object> map, Bundle bundle) {
-        for (String key : map.keySet()) {
-            Object value = map.get(key);
-            if (value instanceof String) {
-                bundle.putString(key, (String) value);
-            } else if (value instanceof Integer) {
-                bundle.putInt(key, (Integer) value);
-            } else if (value instanceof Double) {
-                bundle.putDouble(key, ((Double) value).doubleValue());
-            } else if (value instanceof Boolean) {
-                bundle.putBoolean(key, (Boolean) value);
-            } else if (value instanceof HashMap) {
-                bundle.putBundle(key, spreadHashMap((HashMap<String, Object>) value, new Bundle()));
-                //TODO nulls and Arrays needed
-            }
-        }
-        return bundle;
-    }
 }
 

From 11b1a1a87fb058e6cfb44c33caad45e2447f5474 Mon Sep 17 00:00:00 2001
From: Yedidya Kennard <yedidyak@wix.com>
Date: Thu, 26 May 2016 12:38:21 +0300
Subject: [PATCH 3/5] Adds changes to example-redux showcasing passing props
 functionality

---
 example-redux/src/app.js                     | 50 ++++++++++++++++----
 example-redux/src/screens/FirstTabScreen.js  | 31 ++++++++++--
 example-redux/src/screens/LoginScreen.js     | 12 +++--
 example-redux/src/screens/PushedScreen.js    | 37 +++++++++++++--
 example-redux/src/screens/SecondTabScreen.js |  9 +++-
 5 files changed, 116 insertions(+), 23 deletions(-)

diff --git a/example-redux/src/app.js b/example-redux/src/app.js
index de45bc941dd..a044930354e 100644
--- a/example-redux/src/app.js
+++ b/example-redux/src/app.js
@@ -41,13 +41,25 @@ export default class App {
             title: 'Login',
             navigatorStyle: {},
             passProps: {
-              passed: 'This is a prop passed in \'startSingleScreenApp\'!',
-              deep: {
-                deepProp: 123,
-                deeper: {
-                  deeperProp: 'Deep!'
-                }
-              }
+              str: 'This is a prop passed in \'startSingleScreenApp()\'!',
+              obj: {
+                str: 'This is a prop passed in an object!',
+                arr: [
+                  {
+                    str: 'This is a prop in an object in an array in an object!'
+                  }
+                ],
+                arr2: [
+                    [
+                        'array of strings',
+                        'with two strings'
+                    ],
+                    [
+                        1, 2, 3
+                    ]
+                ]
+              },
+              num: 1234
             }
           }
         });
@@ -63,8 +75,17 @@ export default class App {
               title: 'Screen One',
               navigatorStyle: {},
               passProps: {
-                passed: 'This is a prop passed in \'startTabBasedApp\'!'
-  }
+                str: 'This is a prop passed in \'startTabBasedApp\'!',
+                obj: {
+                  str: 'This is a prop passed in an object!',
+                  arr: [
+                    {
+                      str: 'This is a prop in an object in an array in an object!'
+                    }
+                  ]
+                },
+                num: 1234
+              }
             },
             {
               label: 'Two',
@@ -74,7 +95,16 @@ export default class App {
               title: 'Screen Two',
               navigatorStyle: {},
               passProps: {
-                passed: 'This is a prop passed in \'startTabBasedApp\'!'
+                str: 'This is a prop passed in \'startTabBasedApp\'!',
+                obj: {
+                  str: 'This is a prop passed in an object!',
+                  arr: [
+                    {
+                      str: 'This is a prop in an object in an array in an object!'
+                    }
+                  ]
+                },
+                num: 1234
               }
             }
           ],
diff --git a/example-redux/src/screens/FirstTabScreen.js b/example-redux/src/screens/FirstTabScreen.js
index 7e0ba38169b..2fb9f543e10 100644
--- a/example-redux/src/screens/FirstTabScreen.js
+++ b/example-redux/src/screens/FirstTabScreen.js
@@ -38,7 +38,9 @@ class FirstTabScreen extends Component {
   };
 
   static propTypes = {
-    passed: PropTypes.string.isRequired
+    str: PropTypes.string.isRequired,
+    obj: PropTypes.object.isRequired,
+    num: PropTypes.number.isRequired
   };
 
   constructor(props) {
@@ -82,7 +84,10 @@ class FirstTabScreen extends Component {
           <Text style={styles.button}>Modal Screen</Text>
         </TouchableOpacity>
 
-        <Text style={{fontWeight: '500'}}>{this.props.passed}</Text>
+        <Text style={{fontWeight: '500'}}>String prop: {this.props.str}</Text>
+        <Text style={{fontWeight: '500'}}>Number prop: {this.props.num}</Text>
+        <Text style={{fontWeight: '500'}}>Object prop: {this.props.obj.str}</Text>
+        <Text style={{fontWeight: '500'}}>Array prop: {this.props.obj.arr[0].str}</Text>
       </View>
     );
   }
@@ -96,7 +101,16 @@ class FirstTabScreen extends Component {
       title: "More",
       screen: "example.PushedScreen",
       passProps: {
-        passed: 'This is a prop passed in \'navigator.push()\'!'
+        passed: 'This is a prop passed in \'navigator.push()\'!',
+        obj: {
+          str: 'This is a prop passed in an object!',
+          arr: [
+            {
+              str: 'This is a prop in an object in an array in an object!'
+            }
+          ]
+        },
+        num: 1234
       }
     });
   }
@@ -106,7 +120,16 @@ class FirstTabScreen extends Component {
       title: "Modal Screen",
       screen: "example.PushedScreen",
       passProps: {
-        passed: 'This is a prop passed in \'navigator.showModal()\'!'
+        passed: 'This is a prop passed in \'navigator.showModal()\'!',
+        obj: {
+          str: 'This is a prop passed in an object!',
+          arr: [
+            {
+              str: 'This is a prop in an object in an array in an object!'
+            }
+          ]
+        },
+        num: 1234
       }
     });
   }
diff --git a/example-redux/src/screens/LoginScreen.js b/example-redux/src/screens/LoginScreen.js
index 54e636bab11..01448a87a5c 100644
--- a/example-redux/src/screens/LoginScreen.js
+++ b/example-redux/src/screens/LoginScreen.js
@@ -14,11 +14,14 @@ import * as appActions from '../reducers/app/actions';
 class LoginScreen extends Component {
 
   static propTypes = {
-    passed: PropTypes.string.isRequired
+    str: PropTypes.string.isRequired,
+    obj: PropTypes.object.isRequired,
+    num: PropTypes.number.isRequired
   };
 
   constructor(props) {
     super(props);
+    console.log(props);
   }
 
   render() {
@@ -37,8 +40,11 @@ class LoginScreen extends Component {
           <Text style={styles.button}>Login</Text>
         </TouchableOpacity>
 
-
-        <Text style={{fontWeight: '500'}}>{this.props.passed}</Text>
+        <Text style={{fontWeight: '500'}}>String prop: {this.props.str}</Text>
+        <Text style={{fontWeight: '500'}}>Number prop: {this.props.num}</Text>
+        <Text style={{fontWeight: '500'}}>Object prop: {this.props.obj.str}</Text>
+        <Text style={{fontWeight: '500'}}>Array prop: {this.props.obj.arr[0].str}</Text>
+        <Text style={{fontWeight: '500'}}>Array of arrays prop: {JSON.stringify(this.props.obj.arr2)}</Text>
 
       </View>
     );
diff --git a/example-redux/src/screens/PushedScreen.js b/example-redux/src/screens/PushedScreen.js
index e5da677d5b4..9f7f30a619e 100644
--- a/example-redux/src/screens/PushedScreen.js
+++ b/example-redux/src/screens/PushedScreen.js
@@ -24,7 +24,9 @@ class PushedScreen extends Component {
   };
 
   static propTypes = {
-    passed: PropTypes.string.isRequired
+    str: PropTypes.string.isRequired,
+    obj: PropTypes.object.isRequired,
+    num: PropTypes.number.isRequired
   };
 
   constructor(props) {
@@ -76,7 +78,10 @@ class PushedScreen extends Component {
 
         <TextInput style={{height: 40, borderColor: 'gray', borderWidth: 1}}/>
 
-        <Text style={{fontWeight: '500'}}>{this.props.passed}</Text>
+        <Text style={{fontWeight: '500'}}>String prop: {this.props.str}</Text>
+        <Text style={{fontWeight: '500'}}>Number prop: {this.props.num}</Text>
+        <Text style={{fontWeight: '500'}}>Object prop: {this.props.obj.str}</Text>
+        <Text style={{fontWeight: '500'}}>Array prop: {this.props.obj.arr[0].str}</Text>
 
       </View>
     );
@@ -89,7 +94,19 @@ class PushedScreen extends Component {
   onPushPress() {
     this.props.navigator.push({
       title: "More",
-      screen: "example.PushedScreen"
+      screen: "example.PushedScreen",
+      passProps: {
+        passed: 'This is a prop passed in \'navigator.push()\'!',
+        obj: {
+          str: 'This is a prop passed in an object!',
+          arr: [
+            {
+              str: 'This is a prop in an object in an array in an object!'
+            }
+          ]
+        },
+        num: 1234
+      }
     });
   }
 
@@ -100,7 +117,19 @@ class PushedScreen extends Component {
   onShowModalPress() {
     this.props.navigator.showModal({
       title: "Modal Screen",
-      screen: "example.PushedScreen"
+      screen: "example.PushedScreen",
+      passProps: {
+        passed: 'This is a prop passed in \'navigator.showModal()\'!',
+        obj: {
+          str: 'This is a prop passed in an object!',
+          arr: [
+            {
+              str: 'This is a prop in an object in an array in an object!'
+            }
+          ]
+        },
+        num: 1234
+      }
     });
   }
 
diff --git a/example-redux/src/screens/SecondTabScreen.js b/example-redux/src/screens/SecondTabScreen.js
index 9ab413cf480..34fcc1be4fe 100644
--- a/example-redux/src/screens/SecondTabScreen.js
+++ b/example-redux/src/screens/SecondTabScreen.js
@@ -20,7 +20,9 @@ class SecondTabScreen extends Component {
   };
 
   static propTypes = {
-    passed: PropTypes.string.isRequired
+    str: PropTypes.string.isRequired,
+    obj: PropTypes.object.isRequired,
+    num: PropTypes.number.isRequired
   };
 
   constructor(props) {
@@ -43,7 +45,10 @@ class SecondTabScreen extends Component {
             <Text style={styles.button}>Increment Counter</Text>
           </TouchableOpacity>
 
-          <Text style={{fontWeight: '500'}}>{this.props.passed}</Text>
+          <Text style={{fontWeight: '500'}}>String prop: {this.props.str}</Text>
+          <Text style={{fontWeight: '500'}}>Number prop: {this.props.num}</Text>
+          <Text style={{fontWeight: '500'}}>Object prop: {this.props.obj.str}</Text>
+          <Text style={{fontWeight: '500'}}>Array prop: {this.props.obj.arr[0].str}</Text>
 
         </View>
 

From c800aa92cd2496592dc8ba89546a7f98cbf45ec7 Mon Sep 17 00:00:00 2001
From: Yedidya Kennard <yedidyak@wix.com>
Date: Sun, 29 May 2016 09:35:07 +0300
Subject: [PATCH 4/5] Corrected styling

---
 .../core/objects/Screen.java                  | 16 +++++--------
 .../utils/BridgeUtils.java                    | 24 +++++++++++--------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/android/app/src/main/java/com/reactnativenavigation/core/objects/Screen.java b/android/app/src/main/java/com/reactnativenavigation/core/objects/Screen.java
index a94baacedb4..c227f755472 100644
--- a/android/app/src/main/java/com/reactnativenavigation/core/objects/Screen.java
+++ b/android/app/src/main/java/com/reactnativenavigation/core/objects/Screen.java
@@ -1,6 +1,5 @@
 package com.reactnativenavigation.core.objects;
 
-import android.os.Bundle;
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -48,7 +47,7 @@ public class Screen extends JsonObject implements Serializable {
     public final String navigatorEventId;
     public final int icon;
     public final ArrayList<Button> buttons;
-    public final HashMap passedProps;
+    public HashMap<String, Object> passedProps = new HashMap<>();
 
     // Navigation styling
     @Nullable @ColorInt public Integer toolBarColor;
@@ -62,7 +61,7 @@ public class Screen extends JsonObject implements Serializable {
 
     @NonNull
     public List<Button> getButtons() {
-        return buttons == null ? Collections.EMPTY_LIST : buttons;
+        return buttons == null ? Collections.<Button>emptyList() : buttons;
     }
 
     public Screen(ReadableMap screen) {
@@ -73,17 +72,15 @@ public Screen(ReadableMap screen) {
         navigatorId = getString(screen, KEY_NAVIGATOR_ID);
         navigatorEventId = getString(screen, KEY_NAVIGATOR_EVENT_ID);
         icon = getInt(screen, KEY_ICON);
-        if(screen.hasKey(KEY_PROPS))
-            passedProps = ((ReadableNativeMap)screen.getMap(KEY_PROPS)).toHashMap();
-        else
-            passedProps = null;
-
+        if(screen.hasKey(KEY_PROPS)) {
+            passedProps = ((ReadableNativeMap) screen.getMap(KEY_PROPS)).toHashMap();
+        }
         buttons = getButtons(screen);
         setToolbarStyle(screen);
     }
 
     private ArrayList<Button> getButtons(ReadableMap screen) {
-        ArrayList<Button> ret = new ArrayList();
+        ArrayList<Button> ret = new ArrayList<>();
         if (screen.hasKey(KEY_RIGHT_BUTTONS)) {
             ReadableArray rightButtons = screen.getArray(KEY_RIGHT_BUTTONS);
             for (int i = 0; i < rightButtons.size(); i++) {
@@ -93,7 +90,6 @@ private ArrayList<Button> getButtons(ReadableMap screen) {
         return ret;
     }
 
-
     public void setToolbarStyle(ReadableMap screen) {
         ReadableMap style = getMap(screen, KEY_TOOL_BAR_STYLE);
         if (style != null) {
diff --git a/android/app/src/main/java/com/reactnativenavigation/utils/BridgeUtils.java b/android/app/src/main/java/com/reactnativenavigation/utils/BridgeUtils.java
index 8eb5f5bb141..3845df85a69 100644
--- a/android/app/src/main/java/com/reactnativenavigation/utils/BridgeUtils.java
+++ b/android/app/src/main/java/com/reactnativenavigation/utils/BridgeUtils.java
@@ -51,7 +51,7 @@ private static void putArray(String key, ArrayList arrayList, Bundle bundle) {
             } else if (arrayList.get(0) instanceof HashMap) {
                 bundle.putParcelableArray(key, toBundleArray((ArrayList<HashMap>) arrayList));
             } else if (arrayList.get(0) instanceof ArrayList) {
-                Log.w("RNNNavigation", "Arrays of arrays passed in props are converted to dictionaries with indexes as keys");
+                Log.w("RNNavigation", "Arrays of arrays passed in props are converted to dictionaries with indexes as keys");
                 Bundle innerArray = new Bundle();
                 for (int i = 0; i < arrayList.size(); i++) {
                     putArray(String.valueOf(i), (ArrayList) arrayList.get(i), innerArray);
@@ -62,11 +62,10 @@ private static void putArray(String key, ArrayList arrayList, Bundle bundle) {
     }
 
     private static void verifyArrayListIsSingleType(ArrayList arrayList) {
-        int i = 1;
-        while (i < arrayList.size()) {
-            if (!arrayList.get(i - 1).getClass().isInstance(arrayList.get(i)))
+        for (int i = 1; i < arrayList.size(); i++) {
+            if (!arrayList.get(i - 1).getClass().isInstance(arrayList.get(i))) {
                 throw new IllegalArgumentException("Cannot pass array of multiple types via props");
-            i++;
+            }
         }
     }
 
@@ -80,36 +79,41 @@ private static Bundle[] toBundleArray(ArrayList<HashMap> arrayList) {
 
     private static int[] toIntArray(ArrayList<Integer> arrayList) {
         int[] ret = new int[arrayList.size()];
-        for (int i=0; i < ret.length; i++)
+        for (int i=0; i < ret.length; i++) {
             ret[i] = arrayList.get(i);
+        }
         return ret;
     }
 
     private static float[] toFloatArray(ArrayList<Float> arrayList) {
         float[] ret = new float[arrayList.size()];
-        for (int i=0; i < ret.length; i++)
+        for (int i=0; i < ret.length; i++) {
             ret[i] = arrayList.get(i);
+        }
         return ret;
     }
 
     private static double[] toDoubleArray(ArrayList<Double> arrayList) {
         double[] ret = new double[arrayList.size()];
-        for (int i=0; i < ret.length; i++)
+        for (int i=0; i < ret.length; i++) {
             ret[i] = arrayList.get(i);
+        }
         return ret;
     }
 
     private static boolean[] toBooleanArray(ArrayList<Boolean> arrayList) {
         boolean[] ret = new boolean[arrayList.size()];
-        for (int i=0; i < ret.length; i++)
+        for (int i=0; i < ret.length; i++) {
             ret[i] = arrayList.get(i);
+        }
         return ret;
     }
 
     private static String[] toStringArray(ArrayList<String> arrayList) {
         String[] ret = new String[arrayList.size()];
-        for (int i=0; i < ret.length; i++)
+        for (int i=0; i < ret.length; i++) {
             ret[i] = arrayList.get(i);
+        }
         return ret;
     }
 

From 3693807ac5664ced37c5156bc3b2343361646601 Mon Sep 17 00:00:00 2001
From: Yedidya Kennard <yedidyak@wix.com>
Date: Sun, 29 May 2016 09:36:11 +0300
Subject: [PATCH 5/5] Corrected styling

---
 .../main/java/com/reactnativenavigation/utils/BridgeUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/java/com/reactnativenavigation/utils/BridgeUtils.java b/android/app/src/main/java/com/reactnativenavigation/utils/BridgeUtils.java
index 3845df85a69..2a2047f2a22 100644
--- a/android/app/src/main/java/com/reactnativenavigation/utils/BridgeUtils.java
+++ b/android/app/src/main/java/com/reactnativenavigation/utils/BridgeUtils.java
@@ -72,8 +72,9 @@ private static void verifyArrayListIsSingleType(ArrayList arrayList) {
     @SuppressWarnings("unchecked")
     private static Bundle[] toBundleArray(ArrayList<HashMap> arrayList) {
         Bundle[] ret = new Bundle[arrayList.size()];
-        for (int i=0; i < ret.length; i++)
+        for (int i=0; i < ret.length; i++) {
             ret[i] = addMapToBundle(arrayList.get(i), new Bundle());
+        }
         return ret;
     }