From 87ac1d6b29cdedb4a0c5226ff354e4b79346fd47 Mon Sep 17 00:00:00 2001
From: Julia Friesel <julia.friesel@gmail.com>
Date: Sun, 19 Aug 2018 16:47:13 +0200
Subject: [PATCH] Adjust menu styling and remove remnants of navigator
---
components/calendar.js | 2 +-
components/chart/chart.js | 2 +-
components/menu.js | 2 +-
styles/index.js | 7 +++++--
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/components/calendar.js b/components/calendar.js
index 07448729..cb10817d 100644
--- a/components/calendar.js
+++ b/components/calendar.js
@@ -29,7 +29,7 @@ export default class CalendarView extends Component {
passDateToDayView(result) {
const cycleDay = getOrCreateCycleDay(result.dateString)
- const navigate = this.props.navigation.navigate
+ const navigate = this.props.navigate
navigate('CycleDay', { cycleDay })
}
diff --git a/components/chart/chart.js b/components/chart/chart.js
index ded01cfe..d31b128a 100644
--- a/components/chart/chart.js
+++ b/components/chart/chart.js
@@ -21,7 +21,7 @@ export default class CycleChart extends Component {
<DayColumn
{...item}
index={index}
- navigate={this.props.navigation.navigate}
+ navigate={this.props.navigate}
/>
)
}
diff --git a/components/menu.js b/components/menu.js
index 3cf8b101..1a8bed76 100644
--- a/components/menu.js
+++ b/components/menu.js
@@ -12,7 +12,7 @@ export default class Menu extends Component {
return (
<TouchableOpacity
onPress={() => this.props.navigate(componentName)}
- style={{ alignItems: 'center' }}
+ style={styles.menuItem}
>
<Icon name={icon} {...iconStyles.menuIcon} />
<Text style={styles.menuText}>
diff --git a/styles/index.js b/styles/index.js
index 42784d92..6cf269e2 100644
--- a/styles/index.js
+++ b/styles/index.js
@@ -103,12 +103,15 @@ export default StyleSheet.create({
},
menu: {
backgroundColor: primaryColor,
- paddingVertical: 18,
- paddingHorizontal: 10,
alignItems: 'center',
justifyContent: 'space-between',
flexDirection: 'row',
},
+ menuItem: {
+ alignItems: 'center',
+ flex: 1,
+ paddingVertical: 15
+ },
menuText: {
color: fontOnPrimaryColor
},
--
GitLab