Introduce bottom menu

This commit is contained in:
Julia Friesel
2018-08-16 16:12:12 +02:00
parent 0879d4ae4a
commit 5136b9f8e6
3 changed files with 18 additions and 36 deletions
+16 -9
View File
@@ -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)
+1 -1
View File
@@ -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() {
+1 -26
View File
@@ -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>
)