Merge pull request #2 from MaxMa04/develop

Housekeeping
2025-07-22 14:25:22 +02:00
38 changed files with 326 additions and 2326 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -1,15 +0,0 @@
-{
-    // 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"
-        }
-
-    ]
-}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1 +0,0 @@
-{}
--- a/gehGassiApp/gehGassiApp.Core/Services/CommunicationService.cs
+++ b/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/v3/Account/Register", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/v2/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/v3/Account/RegisterExternal", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/v2/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/v2/walks/AcceptPublicWalkRequest", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/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/v2/walks/CancelWalk", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/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/v2/walks/ConfirmWalk", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/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/v2/walks/ConfirmWalkWithRating", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/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/v2/walks/CreateWalkDirect", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/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/v2/walks/CreateWalkRequest", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/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/v2/walks/AcceptWalk", stringContent, token).ConfigureAwait(false);
+                var serverResult = await _httpClient.PostAsync($"api/walks/AcceptWalk", stringContent, token).ConfigureAwait(false);

                if (serverResult.IsSuccessStatusCode)
                {
--- a/gehGassiApp/gehGassiApp.Data/Infos.txt
+++ b/gehGassiApp/gehGassiApp.Data/Infos.txt
@ -1,11 +1,6 @@

 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
--- a/gehGassiApp/gehGassiApp.Data/Migrations/20250706144607_Walk_PaymentType_Added.Designer.cs
+++ b/gehGassiApp/gehGassiApp.Data/Migrations/20250706144607_Walk_PaymentType_Added.Designer.cs
--- a/gehGassiApp/gehGassiApp.Data/Migrations/20250706144607_Walk_PaymentType_Added.cs
+++ b/gehGassiApp/gehGassiApp.Data/Migrations/20250706144607_Walk_PaymentType_Added.cs
@ -1,29 +0,0 @@
-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");
-        }
-    }
-}
--- a/gehGassiApp/gehGassiApp.Data/Migrations/LocalDbContextModelSnapshot.cs
+++ b/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", "8.0.12");
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.2");

            modelBuilder.Entity("gehGassiApp.Domain.Common.Rating", b =>
                {
@ -1345,9 +1345,6 @@ namespace gehGassiApp.Data.Migrations
                    b.Property<int>("PaymentStatus")
                        .HasColumnType("INTEGER");

-                    b.Property<int>("PaymentType")
-                        .HasColumnType("INTEGER");
-
                    b.Property<double>("PickupAddressLat")
                        .HasColumnType("REAL");

--- a/gehGassiApp/gehGassiApp.DbConfig/Config.db
+++ b/gehGassiApp/gehGassiApp.DbConfig/Config.db
--- a/gehGassiApp/gehGassiApp.Domain/Common/Enums.cs
+++ b/gehGassiApp/gehGassiApp.Domain/Common/Enums.cs
@ -130,20 +130,7 @@ 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>
--- a/gehGassiApp/gehGassiApp.Domain/Walks/Walk.cs
+++ b/gehGassiApp/gehGassiApp.Domain/Walks/Walk.cs
@ -176,11 +176,7 @@ 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>
@ -441,11 +437,7 @@ 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>
--- a/gehGassiApp/gehGassiApp/Controls/Register/Step2ExternalControl.xaml
+++ b/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}">
--- a/gehGassiApp/gehGassiApp/Controls/Register/Step3Control.xaml
+++ b/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}">
--- a/gehGassiApp/gehGassiApp/MauiProgram.cs
+++ b/gehGassiApp/gehGassiApp/MauiProgram.cs
@ -103,7 +103,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", "MaterialIconsRegular");
+                fonts.AddFont("MaterialIcons-Regular.ttf", "IconFont");
            }).UseLocalNotifications()
            .ConfigureMauiHandlers((handlers) =>
            {
@ -504,7 +504,7 @@ public static class MauiProgram
 #endif
 #if IOS
                handler.PlatformView.BorderStyle = UITextBorderStyle.None;
-                // handler.PlatformView.SecureTextEntry = false;
+                handler.PlatformView.SecureTextEntry = false;
 #endif
            }

--- a/gehGassiApp/gehGassiApp/Platforms/iOS/Info.plist
+++ b/gehGassiApp/gehGassiApp/Platforms/iOS/Info.plist
@ -27,6 +27,8 @@
 	<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>
@ -67,7 +69,7 @@
 	<array>
 		<string>remote-notification</string>
 	</array>
-	<key>CFBundleIdentifier</key>
-	<string></string>
+	<key>CFBundleVersion</key>
+	<string>274</string>
 </dict>
 </plist>
--- a/gehGassiApp/gehGassiApp/Resources/Templates/ControlTemplates.xaml
+++ b/gehGassiApp/gehGassiApp/Resources/Templates/ControlTemplates.xaml
@ -184,7 +184,7 @@
                            <Image.Source>
                                <FontImageSource
                                    x:Name="homeImageSource"
-                                    FontFamily="MaterialIconsRegular"
+                                    FontFamily="IconFont"
                                    Glyph="home"
                                    Color="{StaticResource Primary_DarkBlue}" />
                            </Image.Source>
@ -217,7 +217,7 @@
                            <Image.Source>
                                <FontImageSource
                                    x:Name="homeWalkerImageSource"
-                                    FontFamily="MaterialIconsRegular"
+                                    FontFamily="IconFont"
                                    Glyph="home"
                                    Color="{StaticResource Primary_DarkBlue}" />
                            </Image.Source>
@ -505,7 +505,7 @@
                        Background="Transparent"
                        Command="{TemplateBinding BindingContext.NavigateBackCommand}"
                        FontAttributes="Bold"
-                        FontFamily="MaterialIconsRegular"
+                        FontFamily="IconFont"
                        FontSize="40"
                        HorizontalOptions="End"
                        Text="close"
--- a/gehGassiApp/gehGassiApp/ViewModels/Account/RegisterViewModel.cs
+++ b/gehGassiApp/gehGassiApp/ViewModels/Account/RegisterViewModel.cs
@ -203,9 +203,7 @@ namespace gehGassiApp.ViewModels.Account
                if (AppUserType == AppUserType.DogOwner)
                    return true;

-                // if (AcceptedTermsMangopay && SelectedNationality != null && SelectedMainResidence != null)
-                //     return true;
-                if (SelectedNationality != null && SelectedMainResidence != null)
+                if (AcceptedTermsMangopay && SelectedNationality != null && SelectedMainResidence != null)
                    return true;

                return false;
--- a/gehGassiApp/gehGassiApp/ViewModels/HomeViewModel.cs
+++ b/gehGassiApp/gehGassiApp/ViewModels/HomeViewModel.cs
@ -112,12 +112,6 @@ namespace gehGassiApp.ViewModels
        [ObservableProperty]
        private ObservableCollection<DogWalkerLookup> _walkers;

-        /// <summary>
-        /// First 10 walkers for the home screen display
-        /// </summary>
-        [ObservableProperty]
-        private ObservableCollection<DogWalkerLookup> _first10Walkers;
-
        [ObservableProperty]
        private DogWalkerLookup _selectedWalker;

@ -547,9 +541,6 @@ namespace gehGassiApp.ViewModels

                    Walkers = requests.Value.ToObservableCollection();

-                    // Set First10Walkers for the home screen display
-                    First10Walkers = requests.Value.Take(10).ToObservableCollection();
-
                    _total = requests.Total;
                    _skip = requests.Skip + requests.Take;
                }
@ -558,7 +549,6 @@ namespace gehGassiApp.ViewModels
                    _total = 0;
                    _skip = 0;
                    Walkers = null;
-                    First10Walkers = null;
                }
            }
            catch (Exception ex)
@ -567,7 +557,6 @@ namespace gehGassiApp.ViewModels
                _total = 0;
                _skip = 0;
                Walkers = null;
-                First10Walkers = null;
            }
        }

--- a/gehGassiApp/gehGassiApp/ViewModels/More/AddPaymentUserViewModel.cs
+++ b/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 = true;
+        private bool _acceptedTermsMangopay;

        #region Commands

@ -177,7 +177,7 @@ namespace gehGassiApp.ViewModels.More
            {
                SelectedNationality = null;
                SelectedMainResidence = null;
-                AcceptedTermsMangopay = true;
+                AcceptedTermsMangopay = false;

                IsBusy = true;
                await Task.Delay(Core.Common.Constants.AnimationDelayDetails);
--- a/gehGassiApp/gehGassiApp/ViewModels/More/BecomeWalkerViewmodel.cs
+++ b/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 = true;
+        private bool _acceptedTermsMangopay;

        #region Commands

@ -193,7 +193,7 @@ namespace gehGassiApp.ViewModels.More
            {
                SelectedNationality = null;
                SelectedMainResidence = null;
-                AcceptedTermsMangopay = true;
+                AcceptedTermsMangopay = false;

                IsBusy = true;
                await Task.Delay(Core.Common.Constants.AnimationDelayDetails);
--- a/gehGassiApp/gehGassiApp/ViewModels/Popups/PaymentInfoPopupViewModel.cs
+++ b/gehGassiApp/gehGassiApp/ViewModels/Popups/PaymentInfoPopupViewModel.cs
@ -1,57 +0,0 @@
-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);
-        }
-    }
-}
--- a/gehGassiApp/gehGassiApp/Views/Account/LoginFormView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/Account/LoginFormView.xaml
@ -35,7 +35,6 @@
                    <Entry
                        x:Name="email"
                        Keyboard="Email"
-                        AutomationId="Login"
                        Placeholder="{x:Static res:Text.Login_Username}"
                        Text="{Binding Email}">
                        <Entry.Behaviors>
@ -49,7 +48,6 @@
                        <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}"
--- a/gehGassiApp/gehGassiApp/Views/Dogs/DogAddView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/Dogs/DogAddView.xaml
@ -77,7 +77,7 @@
                            WidthRequest="40">
                            <Button.ImageSource>
                                <FontImageSource
-                                    FontFamily="MaterialIconsRegular"
+                                    FontFamily="IconFont"
                                    Glyph="photo_camera"
                                    Size="20"
                                    Color="{StaticResource Primary_White}" />
--- a/gehGassiApp/gehGassiApp/Views/Dogs/DogUpdateView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/Dogs/DogUpdateView.xaml
@ -76,7 +76,7 @@
                            WidthRequest="40">
                            <Button.ImageSource>
                                <FontImageSource
-                                    FontFamily="MaterialIconsRegular"
+                                    FontFamily="IconFont"
                                    Glyph="photo_camera"
                                    Size="20"
                                    Color="{StaticResource Primary_White}" />
--- a/gehGassiApp/gehGassiApp/Views/HomeView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/HomeView.xaml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <controls:BaseContentPage
    x:Class="gehGassiApp.Views.HomeView"
    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
@ -23,29 +23,20 @@
    </controls:BaseContentPage.TitleView>

    <ContentPage.Content>
-        <AbsoluteLayout>
-            <!--  Main scrollable content (full screen)  -->
-            <RefreshView
-                x:Name="homeRefreshView"
-                AbsoluteLayout.LayoutBounds="0,0,1,1"
-                AbsoluteLayout.LayoutFlags="All"
-                BackgroundColor="#ffffff"
-                Command="{Binding RefreshWalkersCommand}"
-                IsRefreshing="{Binding WalkersRefreshing}">
-                <ScrollView>
        <Grid
            x:Name="rootHomeGrid"
-                        Padding="20,20,20,90"
+            Padding="20,20,20,0"
            HorizontalOptions="FillAndExpand"
-                        RowDefinitions="Auto,Auto"
+            RowDefinitions="Auto,*"
            VerticalOptions="FillAndExpand">

            <VerticalStackLayout
                x:Name="rootVerticalStackLayout"
                Grid.Row="0"
                HorizontalOptions="Fill"
+                SizeChanged="rootVerticalStackLayout_SizeChanged"
                Spacing="0"
-                            VerticalOptions="Start">
+                VerticalOptions="FillAndExpand">
                <Border x:Name="permissionStatusBorder" Style="{StaticResource PermissionStatusBorder}">
                    <Label Style="{StaticResource PermissionStatusLabel}" Text="{x:Static res:Text.Permission_Location_Error}" />
                    <Border.IsVisible>
@ -121,49 +112,100 @@
                    Style="{StaticResource H6_Blue}"
                    Text="{x:Static res:Text.Common_DogWalkers_NearYou}" />

-                            <!--  Walker StackLayout (first 10)  -->
-                            <StackLayout
-                                x:Name="walkersStackLayout"
-                                BindableLayout.ItemsSource="{Binding First10Walkers}"
-                                Spacing="12">
-                                <BindableLayout.ItemTemplate>
+
+
+            </VerticalStackLayout>
+
+            <controls:EmptyListViewControl
+                Grid.Row="1"
+                ImageHeight="150"
+                IsBusy="{Binding IsBusy}"
+                IsNotBusy="{Binding IsNotBusy}"
+                IsVisible="{Binding Walkers, Converter={StaticResource IsListNullOrEmptyConverter}}"
+                ListSource="{Binding Walkers}"
+                NotFoundImage="walking_dogs"
+                NotFoundText="{x:Static res:Text.Walker_NotFound}"
+                RefreshCommand="{Binding RefreshWalkersCommand}"
+                SearchImage="walking_dogs"
+                SearchText="{x:Static res:Text.Walker_Searching}" />
+
+            <RefreshView
+                x:Name="homeRefreshView"
+                Grid.Row="1"
+                BackgroundColor="#ffffff"
+                Command="{Binding RefreshWalkersCommand}"
+                HorizontalOptions="FillAndExpand"
+                IsRefreshing="{Binding WalkersRefreshing}"
+                IsVisible="{Binding Walkers, Converter={StaticResource IsListNotNullOrEmptyConverter}}"
+                Refreshing="RefreshView_Refreshing"
+                VerticalOptions="FillAndExpand">
+                <Grid HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
+                    <CollectionView
+                        x:Name="homeCollectionView"
+                        Background="#ffffff"
+                        HorizontalOptions="FillAndExpand"
+                        ItemsSource="{Binding Walkers}"
+                        RemainingItemsThreshold="5"
+                        RemainingItemsThresholdReachedCommand="{Binding LoadMoreCommand}"
+                        Scrolled="homeCollectionView_Scrolled"
+                        SelectedItem="{Binding SelectedWalker}"
+                        SelectionMode="Single"
+                        VerticalOptions="Fill"
+                        VerticalScrollBarVisibility="Never">
+                        <CollectionView.ItemsLayout>
+                            <GridItemsLayout Orientation="Vertical" VerticalItemSpacing="12" />
+                        </CollectionView.ItemsLayout>
+                        <CollectionView.ItemTemplate>
                            <DataTemplate>
-                                        <controls:WalkerListControl DogOwnerHasPremium="{Binding Source={RelativeSource AncestorType={x:Type viewmodels:HomeViewModel}}, Path=IsPremiumUser}" Walker="{Binding .}">
+                                <!--<SwipeView BackgroundColor="{StaticResource Primary_White}" Margin="0,0,0,12">
+                                    <SwipeView.LeftItems>
+                                        <SwipeItems>
+                                            <SwipeItemView Command="{Binding Source={RelativeSource AncestorType={x:Type viewmodels:HomeViewModel}}, Path=BlockCommand}" CommandParameter="{Binding .}">
+                                                <StackLayout HorizontalOptions="Center" VerticalOptions="Center">
+                                                    <Image Source="block_user" WidthRequest="24" HeightRequest="24" HorizontalOptions="Center" VerticalOptions="Center"/>
+                                                    <Label Text="{x:Static res:Text.Common_Block}" HorizontalOptions="Center" Style="{StaticResource BodyS_GreyDark}"></Label>
+                                                </StackLayout>
+                                            </SwipeItemView>
+                                        </SwipeItems>
+                                    </SwipeView.LeftItems>
+                                    <SwipeView.RightItems>
+                                        <SwipeItems>
+                                            <SwipeItemView Command="{Binding Source={RelativeSource AncestorType={x:Type viewmodels:HomeViewModel}}, Path=ReportCommand}" CommandParameter="{Binding .}">
+                                                <StackLayout HorizontalOptions="Center" VerticalOptions="Center">
+                                                    <Image Source="report_user" WidthRequest="24" HeightRequest="24" HorizontalOptions="Center" VerticalOptions="Center"/>
+                                                    <Label Text="{x:Static res:Text.Common_Report}" HorizontalOptions="Center" Style="{StaticResource BodyS_GreyDark}"></Label>
+                                                </StackLayout>
+                                            </SwipeItemView>
+                                        </SwipeItems>
+                                    </SwipeView.RightItems>-->
+                                <controls:WalkerListControl DogOwnerHasPremium="{Binding IsPremiumUser}" Walker="{Binding .}">
                                    <controls:WalkerListControl.GestureRecognizers>
                                        <TapGestureRecognizer Command="{Binding Source={RelativeSource AncestorType={x:Type viewmodels:HomeViewModel}}, Path=WalkerSelectedCommand}" CommandParameter="{Binding .}" />
                                    </controls:WalkerListControl.GestureRecognizers>
                                </controls:WalkerListControl>
+                                <!--<VisualStateManager.VisualStateGroups>
+                                        <VisualStateGroup Name="CommonStates">
+                                            <VisualState Name="Selected">
+                                                <VisualState.Setters>
+                                                    <Setter Property="BackgroundColor" Value="{StaticResource Primary_White}" />
+                                                </VisualState.Setters>
+                                            </VisualState>
+                                        </VisualStateGroup>
+                                    </VisualStateManager.VisualStateGroups>-->
+                                <!--</SwipeView>-->
                            </DataTemplate>
-                                </BindableLayout.ItemTemplate>
-                            </StackLayout>
-
-                            <!--  "Alle anzeigen" Link Label  -->
-                            <Label
-                                Margin="0,16,0,0"
-                                Style="{StaticResource LinkLabelStyle}"
-                                HorizontalOptions="Center"
-                                Text="Alle anzeigen">
-                                <Label.GestureRecognizers>
-                                    <TapGestureRecognizer Command="{Binding NavigateCommand}" CommandParameter="{x:Static viewmodels:MenuSelected.Walkers}" />
-                                </Label.GestureRecognizers>
-                            </Label>
-
-                        </VerticalStackLayout>
-
+                        </CollectionView.ItemTemplate>
+                    </CollectionView>
                </Grid>
-                </ScrollView>
            </RefreshView>

-            <!--  Floating Public Request Button (over content)  -->
            <Button
-                Margin="0,0,0,20"
-                AbsoluteLayout.LayoutBounds="0.5,1,300,90"
-                AbsoluteLayout.LayoutFlags="PositionProportional"
-                BackgroundColor="{StaticResource Primary}"
+                Grid.Row="0"
+                Grid.RowSpan="2"
+                Margin="0,0,0,10"
                Command="{Binding CreatePublicWalkRequestCommand}"
                ContentLayout="Left, 5"
-                CornerRadius="15"
-                HorizontalOptions="Center"
+                HorizontalOptions="CenterAndExpand"
                LineBreakMode="TailTruncation"
                Text="{x:Static res:Text.PublicWalkRequest_Title}"
                VerticalOptions="End">
@ -175,7 +217,7 @@
                </Button.ImageSource>
            </Button>

-        </AbsoluteLayout>
+        </Grid>
    </ContentPage.Content>


--- a/gehGassiApp/gehGassiApp/Views/HomeView.xaml.cs
+++ b/gehGassiApp/gehGassiApp/Views/HomeView.xaml.cs
@ -10,11 +10,9 @@ public partial class HomeView : BaseContentPage
    IDeviceInstallationService _deviceInstallationService;
    IDeviceInstallationService DeviceInstallationService => _deviceInstallationService ??= ServiceHelper.GetService<IDeviceInstallationService>();
    private HomeViewModel ViewModel => BindingContext as HomeViewModel;
-    
-    // COMMENTED OUT: Animation variables for collapsing header
-    //private bool _isRowHidden = false;
-    //private double _initialRowHeight;
-    //private bool _animationRunning = false;
+    private bool _isRowHidden = false;
+    private double _initialRowHeight;
+    private bool _animationRunning = false;

    /// <summary>
    /// Erstellt eine Instanz
@ -33,13 +31,10 @@ public partial class HomeView : BaseContentPage
        await ViewModel.InitializeAsync(this);
        var width = DeviceDisplay.Current.MainDisplayInfo.Width / DeviceDisplay.Current.MainDisplayInfo.Density;
        ViewModel.NextWalkWidth = width * 0.8;
-        
-        // COMMENTED OUT: Animation initialization
-        //_isRowHidden = false;
-        //_initialRowHeight = 0;
-        //_animationRunning = false;
-        //rootVerticalStackLayout.HeightRequest = -1;
-        
+        _isRowHidden = false;
+        _initialRowHeight = 0;
+        _animationRunning = false;
+        rootVerticalStackLayout.HeightRequest = -1;
 #if IOS
        if (DeviceInstallationService.NotificationsSupported)
        {
@ -55,78 +50,74 @@ public partial class HomeView : BaseContentPage
        await ViewModel.DisappearingAsync(this);
    }

-    // COMMENTED OUT: Workaround für den IOS-Bug der Höhenberechnung! Siehe https://github.com/dotnet/maui/issues/8820
-    //private void rootVerticalStackLayout_SizeChanged(object sender, EventArgs e)
-    //{
-    //    if(!_isRowHidden && rootVerticalStackLayout.Height > _initialRowHeight)
-    //        _initialRowHeight = rootVerticalStackLayout.Height;
-    //}
-
-    // COMMENTED OUT: Scroll handler for collapsing animation
-    //private async void homeCollectionView_Scrolled(object sender, ItemsViewScrolledEventArgs e)
-    //{
-    //    if(_animationRunning)
-    //        return;
-    //    
-    //    if (e.VerticalDelta > 0 && e.VerticalOffset >= 50 && !_isRowHidden)
-    //    {
-    //        await HideHeader();
-    //    }
-    //    else if (e.VerticalDelta < 0 && e.VerticalOffset <= 50 && _isRowHidden)
-    //    {
-    //        await ShowHeader();
-    //    }
-    //}
-
-    // COMMENTED OUT: Show header animation
-    //private async Task ShowHeader()
-    //{
-    //    homeRefreshView.IsEnabled = false;
-    //    homeCollectionView.IsEnabled = false;
-    //    _isRowHidden = false;
-    //    _animationRunning = true;
-    //    var animation = new Animation(v => rootVerticalStackLayout.HeightRequest = v, 0, _initialRowHeight);
-
-    //    MainThread.BeginInvokeOnMainThread(() =>
-    //    {
-    //        animation.Commit(this, "HideRowAnimation", length: 500, easing: Easing.SinIn);
-    //            
-    //    });
-
-    //    await Task.Delay(500);
-    //    _animationRunning = false;
-    //    homeCollectionView.IsEnabled = true;
-    //    homeRefreshView.IsEnabled = true;
-    //}
-
-    // COMMENTED OUT: Hide header animation
-    //private async Task HideHeader()
-    //{
-    //    homeRefreshView.IsEnabled = false;
-    //    homeCollectionView.IsEnabled = false;
-    //    _isRowHidden = true;
-    //    _animationRunning = true;
-    //    var animation = new Animation(v => rootVerticalStackLayout.HeightRequest = v, _initialRowHeight, 0);
-    //        
-    //    MainThread.BeginInvokeOnMainThread(() =>
-    //    {
-    //        animation.Commit(this, "HideRowAnimation", length: 500, easing: Easing.SinOut);
-    //            
-    //    });
-    //        
-    //    await Task.Delay(500);
-    //    _animationRunning = false;
-    //    homeCollectionView.IsEnabled = true;
-    //    homeRefreshView.IsEnabled = true;
-    //}
-
-    // COMMENTED OUT: RefreshView refreshing handler
-    //private async void RefreshView_Refreshing(object sender, EventArgs e)
-    //{
-    //    if (_isRowHidden)
-    //    {
-    //        await ShowHeader();
-    //    }
-    //}
+    //Workaround für den IOS-Bug der Höhenberechnung! Siehe https://github.com/dotnet/maui/issues/8820
+    private void rootVerticalStackLayout_SizeChanged(object sender, EventArgs e)
+    {
+        if(!_isRowHidden && rootVerticalStackLayout.Height > _initialRowHeight)
+            _initialRowHeight = rootVerticalStackLayout.Height;
+    }
+
+    private async void homeCollectionView_Scrolled(object sender, ItemsViewScrolledEventArgs e)
+    {
+        if(_animationRunning)
+            return;
+        
+        if (e.VerticalDelta > 0 && e.VerticalOffset >= 50 && !_isRowHidden)
+        {
+            await HideHeader();
+        }
+        else if (e.VerticalDelta < 0 && e.VerticalOffset <= 50 && _isRowHidden)
+        {
+            await ShowHeader();
+        }
+    }
+
+    private async Task ShowHeader()
+    {
+        homeRefreshView.IsEnabled = false;
+        homeCollectionView.IsEnabled = false;
+        _isRowHidden = false;
+        _animationRunning = true;
+        var animation = new Animation(v => rootVerticalStackLayout.HeightRequest = v, 0, _initialRowHeight);
+
+        MainThread.BeginInvokeOnMainThread(() =>
+        {
+            animation.Commit(this, "HideRowAnimation", length: 500, easing: Easing.SinIn);
+                
+        });
+
+        await Task.Delay(500);
+        _animationRunning = false;
+        homeCollectionView.IsEnabled = true;
+        homeRefreshView.IsEnabled = true;
+    }
+
+    private async Task HideHeader()
+    {
+        homeRefreshView.IsEnabled = false;
+        homeCollectionView.IsEnabled = false;
+        _isRowHidden = true;
+        _animationRunning = true;
+        var animation = new Animation(v => rootVerticalStackLayout.HeightRequest = v, _initialRowHeight, 0);
+            
+        MainThread.BeginInvokeOnMainThread(() =>
+        {
+            animation.Commit(this, "HideRowAnimation", length: 500, easing: Easing.SinOut);
+                
+        });
+            
+        await Task.Delay(500);
+        _animationRunning = false;
+        homeCollectionView.IsEnabled = true;
+        homeRefreshView.IsEnabled = true;
+    }
+
+    private async void RefreshView_Refreshing(object sender, EventArgs e)
+    {
+        if (_isRowHidden)
+        {
+            await ShowHeader();
+        }
+    }
 }

--- a/gehGassiApp/gehGassiApp/Views/More/AddPaymentUserView.xaml
+++ b/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"
--- a/gehGassiApp/gehGassiApp/Views/More/BecomeWalkerView.xaml
+++ b/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"
--- a/gehGassiApp/gehGassiApp/Views/More/MoreView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/More/MoreView.xaml
@ -476,7 +476,7 @@
                            </Grid.GestureRecognizers>
                        </Grid>

-                        <!-- <Border Style="{StaticResource Separator}" />
+                        <Border Style="{StaticResource Separator}" />

                        <Grid
                            ColumnDefinitions="24,*,24"
@ -599,7 +599,7 @@
                            <Grid.GestureRecognizers>
                                <TapGestureRecognizer Command="{Binding PayoutsCommand}" />
                            </Grid.GestureRecognizers>
-                        </Grid> -->
+                        </Grid>

                        <Border Style="{StaticResource Separator}" />

--- a/gehGassiApp/gehGassiApp/Views/More/MoreWalkerView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/More/MoreWalkerView.xaml
@ -441,7 +441,7 @@
                            </Grid.GestureRecognizers>
                        </Grid>

-                        <!-- <Border Style="{StaticResource Separator}" />
+                        <Border Style="{StaticResource Separator}" />

                        <Grid
                            ColumnDefinitions="24,*,24"
@ -484,9 +484,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 +529,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 +564,7 @@
                            <Grid.GestureRecognizers>
                                <TapGestureRecognizer Command="{Binding PayoutsCommand}" />
                            </Grid.GestureRecognizers>
-                        </Grid> -->
+                        </Grid>

                        <Border Style="{StaticResource Separator}" />

--- a/gehGassiApp/gehGassiApp/Views/Onboarding/OnboardingView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/Onboarding/OnboardingView.xaml
@ -136,7 +136,7 @@
                BorderWidth="1"
                Command="{Binding PreviousStepCommand}"
                CornerRadius="30"
-                FontFamily="MaterialIconsRegular"
+                FontFamily="IconFont"
                FontSize="40"
                HeightRequest="60"
                HorizontalOptions="Start"
@ -158,7 +158,7 @@
                BorderWidth="1"
                Command="{Binding NextStepCommand}"
                CornerRadius="30"
-                FontFamily="MaterialIconsRegular"
+                FontFamily="IconFont"
                FontSize="40"
                HeightRequest="60"
                HorizontalOptions="End"
--- a/gehGassiApp/gehGassiApp/Views/Popups/PaymentInfoPopup.xaml
+++ b/gehGassiApp/gehGassiApp/Views/Popups/PaymentInfoPopup.xaml
@ -1,98 +0,0 @@
-<?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>
--- a/gehGassiApp/gehGassiApp/Views/Popups/PaymentInfoPopup.xaml.cs
+++ b/gehGassiApp/gehGassiApp/Views/Popups/PaymentInfoPopup.xaml.cs
@ -1,13 +0,0 @@
-using CommunityToolkit.Maui.Views;
-using gehGassiApp.ViewModels.Popups;
-
-namespace gehGassiApp.Views.Popups;
-
-public partial class PaymentInfoPopup : Popup
-{
-    public PaymentInfoPopup()
-    {
-        InitializeComponent();
-        BindingContext = new PaymentInfoPopupViewModel(this);
-    }
-}
--- a/gehGassiApp/gehGassiApp/Views/Popups/SubscriptionOfferPopup.xaml
+++ b/gehGassiApp/gehGassiApp/Views/Popups/SubscriptionOfferPopup.xaml
@ -36,7 +36,7 @@
                Background="Transparent"
                Command="{Binding DeclineCommand}"
                FontAttributes="Bold"
-                FontFamily="MaterialIconsRegular"
+                FontFamily="IconFont"
                FontSize="40"
                HorizontalOptions="End"
                Text="close"
@ -53,7 +53,7 @@

                <!--  Icon - Gestapelte Napf-Icons  -->
                <Image
-                    Margin="0,0,0,-20"
+                    Margin="0,0,0,-10"
                    HeightRequest="120"
                    HorizontalOptions="Center"
                    Source="coins.png"
@ -109,7 +109,7 @@
            <!--  Action Button  -->
            <Button
                Grid.Row="2"
-                Margin="30,0,30,20"
+                Margin="30,0,30,30"
                BackgroundColor="{AppThemeBinding Light={StaticResource Primary_DarkBlue},
                                                  Dark={StaticResource Primary_DarkBlue_Dark}}"
                Command="{Binding AcceptCommand}"
--- a/gehGassiApp/gehGassiApp/Views/Popups/SubscriptionSuccessPopup.xaml
+++ b/gehGassiApp/gehGassiApp/Views/Popups/SubscriptionSuccessPopup.xaml
@ -36,7 +36,7 @@
                BackgroundColor="Transparent"
                Command="{Binding CloseCommand}"
                FontAttributes="Bold"
-                FontFamily="MaterialIconsRegular"
+                FontFamily="IconFont"
                FontSize="40"
                HorizontalOptions="End"
                Style="{StaticResource LinkButton}"
--- a/gehGassiApp/gehGassiApp/Views/ProfileView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/ProfileView.xaml
@ -89,7 +89,7 @@
                            WidthRequest="40">
                            <Button.ImageSource>
                                <FontImageSource
-                                    FontFamily="MaterialIconsRegular"
+                                    FontFamily="IconFont"
                                    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"
--- a/gehGassiApp/gehGassiApp/Views/ProfileWalkerView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/ProfileWalkerView.xaml
@ -95,7 +95,7 @@
                            WidthRequest="40">
                            <Button.ImageSource>
                                <FontImageSource
-                                    FontFamily="MaterialIconsRegular"
+                                    FontFamily="IconFont"
                                    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"
--- a/gehGassiApp/gehGassiApp/Views/Subscriptions/SubscriptionsView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/Subscriptions/SubscriptionsView.xaml
@ -51,7 +51,7 @@
                                <Button
                                    Margin="0,0,-5,-35"
                                    Command="{Binding NavigateBackCommand}"
-                                    FontFamily="MaterialIconsRegular"
+                                    FontFamily="IconFont"
                                    FontSize="30"
                                    HorizontalOptions="End"
                                    Style="{StaticResource LinkButton}"
--- a/gehGassiApp/gehGassiApp/gehGassiApp.csproj
+++ b/gehGassiApp/gehGassiApp/gehGassiApp.csproj
@ -45,12 +45,16 @@
    <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>
@ -58,6 +62,8 @@
    <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>
@ -67,6 +73,8 @@
    <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>
@ -76,6 +84,8 @@
    <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>
@ -84,12 +94,16 @@
    <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>
@ -99,6 +113,8 @@
 	
 	
  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Staging|net8.0-ios|AnyCPU'">
+    <ApplicationDisplayVersion>1.274</ApplicationDisplayVersion>
+    <ApplicationVersion>274</ApplicationVersion>
    <ApplicationId>com.gehgassi.local</ApplicationId>
  </PropertyGroup>
 	
@ -124,13 +140,8 @@
 		<MauiImage Include="Resources\Images\*" />

 		<!-- Custom 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" />
+		<MauiFont Include="Resources\Fonts\*" />
+
 		<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
 		<!-- https://github.com/dotnet/maui/issues/14044 -->
 		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
@ -147,6 +158,10 @@
 	  <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" />