From 1b11b24a4c0c780898b6b58cbec83589b04e062b Mon Sep 17 00:00:00 2001 From: tina <lt-bloody@riox.eu> Date: Wed, 26 Sep 2018 19:31:30 +0200 Subject: [PATCH] enables back button on symptom view --- components/app.js | 6 ++++++ components/cycle-day/symptoms/bleeding.js | 10 ---------- components/header.js | 4 ---- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/components/app.js b/components/app.js index 4cc978d8..94472a11 100644 --- a/components/app.js +++ b/components/app.js @@ -60,6 +60,12 @@ export default class App extends Component { <Header title={titles[this.state.currentPage]} />} + {isSymptomView(this.state.currentPage) && + <Header + title={titles[this.state.currentPage]} + isSymptomView={true} + goBack={this.handleBackButtonPress} + />} {React.createElement(page, { navigate: this.navigate, diff --git a/components/cycle-day/symptoms/bleeding.js b/components/cycle-day/symptoms/bleeding.js index 94125cfa..3c88ec5c 100644 --- a/components/cycle-day/symptoms/bleeding.js +++ b/components/cycle-day/symptoms/bleeding.js @@ -10,7 +10,6 @@ import { bleeding as labels } from '../labels/labels' import ActionButtonFooter from './action-button-footer' import SelectTabGroup from '../select-tab-group' import SymptomSection from './symptom-section' -import Header from '../../header' export default class Bleeding extends Component { constructor(props) { @@ -32,15 +31,6 @@ export default class Bleeding extends Component { ] return ( <View style={{ flex: 1 }}> - <Header - title={'Bleeding'} - isSymptomView={true} - goBack={() => this.props.navigate('CycleDay', this.props.cycleDay)} - cycleDayNumber={this.props.cycleDayNumber} - date={this.props.cycleDay.date} - infoTitle={'Info here'} - infoText={'bla bla'} - /> <ScrollView style={styles.page}> <SymptomSection header="Heaviness" diff --git a/components/header.js b/components/header.js index 174d8799..f8e0c8a6 100644 --- a/components/header.js +++ b/components/header.js @@ -10,7 +10,6 @@ import { formatDateForViewHeader } from '../components/cycle-day/labels/format' export default class Header extends Component { render() { - console.log(this.props) return ( this.props.isCycleDayOverView ? <View style={[styles.header, styles.headerCycleDay]}> @@ -45,9 +44,6 @@ export default class Header extends Component { <Text style={styles.dateHeader}> {this.props.title} </Text> - <Text style={styles.cycleDayNumber} > - {formatDateForViewHeader(this.props.date)} - </Text> </View > <Icon name='information-outline' -- GitLab