Merge pull request #1 from infinitered/nav_update

Nav update

boilerplate/App/Containers/LoginScreen.js

@@ -13,7 +13,6 @@ import { connect } from 'react-redux'
 import Styles from './Styles/LoginScreenStyles'
 import {Images, Metrics} from '../Themes'
 import LoginActions from '../Redux/LoginRedux'
-import { Actions as NavigationActions } from 'react-native-router-flux'
 
 class LoginScreen extends React.Component {
 
@@ -42,7 +41,7 @@ class LoginScreen extends React.Component {
     this.forceUpdate()
     // Did the login attempt complete?
     if (this.isAttempting && !newProps.fetching) {
-      NavigationActions.pop()
+      this.props.navigation.goBack()
     }
   }
 
@@ -142,7 +141,7 @@ class LoginScreen extends React.Component {
                 <Text style={Styles.loginText}>Sign In</Text>
               </View>
             </TouchableOpacity>
-            <TouchableOpacity style={Styles.loginButtonWrapper} onPress={NavigationActions.pop}>
+            <TouchableOpacity style={Styles.loginButtonWrapper} onPress={() => this.props.navigation.goBack()}>
               <View style={Styles.loginButton}>
                 <Text style={Styles.loginText}>Cancel</Text>
               </View>

boilerplate/App/Containers/RootContainer.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import { View, StatusBar } from 'react-native'
-import NavigationRouter from '../Navigation/NavigationRouter'
+import Navigation from '../Navigation/AppNavigation'
 import { connect } from 'react-redux'
 import StartupActions from '../Redux/StartupRedux'
 import ReduxPersist from '../Config/ReduxPersist'
@@ -21,7 +21,7 @@ class RootContainer extends Component {
     return (
       <View style={styles.applicationView}>
         <StatusBar barStyle='light-content' />
-        <NavigationRouter />
+        <Navigation />
       </View>
     )
   }

boilerplate/App/Navigation/AppNavigation.js

@@ -0,0 +1,25 @@
+import { StackNavigator } from 'react-navigation'
+import LaunchScreen from '../Containers/LaunchScreen'
+import LoginScreen from '../Containers/LoginScreen'
+
+import styles from './Styles/NavigationStyles'
+
+// Manifest of possible screens
+const PrimaryNav = StackNavigator({
+  LaunchScreen: { screen: LaunchScreen },
+  LoginScreen: {
+    screen: LoginScreen,
+    navigationOptions: { title: 'Login' }
+  }
+}, {
+  // Default config for all screens
+  headerMode: 'none',
+  initialRouteName: 'LaunchScreen',
+  navigationOptions: {
+    header: {
+      style: styles.header
+    }
+  }
+})
+
+export default PrimaryNav