From c72e8d45a9786b588a5860ddad01a56e1763f69a Mon Sep 17 00:00:00 2001 From: Julia Friesel Date: Thu, 14 Jun 2018 14:55:08 +0200 Subject: [PATCH] Rename screen in navigtor --- app.js | 4 ++-- bleeding.js | 2 +- calendar.js | 2 +- cycle-day-overview.js | 2 +- cycle-day.js | 6 +++--- home.js | 2 +- temperature.js | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app.js b/app.js index 012b396..70c1a05 100644 --- a/app.js +++ b/app.js @@ -2,7 +2,7 @@ import { createStackNavigator } from 'react-navigation' import Home from './home' 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 import { YellowBox } from 'react-native' @@ -11,5 +11,5 @@ YellowBox.ignoreWarnings(['Warning: isMounted(...) is deprecated']) export default createStackNavigator({ home: { screen: Home }, calendar: { screen: Calendar }, - day: { screen: Day } + cycleDay: { screen: CycleDay } }) diff --git a/bleeding.js b/bleeding.js index 2854aeb..4019e9c 100644 --- a/bleeding.js +++ b/bleeding.js @@ -14,7 +14,7 @@ export default class Bleeding extends Component { constructor(props) { super(props) this.cycleDay = props.cycleDay - this.showView = props.bringIntoView + this.showView = props.showView let bleedingValue = this.cycleDay.bleeding && this.cycleDay.bleeding.value if (! (typeof bleedingValue === 'number') ){ bleedingValue = -1 diff --git a/calendar.js b/calendar.js index 2274a14..2880647 100644 --- a/calendar.js +++ b/calendar.js @@ -19,7 +19,7 @@ export default class DatePickView extends Component { passDateToDayView(result) { const cycleDay = getOrCreateCycleDay(result.dateString) const navigate = this.props.navigation.navigate - navigate('day', { cycleDay }) + navigate('cycleDay', { cycleDay }) } render() { diff --git a/cycle-day-overview.js b/cycle-day-overview.js index bafe44e..eca8cb6 100644 --- a/cycle-day-overview.js +++ b/cycle-day-overview.js @@ -15,7 +15,7 @@ export default class DayView extends Component { constructor(props) { super(props) this.cycleDay = props.cycleDay - this.showView = props.bringIntoView + this.showView = props.showView bleedingDaysSortedByDate.addListener(setStateWithCurrentCycleDayNumber.bind(this)) } diff --git a/cycle-day.js b/cycle-day.js index f16fb85..de5a577 100644 --- a/cycle-day.js +++ b/cycle-day.js @@ -33,9 +33,9 @@ export default class Day extends Component { {formatDateForViewHeader(this.cycleDay.date)} { this.cycleDayNumber && Cycle day {this.cycleDayNumber} } { - { dayView: , - bleedingEditView: , - temperatureEditView: + { dayView: , + bleedingEditView: , + temperatureEditView: }[this.state.visibleComponent] } diff --git a/home.js b/home.js index 98f79cd..81b2d13 100644 --- a/home.js +++ b/home.js @@ -32,7 +32,7 @@ export default class Home extends Component { const todayDateString = LocalDate.now().toString() const cycleDay = getOrCreateCycleDay(todayDateString) const navigate = this.props.navigation.navigate - navigate('day', { cycleDay }) + navigate('cycleDay', { cycleDay }) } render() { diff --git a/temperature.js b/temperature.js index fe2a9a7..786248b 100644 --- a/temperature.js +++ b/temperature.js @@ -13,7 +13,7 @@ export default class Temp extends Component { constructor(props) { super(props) this.cycleDay = props.cycleDay - this.showView = props.bringIntoView + this.showView = props.showView let initialValue if(this.cycleDay.temperature) {