Adjust menu styling and remove remnants of navigator

This commit is contained in:
Julia Friesel
2018-08-19 16:47:13 +02:00
parent c744520bd9
commit 87ac1d6b29
4 changed files with 8 additions and 5 deletions
+1 -1
View File
@@ -29,7 +29,7 @@ export default class CalendarView extends Component {
passDateToDayView(result) { passDateToDayView(result) {
const cycleDay = getOrCreateCycleDay(result.dateString) const cycleDay = getOrCreateCycleDay(result.dateString)
const navigate = this.props.navigation.navigate const navigate = this.props.navigate
navigate('CycleDay', { cycleDay }) navigate('CycleDay', { cycleDay })
} }
+1 -1
View File
@@ -21,7 +21,7 @@ export default class CycleChart extends Component {
<DayColumn <DayColumn
{...item} {...item}
index={index} index={index}
navigate={this.props.navigation.navigate} navigate={this.props.navigate}
/> />
) )
} }
+1 -1
View File
@@ -12,7 +12,7 @@ export default class Menu extends Component {
return ( return (
<TouchableOpacity <TouchableOpacity
onPress={() => this.props.navigate(componentName)} onPress={() => this.props.navigate(componentName)}
style={{ alignItems: 'center' }} style={styles.menuItem}
> >
<Icon name={icon} {...iconStyles.menuIcon} /> <Icon name={icon} {...iconStyles.menuIcon} />
<Text style={styles.menuText}> <Text style={styles.menuText}>
+5 -2
View File
@@ -103,12 +103,15 @@ export default StyleSheet.create({
}, },
menu: { menu: {
backgroundColor: primaryColor, backgroundColor: primaryColor,
paddingVertical: 18,
paddingHorizontal: 10,
alignItems: 'center', alignItems: 'center',
justifyContent: 'space-between', justifyContent: 'space-between',
flexDirection: 'row', flexDirection: 'row',
}, },
menuItem: {
alignItems: 'center',
flex: 1,
paddingVertical: 15
},
menuText: { menuText: {
color: fontOnPrimaryColor color: fontOnPrimaryColor
}, },