Refactor XAML and ViewModel code to comment out not needed UI elements and logic for mangopay
This commit is contained in:
parent
e6671d19fb
commit
1c44f686ab
@ -150,7 +150,7 @@
|
|||||||
<Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedPrivacy}"></Switch>
|
<Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedPrivacy}"></Switch>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Grid ColumnDefinitions="*,Auto" ColumnSpacing="10"
|
<!-- <Grid ColumnDefinitions="*,Auto" ColumnSpacing="10"
|
||||||
IsVisible="{Binding ViewModel.AppUserType, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static enum:AppUserType.DogWalker}}" >
|
IsVisible="{Binding ViewModel.AppUserType, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static enum:AppUserType.DogWalker}}" >
|
||||||
<Label Grid.Column="0" Text="{x:Static res:Text.Register_AcceptTermsMangopay}" Style="{StaticResource LinkLabelStyle}" HorizontalOptions="Start" Padding="0,0,0,0" LineBreakMode="TailTruncation">
|
<Label Grid.Column="0" Text="{x:Static res:Text.Register_AcceptTermsMangopay}" Style="{StaticResource LinkLabelStyle}" HorizontalOptions="Start" Padding="0,0,0,0" LineBreakMode="TailTruncation">
|
||||||
<Label.GestureRecognizers>
|
<Label.GestureRecognizers>
|
||||||
@ -158,7 +158,7 @@
|
|||||||
</Label.GestureRecognizers>
|
</Label.GestureRecognizers>
|
||||||
</Label>
|
</Label>
|
||||||
<Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedTermsMangopay}"></Switch>
|
<Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedTermsMangopay}"></Switch>
|
||||||
</Grid>
|
</Grid> -->
|
||||||
</VerticalStackLayout>
|
</VerticalStackLayout>
|
||||||
|
|
||||||
<VerticalStackLayout Spacing="0" IsVisible="{Binding ViewModel.AppUserType, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static enum:AppUserType.DogWalker}}" Margin="{StaticResource MarginBig}">
|
<VerticalStackLayout Spacing="0" IsVisible="{Binding ViewModel.AppUserType, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static enum:AppUserType.DogWalker}}" Margin="{StaticResource MarginBig}">
|
||||||
|
|||||||
@ -117,7 +117,7 @@
|
|||||||
<Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedPrivacy}"></Switch>
|
<Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedPrivacy}"></Switch>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Grid ColumnDefinitions="*,Auto" ColumnSpacing="10"
|
<!-- <Grid ColumnDefinitions="*,Auto" ColumnSpacing="10"
|
||||||
IsVisible="{Binding ViewModel.AppUserType, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static enum:AppUserType.DogWalker}}" >
|
IsVisible="{Binding ViewModel.AppUserType, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static enum:AppUserType.DogWalker}}" >
|
||||||
<Label Grid.Column="0" Text="{x:Static res:Text.Register_AcceptTermsMangopay}" Style="{StaticResource LinkLabelStyle}" HorizontalOptions="Start" Padding="0,0,0,0" LineBreakMode="TailTruncation">
|
<Label Grid.Column="0" Text="{x:Static res:Text.Register_AcceptTermsMangopay}" Style="{StaticResource LinkLabelStyle}" HorizontalOptions="Start" Padding="0,0,0,0" LineBreakMode="TailTruncation">
|
||||||
<Label.GestureRecognizers>
|
<Label.GestureRecognizers>
|
||||||
@ -125,7 +125,7 @@
|
|||||||
</Label.GestureRecognizers>
|
</Label.GestureRecognizers>
|
||||||
</Label>
|
</Label>
|
||||||
<Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedTermsMangopay}"></Switch>
|
<Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedTermsMangopay}"></Switch>
|
||||||
</Grid>
|
</Grid> -->
|
||||||
</VerticalStackLayout>
|
</VerticalStackLayout>
|
||||||
|
|
||||||
<VerticalStackLayout Spacing="0" IsVisible="{Binding ViewModel.AppUserType, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static enum:AppUserType.DogWalker}}" Margin="{StaticResource MarginBig}">
|
<VerticalStackLayout Spacing="0" IsVisible="{Binding ViewModel.AppUserType, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static enum:AppUserType.DogWalker}}" Margin="{StaticResource MarginBig}">
|
||||||
|
|||||||
@ -203,7 +203,9 @@ namespace gehGassiApp.ViewModels.Account
|
|||||||
if (AppUserType == AppUserType.DogOwner)
|
if (AppUserType == AppUserType.DogOwner)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (AcceptedTermsMangopay && SelectedNationality != null && SelectedMainResidence != null)
|
// if (AcceptedTermsMangopay && SelectedNationality != null && SelectedMainResidence != null)
|
||||||
|
// return true;
|
||||||
|
if (SelectedNationality != null && SelectedMainResidence != null)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@ -476,7 +476,7 @@
|
|||||||
</Grid.GestureRecognizers>
|
</Grid.GestureRecognizers>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Border Style="{StaticResource Separator}" />
|
<!-- <Border Style="{StaticResource Separator}" />
|
||||||
|
|
||||||
<Grid
|
<Grid
|
||||||
ColumnDefinitions="24,*,24"
|
ColumnDefinitions="24,*,24"
|
||||||
@ -599,7 +599,7 @@
|
|||||||
<Grid.GestureRecognizers>
|
<Grid.GestureRecognizers>
|
||||||
<TapGestureRecognizer Command="{Binding PayoutsCommand}" />
|
<TapGestureRecognizer Command="{Binding PayoutsCommand}" />
|
||||||
</Grid.GestureRecognizers>
|
</Grid.GestureRecognizers>
|
||||||
</Grid>
|
</Grid> -->
|
||||||
|
|
||||||
<Border Style="{StaticResource Separator}" />
|
<Border Style="{StaticResource Separator}" />
|
||||||
|
|
||||||
|
|||||||
@ -441,7 +441,7 @@
|
|||||||
</Grid.GestureRecognizers>
|
</Grid.GestureRecognizers>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Border Style="{StaticResource Separator}" />
|
<!-- <Border Style="{StaticResource Separator}" />
|
||||||
|
|
||||||
<Grid
|
<Grid
|
||||||
ColumnDefinitions="24,*,24"
|
ColumnDefinitions="24,*,24"
|
||||||
@ -484,9 +484,9 @@
|
|||||||
<Grid.GestureRecognizers>
|
<Grid.GestureRecognizers>
|
||||||
<TapGestureRecognizer Command="{Binding BankAccountCommand}" />
|
<TapGestureRecognizer Command="{Binding BankAccountCommand}" />
|
||||||
</Grid.GestureRecognizers>
|
</Grid.GestureRecognizers>
|
||||||
</Grid>
|
</Grid> -->
|
||||||
|
|
||||||
<Border Style="{StaticResource Separator}" />
|
<!-- <Border Style="{StaticResource Separator}" />
|
||||||
|
|
||||||
<Grid
|
<Grid
|
||||||
ColumnDefinitions="24,*,24"
|
ColumnDefinitions="24,*,24"
|
||||||
@ -529,9 +529,9 @@
|
|||||||
<Grid.GestureRecognizers>
|
<Grid.GestureRecognizers>
|
||||||
<TapGestureRecognizer Command="{Binding IdentityProofCommand}" />
|
<TapGestureRecognizer Command="{Binding IdentityProofCommand}" />
|
||||||
</Grid.GestureRecognizers>
|
</Grid.GestureRecognizers>
|
||||||
</Grid>
|
</Grid> -->
|
||||||
|
|
||||||
<Border Style="{StaticResource Separator}" />
|
<!-- <Border Style="{StaticResource Separator}" />
|
||||||
|
|
||||||
<Grid
|
<Grid
|
||||||
ColumnDefinitions="24,*,24"
|
ColumnDefinitions="24,*,24"
|
||||||
@ -564,7 +564,7 @@
|
|||||||
<Grid.GestureRecognizers>
|
<Grid.GestureRecognizers>
|
||||||
<TapGestureRecognizer Command="{Binding PayoutsCommand}" />
|
<TapGestureRecognizer Command="{Binding PayoutsCommand}" />
|
||||||
</Grid.GestureRecognizers>
|
</Grid.GestureRecognizers>
|
||||||
</Grid>
|
</Grid> -->
|
||||||
|
|
||||||
<Border Style="{StaticResource Separator}" />
|
<Border Style="{StaticResource Separator}" />
|
||||||
|
|
||||||
|
|||||||
@ -442,7 +442,7 @@
|
|||||||
SelectedItem="{Binding SelectedMainResidence}" />
|
SelectedItem="{Binding SelectedMainResidence}" />
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<Grid Margin="{StaticResource MarginVerySmall}" ColumnDefinitions="*,*">
|
<!-- <Grid Margin="{StaticResource MarginVerySmall}" ColumnDefinitions="*,*">
|
||||||
<Label
|
<Label
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
LineBreakMode="TailTruncation"
|
LineBreakMode="TailTruncation"
|
||||||
@ -467,7 +467,7 @@
|
|||||||
<Label
|
<Label
|
||||||
Margin="{StaticResource MarginBig}"
|
Margin="{StaticResource MarginBig}"
|
||||||
Style="{StaticResource BodyCaption_GreyDark}"
|
Style="{StaticResource BodyCaption_GreyDark}"
|
||||||
Text="{x:Static res:Text.Profile_AutoPayout_Desc}" />
|
Text="{x:Static res:Text.Profile_AutoPayout_Desc}" /> -->
|
||||||
|
|
||||||
<ActivityIndicator
|
<ActivityIndicator
|
||||||
HorizontalOptions="Center"
|
HorizontalOptions="Center"
|
||||||
|
|||||||
@ -500,7 +500,7 @@
|
|||||||
SelectedItem="{Binding SelectedMainResidence}" />
|
SelectedItem="{Binding SelectedMainResidence}" />
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<Grid Margin="{StaticResource MarginVerySmall}" ColumnDefinitions="*,*">
|
<!-- <Grid Margin="{StaticResource MarginVerySmall}" ColumnDefinitions="*,*">
|
||||||
<Label
|
<Label
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
LineBreakMode="TailTruncation"
|
LineBreakMode="TailTruncation"
|
||||||
@ -522,7 +522,7 @@
|
|||||||
</Switch>
|
</Switch>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Label Style="{StaticResource BodyCaption_GreyDark}" Text="{x:Static res:Text.Profile_AutoPayout_Desc}" />
|
<Label Style="{StaticResource BodyCaption_GreyDark}" Text="{x:Static res:Text.Profile_AutoPayout_Desc}" /> -->
|
||||||
|
|
||||||
<ActivityIndicator
|
<ActivityIndicator
|
||||||
HorizontalOptions="Center"
|
HorizontalOptions="Center"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user