diff --git a/app.js b/app.js index fe0f57c6a302339ef6d7f85e7465d7c56bbc309b..5e4b9baefc8fa86cbf01b6020b23458a6d3d2856 100644 --- a/app.js +++ b/app.js @@ -10,6 +10,7 @@ import Chart from './components/chart/chart' import Settings from './components/settings' import Stats from './components/stats' import styles from './styles' +import {headerTitles as titles} from './components/labels' // this is until react native fixes this bugg, see // https://github.com/facebook/react-native/issues/18868#issuecomment-382671739 @@ -53,7 +54,7 @@ export default class App extends Component { return ( <View style={styles.menuOnBottom}> - {this.state.currentPage != 'CycleDay' && <Header title={this.state.currentPage} />} + {this.state.currentPage != 'CycleDay' && <Header title={titles[this.state.currentPage]} />} {React.createElement(page, { navigate: this.navigate.bind(this), diff --git a/components/cycle-day/symptoms/bleeding.js b/components/cycle-day/symptoms/bleeding.js index ce27ba198ba5422a0a82d195b692ec5e8929cede..277c4009a466fe84a75b73a0905dbf066cf29b9f 100644 --- a/components/cycle-day/symptoms/bleeding.js +++ b/components/cycle-day/symptoms/bleeding.js @@ -35,7 +35,6 @@ export default class Bleeding extends Component { return ( <View style={styles.menuOnBottom}> <View> - <Text style={styles.symptomDayView}>Bleeding</Text> <View style={styles.radioButtonRow}> <RadioForm radio_props={bleedingRadioProps} diff --git a/components/cycle-day/symptoms/cervix.js b/components/cycle-day/symptoms/cervix.js index 2de55821c039e219eb28046fdfa9cfbd0f5e46e8..25730a4ecf3a5e9c4b8958737b3e8253778a159c 100644 --- a/components/cycle-day/symptoms/cervix.js +++ b/components/cycle-day/symptoms/cervix.js @@ -51,7 +51,6 @@ export default class Cervix extends Component { return ( <View style={styles.menuOnBottom}> <View> - <Text style={styles.symptomDayView}>Cervix</Text> <Text style={styles.symptomDayView}>Opening</Text> <View style={styles.radioButtonRow}> <RadioForm diff --git a/components/cycle-day/symptoms/desire.js b/components/cycle-day/symptoms/desire.js index 351dc971e50fa3ef582d6b2d7fafd24f9b80b776..ecb356b01b45b73b854be4472285a61a58c9279a 100644 --- a/components/cycle-day/symptoms/desire.js +++ b/components/cycle-day/symptoms/desire.js @@ -30,7 +30,6 @@ export default class Desire extends Component { return ( <View style={styles.menuOnBottom}> <View> - <Text style={styles.symptomDayView}>Desire</Text> <View style={styles.radioButtonRow}> <RadioForm radio_props={desireRadioProps} diff --git a/components/cycle-day/symptoms/mucus.js b/components/cycle-day/symptoms/mucus.js index 2df033d07a9af96cc5b9f76d9ab3dfa1bd6f0c0c..107da9fc2c6e698f46c8217b76a8029ce3237553 100644 --- a/components/cycle-day/symptoms/mucus.js +++ b/components/cycle-day/symptoms/mucus.js @@ -49,7 +49,6 @@ export default class Mucus extends Component { return ( <View style={styles.menuOnBottom}> <View> - <Text style={styles.symptomDayView}>Mucus</Text> <Text style={styles.symptomDayView}>Feeling</Text> <View style={styles.radioButtonRow}> <RadioForm diff --git a/components/cycle-day/symptoms/note.js b/components/cycle-day/symptoms/note.js index 6100a7ac528018f817471a680010dda4a37b42a0..6be5ac7a90ceacd83ff46d9e4359919cca9faa4b 100644 --- a/components/cycle-day/symptoms/note.js +++ b/components/cycle-day/symptoms/note.js @@ -25,7 +25,6 @@ export default class Temp extends Component { return ( <View style={styles.menuOnBottom}> <View style={styles.symptomViewRow}> - <Text style={styles.symptomDayView}>Note</Text> <TextInput multiline={true} placeholder="Enter" diff --git a/components/cycle-day/symptoms/sex.js b/components/cycle-day/symptoms/sex.js index 9adb224b21ab3873942db3824883690bebbfa743..fc8174ef7a5bbfc04f98f6698eedc8f00ff17ca0 100644 --- a/components/cycle-day/symptoms/sex.js +++ b/components/cycle-day/symptoms/sex.js @@ -33,7 +33,6 @@ export default class Sex extends Component { return ( <View style={styles.menuOnBottom}> <View> - <Text style={styles.symptomDayView}>SEX</Text> <View style={styles.symptomViewRowInline}> <Text style={styles.symptomDayView}>{activityLabels.solo}</Text> <CheckBox diff --git a/components/labels.js b/components/labels.js index 99400a2de63b6480c53cc5175b4fd1c24884bc59..1d3258a99bdc6f85b6618d54da4d774debfa2dcb 100644 --- a/components/labels.js +++ b/components/labels.js @@ -30,4 +30,19 @@ export const settings = { message: 'Data successfully imported' } } +} + +export const headerTitles = { + Home: 'Home', + Calendar: 'Calendar', + Chart: 'Chart', + Stats: 'Statistics', + Settings: 'Settings', + BleedingEditView: 'Bleeding', + TemperatureEditView: 'Temperature', + MucusEditView: 'Mucus', + CervixEditView: 'Cervix', + NoteEditView: 'Note', + DesireEditView: 'Desire', + SexEditView: 'Sex' } \ No newline at end of file