From 5136b9f8e6635ea337a0faa0087deddab4897198 Mon Sep 17 00:00:00 2001
From: Julia Friesel <julia.friesel@gmail.com>
Date: Thu, 16 Aug 2018 16:12:12 +0200
Subject: [PATCH] Introduce bottom menu
---
app.js | 25 ++++++++++++++++---------
components/calendar.js | 2 +-
components/home.js | 27 +--------------------------
3 files changed, 18 insertions(+), 36 deletions(-)
diff --git a/app.js b/app.js
index fae73d63..2c567ba2 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 b447bf24..4aa7f135 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 315ea504..5381e3be 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>
)
--
GitLab