Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
keplyx 2020-03-08 14:43:07 +01:00
commit 376b5f665c
2 changed files with 15 additions and 13 deletions

View file

@ -213,35 +213,35 @@ export default class ProximoListScreen extends React.Component<Props, State> {
>
<View style={{
flexDirection: 'row',
justifyContent: 'center',
justifyContent: 'flex-start',
alignItems: 'center'
}}>
<Text>{i18n.t('proximoScreen.sortPrice')}</Text>
<RadioButton value={1}/>
<Text>{i18n.t('proximoScreen.sortPrice')}</Text>
</View>
<View style={{
flexDirection: 'row',
justifyContent: 'center',
justifyContent: 'flex-start',
alignItems: 'center'
}}>
<Text>{i18n.t('proximoScreen.sortPriceReverse')}</Text>
<RadioButton value={2}/>
<Text>{i18n.t('proximoScreen.sortPriceReverse')}</Text>
</View>
<View style={{
flexDirection: 'row',
justifyContent: 'center',
justifyContent: 'flex-start',
alignItems: 'center'
}}>
<Text>{i18n.t('proximoScreen.sortName')}</Text>
<RadioButton value={3}/>
<Text>{i18n.t('proximoScreen.sortName')}</Text>
</View>
<View style={{
flexDirection: 'row',
justifyContent: 'center',
justifyContent: 'flex-start',
alignItems: 'center'
}}>
<Text>{i18n.t('proximoScreen.sortNameReverse')}</Text>
<RadioButton value={4}/>
<Text>{i18n.t('proximoScreen.sortNameReverse')}</Text>
</View>
</RadioButton.Group>
</View>

View file

@ -99,11 +99,11 @@ export default class SelfMenuScreen extends React.Component<Props> {
getRenderSectionHeader({section}: Object) {
return (
<Card style={{
width: '90%',
width: '95%',
marginLeft: 'auto',
marginRight: 'auto',
marginBottom: 10,
marginTop: 20,
marginTop: 5,
marginBottom: 5,
elevation: 4,
}}>
<Card.Title
@ -126,9 +126,11 @@ export default class SelfMenuScreen extends React.Component<Props> {
return (
<Card style={{
flex: 0,
margin: 10,
marginHorizontal: 10,
marginVertical: 5,
}}>
<Card.Title
style={{marginTop: 5}}
title={item.name}
/>
<View style={{
@ -137,7 +139,7 @@ export default class SelfMenuScreen extends React.Component<Props> {
marginRight: 'auto',
borderBottomWidth: 1,
borderBottomColor: ThemeManager.getCurrentThemeVariables().primary,
marginTop: 10,
marginTop: 5,
marginBottom: 5,
}}/>
<Card.Content>