diff --git a/components/calendar.js b/components/calendar.js index 074487297ff8462b59297bf840e1990a3480a4d5..cb10817d6ad0dd533d8981961ce60fc2fe559de5 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 ded01cfecaa565fc8d89374f17d76e7c28d8a080..d31b128a2475f5aa831f4c0d06644a841ee17f07 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 3cf8b1017b8dbdb416da4d6861afd9e89121899c..1a8bed769dd9baeed49596d3cf175d8a8cc02093 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 42784d9262b2804423df487c66998ff3080418e3..6cf269e2c09ba25c330be2f34296cf80676088a3 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 },