From 1a49b79eecb9e99d5de8484f1df38ef43079d88b Mon Sep 17 00:00:00 2001
From: emelko <ml.kochsiek@mailbox.org>
Date: Mon, 4 Feb 2019 20:34:57 +0100
Subject: [PATCH 1/2] Rename info symptom header into back button

---
 components/header/{info-symptom.js => back-button.js} | 2 +-
 components/header/index.js                            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename components/header/{info-symptom.js => back-button.js} (94%)

diff --git a/components/header/info-symptom.js b/components/header/back-button.js
similarity index 94%
rename from components/header/info-symptom.js
rename to components/header/back-button.js
index 3a0d490..6196106 100644
--- a/components/header/info-symptom.js
+++ b/components/header/back-button.js
@@ -8,7 +8,7 @@ import styles, { iconStyles } from '../../styles'
 import NavigationArrow from './navigation-arrow'
 import Icon from 'react-native-vector-icons/Entypo'
 
-export default function InfoSymptomHeader(props) {
+export default function BackButtonHeader(props) {
   return (
     <View style={[styles.header, styles.headerCycleDay, styles.headerSymptom]}>
       <View
diff --git a/components/header/index.js b/components/header/index.js
index 5adba3b..5ee9009 100644
--- a/components/header/index.js
+++ b/components/header/index.js
@@ -2,7 +2,7 @@ import React from 'react'
 import { Dimensions } from 'react-native'
 import CycleDayHeader from './cycle-day'
 import DefaultHeader from './default'
-import InfoSymptomHeader from './info-symptom'
+import BackButtonHeader from './back-button'
 import SymptomViewHeader from './symptom-view'
 
 export default function Header(p) {
@@ -16,7 +16,7 @@ export default function Header(p) {
     return (<SymptomViewHeader {...props} />)
   }
   else if (props.title === 'info') {
-    return (<InfoSymptomHeader {...props} />)
+    return (<BackButtonHeader {...props} />)
   }
   else {
     return (<DefaultHeader {...props} />)

From d0dcbd543d35c638aa5f84a66330131cd9379fcb Mon Sep 17 00:00:00 2001
From: emelko <ml.kochsiek@mailbox.org>
Date: Mon, 4 Feb 2019 21:04:17 +0100
Subject: [PATCH 2/2] Adds back button to settings header

---
 components/app.js          | 17 +++++++++--------
 components/header/index.js |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/components/app.js b/components/app.js
index fc8f7e3..da47365 100644
--- a/components/app.js
+++ b/components/app.js
@@ -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>
diff --git a/components/header/index.js b/components/header/index.js
index 5ee9009..9792d03 100644
--- a/components/header/index.js
+++ b/components/header/index.js
@@ -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 {