Merge branch 'master' of github.com:wix/react-native-navigation

README.md

@@ -42,6 +42,7 @@ If you're trying to deliver a user experience that's on par with the best native
 
 For example, this package replaces the native [NavigatorIOS](https://facebook.github.io/react-native/docs/navigatorios.html) that has been [abandoned](https://facebook.github.io/react-native/docs/navigator-comparison.html) in favor of JS-based solutions that are easier to maintain. For more details see in-depth discussion [here](https://github.com/wix/react-native-controllers#why-do-we-need-this-package).
 
+
 ## License
 
 The MIT License.

example/src/app.js

@@ -12,17 +12,7 @@ Navigation.startTabBasedApp({
       screen: 'example.FirstTabScreen',
       icon: require('../img/one.png'),
       selectedIcon: require('../img/one_selected.png'),
-      title: 'Screen One',
-      navigatorStyle: {
-        navBarBackgroundColor: '#4dbce9',
-        navBarTextColor: '#ffff00',
-        navBarSubtitleTextColor: '#ff0000',
-        navBarButtonColor: '#ffffff',
-        statusBarTextColorScheme: 'light',
-        tabBarBackgroundColor: '#4dbce9',
-        tabBarButtonColor: '#ffffff',
-        tabBarSelectedButtonColor: '#ffff00'
-      }
+      title: 'Screen One'
     },
     {
       label: 'Two',
@@ -34,7 +24,12 @@ Navigation.startTabBasedApp({
         tabBarBackgroundColor: '#4dbce9',
       }
     }
-  ]
+  ],
+  drawer: {
+    left: {
+      screen: 'example.SideMenu'
+    }
+  }
 });
 // Navigation.startSingleScreenApp({
 //   screen: {

example/src/screens/FirstTabScreen.js

@@ -7,6 +7,7 @@ import {
   Alert,
   Platform
 } from 'react-native';
+import {Navigation} from 'react-native-navigation';
 
 export default class FirstTabScreen extends Component {
   static navigatorButtons = {
@@ -26,7 +27,14 @@ export default class FirstTabScreen extends Component {
     ]
   };
   static navigatorStyle = {
-    drawUnderTabBar: true
+    navBarBackgroundColor: '#4dbce9',
+    navBarTextColor: '#ffff00',
+    navBarSubtitleTextColor: '#ff0000',
+    navBarButtonColor: '#ffffff',
+    statusBarTextColorScheme: 'light',
+    tabBarBackgroundColor: '#4dbce9',
+    tabBarButtonColor: '#ffffff',
+    tabBarSelectedButtonColor: '#ffff00'
   };
 
   constructor(props) {
@@ -78,6 +86,10 @@ export default class FirstTabScreen extends Component {
               <Text style={styles.button}>Show In-App Notification</Text>
             </TouchableOpacity> : false
         }
+
+        <TouchableOpacity onPress={ this.onStartSingleScreenApp.bind(this) }>
+          <Text style={styles.button}>Show Single Screen App</Text>
+        </TouchableOpacity>
       </View>
     );
   }
@@ -117,6 +129,14 @@ export default class FirstTabScreen extends Component {
       screen: "example.NotificationScreen"
     });
   }
+
+  onStartSingleScreenApp() {
+    Navigation.startSingleScreenApp({
+      screen: {
+        screen: 'example.FirstTabScreen'
+      }
+    });
+  }
 }
 
 const styles = StyleSheet.create({

example/src/screens/PushedScreen.js

@@ -60,7 +60,7 @@ export default class PushedScreen extends Component {
   onResetToPress() {
     this.props.navigator.resetTo({
       title: "New Root",
-      screen: "example.PushedScreen"
+      screen: "example.ThirdTabScreen"
     });
   }
 }