diff --git a/components/menu.js b/components/menu.js index d7cb1d4efba4d9e7b72261315ce720a55e72b3b5..3cf8b1017b8dbdb416da4d6861afd9e89121899c 100644 --- a/components/menu.js +++ b/components/menu.js @@ -1,12 +1,26 @@ import React, { Component } from 'react' import { View, - Text + Text, + TouchableOpacity } from 'react-native' import styles, { iconStyles } from '../styles' import Icon from 'react-native-vector-icons/MaterialCommunityIcons' export default class Menu extends Component { + makeMenuItem({ title, icon, componentName }) { + return ( + <TouchableOpacity + onPress={() => this.props.navigate(componentName)} + style={{ alignItems: 'center' }} + > + <Icon name={icon} {...iconStyles.menuIcon} /> + <Text style={styles.menuText}> + {title} + </Text> + </TouchableOpacity> + ) + } render() { return ( this.props.symptomView ? @@ -19,22 +33,8 @@ export default class Menu extends Component { {title: 'Chart', icon: 'chart-line', componentName: 'Chart'}, {title: 'Stats', icon: 'chart-pie', componentName: 'Stats'}, {title: 'Settings', icon: 'settings', componentName: 'Settings'}, - ].map(makeMenuItem)} + ].map(this.makeMenuItem.bind(this))} </View > ) } } - -function makeMenuItem({title, icon, componentName}) { - return ( - <View style={{alignItems: 'center'}}> - <Icon name={icon} {...iconStyles.menuIcon}/> - <Text - style={styles.menuText} - onPress={() => this.props.navigate(componentName)} - > - {title} - </Text> - </View> - ) -} \ No newline at end of file diff --git a/components/settings.js b/components/settings.js index 3552872a507d960090f0a652671e79351e0a3528..97907b101cd7e527d4f351d5025fd93fe39adb42 100644 --- a/components/settings.js +++ b/components/settings.js @@ -9,7 +9,6 @@ import { import Share from 'react-native-share' import { DocumentPicker, DocumentPickerUtil } from 'react-native-document-picker' import rnfs from 'react-native-fs' -import Header from './header' import styles from '../styles/index' import { settings as labels } from './labels' import getDataAsCsvDataUri from '../lib/import-export/export-to-csv' @@ -19,7 +18,6 @@ export default class Settings extends Component { render() { return ( <ScrollView> - <Header title='Settings'/> <View style={styles.homeButtons}> <View style={styles.homeButton}> <Button diff --git a/components/stats.js b/components/stats.js index c37a518c37817dd13e146c734906e7d73b1dd152..864c13930a26600d460f141cf472534ba5aeee8d 100644 --- a/components/stats.js +++ b/components/stats.js @@ -16,7 +16,6 @@ export default class Stats extends Component { const statsText = determineStatsText(allMensesStarts) return ( <ScrollView> - <Header title='Statistics' /> <View> <Text style={styles.stats}>{statsText}</Text> </View>