Remove IsEnabled bindings for dog attributes in DogAddView and DogUpdateView

- Initialize `_acceptedTermsMangopay` to `true` in
  `AddPaymentUserViewModel.cs` and `BecomeWalkerViewModel.cs`.
- Set `AcceptedTermsMangopay` to `true` on refresh.
- Add `AutomationId` attributes to email and password
  `Entry` elements in `LoginFormView.xaml` for better
  accessibility.
- Comment out a `Grid` element and remove the `Switch`
  control for `AcceptedTermsMangopay` in
  `AddPaymentUserView.xaml` and `BecomeWalkerView.xaml`.

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": ".NET MAUI",
+            "type": "maui",
+            "request": "launch",
+            "preLaunchTask": "maui: Build"
+        }
+
+    ]
+}

.vscode/settings.json

@@ -0,0 +1 @@
+{}

gehGassiApp/gehGassiApp.Core/Services/CommunicationService.cs

@@ -352,7 +352,7 @@ namespace gehGassiApp.Core.Services
                 var json = JsonSerializer.Serialize(registerDto, _jsonOptions);
                 var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
 
-                var serverResult = await _httpClient.PostAsync($"api/v2/Account/Register", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/v3/Account/Register", stringContent, token).ConfigureAwait(false);
 
                 if (serverResult.IsSuccessStatusCode)
                 {
@@ -453,7 +453,7 @@ namespace gehGassiApp.Core.Services
                 var json = JsonSerializer.Serialize(registerDto, _jsonOptions);
                 var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
 
-                var serverResult = await _httpClient.PostAsync($"api/v2/Account/RegisterExternal", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/v3/Account/RegisterExternal", stringContent, token).ConfigureAwait(false);
 
                 if (serverResult.IsSuccessStatusCode)
                 {
@@ -5952,7 +5952,7 @@ namespace gehGassiApp.Core.Services
                 var json = JsonSerializer.Serialize(requestDto, _jsonOptions);
                 var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
 
-                var serverResult = await _httpClient.PostAsync($"api/walks/AcceptPublicWalkRequest", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/v2/walks/AcceptPublicWalkRequest", stringContent, token).ConfigureAwait(false);
 
                 if (serverResult.IsSuccessStatusCode)
                 {
@@ -7499,7 +7499,7 @@ namespace gehGassiApp.Core.Services
                 var json = JsonSerializer.Serialize(requestDto, _jsonOptions);
                 var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
 
-                var serverResult = await _httpClient.PostAsync($"api/walks/CancelWalk", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/v2/walks/CancelWalk", stringContent, token).ConfigureAwait(false);
 
                 if (serverResult.IsSuccessStatusCode)
                 {
@@ -7688,7 +7688,7 @@ namespace gehGassiApp.Core.Services
                 var json = JsonSerializer.Serialize(requestDto, _jsonOptions);
                 var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
 
-                var serverResult = await _httpClient.PostAsync($"api/walks/ConfirmWalk", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/v2/walks/ConfirmWalk", stringContent, token).ConfigureAwait(false);
 
                 if (serverResult.IsSuccessStatusCode)
                 {
@@ -7754,7 +7754,7 @@ namespace gehGassiApp.Core.Services
                 var json = JsonSerializer.Serialize(requestDto, _jsonOptions);
                 var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
 
-                var serverResult = await _httpClient.PostAsync($"api/walks/ConfirmWalkWithRating", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/v2/walks/ConfirmWalkWithRating", stringContent, token).ConfigureAwait(false);
 
                 if (serverResult.IsSuccessStatusCode)
                 {
@@ -7953,7 +7953,7 @@ namespace gehGassiApp.Core.Services
 
                 var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
 
-                var serverResult = await _httpClient.PostAsync($"api/walks/CreateWalkDirect", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/v2/walks/CreateWalkDirect", stringContent, token).ConfigureAwait(false);
 
                 if (serverResult.IsSuccessStatusCode)
                 {
@@ -8032,7 +8032,7 @@ namespace gehGassiApp.Core.Services
 
                 var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
 
-                var serverResult = await _httpClient.PostAsync($"api/walks/CreateWalkRequest", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/v2/walks/CreateWalkRequest", stringContent, token).ConfigureAwait(false);
 
                 if (serverResult.IsSuccessStatusCode)
                 {
@@ -8106,7 +8106,7 @@ namespace gehGassiApp.Core.Services
                 var json = JsonSerializer.Serialize(requestDto, _jsonOptions);
                 var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
 
-                var serverResult = await _httpClient.PostAsync($"api/walks/AcceptWalk", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/v2/walks/AcceptWalk", stringContent, token).ConfigureAwait(false);
 
                 if (serverResult.IsSuccessStatusCode)
                 {

gehGassiApp/gehGassiApp.Data/Infos.txt

@@ -1,6 +1,11 @@
 
 migrations:
 
+dotnet ef migrations add XXX --project gehGassiApp.Data --startup-project gehGassiApp.DbConfig
+
+dotnet ef database update --project gehGassiApp.Data --startup-project gehGassiApp.DbConfig
+
+
 add-migration xxx -Project gehGassiApp.Data -StartupProject gehGassiApp.DbConfig
 
 add-migration Initial -Project gehGassiApp.Data -StartupProject gehGassiApp.DbConfig

gehGassiApp/gehGassiApp.Data/Migrations/20250706144607_Walk_PaymentType_Added.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace gehGassiApp.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class Walk_PaymentType_Added : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "PaymentType",
+                table: "Walks",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "PaymentType",
+                table: "Walks");
+        }
+    }
+}

gehGassiApp/gehGassiApp.Data/Migrations/LocalDbContextModelSnapshot.cs

@@ -15,7 +15,7 @@ namespace gehGassiApp.Data.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.12");
 
             modelBuilder.Entity("gehGassiApp.Domain.Common.Rating", b =>
                 {
@@ -1345,6 +1345,9 @@ namespace gehGassiApp.Data.Migrations
                     b.Property<int>("PaymentStatus")
                         .HasColumnType("INTEGER");
 
+                    b.Property<int>("PaymentType")
+                        .HasColumnType("INTEGER");
+
                     b.Property<double>("PickupAddressLat")
                         .HasColumnType("REAL");
 

gehGassiApp/gehGassiApp.Domain/Common/Enums.cs

@@ -130,7 +130,20 @@ namespace gehGassiApp.Domain.Common
         /// </summary>
         GehGassi = 10
     }
-
+    /// <summary>
+    /// Zahlungsart für einen Walk
+    /// </summary>
+    public enum WalkPaymentType
+    {
+        /// <summary>
+        /// Mit MangoPay bezahlen (z.B. Kreditkarte)
+        /// </summary>
+        MangoPay = 1,
+        /// <summary>
+        /// Barzahlung
+        /// </summary>
+        Cash = 10
+    }
     /// <summary>
     /// Zahlungsstatus in der App
     /// </summary>

gehGassiApp/gehGassiApp.Domain/Walks/Walk.cs

@@ -176,7 +176,11 @@ namespace gehGassiApp.Domain.Walks
         /// </summary>
         [Required]
         public PaymentStatus PaymentStatus { get; set; }
-
+        /// <summary>
+        /// Welche Art von Bezahlung wurde verwendet
+        /// </summary>
+        [Required]
+        public WalkPaymentType PaymentType { get; set; }
         /// <summary>
         /// Datum der Erstellung des Walks
         /// </summary>
@@ -437,7 +441,11 @@ namespace gehGassiApp.Domain.Walks
         /// Zahlungsstatus des Walks
         /// </summary>
         public PaymentStatus PaymentStatus { get; set; }
-
+        /// <summary>
+        /// Welche Art von Bezahlung wurde verwendet
+        /// </summary>
+        [Required]
+        public WalkPaymentType PaymentType { get; set; }
         /// <summary>
         /// Id des Gutscheins der verwendet wurde, wenn einer verwendet wurde
         /// </summary>

gehGassiApp/gehGassiApp/Controls/Register/Step2ExternalControl.xaml

@@ -150,7 +150,7 @@
                 <Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedPrivacy}"></Switch>
             </Grid>
 
-            <Grid ColumnDefinitions="*,Auto" ColumnSpacing="10"
+            <!-- <Grid ColumnDefinitions="*,Auto" ColumnSpacing="10"
                   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.GestureRecognizers>
@@ -158,7 +158,7 @@
                     </Label.GestureRecognizers>
                 </Label>
                 <Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedTermsMangopay}"></Switch>
-            </Grid>
+            </Grid> -->
         </VerticalStackLayout>
 
         <VerticalStackLayout Spacing="0" IsVisible="{Binding ViewModel.AppUserType, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static enum:AppUserType.DogWalker}}" Margin="{StaticResource MarginBig}">

gehGassiApp/gehGassiApp/Controls/Register/Step3Control.xaml

@@ -117,7 +117,7 @@
                 <Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedPrivacy}"></Switch>
             </Grid>
 
-            <Grid ColumnDefinitions="*,Auto" ColumnSpacing="10"
+            <!-- <Grid ColumnDefinitions="*,Auto" ColumnSpacing="10"
                   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.GestureRecognizers>
@@ -125,7 +125,7 @@
                     </Label.GestureRecognizers>
                 </Label>
                 <Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedTermsMangopay}"></Switch>
-            </Grid>
+            </Grid> -->
         </VerticalStackLayout>
 
         <VerticalStackLayout Spacing="0" IsVisible="{Binding ViewModel.AppUserType, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static enum:AppUserType.DogWalker}}" Margin="{StaticResource MarginBig}">

gehGassiApp/gehGassiApp/MauiProgram.cs

@@ -1,4 +1,5 @@
-using CommunityToolkit.Maui;
+using Plugin.Maui.AppRating;
+using CommunityToolkit.Maui;
 using gehGassi.LocalNotifications;
 using gehGassiApp.Constants;
 using gehGassiApp.Core.Data;
@@ -103,7 +104,7 @@ public static class MauiProgram
                 fonts.AddFont("Inter-Medium.ttf", "InterMedium");
                 fonts.AddFont("Inter-SemiBold.ttf", "InterSemiBold");
                 fonts.AddFont("icomoon.ttf", "IconMoon");
-                fonts.AddFont("MaterialIcons-Regular.ttf", "IconFont");
+                fonts.AddFont("MaterialIcons-Regular.ttf", "MaterialIconsRegular");
             }).UseLocalNotifications()
             .ConfigureMauiHandlers((handlers) =>
             {
@@ -484,7 +485,8 @@ public static class MauiProgram
 
         SetHandler();
 
-        return builder.Build();
+    builder.Services.AddSingleton<IAppRating>(AppRating.Default);
+    return builder.Build();
     }
 
     #region Handler
@@ -504,7 +506,7 @@ public static class MauiProgram
 #endif
 #if IOS
                 handler.PlatformView.BorderStyle = UITextBorderStyle.None;
-                handler.PlatformView.SecureTextEntry = false;
+                // handler.PlatformView.SecureTextEntry = false;
 #endif
             }
 

gehGassiApp/gehGassiApp/Platforms/iOS/Info.plist

@@ -27,8 +27,6 @@
 	<string>Assets.xcassets/appicon.appiconset</string>
 	<key>CFBundleIdentifier</key>
 	<string></string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.274</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
@@ -69,7 +67,7 @@
 	<array>
 		<string>remote-notification</string>
 	</array>
-	<key>CFBundleVersion</key>
+	<key>CFBundleIdentifier</key>
-	<string>274</string>
+	<string></string>
 </dict>
 </plist>

gehGassiApp/gehGassiApp/Resources/Templates/ControlTemplates.xaml

@@ -184,7 +184,7 @@
                             <Image.Source>
                                 <FontImageSource
                                     x:Name="homeImageSource"
-                                    FontFamily="IconFont"
+                                    FontFamily="MaterialIconsRegular"
                                     Glyph="home"
                                     Color="{StaticResource Primary_DarkBlue}" />
                             </Image.Source>
@@ -217,7 +217,7 @@
                             <Image.Source>
                                 <FontImageSource
                                     x:Name="homeWalkerImageSource"
-                                    FontFamily="IconFont"
+                                    FontFamily="MaterialIconsRegular"
                                     Glyph="home"
                                     Color="{StaticResource Primary_DarkBlue}" />
                             </Image.Source>
@@ -505,7 +505,7 @@
                         Background="Transparent"
                         Command="{TemplateBinding BindingContext.NavigateBackCommand}"
                         FontAttributes="Bold"
-                        FontFamily="IconFont"
+                        FontFamily="MaterialIconsRegular"
                         FontSize="40"
                         HorizontalOptions="End"
                         Text="close"

gehGassiApp/gehGassiApp/ViewModels/Account/RegisterViewModel.cs

@@ -203,7 +203,9 @@ namespace gehGassiApp.ViewModels.Account
                 if (AppUserType == AppUserType.DogOwner)
                     return true;
 
-                if (AcceptedTermsMangopay && SelectedNationality != null && SelectedMainResidence != null)
+                // if (AcceptedTermsMangopay && SelectedNationality != null && SelectedMainResidence != null)
+                //     return true;
+                if (SelectedNationality != null && SelectedMainResidence != null)
                     return true;
 
                 return false;

gehGassiApp/gehGassiApp/ViewModels/HomeViewModel.cs

@@ -539,7 +539,12 @@ namespace gehGassiApp.ViewModels
                             request.Distance = Location.CalculateDistance(CurrentLocation.Lat.Value, CurrentLocation.Lng.Value, request.Lat, request.Lng, DistanceUnits.Kilometers);
                     }
 
-                    Walkers = requests.Value.ToObservableCollection();
+                    // Sortierung: Entfernung, dann mit Foto, dann mit Rating
+                    Walkers = requests.Value
+                        .OrderBy(x => x.Distance)
+                        .ThenByDescending(x => !string.IsNullOrWhiteSpace(x.Photo))
+                        .ThenByDescending(x => x.AverageRating > 0)
+                        .ToObservableCollection();
 
                     _total = requests.Total;
                     _skip = requests.Skip + requests.Take;

gehGassiApp/gehGassiApp/ViewModels/More/AddPaymentUserViewModel.cs

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

gehGassiApp/gehGassiApp/ViewModels/More/BecomeWalkerViewmodel.cs

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

gehGassiApp/gehGassiApp/ViewModels/More/MoreViewModel.cs

@@ -1,4 +1,5 @@
-using System.Text.Json;
+using Plugin.Maui.AppRating;
+using System.Text.Json;
 using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -30,7 +31,8 @@ namespace gehGassiApp.ViewModels.More
         private readonly IDialogService _dialogService;
         private readonly ISystemMessageService _systemMessageService;
         private readonly IDispatcher _dispatcher;
-        private readonly IPushnotificationService _pushnotificationService;
+    private readonly IPushnotificationService _pushnotificationService;
+    private readonly IAppRating _appRating;
 
         /// <summary>
 		/// Erstellt eine Instanz
@@ -40,8 +42,8 @@ namespace gehGassiApp.ViewModels.More
 		/// <param name="systemMessageService">Instanz eines ISystemMessageService</param>
 		/// <param name="dispatcher">Instanz eines IDispatcher</param>
 		/// <param name="pushnotificationService">Instanz eines IPushnotificationService</param>
-		public MoreViewModel(IAccountService accountService, IDialogService dialogService, ISystemMessageService systemMessageService, IDispatcher dispatcher, 
+        public MoreViewModel(IAccountService accountService, IDialogService dialogService, ISystemMessageService systemMessageService, IDispatcher dispatcher, 
-	        IPushnotificationService pushnotificationService)
+            IPushnotificationService pushnotificationService, IAppRating appRating)
         {
             _accountService = accountService;
             _dialogService = dialogService;
@@ -50,6 +52,43 @@ namespace gehGassiApp.ViewModels.More
             _pushnotificationService = pushnotificationService;
             Title = Text.View_Title_More;
             SelectedMenu = MenuSelected.More;
+            _appRating = appRating;
+        }
+
+        /// <summary>
+        /// Command für die Store-Bewertung
+        /// </summary>
+        [RelayCommand]
+        public async Task RateApp()
+        {
+            try
+            {
+                await _appRating.PerformRatingOnStoreAsync(
+                    packageName: "com.gehgassi.gehgassi",
+                    applicationId: "id1662116305"
+                );
+            }
+            catch (Exception ex)
+            {
+                await TrackErrorAsync(ex, true);
+            }
+        }
+
+        /// <summary>
+        /// Command für das Teilen der App
+        /// </summary>
+        [RelayCommand]
+        public async Task ShareApp()
+        {
+            string url = DeviceInfo.Platform == DevicePlatform.iOS
+                ? "https://apps.apple.com/us/app/gehgassi/id1662116305"
+                : "https://play.google.com/store/apps/details?id=com.gehgassi.gehgassi";
+            string text = $"Schau dir die gehgassi App an! {url}";
+            await Share.Default.RequestAsync(new ShareTextRequest
+            {
+                Text = text,
+                Title = "App teilen"
+            });
         }
 
         /// <summary>

gehGassiApp/gehGassiApp/ViewModels/More/MoreWalkerViewModel.cs

@@ -1,4 +1,5 @@
-using System.Text.Json;
+using Plugin.Maui.AppRating;
+using System.Text.Json;
 using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -30,7 +31,8 @@ namespace gehGassiApp.ViewModels.More
         private readonly IUserService _userService;
         private readonly ISystemMessageService _systemMessageService;
         private readonly IDispatcher _dispatcher;
-        private readonly IPushnotificationService _pushnotificationService;
+    private readonly IPushnotificationService _pushnotificationService;
+    private readonly IAppRating _appRating;
 
         /// <summary>
 		/// Erstellt eine Instanz
@@ -41,8 +43,8 @@ namespace gehGassiApp.ViewModels.More
 		/// <param name="systemMessageService">Instanz eines ISystemMessageService</param>
 		/// <param name="dispatcher">Instanz eines IDispatcher</param>
 		/// <param name="pushnotificationService">Instanz eines IPushnotificationService</param>
-		public MoreWalkerViewModel(IAccountService accountService, IDialogService dialogService, IUserService userService, ISystemMessageService systemMessageService, IDispatcher dispatcher, 
+        public MoreWalkerViewModel(IAccountService accountService, IDialogService dialogService, IUserService userService, ISystemMessageService systemMessageService, IDispatcher dispatcher, 
-	        IPushnotificationService pushnotificationService)
+            IPushnotificationService pushnotificationService, IAppRating appRating)
         {
             _accountService = accountService;
             _dialogService = dialogService;
@@ -52,8 +54,43 @@ namespace gehGassiApp.ViewModels.More
             _pushnotificationService = pushnotificationService;
             Title = Text.View_Title_More;
             SelectedMenu = MenuSelected.More;
+            _appRating = appRating;
         }
 
+        /// <summary>
+        /// Command für die Store-Bewertung
+        /// </summary>
+        [RelayCommand]
+        public async Task RateApp()
+        {
+            try
+            {
+                await _appRating.PerformRatingOnStoreAsync(
+                    packageName: "com.gehgassi.gehgassi",
+                    applicationId: "id1662116305"
+                );
+            }
+            catch (Exception ex)
+            {
+                await TrackErrorAsync(ex, true);
+            }
+        }
+        /// <summary>
+        /// Command für das Teilen der App
+        /// </summary>
+        [RelayCommand]
+        public async Task ShareApp()
+        {
+            string url = DeviceInfo.Platform == DevicePlatform.iOS
+                ? "https://apps.apple.com/us/app/gehgassi/id1662116305"
+                : "https://play.google.com/store/apps/details?id=com.gehgassi.gehgassi";
+            string text = $"Schau dir die gehgassi App an! {url}";
+            await Share.Default.RequestAsync(new ShareTextRequest
+            {
+                Text = text,
+                Title = "App teilen"
+            });
+        }
         /// <summary>
         /// Gibt an ob Switch verfügbar ist
         /// </summary>

gehGassiApp/gehGassiApp/ViewModels/Popups/PaymentInfoPopupViewModel.cs

@@ -0,0 +1,57 @@
+using CommunityToolkit.Maui.Views;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+
+namespace gehGassiApp.ViewModels.Popups
+{
+    /// <summary>
+    /// ViewModel für das Zahlungshinweis-Popup
+    /// 
+    /// Verwendung:
+    /// // Prüfen ob bereits angezeigt
+    /// if (!PaymentInfoPopupViewModel.HasInfoBeenShown())
+    /// {
+    ///     var popup = new PaymentInfoPopup();
+    ///     await Shell.Current.CurrentPage.ShowPopupAsync(popup);
+    /// }
+    /// </summary>
+    public partial class PaymentInfoPopupViewModel : ObservableObject
+    {
+        private readonly Popup _popup;
+        private const string PAYMENT_INFO_SHOWN_KEY = "payment_info_july_shown_2025";
+
+        public PaymentInfoPopupViewModel(Popup popup)
+        {
+            _popup = popup;
+        }
+
+        /// <summary>
+        /// Prüft, ob der Zahlungshinweis bereits angezeigt wurde
+        /// </summary>
+        public static bool HasInfoBeenShown()
+        {
+            return Preferences.Get(PAYMENT_INFO_SHOWN_KEY, false);
+        }
+
+        /// <summary>
+        /// Markiert den Hinweis als angezeigt
+        /// </summary>
+        private static void MarkInfoAsShown()
+        {
+            Preferences.Set(PAYMENT_INFO_SHOWN_KEY, true);
+        }
+
+        /// <summary>
+        /// User hat den Hinweis zur Kenntnis genommen
+        /// </summary>
+        [RelayCommand]
+        private async Task Acknowledge()
+        {
+            // Hinweis als angezeigt markieren
+            MarkInfoAsShown();
+
+            // Popup schließen
+            await _popup.CloseAsync(true);
+        }
+    }
+}

gehGassiApp/gehGassiApp/ViewModels/Walks/PublicWalkRequestCreateViewModel.cs

@@ -526,7 +526,7 @@ namespace gehGassiApp.ViewModels.Walks
             }
         }
 
-#endregion
+        #endregion
 
         /// <summary>
         /// Laden der initialen Daten
@@ -597,6 +597,8 @@ namespace gehGassiApp.ViewModels.Walks
                     CheckSubscription(AppMode.DogOwner);
                 }
             }
+                    DogSelectionChanged();
+            
         }
 
         /// <summary>
@@ -615,10 +617,22 @@ namespace gehGassiApp.ViewModels.Walks
             {
                 Dogs = dogs.ToObservableCollection();
                 SelectedDog = Dogs.FirstOrDefault();
+                
+                // Ersten Hund automatisch zur Auswahl hinzufügen
+                if (Dogs.Count > 0)
+                {
+                    SelectedDogs.Clear();
+                    SelectedDogs.Add(Dogs.First());
+                    DogsSelected = true;
+                    
+                    // DogSelectionChanged Command manuell auslösen für UI-Update
+                }
             }
             else
             {
                 Dogs?.Clear();
+                SelectedDogs?.Clear();
+                DogsSelected = false;
             }
 
             HasNoDog = Dogs.Count == 0;

gehGassiApp/gehGassiApp/Views/Account/LoginFormView.xaml

@@ -35,6 +35,7 @@
                     <Entry
                         x:Name="email"
                         Keyboard="Email"
+                        AutomationId="Login"
                         Placeholder="{x:Static res:Text.Login_Username}"
                         Text="{Binding Email}">
                         <Entry.Behaviors>
@@ -48,6 +49,7 @@
                         <Entry
                             Grid.Column="0"
                             HorizontalOptions="Fill"
+                            AutomationId="Password"
                             IsPassword="{Binding Source={x:Reference showPasswordTrigger}, Path=HidePassword}"
                             Keyboard="Text"
                             Placeholder="{x:Static res:Text.Login_Password}"

gehGassiApp/gehGassiApp/Views/Dogs/DogAddView.xaml

@@ -77,7 +77,7 @@
                             WidthRequest="40">
                             <Button.ImageSource>
                                 <FontImageSource
-                                    FontFamily="IconFont"
+                                    FontFamily="MaterialIconsRegular"
                                     Glyph="photo_camera"
                                     Size="20"
                                     Color="{StaticResource Primary_White}" />
@@ -294,7 +294,7 @@
                             <Label
                                 Grid.Row="0"
                                 Grid.Column="0"
-                                IsEnabled="{Binding Dog.LikesAdults}"
+                            
                                 LineBreakMode="TailTruncation"
                                 Style="{StaticResource BodySMedium_Blue}"
                                 Text="{x:Static res:Text.Dog_LikesAdults}"
@@ -308,7 +308,6 @@
                             <Label
                                 Grid.Row="1"
                                 Grid.Column="0"
-                                IsEnabled="{Binding Dog.LikesConspecifics}"
                                 LineBreakMode="TailTruncation"
                                 Style="{StaticResource BodySMedium_Blue}"
                                 Text="{x:Static res:Text.Dog_LikesConspecifics}"
@@ -322,7 +321,6 @@
                             <Label
                                 Grid.Row="2"
                                 Grid.Column="0"
-                                IsEnabled="{Binding Dog.IsTrustful}"
                                 LineBreakMode="TailTruncation"
                                 Style="{StaticResource BodySMedium_Blue}"
                                 Text="{x:Static res:Text.Dog_IsTrustful}"
@@ -336,7 +334,6 @@
                             <Label
                                 Grid.Row="3"
                                 Grid.Column="0"
-                                IsEnabled="{Binding Dog.IsLoneGunner}"
                                 LineBreakMode="TailTruncation"
                                 Style="{StaticResource BodySMedium_Blue}"
                                 Text="{x:Static res:Text.Dog_IsLoneGunner}"
@@ -350,7 +347,6 @@
                             <Label
                                 Grid.Row="4"
                                 Grid.Column="0"
-                                IsEnabled="{Binding Dog.HouseTrained}"
                                 LineBreakMode="TailTruncation"
                                 Style="{StaticResource BodySMedium_Blue}"
                                 Text="{x:Static res:Text.Dog_HouseTrained}"
@@ -364,7 +360,6 @@
                             <Label
                                 Grid.Row="5"
                                 Grid.Column="0"
-                                IsEnabled="{Binding Dog.IsAggressiv}"
                                 LineBreakMode="TailTruncation"
                                 Style="{StaticResource BodySMedium_Blue}"
                                 Text="{x:Static res:Text.Dog_IsAggressiv}"
@@ -422,7 +417,6 @@
                         <Label
                             Grid.Row="0"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.PullsTheLeash}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_PullsTheLeash}"
@@ -436,7 +430,6 @@
                         <Label
                             Grid.Row="1"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.BasicCommands}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_BasicCommands}"
@@ -450,7 +443,6 @@
                         <Label
                             Grid.Row="2"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.Hunter}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_Hunter}"
@@ -464,7 +456,6 @@
                         <Label
                             Grid.Row="3"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.Eating}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_Eating}"
@@ -478,7 +469,6 @@
                         <Label
                             Grid.Row="4"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.Jumper}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_Jumper}"
@@ -505,7 +495,6 @@
                         <Label
                             Grid.Row="0"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.RushesOutside}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_RushesOutside}"
@@ -519,7 +508,6 @@
                         <Label
                             Grid.Row="1"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.IsCalm}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_IsCalm}"
@@ -533,7 +521,6 @@
                         <Label
                             Grid.Row="2"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.IsPeeing}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_IsPeeing}"
@@ -547,7 +534,6 @@
                         <Label
                             Grid.Row="3"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.IsShy}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_IsShy}"
@@ -561,7 +547,6 @@
                         <Label
                             Grid.Row="4"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.IsGuard}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_IsGuard}"

gehGassiApp/gehGassiApp/Views/Dogs/DogUpdateView.xaml

@@ -76,7 +76,7 @@
                             WidthRequest="40">
                             <Button.ImageSource>
                                 <FontImageSource
-                                    FontFamily="IconFont"
+                                    FontFamily="MaterialIconsRegular"
                                     Glyph="photo_camera"
                                     Size="20"
                                     Color="{StaticResource Primary_White}" />
@@ -292,7 +292,6 @@
                             <Label
                                 Grid.Row="0"
                                 Grid.Column="0"
-                                IsEnabled="{Binding Dog.LikesAdults}"
                                 LineBreakMode="TailTruncation"
                                 Style="{StaticResource BodySMedium_Blue}"
                                 Text="{x:Static res:Text.Dog_LikesAdults}"
@@ -306,7 +305,6 @@
                             <Label
                                 Grid.Row="1"
                                 Grid.Column="0"
-                                IsEnabled="{Binding Dog.LikesConspecifics}"
                                 LineBreakMode="TailTruncation"
                                 Style="{StaticResource BodySMedium_Blue}"
                                 Text="{x:Static res:Text.Dog_LikesConspecifics}"
@@ -320,7 +318,6 @@
                             <Label
                                 Grid.Row="2"
                                 Grid.Column="0"
-                                IsEnabled="{Binding Dog.IsTrustful}"
                                 LineBreakMode="TailTruncation"
                                 Style="{StaticResource BodySMedium_Blue}"
                                 Text="{x:Static res:Text.Dog_IsTrustful}"
@@ -334,7 +331,6 @@
                             <Label
                                 Grid.Row="3"
                                 Grid.Column="0"
-                                IsEnabled="{Binding Dog.IsLoneGunner}"
                                 LineBreakMode="TailTruncation"
                                 Style="{StaticResource BodySMedium_Blue}"
                                 Text="{x:Static res:Text.Dog_IsLoneGunner}"
@@ -348,7 +344,6 @@
                             <Label
                                 Grid.Row="4"
                                 Grid.Column="0"
-                                IsEnabled="{Binding Dog.HouseTrained}"
                                 LineBreakMode="TailTruncation"
                                 Style="{StaticResource BodySMedium_Blue}"
                                 Text="{x:Static res:Text.Dog_HouseTrained}"
@@ -362,7 +357,6 @@
                             <Label
                                 Grid.Row="5"
                                 Grid.Column="0"
-                                IsEnabled="{Binding Dog.IsAggressiv}"
                                 LineBreakMode="TailTruncation"
                                 Style="{StaticResource BodySMedium_Blue}"
                                 Text="{x:Static res:Text.Dog_IsAggressiv}"
@@ -420,7 +414,6 @@
                         <Label
                             Grid.Row="0"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.PullsTheLeash}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_PullsTheLeash}"
@@ -434,7 +427,6 @@
                         <Label
                             Grid.Row="1"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.BasicCommands}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_BasicCommands}"
@@ -448,7 +440,6 @@
                         <Label
                             Grid.Row="2"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.Hunter}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_Hunter}"
@@ -462,7 +453,6 @@
                         <Label
                             Grid.Row="3"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.Eating}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_Eating}"
@@ -476,7 +466,6 @@
                         <Label
                             Grid.Row="4"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.Jumper}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_Jumper}"
@@ -503,7 +492,6 @@
                         <Label
                             Grid.Row="0"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.RushesOutside}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_RushesOutside}"
@@ -517,7 +505,6 @@
                         <Label
                             Grid.Row="1"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.IsCalm}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_IsCalm}"
@@ -531,7 +518,6 @@
                         <Label
                             Grid.Row="2"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.IsPeeing}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_IsPeeing}"
@@ -545,7 +531,6 @@
                         <Label
                             Grid.Row="3"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.IsShy}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_IsShy}"
@@ -559,7 +544,6 @@
                         <Label
                             Grid.Row="4"
                             Grid.Column="0"
-                            IsEnabled="{Binding Dog.IsGuard}"
                             LineBreakMode="TailTruncation"
                             Style="{StaticResource BodySMedium_Blue}"
                             Text="{x:Static res:Text.Dog_IsGuard}"

gehGassiApp/gehGassiApp/Views/More/AddPaymentUserView.xaml

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

gehGassiApp/gehGassiApp/Views/More/BecomeWalkerView.xaml

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

gehGassiApp/gehGassiApp/Views/More/MoreView.xaml

@@ -398,6 +398,76 @@
 
                         <Border Style="{StaticResource Separator}" />
 
+                        <Grid
+                            ColumnDefinitions="24,*,24"
+                            ColumnSpacing="12"
+                            HorizontalOptions="FillAndExpand"
+                            VerticalOptions="StartAndExpand">
+                            <Image Grid.Column="0" HeightRequest="24">
+                                <Image.Source>
+                                    <FontImageSource
+                                        FontFamily="MaterialIconsRegular"
+                                        Glyph="thumb_up"
+                                        Color="{StaticResource Primary_DarkBlue}" />
+                                </Image.Source>
+                            </Image>
+                            <Label
+                                Grid.Column="1"
+                                HorizontalOptions="StartAndExpand"
+                                LineBreakMode="TailTruncation"
+                                Style="{StaticResource H5_Blue}"
+                                Text="App bewerten"
+                                VerticalOptions="Center" />
+                            <Image Grid.Column="2" HeightRequest="24">
+                                <Image.Source>
+                                    <FontImageSource
+                                        FontFamily="IconMoon"
+                                        Glyph="{x:Static i:IconsMoon.Icon_Chevron_Right}"
+                                        Color="{StaticResource Primary_DarkBlue}" />
+                                </Image.Source>
+                            </Image>
+                            <Grid.GestureRecognizers>
+                                <TapGestureRecognizer Command="{Binding RateAppCommand}" />
+                            </Grid.GestureRecognizers>
+                        </Grid>
+
+                        <Border Style="{StaticResource Separator}" />
+
+                        <Grid
+                            ColumnDefinitions="24,*,24"
+                            ColumnSpacing="12"
+                            HorizontalOptions="FillAndExpand"
+                            VerticalOptions="StartAndExpand">
+                            <Image Grid.Column="0" HeightRequest="24">
+                                <Image.Source>
+                                    <FontImageSource
+                                        FontFamily="MaterialIconsRegular"
+                                        Glyph="share"
+                                        Color="{StaticResource Primary_DarkBlue}" />
+                                </Image.Source>
+                            </Image>
+                            <Label
+                                Grid.Column="1"
+                                HorizontalOptions="StartAndExpand"
+                                LineBreakMode="TailTruncation"
+                                Style="{StaticResource H5_Blue}"
+                                Text="App teilen"
+                                VerticalOptions="Center" />
+                            <Image Grid.Column="2" HeightRequest="24">
+                                <Image.Source>
+                                    <FontImageSource
+                                        FontFamily="IconMoon"
+                                        Glyph="{x:Static i:IconsMoon.Icon_Chevron_Right}"
+                                        Color="{StaticResource Primary_DarkBlue}" />
+                                </Image.Source>
+                            </Image>
+                            <Grid.GestureRecognizers>
+                                <TapGestureRecognizer Command="{Binding ShareAppCommand}" />
+                            </Grid.GestureRecognizers>
+                        </Grid>
+
+                        <Border Style="{StaticResource Separator}" />
+
                         <Grid
                             ColumnDefinitions="24,*,24"
                             ColumnSpacing="12"
@@ -476,7 +546,7 @@
                             </Grid.GestureRecognizers>
                         </Grid>
 
-                        <Border Style="{StaticResource Separator}" />
+                        <!-- <Border Style="{StaticResource Separator}" />
 
                         <Grid
                             ColumnDefinitions="24,*,24"
@@ -599,7 +669,7 @@
                             <Grid.GestureRecognizers>
                                 <TapGestureRecognizer Command="{Binding PayoutsCommand}" />
                             </Grid.GestureRecognizers>
-                        </Grid>
+                        </Grid> -->
 
                         <Border Style="{StaticResource Separator}" />
 

gehGassiApp/gehGassiApp/Views/More/MoreWalkerView.xaml

@@ -221,8 +221,8 @@
                             </Grid.GestureRecognizers>
                         </Grid>
 
-                        <Border Style="{StaticResource Separator}" />
 
+                        <Border Style="{StaticResource Separator}" />
                         <Grid
                             ColumnDefinitions="24,*,24"
                             ColumnSpacing="12"
@@ -256,8 +256,9 @@
                             </Grid.GestureRecognizers>
                         </Grid>
 
-                        <Border Style="{StaticResource Separator}" />
                       
+
+                        <Border Style="{StaticResource Separator}" />
                         <Grid
                             ColumnDefinitions="24,*,24"
                             ColumnSpacing="12"
@@ -360,6 +361,74 @@
                                 <TapGestureRecognizer Command="{Binding FeedbackCommand}" />
                             </Grid.GestureRecognizers>
                         </Grid>
+                        <Border Style="{StaticResource Separator}" />
+   <Grid
+                            ColumnDefinitions="24,*,24"
+                            ColumnSpacing="12"
+                            HorizontalOptions="FillAndExpand"
+                            VerticalOptions="StartAndExpand">
+                            <Image Grid.Column="0" HeightRequest="24">
+                                <Image.Source>
+                                    <FontImageSource
+                                        FontFamily="MaterialIconsRegular"
+                                        Glyph="thumb_up"
+                                        Color="{StaticResource Primary_DarkBlue}" />
+                                </Image.Source>
+                            </Image>
+                            <Label
+                                Grid.Column="1"
+                                HorizontalOptions="StartAndExpand"
+                                LineBreakMode="TailTruncation"
+                                Style="{StaticResource H5_Blue}"
+                                Text="App bewerten"
+                                VerticalOptions="Center" />
+                            <Image Grid.Column="2" HeightRequest="24">
+                                <Image.Source>
+                                    <FontImageSource
+                                        FontFamily="IconMoon"
+                                        Glyph="{x:Static i:IconsMoon.Icon_Chevron_Right}"
+                                        Color="{StaticResource Primary_DarkBlue}" />
+                                </Image.Source>
+                            </Image>
+                            <Grid.GestureRecognizers>
+                                <TapGestureRecognizer Command="{Binding RateAppCommand}" />
+                            </Grid.GestureRecognizers>
+                        </Grid>
+
+                        <Border Style="{StaticResource Separator}" />
+
+                        <Grid
+                            ColumnDefinitions="24,*,24"
+                            ColumnSpacing="12"
+                            HorizontalOptions="FillAndExpand"
+                            VerticalOptions="StartAndExpand">
+                            <Image Grid.Column="0" HeightRequest="24">
+                                <Image.Source>
+                                    <FontImageSource
+                                        FontFamily="MaterialIconsRegular"
+                                        Glyph="share"
+                                        Color="{StaticResource Primary_DarkBlue}" />
+                                </Image.Source>
+                            </Image>
+                            <Label
+                                Grid.Column="1"
+                                HorizontalOptions="StartAndExpand"
+                                LineBreakMode="TailTruncation"
+                                Style="{StaticResource H5_Blue}"
+                                Text="App teilen"
+                                VerticalOptions="Center" />
+                            <Image Grid.Column="2" HeightRequest="24">
+                                <Image.Source>
+                                    <FontImageSource
+                                        FontFamily="IconMoon"
+                                        Glyph="{x:Static i:IconsMoon.Icon_Chevron_Right}"
+                                        Color="{StaticResource Primary_DarkBlue}" />
+                                </Image.Source>
+                            </Image>
+                            <Grid.GestureRecognizers>
+                                <TapGestureRecognizer Command="{Binding ShareAppCommand}" />
+                            </Grid.GestureRecognizers>
+                        </Grid>
 
                         <Border Style="{StaticResource Separator}" />
 
@@ -441,7 +510,7 @@
                             </Grid.GestureRecognizers>
                         </Grid>
 
-                        <Border Style="{StaticResource Separator}" />
+                        <!-- <Border Style="{StaticResource Separator}" />
 
                         <Grid
                             ColumnDefinitions="24,*,24"
@@ -484,9 +553,9 @@
                             <Grid.GestureRecognizers>
                                 <TapGestureRecognizer Command="{Binding BankAccountCommand}" />
                             </Grid.GestureRecognizers>
-                        </Grid>
+                        </Grid> -->
 
-                        <Border Style="{StaticResource Separator}" />
+                        <!-- <Border Style="{StaticResource Separator}" />
 
                         <Grid
                             ColumnDefinitions="24,*,24"
@@ -529,9 +598,9 @@
                             <Grid.GestureRecognizers>
                                 <TapGestureRecognizer Command="{Binding IdentityProofCommand}" />
                             </Grid.GestureRecognizers>
-                        </Grid>
+                        </Grid> -->
 
-                        <Border Style="{StaticResource Separator}" />
+                        <!-- <Border Style="{StaticResource Separator}" />
 
                         <Grid
                             ColumnDefinitions="24,*,24"
@@ -564,7 +633,7 @@
                             <Grid.GestureRecognizers>
                                 <TapGestureRecognizer Command="{Binding PayoutsCommand}" />
                             </Grid.GestureRecognizers>
-                        </Grid>
+                        </Grid> -->
 
                         <Border Style="{StaticResource Separator}" />
 

gehGassiApp/gehGassiApp/Views/Onboarding/OnboardingView.xaml

@@ -136,7 +136,7 @@
                 BorderWidth="1"
                 Command="{Binding PreviousStepCommand}"
                 CornerRadius="30"
-                FontFamily="IconFont"
+                FontFamily="MaterialIconsRegular"
                 FontSize="40"
                 HeightRequest="60"
                 HorizontalOptions="Start"
@@ -158,7 +158,7 @@
                 BorderWidth="1"
                 Command="{Binding NextStepCommand}"
                 CornerRadius="30"
-                FontFamily="IconFont"
+                FontFamily="MaterialIconsRegular"
                 FontSize="40"
                 HeightRequest="60"
                 HorizontalOptions="End"

gehGassiApp/gehGassiApp/Views/Popups/PaymentInfoPopup.xaml

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<toolkit:Popup
+    x:Class="gehGassiApp.Views.Popups.PaymentInfoPopup"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:res="clr-namespace:gehGassiApp.Resources"
+    xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+    CanBeDismissedByTappingOutsideOfPopup="True"
+    Color="Transparent">
+
+    <!--  Popup Content  -->
+    <Border
+        Padding="0"
+        BackgroundColor="White"
+        StrokeShape="RoundRectangle 16"
+        StrokeThickness="0"
+        WidthRequest="350">
+
+        <!--  Drop Shadow Effect  -->
+        <Border.Shadow>
+            <Shadow
+                Brush="{AppThemeBinding Light={StaticResource Grey_Dark},
+                                        Dark={StaticResource Grey_Dark_Dark}}"
+                Opacity="0.3"
+                Radius="8"
+                Offset="0,4" />
+        </Border.Shadow>
+
+        <Grid RowDefinitions="Auto,Auto,Auto">
+
+            <!--  Header  -->
+            <Border
+                Grid.Row="0"
+                Padding="20,16"
+                BackgroundColor="{AppThemeBinding Light={StaticResource Primary_DarkBlue},
+                                                  Dark={StaticResource Primary_DarkBlue_Dark}}"
+                StrokeShape="RoundRectangle 16,16,0,0"
+                StrokeThickness="0">
+                <Label
+                    Style="{StaticResource H4}"
+                    Text="Zahlungshinweis"
+                    TextColor="{AppThemeBinding Light={StaticResource Primary_White},
+                                                Dark={StaticResource Primary_White_Dark}}"
+                    VerticalOptions="Center" />
+            </Border>
+
+            <!--  Content Bereich  -->
+            <VerticalStackLayout
+                Grid.Row="1"
+                Padding="20,20"
+                Spacing="16">
+
+                <!--  Info Icon  -->
+                <Label
+                    FontFamily="MaterialIconsRegular"
+                    FontSize="48"
+                    HorizontalOptions="Center"
+                    Text="info"
+                    TextColor="{AppThemeBinding Light={StaticResource Primary_DarkBlue},
+                                                Dark={StaticResource Primary_DarkBlue_Dark}}" />
+
+                <!--  Info Text  -->
+                <Label
+                    HorizontalTextAlignment="Center"
+                    LineHeight="1.4"
+                    Style="{StaticResource BodyM}"
+                    Text="Leider sind diese Funktionen im Juli nicht verfügbar. Wir arbeiten aber fleißig an einer Lösung."
+                    TextColor="{AppThemeBinding Light={StaticResource Grey_Dark},
+                                                Dark={StaticResource Grey_Dark_Dark}}" />
+
+                <!--  Additional Info  -->
+                <Label
+                    HorizontalTextAlignment="Center"
+                    LineHeight="1.4"
+                    Style="{StaticResource BodyM}"
+                    Text="Im Juli sind nur Barzahlungen verfügbar."
+                    TextColor="{AppThemeBinding Light={StaticResource Primary_DarkBlue},
+                                                Dark={StaticResource Primary_DarkBlue_Dark}}"
+                    FontAttributes="Bold" />
+
+            </VerticalStackLayout>
+
+            <!--  Action Button  -->
+            <Button
+                Grid.Row="2"
+                Margin="20,0,20,20"
+                BackgroundColor="{AppThemeBinding Light={StaticResource Primary_DarkBlue},
+                                                  Dark={StaticResource Primary_DarkBlue_Dark}}"
+                Command="{Binding AcknowledgeCommand}"
+                CornerRadius="12"
+                FontAttributes="Bold"
+                FontSize="{StaticResource FontLabelM}"
+                Text="Verstanden"
+                TextColor="White" />
+
+        </Grid>
+    </Border>
+</toolkit:Popup>

gehGassiApp/gehGassiApp/Views/Popups/PaymentInfoPopup.xaml.cs

@@ -0,0 +1,13 @@
+using CommunityToolkit.Maui.Views;
+using gehGassiApp.ViewModels.Popups;
+
+namespace gehGassiApp.Views.Popups;
+
+public partial class PaymentInfoPopup : Popup
+{
+    public PaymentInfoPopup()
+    {
+        InitializeComponent();
+        BindingContext = new PaymentInfoPopupViewModel(this);
+    }
+}

gehGassiApp/gehGassiApp/Views/Popups/SubscriptionOfferPopup.xaml

@@ -36,7 +36,7 @@
                 Background="Transparent"
                 Command="{Binding DeclineCommand}"
                 FontAttributes="Bold"
-                FontFamily="IconFont"
+                FontFamily="MaterialIconsRegular"
                 FontSize="40"
                 HorizontalOptions="End"
                 Text="close"
@@ -53,7 +53,7 @@
 
                 <!--  Icon - Gestapelte Napf-Icons  -->
                 <Image
-                    Margin="0,0,0,-10"
+                    Margin="0,0,0,-20"
                     HeightRequest="120"
                     HorizontalOptions="Center"
                     Source="coins.png"
@@ -109,7 +109,7 @@
             <!--  Action Button  -->
             <Button
                 Grid.Row="2"
-                Margin="30,0,30,30"
+                Margin="30,0,30,20"
                 BackgroundColor="{AppThemeBinding Light={StaticResource Primary_DarkBlue},
                                                   Dark={StaticResource Primary_DarkBlue_Dark}}"
                 Command="{Binding AcceptCommand}"

gehGassiApp/gehGassiApp/Views/Popups/SubscriptionSuccessPopup.xaml

@@ -36,7 +36,7 @@
                 BackgroundColor="Transparent"
                 Command="{Binding CloseCommand}"
                 FontAttributes="Bold"
-                FontFamily="IconFont"
+                FontFamily="MaterialIconsRegular"
                 FontSize="40"
                 HorizontalOptions="End"
                 Style="{StaticResource LinkButton}"

gehGassiApp/gehGassiApp/Views/ProfileView.xaml

@@ -89,7 +89,7 @@
                             WidthRequest="40">
                             <Button.ImageSource>
                                 <FontImageSource
-                                    FontFamily="IconFont"
+                                    FontFamily="MaterialIconsRegular"
                                     Glyph="photo_camera"
                                     Size="20"
                                     Color="{StaticResource Primary_White}" />
@@ -442,7 +442,7 @@
                                 SelectedItem="{Binding SelectedMainResidence}" />
                         </Border>
 
-                        <Grid Margin="{StaticResource MarginVerySmall}" ColumnDefinitions="*,*">
+                        <!-- <Grid Margin="{StaticResource MarginVerySmall}" ColumnDefinitions="*,*">
                             <Label
                                 Grid.Column="0"
                                 LineBreakMode="TailTruncation"
@@ -467,7 +467,7 @@
                         <Label
                             Margin="{StaticResource MarginBig}"
                             Style="{StaticResource BodyCaption_GreyDark}"
-                            Text="{x:Static res:Text.Profile_AutoPayout_Desc}" />
+                            Text="{x:Static res:Text.Profile_AutoPayout_Desc}" /> -->
 
                         <ActivityIndicator
                             HorizontalOptions="Center"

gehGassiApp/gehGassiApp/Views/ProfileWalkerView.xaml

@@ -95,7 +95,7 @@
                             WidthRequest="40">
                             <Button.ImageSource>
                                 <FontImageSource
-                                    FontFamily="IconFont"
+                                    FontFamily="MaterialIconsRegular"
                                     Glyph="photo_camera"
                                     Size="20"
                                     Color="{StaticResource Primary_White}" />
@@ -500,7 +500,7 @@
                                 SelectedItem="{Binding SelectedMainResidence}" />
                         </Border>
 
-                        <Grid Margin="{StaticResource MarginVerySmall}" ColumnDefinitions="*,*">
+                        <!-- <Grid Margin="{StaticResource MarginVerySmall}" ColumnDefinitions="*,*">
                             <Label
                                 Grid.Column="0"
                                 LineBreakMode="TailTruncation"
@@ -522,7 +522,7 @@
                             </Switch>
                         </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
                             HorizontalOptions="Center"

gehGassiApp/gehGassiApp/Views/Subscriptions/SubscriptionsView.xaml

@@ -51,7 +51,7 @@
                                 <Button
                                     Margin="0,0,-5,-35"
                                     Command="{Binding NavigateBackCommand}"
-                                    FontFamily="IconFont"
+                                    FontFamily="MaterialIconsRegular"
                                     FontSize="30"
                                     HorizontalOptions="End"
                                     Style="{StaticResource LinkButton}"

gehGassiApp/gehGassiApp/gehGassiApp.csproj

@@ -45,16 +45,12 @@
     <GenerateSatelliteAssembliesForCore>True</GenerateSatelliteAssembliesForCore>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android|AnyCPU'">
-    <ApplicationDisplayVersion>1.274</ApplicationDisplayVersion>
-    <ApplicationVersion>274</ApplicationVersion>
     <AndroidUseAapt2>True</AndroidUseAapt2>
     <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
     <ApplicationId>com.gehgassi.local</ApplicationId>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='DebugStaging|net8.0-android|AnyCPU'">
-    <ApplicationDisplayVersion>1.274</ApplicationDisplayVersion>
-    <ApplicationVersion>274</ApplicationVersion>
     <AndroidUseAapt2>True</AndroidUseAapt2>
     <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
@@ -62,8 +58,6 @@
     <ApplicationId>com.gehgassi.local</ApplicationId>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android|AnyCPU'">
-    <ApplicationDisplayVersion>1.274</ApplicationDisplayVersion>
-    <ApplicationVersion>274</ApplicationVersion>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
     <RunAOTCompilation>True</RunAOTCompilation>
     <PublishTrimmed>True</PublishTrimmed>
@@ -73,8 +67,6 @@
     <ApplicationId>com.gehgassi.gehgassi</ApplicationId>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Staging|net8.0-android|AnyCPU'">
-    <ApplicationDisplayVersion>1.274</ApplicationDisplayVersion>
-    <ApplicationVersion>274</ApplicationVersion>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
     <RunAOTCompilation>True</RunAOTCompilation>
     <PublishTrimmed>True</PublishTrimmed>
@@ -84,8 +76,6 @@
     <ApplicationId>com.gehgassi.local</ApplicationId>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
-    <ApplicationDisplayVersion>1.274</ApplicationDisplayVersion>
-    <ApplicationVersion>274</ApplicationVersion>
     <ApplicationId>com.gehgassi.local</ApplicationId>
     <MtouchDebug>True</MtouchDebug>
     <MtouchLink>None</MtouchLink>
@@ -94,16 +84,12 @@
     <ForceSimulatorX64ArchitectureInIDE>true</ForceSimulatorX64ArchitectureInIDE>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='DebugStaging|net8.0-ios|AnyCPU'">
-    <ApplicationDisplayVersion>1.274</ApplicationDisplayVersion>
-    <ApplicationVersion>274</ApplicationVersion>
     <ApplicationId>com.gehgassi.local</ApplicationId>
   </PropertyGroup>
 	
 	
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
     <UseInterpreter>True</UseInterpreter>
-    <ApplicationDisplayVersion>1.274</ApplicationDisplayVersion>
-    <ApplicationVersion>274</ApplicationVersion>
     <CodesignEntitlements>Platforms\iOS\Entitlements.production.plist</CodesignEntitlements>
     <CodesignKey></CodesignKey>
     <CodesignProvision></CodesignProvision>
@@ -113,8 +99,6 @@
 	
 	
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Staging|net8.0-ios|AnyCPU'">
-    <ApplicationDisplayVersion>1.274</ApplicationDisplayVersion>
-    <ApplicationVersion>274</ApplicationVersion>
     <ApplicationId>com.gehgassi.local</ApplicationId>
   </PropertyGroup>
 	
@@ -140,8 +124,13 @@
 		<MauiImage Include="Resources\Images\*" />
 
 		<!-- Custom Fonts -->
-		<MauiFont Include="Resources\Fonts\*" />
+		<!-- <MauiFont Include="Resources\Fonts\*" /> -->
-
+		<!-- Durch akuellen Bug müssen alle Fonts einzeln referenziert werden: https://learn.microsoft.com/en-us/answers/questions/1684493/custom-fonts-not-working-when-uploading-maui-andro -->
+		<MauiFont Include="Resources\Fonts\icomoon.ttf" Alias="IconMoon" />
+		<MauiFont Include="Resources\Fonts\Inter-Medium.ttf" Alias="InterMedium" />
+		<MauiFont Include="Resources\Fonts\Inter-Regular.ttf" Alias="InterRegular" />
+		<MauiFont Include="Resources\Fonts\Inter-SemiBold.ttf" Alias="InterSemiBold" />
+		<MauiFont Include="Resources\Fonts\MaterialIcons-Regular.ttf" Alias="MaterialIconsRegular" />
 		<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
 		<!-- https://github.com/dotnet/maui/issues/14044 -->
 		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
@@ -158,10 +147,6 @@
 	  <None Remove="Platforms\Android\google-services_Live.json" />
 	  <None Remove="Platforms\Android\Resources\drawable\appiconpush2.svg" />
 	  <None Remove="Platforms\Android\Resources\xml\auto_backup_rules.xml" />
-	  <None Remove="Resources\Fonts\icomoon.ttf" />
-	  <None Remove="Resources\Fonts\Inter-Medium.ttf" />
-	  <None Remove="Resources\Fonts\Inter-Regular.ttf" />
-	  <None Remove="Resources\Fonts\Inter-SemiBold.ttf" />
 	  <None Remove="Resources\Images\aggression_level_high.svg" />
 	  <None Remove="Resources\Images\aggression_level_low.svg" />
 	  <None Remove="Resources\Images\aggression_level_medium.svg" />
@@ -220,6 +205,7 @@
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.12" />
 	  <PackageReference Include="Microsoft.Maui.Graphics.Skia" Version="8.0.100" />
 	  <PackageReference Include="Plugin.InAppBilling" Version="8.0.5" />
+	  <PackageReference Include="Plugin.Maui.AppRating" Version="1.2.1" />
 	  <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.1.2" />
     <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.100" />
     <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.100" />