Skip to content
Snippets Groups Projects
Commit 87ac1d6b authored by Julia Friesel's avatar Julia Friesel
Browse files

Adjust menu styling and remove remnants of navigator

parent c744520b
No related branches found
No related tags found
No related merge requests found
...@@ -29,7 +29,7 @@ export default class CalendarView extends Component { ...@@ -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 })
} }
......
...@@ -21,7 +21,7 @@ export default class CycleChart extends Component { ...@@ -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}
/> />
) )
} }
......
...@@ -12,7 +12,7 @@ export default class Menu extends Component { ...@@ -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}>
......
...@@ -103,12 +103,15 @@ export default StyleSheet.create({ ...@@ -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
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment