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

Rename showView callback

parent 5041a455
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ export default class Bleeding extends Component { ...@@ -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.bringIntoView = props.bringIntoView this.showView = props.bringIntoView
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
...@@ -51,13 +51,13 @@ export default class Bleeding extends Component { ...@@ -51,13 +51,13 @@ export default class Bleeding extends Component {
}} }}
value={this.state.exclude} /> value={this.state.exclude} />
<Button <Button
onPress={() => this.bringIntoView('dayView')} onPress={() => this.showView('dayView')}
title="Cancel"> title="Cancel">
</Button> </Button>
<Button <Button
onPress={() => { onPress={() => {
saveBleeding(this.cycleDay) saveBleeding(this.cycleDay)
this.bringIntoView('dayView') this.showView('dayView')
}} }}
title="Delete entry"> title="Delete entry">
</Button> </Button>
...@@ -67,7 +67,7 @@ export default class Bleeding extends Component { ...@@ -67,7 +67,7 @@ export default class Bleeding extends Component {
value: this.state.currentValue, value: this.state.currentValue,
exclude: this.state.exclude exclude: this.state.exclude
}) })
this.bringIntoView('dayView') this.showView('dayView')
}} }}
disabled={ this.state.currentValue === -1 } disabled={ this.state.currentValue === -1 }
title="Save"> title="Save">
......
...@@ -15,7 +15,7 @@ export default class DayView extends Component { ...@@ -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.bringIntoView = props.bringIntoView this.showView = props.bringIntoView
bleedingDaysSortedByDate.addListener(setStateWithCurrentCycleDayNumber.bind(this)) bleedingDaysSortedByDate.addListener(setStateWithCurrentCycleDayNumber.bind(this))
} }
...@@ -46,11 +46,11 @@ export default class DayView extends Component { ...@@ -46,11 +46,11 @@ export default class DayView extends Component {
<Text style={styles.welcome}>{bleedingLabel}</Text> <Text style={styles.welcome}>{bleedingLabel}</Text>
<Text style={styles.welcome}>{temperatureLabel}</Text> <Text style={styles.welcome}>{temperatureLabel}</Text>
<Button <Button
onPress={() => this.bringIntoView('bleedingEditView')} onPress={() => this.showView('bleedingEditView')}
title="Edit bleeding"> title="Edit bleeding">
</Button> </Button>
<Button <Button
onPress={() => this.bringIntoView('temperatureEditView')} onPress={() => this.showView('temperatureEditView')}
title="Edit temperature"> title="Edit temperature">
</Button> </Button>
</View > </View >
......
...@@ -22,7 +22,7 @@ export default class Day extends Component { ...@@ -22,7 +22,7 @@ export default class Day extends Component {
visibleComponent: 'dayView', visibleComponent: 'dayView',
} }
this.bringIntoView = view => { this.showView = view => {
this.setState({visibleComponent: view}) this.setState({visibleComponent: view})
} }
} }
...@@ -33,9 +33,9 @@ export default class Day extends Component { ...@@ -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.bringIntoView} />, { dayView: <DayView cycleDay={this.cycleDay} bringIntoView={this.showView} />,
bleedingEditView: <BleedingEditView cycleDay={this.cycleDay} bringIntoView={this.bringIntoView}/>, bleedingEditView: <BleedingEditView cycleDay={this.cycleDay} bringIntoView={this.showView}/>,
temperatureEditView: <TemperatureEditView cycleDay={this.cycleDay} bringIntoView={this.bringIntoView}/> temperatureEditView: <TemperatureEditView cycleDay={this.cycleDay} bringIntoView={this.showView}/>
}[this.state.visibleComponent] }[this.state.visibleComponent]
} }
......
...@@ -13,7 +13,7 @@ export default class Temp extends Component { ...@@ -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.bringIntoView = props.bringIntoView this.showView = props.bringIntoView
let initialValue let initialValue
if(this.cycleDay.temperature) { if(this.cycleDay.temperature) {
...@@ -51,14 +51,14 @@ export default class Temp extends Component { ...@@ -51,14 +51,14 @@ export default class Temp extends Component {
/> />
<Button <Button
onPress={() => { onPress={() => {
this.bringIntoView('dayView') this.showView('dayView')
}} }}
title="Cancel"> title="Cancel">
</Button> </Button>
<Button <Button
onPress={() => { onPress={() => {
saveTemperature(cycleDay) saveTemperature(cycleDay)
this.bringIntoView('dayView') this.showView('dayView')
}} }}
title="Delete entry"> title="Delete entry">
</Button> </Button>
...@@ -68,7 +68,7 @@ export default class Temp extends Component { ...@@ -68,7 +68,7 @@ export default class Temp extends Component {
value: Number(this.state.currentValue), value: Number(this.state.currentValue),
exclude: this.state.exclude exclude: this.state.exclude
}) })
this.bringIntoView('dayView') this.showView('dayView')
}} }}
disabled={ this.state.currentValue === '' } disabled={ this.state.currentValue === '' }
title="Save"> title="Save">
......
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