Skip to content
Snippets Groups Projects
Commit 86e0d967 authored by Julia Friesel's avatar Julia Friesel
Browse files

Pass correct props to bleeding edit view from home screen

parent a9e22c94
No related branches found
No related tags found
No related merge requests found
import React, { Component } from 'react' import React, { Component } from 'react'
import { ScrollView, View, TouchableOpacity, TouchableHighlight, Dimensions } from 'react-native' import { ScrollView, View, TouchableHighlight, Dimensions } from 'react-native'
import { LocalDate, ChronoUnit } from 'js-joda' import { LocalDate, ChronoUnit } from 'js-joda'
import Icon from 'react-native-vector-icons/Entypo' import Icon from 'react-native-vector-icons/Entypo'
import { secondaryColor, cycleDayColor, periodColor } from '../styles' import { secondaryColor, cycleDayColor, periodColor } from '../styles'
import { home as labels, bleedingPrediction as predictLabels, shared } from '../i18n/en/labels' import { home as labels, bleedingPrediction as predictLabels, shared } from '../i18n/en/labels'
import cycleModule from '../lib/cycle' import cycleModule from '../lib/cycle'
import { getCycleDaysSortedByDate } from '../db' import { getCycleDaysSortedByDate, getCycleDay } from '../db'
import { getFertilityStatusForDay } from '../lib/sympto-adapter' import { getFertilityStatusForDay } from '../lib/sympto-adapter'
import styles from '../styles' import styles from '../styles'
import AppText, { AppTextLight } from './app-text' import AppText, { AppTextLight } from './app-text'
...@@ -46,13 +46,8 @@ export default class Home extends Component { ...@@ -46,13 +46,8 @@ export default class Home extends Component {
return ( return (
<View flex={1}> <View flex={1}>
<ScrollView> <ScrollView>
<View <View style={styles.homeView}>
style={styles.homeView} <View style={styles.homeIconElement}>
>
<TouchableOpacity
onPress={() => this.passTodayTo('CycleDay')}
style={styles.homeIconElement}
>
<View position='absolute'> <View position='absolute'>
<DripHomeIcon name="circle" size={80} color={cycleDayColor}/> <DripHomeIcon name="circle" size={80} color={cycleDayColor}/>
</View> </View>
...@@ -72,12 +67,9 @@ export default class Home extends Component { ...@@ -72,12 +67,9 @@ export default class Home extends Component {
{labels.editToday} {labels.editToday}
</Button> </Button>
</TouchableOpacity> </View>
<TouchableOpacity <View style={styles.homeIconElement}>
onPress={() => this.passTodayTo('BleedingEditView')}
style={styles.homeIconElement}
>
<View position='absolute'> <View position='absolute'>
<DripHomeIcon name="drop" size={105} color={periodColor} /> <DripHomeIcon name="drop" size={105} color={periodColor} />
</View> </View>
...@@ -94,20 +86,21 @@ export default class Home extends Component { ...@@ -94,20 +86,21 @@ export default class Home extends Component {
} }
<Button <Button
onPress={() => this.passTodayTo('BleedingEditView')} onPress={() => {
const today = LocalDate.now().toString()
const cycleDay = getCycleDay(today)
const props = {date: today}
if (cycleDay) props.cycleDay = cycleDay
this.props.navigate('BleedingEditView', props)
}}
backgroundColor={periodColor}> backgroundColor={periodColor}>
{labels.trackPeriod} {labels.trackPeriod}
</Button> </Button>
</TouchableOpacity> </View>
<TouchableOpacity
onPress={() => this.props.navigate('Chart')}
style={styles.homeIconElement}
>
<View style={styles.homeIconElement}>
<View style={styles.homeCircle} position='absolute' /> <View style={styles.homeCircle} position='absolute' />
<View style={[styles.homeIconTextWrapper, styles.wrapperCircle]}> <View style={[styles.homeIconTextWrapper, styles.wrapperCircle]}>
<AppTextLight style={styles.iconText}> <AppTextLight style={styles.iconText}>
{this.state.phase ? {this.state.phase ?
...@@ -133,7 +126,7 @@ export default class Home extends Component { ...@@ -133,7 +126,7 @@ export default class Home extends Component {
backgroundColor={secondaryColor}> backgroundColor={secondaryColor}>
{labels.checkFertility} {labels.checkFertility}
</Button> </Button>
</TouchableOpacity> </View>
</View> </View>
</ScrollView> </ScrollView>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment