diff --git a/Containers/Screen1.js b/Containers/Screen1.js index b9e266c..1b778e8 100644 --- a/Containers/Screen1.js +++ b/Containers/Screen1.js @@ -2,15 +2,6 @@ import React from 'react' import { StyleSheet, Text, View, Image } from 'react-native' export default class Screen1 extends React.Component { - static navigationOptions = { - drawerLabel: 'Screen One', - drawerIcon: () => ( - - ) - } render() { return ( diff --git a/Containers/Screen2.js b/Containers/Screen2.js index 5366e9d..2e8f5c6 100644 --- a/Containers/Screen2.js +++ b/Containers/Screen2.js @@ -2,15 +2,6 @@ import React from 'react' import { StyleSheet, Text, View, Image } from 'react-native' export default class Screen2 extends React.Component { - static navigationOptions = { - drawerLabel: 'Screen Two', - drawerIcon: () => ( - - ) - } render() { return ( diff --git a/Containers/Screen3.js b/Containers/Screen3.js index e37cab3..8da2661 100644 --- a/Containers/Screen3.js +++ b/Containers/Screen3.js @@ -2,15 +2,6 @@ import React from 'react' import { StyleSheet, Text, View, Image } from 'react-native' export default class Screen3 extends React.Component { - static navigationOptions = { - drawerLabel: 'Screen Three', - drawerIcon: () => ( - - ) - } render() { return ( diff --git a/Navigation/AppNavigation.js b/Navigation/AppNavigation.js index 05f7085..babba3c 100644 --- a/Navigation/AppNavigation.js +++ b/Navigation/AppNavigation.js @@ -1,5 +1,5 @@ import React from 'react' -import { Text, Animated, Easing } from 'react-native' +import { Text } from 'react-native' import { StackNavigator, DrawerNavigator } from 'react-navigation' import LoginScreen from '../Containers/LoginScreen' import SignupScreen from '../Containers/SignupScreen' @@ -8,22 +8,12 @@ import Screen1 from '../Containers/Screen1' import Screen2 from '../Containers/Screen2' import Screen3 from '../Containers/Screen3' -// https://github.com/react-community/react-navigation/issues/1254 -const noTransitionConfig = () => ({ - transitionSpec: { - duration: 0, - timing: Animated.timing, - easing: Easing.step0 - } -}) // drawer stack const DrawerStack = DrawerNavigator({ screen1: { screen: Screen1 }, screen2: { screen: Screen2 }, screen3: { screen: Screen3 }, -}, { - gesturesEnabled: false }) const DrawerNavigation = StackNavigator({ @@ -33,7 +23,6 @@ const DrawerNavigation = StackNavigator({ navigationOptions: ({navigation}) => ({ headerStyle: {backgroundColor: 'green'}, title: 'Logged In to your app!', - gesturesEnabled: false, headerLeft: navigation.navigate('DrawerOpen')}>Menu }) }) @@ -59,8 +48,7 @@ const PrimaryNav = StackNavigator({ // Default config for all screens headerMode: 'none', title: 'Main', - initialRouteName: 'loginStack', - transitionConfig: noTransitionConfig + initialRouteName: 'loginStack' }) export default PrimaryNav