Makes react native route stable for android.

.gitignore

@@ -28,3 +28,5 @@ node_modules
 
 # OSX
 .DS_Store
+
+.idea/

README.md

@@ -2,14 +2,16 @@ React Native Router
 ===================
 Awesome navigation for your React Native app.
 
+** This is a React Native Router fix version. It can be used in Android project. **
+
 ![Twitter navigation](http://tristanedwards.me/u/react-native-router/native-router.gif)
 
 Install
 -------
 
 Make sure that you are in your React Native project directory and run:
 
-```npm install react-native-router --save```
+```npm install react-native-router-fix --save```
 
 Usage
 -----

components/NavBarContainer.js

@@ -42,16 +42,18 @@ var NavBarContainer = React.createClass({
   // We render both the current and the previous navbar (for animation)
   render: function() {
     return (
-      <View style={[styles.navbarContainer, this.props.style]}>
+      <View style={styles.navbarContainer}>
         <NavBarContent 
-          route={this.state.previousRoute} 
+          route={this.state.previousRoute}
+          style={this.props.style}
           backButtonComponent={this.props.backButtonComponent}
           rightCorner={this.props.rightCorner}
           titleStyle={this.props.titleStyle}
           willDisappear="true" 
         />
         <NavBarContent 
-          route={this.props.currentRoute} 
+          route={this.props.currentRoute}
+          style={this.props.style}
           backButtonComponent={this.props.backButtonComponent}
           rightCorner={this.props.rightCorner}
           titleStyle={this.props.titleStyle}
@@ -71,7 +73,7 @@ var styles = StyleSheet.create({
     top: 0,
     left: 0,
     right: 0,
-    height: 64,
+    height: React.Platform.OS == 'ios' ? 64 : 48,
     backgroundColor: '#5589B7'
   }
 });

components/NavBarContent.js

@@ -121,7 +121,7 @@ var NavBarContent = React.createClass({
 
 
     return (
-      <View style={[styles.navbar, this.props.route.headerStyle, transitionStyle]}>
+      <View style={[styles.navbar, this.props.style, this.props.route.headerStyle, transitionStyle]}>
         {leftCorner}
         {titleComponent}
         {rightCorner}
@@ -137,17 +137,17 @@ var styles = StyleSheet.create({
     top: 0,
     left: 0,
     right: 0,
-    height: 64, // Default iOS navbar height
+    height: React.Platform.OS == 'ios' ? 64 : 48, // Default iOS navbar height
     justifyContent: 'center',
     alignItems: 'center',
     flexDirection: 'row',
-    paddingTop: 13
+    paddingTop: React.Platform.OS == 'ios' ? 13 : 0
   },
   navbarText: {
     color: 'white',
     fontSize: 17,
     margin: 10,
-    marginTop: 14,
+    marginTop: React.Platform.OS == 'ios' ? 14 : 10,
     fontWeight: '600',
     textAlign: 'center',
     alignItems: 'center',

index.js

@@ -68,6 +68,10 @@ var Router = React.createClass({
       this.customAction(opts);
     }.bind(this);
 
+    var isRootView = function() {
+      return this.state.route.index == 1;
+    }.bind(this);
+
     var didStartDrag = function(evt) {
       var x = evt.nativeEvent.pageX;
       if (x < 28) {
@@ -114,6 +118,7 @@ var Router = React.createClass({
           toRoute={goForward}
           toBack={goBackwards}
           reset={goToFirstRoute}
+          isRootView={isRootView}
           customAction={customAction}
         />
       </View>
@@ -123,11 +128,13 @@ var Router = React.createClass({
 
   render: function() {
 
-    // Status bar color
-    if (this.props.statusBarColor === "black") {
-      StatusBarIOS.setStyle(0);
-    } else {
-      StatusBarIOS.setStyle(1);
+    // Status bar color, if on iOS
+    if (React.Platform.OS == 'ios') {
+      if (this.props.statusBarColor === "black") {
+        StatusBarIOS.setStyle(0);
+      } else {
+        StatusBarIOS.setStyle(1);
+      }
     }
 
     var navigationBar;
@@ -147,14 +154,26 @@ var Router = React.createClass({
       />
     }
 
-    return (
-      <Navigator
-        initialRoute={this.props.firstRoute}
-        navigationBar={navigationBar}
-        renderScene={this.renderScene}
-        onDidFocus={this.onDidFocus}
-      />
-    )
+    if (React.Platform.OS == 'ios') {
+      return (
+          <Navigator
+              initialRoute={this.props.firstRoute}
+              navigationBar={navigationBar}
+              renderScene={this.renderScene}
+              onDidFocus={this.onDidFocus}
+              />
+      );
+    } else {
+      return (
+          <Navigator
+              initialRoute={this.props.firstRoute}
+              configureScene={(route) => Navigator.SceneConfigs.FadeAndroid}
+              navigationBar={navigationBar}
+              renderScene={this.renderScene}
+              onDidFocus={this.onDidFocus}
+              />
+      );
+    }
   }
 });
 
@@ -163,7 +182,7 @@ var styles = StyleSheet.create({
   container: {
     flex: 1,
     backgroundColor: '#F5FCFF',
-    marginTop: 64
+    marginTop: React.Platform.OS == 'ios' ? 64 : 48
   },
 });
 

package.json

@@ -1,14 +1,14 @@
 {
-  "name": "react-native-router",
-  "version": "0.2.1",
+  "name": "react-native-router-fix",
+  "version": "0.2.1-fix-10",
   "description": "Awesome navigation for your native app.",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/t4t5/react-native-router.git"
+    "url": "https://github.com/starlight36/react-native-router.git"
   },
   "keywords": [
     "react",