Merge branch 'master' into '28-edit-temperature-screen'

# Conflicts:
#   home.js
This commit is contained in:
tina
2018-06-13 11:11:25 +00:00
3 changed files with 1575 additions and 1562 deletions
+13
View File
@@ -4,19 +4,32 @@ import {
Button,
Text
} from 'react-native'
import { LocalDate } from 'js-joda'
import styles from './styles'
import getCycleDay from './get-cycle-day'
import { getOrCreateCycleDay } from './db'
export default class Home extends Component {
constructor(props) {
super(props)
}
passTodayToDayView() {
const todayDateString = LocalDate.now().toString()
const cycleDay = getOrCreateCycleDay(todayDateString)
const navigate = this.props.navigation.navigate
navigate('dayView', { cycleDay })
}
render() {
const navigate = this.props.navigation.navigate
return (
<View style={styles.container}>
<Text style={styles.welcome}>Welcome! Today is day {getCycleDay()} of your current cycle</Text>
<Button
onPress={() => this.passTodayToDayView()}
title="Edit symptoms for today">
</Button>
<Button
onPress={() => navigate('calendar')}
title="Go to calendar">