Merge branch 'action_button_as_buttons' into 'master'

makes the action button footer more like buttons

Closes #318

See merge request bloodyhealth/drip!208
This commit is contained in:
tina
2019-05-10 11:02:33 +00:00
2 changed files with 16 additions and 6 deletions
@@ -60,7 +60,7 @@ export default class ActionButtonFooter extends Component {
} }
] ]
return ( return (
<View style={styles.menu}> <View style={styles.actionButtonFooter}>
{buttons.map(({ title, action, disabledCondition, icon }, i) => { {buttons.map(({ title, action, disabledCondition, icon }, i) => {
const textStyle = [styles.menuText] const textStyle = [styles.menuText]
if (disabledCondition) { if (disabledCondition) {
@@ -77,7 +77,7 @@ export default class ActionButtonFooter extends Component {
return ( return (
<TouchableOpacity <TouchableOpacity
onPress={action} onPress={action}
style={styles.menuItem} style={styles.actionButtonItem}
key={i.toString()} key={i.toString()}
> >
<Icon name={icon} {...iconStyle} /> <Icon name={icon} {...iconStyle} />
+14 -4
View File
@@ -275,10 +275,19 @@ export default StyleSheet.create({
temperatureTextInputSuggestion: { temperatureTextInputSuggestion: {
color: '#939393' color: '#939393'
}, },
actionButtonRow: { actionButtonFooter: {
alignItems: 'center',
justifyContent: 'space-around',
flexDirection: 'row', flexDirection: 'row',
justifyContent: 'space-evenly', height: 60,
marginTop: 50 },
actionButtonItem: {
backgroundColor: secondaryColor,
alignItems: 'center',
flex: 1,
marginHorizontal: 5,
paddingVertical: 5,
borderRadius: 5,
}, },
symptomEditButton: { symptomEditButton: {
width: 130 width: 130
@@ -307,7 +316,8 @@ export default StyleSheet.create({
settingsButton: { settingsButton: {
padding: 10, padding: 10,
alignItems: 'center', alignItems: 'center',
margin: 10 margin: 10,
borderRadius: 5,
}, },
settingsButtonAccent: { settingsButtonAccent: {
backgroundColor: secondaryColor backgroundColor: secondaryColor