Skip to content
Snippets Groups Projects
Commit d0dcbd54 authored by emelko's avatar emelko
Browse files

Adds back button to settings header

parent 1a49b79e
No related branches found
No related tags found
Loading
......@@ -94,9 +94,7 @@ export default class App extends Component {
isDefaultView() {
const { currentPage } = this.state
return currentPage !== CYCLE_DAY_PAGE &&
!this.isSymptomView() &&
!this.isInfoSymptomView()
return this.isMenuItem(currentPage) || currentPage === SETTINGS_MENU_PAGE
}
render() {
......@@ -114,16 +112,19 @@ export default class App extends Component {
}
const page = pages[currentPage]
const title = headerTitlesLowerCase[currentPage]
const isSymptomView = this.isSymptomView()
return (
<View style={{flex: 1}}>
{this.isDefaultView() &&
<Header title={title} />
}
{this.isInfoSymptomView() &&
<Header title={title} goBack={this.handleBackButtonPress} />
{(this.isInfoSymptomView() || this.isSettingsView()) &&
<Header
title={title}
showBackButton={true}
goBack={this.handleBackButtonPress}
/>
}
{isSymptomView &&
{this.isSymptomView() &&
<Header
title={title}
isSymptomView={true}
......@@ -140,7 +141,7 @@ export default class App extends Component {
...currentProps
})}
{!isSymptomView &&
{!this.isSymptomView() &&
<Menu navigate={this.navigate} currentPage={currentPage} />
}
</View>
......
......@@ -15,7 +15,7 @@ export default function Header(p) {
else if (props.isSymptomView) {
return (<SymptomViewHeader {...props} />)
}
else if (props.title === 'info') {
else if (props.showBackButton) {
return (<BackButtonHeader {...props} />)
}
else {
......
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