diff --git a/app.js b/app.js index fae73d637f7ab50ddc879d8a8938d616d4cbc7b1..2c567ba24aa01fdf2bc2c8c7178a8f9b8a425aea 100644 --- a/app.js +++ b/app.js @@ -1,4 +1,4 @@ -import { createStackNavigator } from 'react-navigation' +import { createStackNavigator, createBottomTabNavigator } from 'react-navigation' import Home from './components/home' import Calendar from './components/calendar' @@ -12,11 +12,18 @@ import Stats from './components/stats' import { YellowBox } from 'react-native' YellowBox.ignoreWarnings(['Warning: isMounted(...) is deprecated']) -export default createStackNavigator({ - home: { screen: Home }, - calendar: { screen: Calendar }, - cycleDay: { screen: CycleDay }, - chart: { screen: Chart }, - settings: { screen: Settings }, - stats: { screen: Stats} -}) +const routes = { + Home: { screen: Home }, + Calendar: createStackNavigator({Calendar, CycleDay}), + Chart: createStackNavigator({Chart, CycleDay}), + Settings: { screen: Settings }, + Stats: { screen: Stats} +} + +const config = { + labeled: true, + shifting: false, + backBehavior: 'none' +} + +export default createBottomTabNavigator(routes, config) \ No newline at end of file diff --git a/components/calendar.js b/components/calendar.js index b447bf24cebd82d0d87a8b3c155c0df4885a5c78..4aa7f135eef45fdb040819ecaeb071e7881ff5cc 100644 --- a/components/calendar.js +++ b/components/calendar.js @@ -29,7 +29,7 @@ export default class CalendarView extends Component { passDateToDayView(result) { const cycleDay = getOrCreateCycleDay(result.dateString) const navigate = this.props.navigation.navigate - navigate('cycleDay', { cycleDay }) + navigate('CycleDay', { cycleDay }) } render() { diff --git a/components/home.js b/components/home.js index 315ea5046ac307bc0e768f2e9aa3e9ba57b14ba1..5381e3bec357118f78f6edf27f862d0e2973a405 100644 --- a/components/home.js +++ b/components/home.js @@ -42,11 +42,10 @@ export default class Home extends Component { const todayDateString = LocalDate.now().toString() const cycleDay = getOrCreateCycleDay(todayDateString) const navigate = this.props.navigation.navigate - navigate('cycleDay', { cycleDay }) + navigate('CycleDay', { cycleDay }) } render() { - const navigate = this.props.navigation.navigate return ( <ScrollView> <Text style={styles.welcome}>{this.state.welcomeText}</Text> @@ -57,24 +56,6 @@ export default class Home extends Component { title="Edit symptoms for today"> </Button> </View> - <View style={styles.homeButton}> - <Button - onPress={() => navigate('calendar')} - title="Go to calendar"> - </Button> - </View> - <View style={styles.homeButton}> - <Button - onPress={() => navigate('chart')} - title="Go to chart"> - </Button> - </View> - <View style={styles.homeButton}> - <Button - onPress={() => navigate('settings')} - title="Go to settings"> - </Button> - </View> <View style={styles.homeButton}> <Button onPress={() => fillWithDummyData()} @@ -87,12 +68,6 @@ export default class Home extends Component { title="delete everything"> </Button> </View> - <View style={styles.homeButton}> - <Button - onPress={() => navigate('stats')} - title="Go to stats"> - </Button> - </View> </View> </ScrollView> )