lpitault/application-amicale
1
0
Fork 0
forked from vergnet/application-amicale
Code Issues Pull requests Releases Wiki Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

16
screens/Proximo/ProximoListScreen.js
View file

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

12
screens/SelfMenuScreen.js
View file

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