From c744520bd95d938c35b7121a000e50a7694d1fe5 Mon Sep 17 00:00:00 2001
From: Julia Friesel <julia.friesel@gmail.com>
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 d7cb1d4e..3cf8b101 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 3552872a..97907b10 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 c37a518c..864c1393 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>
--
GitLab