gehgassiGmbH/gehgassi_app
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor terms acceptance handling and update application version to 1.281; clean up commented code in multiple views.

Browse Source
This commit is contained in:
Max Mannstein 2025-10-20 22:15:52 +02:00
parent 4bcc524b2c
commit 20936a5b5d
12 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gehGassiApp/gehGassiApp/Controls/Register/Step2ExternalControl.xaml
View File

@ -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}">

4
gehGassiApp/gehGassiApp/Controls/Register/Step3Control.xaml
View File

@ -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}">

4
gehGassiApp/gehGassiApp/ViewModels/Account/RegisterViewModel.cs
View File

@ -203,9 +203,7 @@ 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;

4
gehGassiApp/gehGassiApp/ViewModels/More/AddPaymentUserViewModel.cs
View File

@ -81,7 +81,7 @@ namespace gehGassiApp.ViewModels.More
/// Hat der Benutzer die MangoPay-AGB akzeptiert? /// Hat der Benutzer die MangoPay-AGB akzeptiert?
/// </summary> /// </summary>
[ObservableProperty] [ObservableProperty]
private bool _acceptedTermsMangopay = true; private bool _acceptedTermsMangopay;
#region Commands #region Commands
@ -177,7 +177,7 @@ namespace gehGassiApp.ViewModels.More
{ {
SelectedNationality = null; SelectedNationality = null;
SelectedMainResidence = null; SelectedMainResidence = null;
AcceptedTermsMangopay = true; AcceptedTermsMangopay = false;
IsBusy = true; IsBusy = true;
await Task.Delay(Core.Common.Constants.AnimationDelayDetails); await Task.Delay(Core.Common.Constants.AnimationDelayDetails);

4
gehGassiApp/gehGassiApp/ViewModels/More/BecomeWalkerViewmodel.cs
View File

@ -91,7 +91,7 @@ namespace gehGassiApp.ViewModels.More
/// Hat der Benutzer die MangoPay-AGB akzeptiert? /// Hat der Benutzer die MangoPay-AGB akzeptiert?
/// </summary> /// </summary>
[ObservableProperty] [ObservableProperty]
private bool _acceptedTermsMangopay = true; private bool _acceptedTermsMangopay;
#region Commands #region Commands
@ -193,7 +193,7 @@ namespace gehGassiApp.ViewModels.More
{ {
SelectedNationality = null; SelectedNationality = null;
SelectedMainResidence = null; SelectedMainResidence = null;
AcceptedTermsMangopay = true; AcceptedTermsMangopay = false;
IsBusy = true; IsBusy = true;
await Task.Delay(Core.Common.Constants.AnimationDelayDetails); await Task.Delay(Core.Common.Constants.AnimationDelayDetails);

6
gehGassiApp/gehGassiApp/Views/More/AddPaymentUserView.xaml
View File

@ -63,8 +63,8 @@
ItemDisplayBinding="{Binding Name}" ItemDisplayBinding="{Binding Name}"
ItemsSource="{Binding MainResidences}" ItemsSource="{Binding MainResidences}"
SelectedItem="{Binding SelectedMainResidence}" /> SelectedItem="{Binding SelectedMainResidence}" />
</Border> </Border>
<!-- <Grid <Grid
Margin="{StaticResource MarginBig}" Margin="{StaticResource MarginBig}"
ColumnDefinitions="*,Auto" ColumnDefinitions="*,Auto"
ColumnSpacing="10"> ColumnSpacing="10">
@ -83,7 +83,7 @@
HorizontalOptions="End" HorizontalOptions="End"
IsToggled="{Binding AcceptedTermsMangopay}" IsToggled="{Binding AcceptedTermsMangopay}"
VerticalOptions="Center" /> VerticalOptions="Center" />
</Grid> --> </Grid>
<ActivityIndicator <ActivityIndicator
HorizontalOptions="Center" HorizontalOptions="Center"

4
gehGassiApp/gehGassiApp/Views/More/BecomeWalkerView.xaml
View File

@ -65,7 +65,7 @@
ItemsSource="{Binding MainResidences}" ItemsSource="{Binding MainResidences}"
SelectedItem="{Binding SelectedMainResidence}" /> SelectedItem="{Binding SelectedMainResidence}" />
</Border> </Border>
<!-- <Grid <Grid
Margin="{StaticResource MarginBig}" Margin="{StaticResource MarginBig}"
ColumnDefinitions="*,Auto" ColumnDefinitions="*,Auto"
ColumnSpacing="10"> ColumnSpacing="10">
@ -84,7 +84,7 @@
HorizontalOptions="End" HorizontalOptions="End"
IsToggled="{Binding AcceptedTermsMangopay}" IsToggled="{Binding AcceptedTermsMangopay}"
VerticalOptions="Center" /> VerticalOptions="Center" />
</Grid>--> </Grid>
<ActivityIndicator <ActivityIndicator
HorizontalOptions="Center" HorizontalOptions="Center"

4
gehGassiApp/gehGassiApp/Views/More/MoreView.xaml
View File

@ -546,7 +546,7 @@
</Grid.GestureRecognizers> </Grid.GestureRecognizers>
</Grid> </Grid>
<!-- <Border Style="{StaticResource Separator}" /> <Border Style="{StaticResource Separator}" />
<Grid <Grid
ColumnDefinitions="24,*,24" ColumnDefinitions="24,*,24"
@ -669,7 +669,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}" />

12
gehGassiApp/gehGassiApp/Views/More/MoreWalkerView.xaml
View File

@ -510,7 +510,7 @@
</Grid.GestureRecognizers> </Grid.GestureRecognizers>
</Grid> </Grid>
<!-- <Border Style="{StaticResource Separator}" /> <Border Style="{StaticResource Separator}" />
<Grid <Grid
ColumnDefinitions="24,*,24" ColumnDefinitions="24,*,24"
@ -553,9 +553,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"
@ -598,9 +598,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"
@ -633,7 +633,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}" />

4
gehGassiApp/gehGassiApp/Views/ProfileView.xaml
View File

@ -453,7 +453,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"
@ -478,7 +478,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"

4
gehGassiApp/gehGassiApp/Views/ProfileWalkerView.xaml
View File

@ -511,7 +511,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"
@ -533,7 +533,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"

4
gehGassiApp/gehGassiApp/gehGassiApp.csproj
View File

@ -22,8 +22,8 @@
<ApplicationIdGuid>284D2BDB-7FFC-485A-968F-8440A92578FE</ApplicationIdGuid> <ApplicationIdGuid>284D2BDB-7FFC-485A-968F-8440A92578FE</ApplicationIdGuid>
<!-- Versions --> <!-- Versions -->
<ApplicationDisplayVersion>1.280</ApplicationDisplayVersion> <ApplicationDisplayVersion>1.281</ApplicationDisplayVersion>
<ApplicationVersion>280</ApplicationVersion> <ApplicationVersion>281</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion> <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">29.0</SupportedOSPlatformVersion> <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">29.0</SupportedOSPlatformVersion>