From c744520bd95d938c35b7121a000e50a7694d1fe5 Mon Sep 17 00:00:00 2001 From: Julia Friesel Date: Sun, 19 Aug 2018 16:37:37 +0200 Subject: [PATCH] Fix menu bug --- components/menu.js | 32 ++++++++++++++++---------------- components/settings.js | 2 -- components/stats.js | 1 - 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/components/menu.js b/components/menu.js index d7cb1d4..3cf8b10 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 ( + this.props.navigate(componentName)} + style={{ alignItems: 'center' }} + > + + + {title} + + + ) + } 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))} ) } } - -function makeMenuItem({title, icon, componentName}) { - return ( - - - this.props.navigate(componentName)} - > - {title} - - - ) -} \ No newline at end of file diff --git a/components/settings.js b/components/settings.js index 3552872..97907b1 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 ( -