Rename screen in navigtor

This commit is contained in:
Julia Friesel
2018-06-14 14:55:08 +02:00
parent be0b9ba09e
commit c72e8d45a9
7 changed files with 10 additions and 10 deletions
+2 -2
View File
@@ -2,7 +2,7 @@ import { createStackNavigator } from 'react-navigation'
import Home from './home' import Home from './home'
import Calendar from './calendar' import Calendar from './calendar'
import Day from './cycle-day' import CycleDay from './cycle-day'
// this is until react native fixes this bug, see https://github.com/facebook/react-native/issues/18868#issuecomment-382671739 // this is until react native fixes this bug, see https://github.com/facebook/react-native/issues/18868#issuecomment-382671739
import { YellowBox } from 'react-native' import { YellowBox } from 'react-native'
@@ -11,5 +11,5 @@ YellowBox.ignoreWarnings(['Warning: isMounted(...) is deprecated'])
export default createStackNavigator({ export default createStackNavigator({
home: { screen: Home }, home: { screen: Home },
calendar: { screen: Calendar }, calendar: { screen: Calendar },
day: { screen: Day } cycleDay: { screen: CycleDay }
}) })
+1 -1
View File
@@ -14,7 +14,7 @@ export default class Bleeding extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.cycleDay = props.cycleDay this.cycleDay = props.cycleDay
this.showView = props.bringIntoView this.showView = props.showView
let bleedingValue = this.cycleDay.bleeding && this.cycleDay.bleeding.value let bleedingValue = this.cycleDay.bleeding && this.cycleDay.bleeding.value
if (! (typeof bleedingValue === 'number') ){ if (! (typeof bleedingValue === 'number') ){
bleedingValue = -1 bleedingValue = -1
+1 -1
View File
@@ -19,7 +19,7 @@ export default class DatePickView extends Component {
passDateToDayView(result) { passDateToDayView(result) {
const cycleDay = getOrCreateCycleDay(result.dateString) const cycleDay = getOrCreateCycleDay(result.dateString)
const navigate = this.props.navigation.navigate const navigate = this.props.navigation.navigate
navigate('day', { cycleDay }) navigate('cycleDay', { cycleDay })
} }
render() { render() {
+1 -1
View File
@@ -15,7 +15,7 @@ export default class DayView extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.cycleDay = props.cycleDay this.cycleDay = props.cycleDay
this.showView = props.bringIntoView this.showView = props.showView
bleedingDaysSortedByDate.addListener(setStateWithCurrentCycleDayNumber.bind(this)) bleedingDaysSortedByDate.addListener(setStateWithCurrentCycleDayNumber.bind(this))
} }
+3 -3
View File
@@ -33,9 +33,9 @@ export default class Day extends Component {
<Text style={styles.welcome}>{formatDateForViewHeader(this.cycleDay.date)}</Text> <Text style={styles.welcome}>{formatDateForViewHeader(this.cycleDay.date)}</Text>
{ this.cycleDayNumber && <Text>Cycle day {this.cycleDayNumber}</Text> } { this.cycleDayNumber && <Text>Cycle day {this.cycleDayNumber}</Text> }
{ {
{ dayView: <DayView cycleDay={this.cycleDay} bringIntoView={this.showView} />, { dayView: <DayView cycleDay={this.cycleDay} showView={this.showView} />,
bleedingEditView: <BleedingEditView cycleDay={this.cycleDay} bringIntoView={this.showView}/>, bleedingEditView: <BleedingEditView cycleDay={this.cycleDay} showView={this.showView}/>,
temperatureEditView: <TemperatureEditView cycleDay={this.cycleDay} bringIntoView={this.showView}/> temperatureEditView: <TemperatureEditView cycleDay={this.cycleDay} showView={this.showView}/>
}[this.state.visibleComponent] }[this.state.visibleComponent]
} }
+1 -1
View File
@@ -32,7 +32,7 @@ export default class Home extends Component {
const todayDateString = LocalDate.now().toString() const todayDateString = LocalDate.now().toString()
const cycleDay = getOrCreateCycleDay(todayDateString) const cycleDay = getOrCreateCycleDay(todayDateString)
const navigate = this.props.navigation.navigate const navigate = this.props.navigation.navigate
navigate('day', { cycleDay }) navigate('cycleDay', { cycleDay })
} }
render() { render() {
+1 -1
View File
@@ -13,7 +13,7 @@ export default class Temp extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.cycleDay = props.cycleDay this.cycleDay = props.cycleDay
this.showView = props.bringIntoView this.showView = props.showView
let initialValue let initialValue
if(this.cycleDay.temperature) { if(this.cycleDay.temperature) {