Refactor: Remove ITokenProvider and SettingsTokenProvider; update StundePage layout and optimize dependency injection configuration.

Jugenddienst Stunden/Infrastructure/ApiClient.cs

@@ -13,7 +13,7 @@ internal sealed class ApiClient : IApiClient {
 	private readonly ApiOptions _options;
 	private readonly IAppSettings _settings;
 
-	public ApiClient(HttpClient http, ApiOptions options, ITokenProvider tokenProvider, IAppSettings settings) {
+	public ApiClient(HttpClient http, ApiOptions options, IAppSettings settings) {
 		_http = http;
 		_options = options;
 		_settings = settings;

Jugenddienst Stunden/Infrastructure/SettingsTokenProvider.cs

@@ -1,10 +0,0 @@
-using Jugenddienst_Stunden.Interfaces;
-
-namespace Jugenddienst_Stunden.Infrastructure;
-
-internal sealed class SettingsTokenProvider : ITokenProvider {
-	private readonly IAppSettings _settings;
-	public SettingsTokenProvider(IAppSettings settings) => _settings = settings;
-
-	public string GetToken() => _settings.ApiKey;
-}

Jugenddienst Stunden/Interfaces/ITokenProvider.cs

@@ -1,5 +0,0 @@
-namespace Jugenddienst_Stunden.Interfaces;
-
-internal interface ITokenProvider {
-	string? GetToken();
-}

Jugenddienst Stunden/MauiProgram.cs

@@ -9,6 +9,7 @@ using Microsoft.Extensions.Logging;
 using ZXing.Net.Maui.Controls;
 using System.Net.Http;
 using Jugenddienst_Stunden.ViewModels;
+using Jugenddienst_Stunden.Views;
 using System.Net;
 
 namespace Jugenddienst_Stunden;
@@ -27,26 +28,8 @@ public static class MauiProgram {
 				fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
 				fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
 			})
-			//.UseBarcodeScanning();
 			.UseBarcodeReader();
 
-		//#if DEBUG
-		//		if (string.IsNullOrWhiteSpace(GlobalVar.ApiKey)) {
-		//			GlobalVar.ApiKey = Preferences.Default.Get("apiKey",
-		//				"MTQxfHNkdFptQkNZTXlPT3ZyMHxodHRwOi8vaG91cnMuZGF1bmkubWluZS5udTo4MS9hcHBhcGk=");
-		//			GlobalVar.Name = Preferences.Default.Get("name", "Testserver: Isabell");
-		//			GlobalVar.Surname = Preferences.Default.Get("surname", "Biasi");
-		//			GlobalVar.EmployeeId = Preferences.Default.Get("EmployeeId", 141);
-		//			GlobalVar.ApiUrl = Preferences.Default.Get("apiUrl", "https://hours.dauni.mine.nu/appapi");
-		//		}
-
-		//		builder.Logging.AddDebug();
-		//#endif
-
-		// ApiClient registrieren: SocketsHttpHandler als Primary Handler (vermeidet AndroidMessageHandler-Castfehler)
-		//var apiOptions = new Infrastructure.ApiOptions { BaseUrl = GlobalVar.ApiUrl, Timeout = TimeSpan.FromSeconds(15) };
-		//builder.Services.AddApiHttpClient(apiOptions);
-
 		// DI: AlertService für globale Alerts (z. B. leere ApiUrl)
 		builder.Services.AddSingleton<IAlertService, AlertService>();
 
@@ -59,49 +42,22 @@ public static class MauiProgram {
 			Timeout = TimeSpan.FromSeconds(15)
 		});
 
-		// Token Provider soll ebenfalls aus Settings/Preferences lesen
-		builder.Services.AddSingleton<ITokenProvider, SettingsTokenProvider>();
 
-		// HttpClient + ApiClient
-		// Configure HttpClient with SocketsHttpHandler (managed) and RequestLoggingHandler
+		// HttpClient + ApiClient Best Practices:
+		// 1. IHttpClientFactory verwenden (vermeidet Socket Exhaustion & DNS Probleme)
+		// 2. Typed Client für bessere Dependency Injection (AddHttpClient<TInterface, TImplementation>)
+		// 3. DelegatingHandler für Logging/Infrastruktur einbinden
 		builder.Services.AddTransient<RequestLoggingHandler>();
-		builder.Services.AddSingleton<HttpClient>(sp => {
-			var nativeHandler = new SocketsHttpHandler {
+
+		builder.Services.AddHttpClient<IApiClient, ApiClient>()
+			.ConfigurePrimaryHttpMessageHandler(() => new SocketsHttpHandler {
 				AllowAutoRedirect = false,
 				AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate,
 				PooledConnectionLifetime = TimeSpan.FromMinutes(5),
 				ConnectTimeout = TimeSpan.FromSeconds(10)
-			};
-			var logging = sp.GetRequiredService<RequestLoggingHandler>();
-			logging.InnerHandler = nativeHandler;
-			// HttpClient.Timeout will be adjusted by ApiClient if needed
-			return new HttpClient(logging, disposeHandler: true);
-		});
-
-		builder.Services.AddSingleton<IApiClient>(sp => {
-			var alert = sp.GetRequiredService<IAlertService>();
-			try {
-				return new ApiClient(
-					sp.GetRequiredService<HttpClient>(),
-					sp.GetRequiredService<ApiOptions>(),
-					sp.GetRequiredService<ITokenProvider>(),
-					sp.GetRequiredService<IAppSettings>());
-			} catch (Exception e) {
-				// Alert an UI/VM weiterreichen
-				alert.Raise(e.Message);
-				// Fallback: NullApiClient liefert beim Aufruf aussagekräftige Exception
-				return new NullApiClient(e.Message);
-			}
-		});
-
-		// DI: Infrastruktur
-		//builder.Services.AddSingleton(new ApiOptions { BaseUrl = GlobalVar.ApiUrl, Timeout = TimeSpan.FromSeconds(15) });
-		//builder.Services.AddSingleton<ITokenProvider, GlobalVarTokenProvider>();
-		//builder.Services.AddSingleton<HttpClient>(_ => new HttpClient());
-		//builder.Services.AddSingleton<IApiClient>(sp => new ApiClient(
-		//    sp.GetRequiredService<HttpClient>(),
-		//    sp.GetRequiredService<ApiOptions>(),
-		//    sp.GetRequiredService<ITokenProvider>()));
+			})
+			.AddHttpMessageHandler<RequestLoggingHandler>()
+			.SetHandlerLifetime(TimeSpan.FromMinutes(5));
 
 		// DI: Validatoren
 		builder.Services.AddSingleton<IHoursValidator, HoursValidator>();
@@ -112,12 +68,12 @@ public static class MauiProgram {
 		builder.Services.AddSingleton<IAuthService, AuthService>();
 
 		// DI: Views/ViewModels
-		builder.Services.AddTransient<ViewModels.StundenViewModel>();
-		builder.Services.AddTransient<Views.StundenPage>();
-		builder.Services.AddTransient<ViewModels.StundeViewModel>();
-		builder.Services.AddTransient<Views.StundePage>();
-		builder.Services.AddTransient<ViewModels.LoginViewModel>();
-		builder.Services.AddTransient<Views.LoginPage>();
+		builder.Services.AddTransient<StundenViewModel>();
+		builder.Services.AddTransient<StundenPage>();
+		builder.Services.AddTransient<StundeViewModel>();
+		builder.Services.AddTransient<StundePage>();
+		builder.Services.AddTransient<LoginViewModel>();
+		builder.Services.AddTransient<LoginPage>();
 
 		return builder.Build();
 	}

Jugenddienst Stunden/ViewModels/LoginViewModel.cs

@@ -11,6 +11,7 @@ namespace Jugenddienst_Stunden.ViewModels;
 public partial class LoginViewModel : ObservableObject {
 	private readonly IAuthService _auth;
 	private readonly IAlertService? _alerts;
+	private readonly IAppSettings _settings;
 	private DateTime _lastDetectionTime = DateTime.MinValue;
 	private readonly TimeSpan _detectionInterval = TimeSpan.FromSeconds(5);
 
@@ -38,7 +39,7 @@ public partial class LoginViewModel : ObservableObject {
 	private string? serverLabel;
 
 	[ObservableProperty]
-	private string title = Preferences.Default.Get("name", "Nicht") + " " + Preferences.Default.Get("surname", "eingeloggt");
+	private string title = "Nicht eingeloggt";
 
 	[ObservableProperty]
 	private string? username;
@@ -58,8 +59,9 @@ public partial class LoginViewModel : ObservableObject {
 	// Explizite Command-Property für den QR-Scanner-Event, damit das Binding in XAML zuverlässig greift
 	public IAsyncRelayCommand<object?> QrDetectedCommand { get; }
 
-	public LoginViewModel(IAuthService auth) {
+	public LoginViewModel(IAuthService auth, IAppSettings settings) {
 		_auth = auth;
+		_settings = settings;
 
 		// gespeicherte Präferenz für Logintyp laden
 		var lt = Preferences.Default.Get("logintype", "qr");
@@ -68,22 +70,36 @@ public partial class LoginViewModel : ObservableObject {
 		IsDetecting = !isManualMode;
 
 		// Serveranzeige vorbereiten
-		var apiUrl = Preferences.Default.Get("apiUrl", string.Empty);
-		if (!string.IsNullOrWhiteSpace(apiUrl)) {
-			Server = apiUrl.Replace("/appapi", "").Replace("https://", "").Replace("http://", "");
-			ServerLabel = "Server: " + Server;
-		}
+		RefreshSettings();
 
 		// Command initialisieren
 		QrDetectedCommand = new AsyncRelayCommand<object?>(QrDetectedAsync);
 	}
 
 	// DI-Konstruktor: AlertService anbinden und Alerts an VM-Event weiterreichen (analog StundeViewModel)
-	internal LoginViewModel(IAuthService auth, IAlertService alertService) : this(auth) {
+	internal LoginViewModel(IAuthService auth, IAlertService alertService,IAppSettings settings) : this(auth,settings) {
 		_alerts = alertService;
+		_settings = settings;
 		if (alertService is not null) {
 			alertService.AlertRaised += (s, msg) => AlertEvent?.Invoke(this, msg);
 		}
+		RefreshSettings();
+	}
+
+	/// <summary>
+	/// Aktualisiert die Serveranzeige aus den aktuellen AppSettings.
+	/// </summary>
+	public void RefreshSettings() {
+		var apiUrl = _settings.ApiUrl;
+		if (!string.IsNullOrWhiteSpace(apiUrl)) {
+			Server = apiUrl.Replace("/appapi", "").Replace("https://", "").Replace("http://", "");
+			ServerLabel = "Server: " + Server;
+		} else {
+			Server = string.Empty;
+			ServerLabel = "Server: Nicht konfiguriert";
+		}
+
+		Title = $"{_settings.Name} {_settings.Surname}";
 	}
 
 	partial void OnIsManualModeChanged(bool value) {

Jugenddienst Stunden/ViewModels/StundeViewModel.cs

@@ -233,6 +233,8 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
 				//die soll aber ignoriert werden, weil beim Neueintrag ist das ja Wurscht
 				//In dem Fall müssen die Settings aber nochmal geholt werden, weil die dann nicht geladen wurden
 				// LoadSettingsAsync();
+				var settings = await _hoursService.GetSettingsAsync();
+				UpdateSettings(settings);
 			} finally {
 				DayTime = new DayTime();
 				DayTime.Day = _date;

Jugenddienst Stunden/ViewModels/StundenViewModel.cs

@@ -231,7 +231,6 @@ public partial class StundenViewModel : ObservableObject, IQueryAttributable, IN
 					" installiert)");
 			}
 
-			//_hour = await HoursBase.LoadData();
 			RefreshProperties();
 		} catch (Exception e) {
 			AlertEvent?.Invoke(this, e.Message);

Jugenddienst Stunden/Views/LoginPage.xaml.cs

@@ -64,13 +64,21 @@ public partial class LoginPage : ContentPage {
 		base.OnDisappearing();
 
 		barcodeScannerView.CameraLocation = CameraLocation.Front;
-		// IsDetecting wird via Binding vom ViewModel gesteuert
+		// Scanner deaktivieren, wenn Seite verlassen wird
+		if (BindingContext is LoginViewModel vm) {
+			vm.IsDetecting = false;
+		}
 	}
 
 	protected override void OnAppearing() {
 		base.OnAppearing();
 		
-		// IsDetecting wird via Binding vom ViewModel gesteuert
+		if (BindingContext is LoginViewModel vm) {
+			vm.RefreshSettings();
+			// Scanner wieder aktivieren, wenn QR-Modus aktiv ist
+			vm.IsDetecting = !vm.IsManualMode;
+		}
+
 		barcodeScannerView.CameraLocation = CameraLocation.Rear;
 	}
 

Jugenddienst Stunden/Views/StundePage.xaml

@@ -21,11 +21,24 @@
             StatusBarStyle="LightContent" />
     </ContentPage.Behaviors>
 
-    <VerticalStackLayout Spacing="10" Margin="10">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50"/>
+            <RowDefinition Height="180"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="50"/>
+            <RowDefinition Height="20"/>
+            <RowDefinition Height="40"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
 
-        <Label Text="{Binding SubTitle}" FontSize="Medium" FontAttributes="Bold" Margin="4,0,0,0" />
 
-        <Border>
+
+        <Label Text="{Binding SubTitle}" FontSize="Medium" FontAttributes="Bold" Margin="4,0,0,0" Grid.Row="0" />
+
+        <FlexLayout Direction="Row" AlignItems="Start" Wrap="Wrap" AlignContent="Start" JustifyContent="Start" Grid.Row="1" >
+
+            <Border Margin="0,0,0,10" MinimumHeightRequest="72" FlexLayout.Grow="1">
                 <Border.Padding>
                     <OnPlatform x:TypeArguments="Thickness" Default="0,15,10,0">
                         <On Platform="Android" Value="0,4,10,8" />
@@ -33,7 +46,7 @@
                     </OnPlatform>
                 </Border.Padding>
 
-            <FlexLayout Direction="Row" AlignItems="Start" Wrap="Wrap" JustifyContent="SpaceBetween">
+                <FlexLayout Direction="Row" AlignItems="Start" Wrap="Wrap" JustifyContent="Start" AlignContent="Start">
                     <HorizontalStackLayout Spacing="10">
                         <Label Text="Beginn" VerticalTextAlignment="Center" HorizontalTextAlignment="End"
                            MinimumWidthRequest="60">
@@ -52,14 +65,16 @@
                 </FlexLayout>
             </Border>
 
-        <Border>
+
+            <Border FlexLayout.Grow="1">
                 <Border.Padding>
                     <OnPlatform x:TypeArguments="Thickness" Default="5">
                         <On Platform="Android" Value="5,4,5,8" />
                         <On Platform="WPF" Value="5" />
                     </OnPlatform>
                 </Border.Padding>
-            <HorizontalStackLayout>
+
+                <HorizontalStackLayout Spacing="10">
                     <Picker x:Name="pick_gemeinde" Title="Gemeinde" ItemsSource="{Binding OptionsGemeinde}"
                         SelectedItem="{Binding DayTime.GemeindeAktiv, Mode=TwoWay}" ItemDisplayBinding="{Binding Name}"
                         IsVisible="{Binding GemeindeAktivSet}">
@@ -74,11 +89,13 @@
                     </Picker>
                 </HorizontalStackLayout>
             </Border>
+        </FlexLayout>
+
 
         <Editor Placeholder="Beschreibung" Text="{Binding DayTime.Description}" MinimumHeightRequest="40"
-                AutoSize="TextChanges" FontSize="18" />
+                AutoSize="TextChanges" FontSize="18" Grid.Row="2" />
 
-        <Grid ColumnDefinitions="*,*" ColumnSpacing="4">
+        <Grid ColumnDefinitions="*,*" ColumnSpacing="4" Grid.Row="3">
             <Button Grid.Column="1" Text="Speichern"
                     TextColor="{AppThemeBinding Dark={StaticResource White}, Light={StaticResource White}}"
                     Command="{Binding SaveCommand}" />
@@ -91,14 +108,14 @@
         </Grid>
 
 
-        <BoxView HeightRequest="1" Margin="3,10" />
+        <BoxView HeightRequest="1" Margin="3,10" Grid.Row="4" />
 
         <Label Text="Noch keine Einträge vorhanden"
                IsVisible="{Binding DayTimes, Converter={StaticResource CollectionVisibilityConverter}, ConverterParameter=Invert}"
-               Margin="6,0,0,0" />
+               Margin="6,0,0,0" Grid.Row="5" />
 
         <StackLayout Margin="6,0,0,0"
-                     IsVisible="{Binding DayTimes, Converter={StaticResource CollectionVisibilityConverter}}">
+                     IsVisible="{Binding DayTimes, Converter={StaticResource CollectionVisibilityConverter}}" Grid.Row="5">
             <Label>
                 <Label.FormattedText>
                     <FormattedString>
@@ -109,14 +126,17 @@
             </Label>
         </StackLayout>
 
-        <ScrollView IsVisible="{Binding DayTimes, Converter={StaticResource CollectionVisibilityConverter}}">
+
+
         <CollectionView
                 ItemsSource="{Binding DayTimes}"
                 x:Name="stundeItems" Margin="0"
-                HeightRequest="350"
                 SelectionMode="Single"
+            VerticalOptions="Start"
                 SelectionChangedCommand="{Binding SelectEntryCommand}"
-                SelectionChangedCommandParameter="{Binding Source={RelativeSource Self}, Path=SelectedItem}">
+                SelectionChangedCommandParameter="{Binding Source={RelativeSource Self}, Path=SelectedItem}"
+                IsVisible="{Binding DayTimes, Converter={StaticResource CollectionVisibilityConverter}}"
+            Grid.Row="6">
 
             <CollectionView.ItemsLayout>
                 <LinearItemsLayout Orientation="Vertical" ItemSpacing="0" />
@@ -151,6 +171,8 @@
             </CollectionView.ItemTemplate>
 
         </CollectionView>
-        </ScrollView>
-    </VerticalStackLayout>
+
+
+    </Grid>
+
 </ContentPage>

Jugenddienst Stunden/Views/StundePage.xaml.cs

@@ -40,12 +40,4 @@ public partial class StundePage : ContentPage {
 		});
 	}
 
-	//private async Task<bool> ShowConfirm(string title, string message, string ok, string not_ok) {
-	//    return await DisplayAlert(title, message, ok, not_ok);
-	//}
-
-	//private async void ShowConfirm(object? sender, ConfirmEventArgs e) {
-	//    bool result = await DisplayAlert(e.Title, e.Message, e.Ok, e.NotOk);
-	//    e.Result = result;
-	//}
 }