From 933ddd987403aaa341cc2d0808124c73f1f8dd23 Mon Sep 17 00:00:00 2001
From: Daniel Pichler <pichler.daniel@gmail.com>
Date: Mon, 29 Dec 2025 16:18:04 +0100
Subject: [PATCH] Refactor StundePage and StundenPage layouts: adjust grid
 structure, improve margin handling, and enhance visuals with new binding and
 triggers.

---
 .../Converter/AnyTrueMultiConverter.cs        | 22 +++++
 Jugenddienst Stunden/Views/StundePage.xaml    |  9 +--
 Jugenddienst Stunden/Views/StundenPage.xaml   | 81 ++++++++++---------
 3 files changed, 68 insertions(+), 44 deletions(-)
 create mode 100644 Jugenddienst Stunden/Converter/AnyTrueMultiConverter.cs

diff --git a/Jugenddienst Stunden/Converter/AnyTrueMultiConverter.cs b/Jugenddienst Stunden/Converter/AnyTrueMultiConverter.cs
new file mode 100644
index 0000000..2518d56
--- /dev/null
+++ b/Jugenddienst Stunden/Converter/AnyTrueMultiConverter.cs	
@@ -0,0 +1,22 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using Microsoft.Maui.Controls;
+
+namespace Jugenddienst_Stunden.Converter;
+
+public class AnyTrueMultiConverter : IMultiValueConverter {
+	public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) {
+		foreach (object value in values) {
+			if (value is bool b && b) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) {
+	throw new NotSupportedException();
+}
+
+}
\ No newline at end of file
diff --git a/Jugenddienst Stunden/Views/StundePage.xaml b/Jugenddienst Stunden/Views/StundePage.xaml
index 4823833..a469ad2 100644
--- a/Jugenddienst Stunden/Views/StundePage.xaml	
+++ b/Jugenddienst Stunden/Views/StundePage.xaml	
@@ -24,9 +24,9 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="50"/>
-            <RowDefinition Height="180"/>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="50"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="45"/>
             <RowDefinition Height="20"/>
             <RowDefinition Height="40"/>
             <RowDefinition Height="*"/>
@@ -36,7 +36,7 @@
 
         <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" >
+        <FlexLayout Direction="Row" AlignItems="Start" Wrap="Wrap" AlignContent="Start" JustifyContent="Start" Grid.Row="1" Margin="0,0,0,10" >
 
             <Border Margin="0,0,0,10" MinimumHeightRequest="72" FlexLayout.Grow="1">
                 <Border.Padding>
@@ -93,7 +93,7 @@
 
 
         <Editor Placeholder="Beschreibung" Text="{Binding DayTime.Description}" MinimumHeightRequest="40"
-                AutoSize="TextChanges" FontSize="18" Grid.Row="2" />
+                AutoSize="TextChanges" FontSize="18" Grid.Row="2" Margin="0,0,0,10" />
 
         <Grid ColumnDefinitions="*,*" ColumnSpacing="4" Grid.Row="3">
             <Button Grid.Column="1" Text="Speichern"
@@ -127,7 +127,6 @@
         </StackLayout>
 
 
-
         <CollectionView
                 ItemsSource="{Binding DayTimes}"
                 x:Name="stundeItems" Margin="0"
diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml b/Jugenddienst Stunden/Views/StundenPage.xaml
index 84370ba..d005786 100644
--- a/Jugenddienst Stunden/Views/StundenPage.xaml	
+++ b/Jugenddienst Stunden/Views/StundenPage.xaml	
@@ -13,6 +13,7 @@
     <ContentPage.Resources>
         <ResourceDictionary>
             <conv:SecondsTimeConverter x:Key="secToTime" />
+            <conv:AnyTrueMultiConverter x:Key="AnyTrue"/>
             <FontImageSource x:Key="ToolbarIcon"
                              Glyph="+"
                              Size="22"
@@ -27,7 +28,7 @@
     </ContentPage.Behaviors>
 
     <ContentPage.ToolbarItems>
-        <!--<ToolbarItem Text="Lade Liste" Command="{Binding RefreshListCommand}"/>-->
+
         <ToolbarItem Text="Neuer Eintrag" IconImageSource="{StaticResource ToolbarIcon}"
                      Command="{Binding NewEntryCommand}" />
     </ContentPage.ToolbarItems>
@@ -35,7 +36,6 @@
     <RefreshView x:Name="MyRefreshView" Command="{Binding RefreshCommand}" IsRefreshing="{Binding IsRefreshing}"
                  Margin="10" Padding="10">
         <Grid RowDefinitions="50,*,Auto,80">
-            <!--<VerticalStackLayout Spacing="10" Margin="10">-->
 
             <Grid RowDefinitions="Auto" ColumnDefinitions="Auto,*" HeightRequest="50" Grid.Row="0">
                 <DatePicker Grid.Column="0" MinimumDate="{Binding MinimumDate}"
@@ -53,7 +53,6 @@
             <CollectionView
                 ItemsSource="{Binding DayTimes}"
                 x:Name="stundeItems" Margin="0,0,0,20"
-
                 SelectionMode="Single"
                 SelectionChangedCommand="{Binding SelectEntryCommand}"
                 SelectionChangedCommandParameter="{Binding Source={RelativeSource Self}, Path=SelectedItem}"
@@ -61,79 +60,83 @@
                 Grid.Row="1">
 
                 <CollectionView.ItemsLayout>
-                    <LinearItemsLayout Orientation="Vertical" ItemSpacing="0" />
+                    <LinearItemsLayout Orientation="Vertical" ItemSpacing="10" />
                 </CollectionView.ItemsLayout>
 
                 <CollectionView.ItemTemplate>
                     <DataTemplate>
-                        <VerticalStackLayout Padding="5,10,5,0">
+                        <Border Padding="5" StrokeShape="RoundRectangle 0,30,0,30" >
+                            <Border.Triggers>
+                                <DataTrigger TargetType="Border" Binding="{Binding Approved}" Value="True">
+                                    <Setter Property="Background" Value="LightCoral"/>
+                                    <Setter Property="Padding" Value="4"/>
+                                </DataTrigger>
+                            </Border.Triggers>
 
                             <VisualStateManager.VisualStateGroups>
                                 <VisualStateGroup Name="CommonStates">
                                     <VisualState Name="Normal">
                                         <VisualState.Setters>
                                             <Setter Property="BackgroundColor"
-                                                    Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource TransparentColor}}" />
+                                Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource TransparentColor}}" />
                                         </VisualState.Setters>
                                     </VisualState>
                                     <VisualState Name="Selected">
                                         <VisualState.Setters>
                                             <Setter Property="BackgroundColor"
-                                                    Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}" />
+                                Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}" />
                                         </VisualState.Setters>
                                     </VisualState>
                                 </VisualStateGroup>
                             </VisualStateManager.VisualStateGroups>
 
+                            <Grid RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="*" >
 
-                            <HorizontalStackLayout>
-                                <HorizontalStackLayout.Triggers>
-                                    <DataTrigger TargetType="HorizontalStackLayout" Binding="{Binding Approved}"
-                                                 Value="True">
-                                        <Setter Property="BackgroundColor" Value="LightCoral" />
-                                        <Setter Property="Padding" Value="4" />
-                                    </DataTrigger>
-                                </HorizontalStackLayout.Triggers>
-                                <Label Text="{Binding Day, StringFormat='{0:dddd, dd. MMMM}'}" />
-                                <Label Text="von" Padding="5,0,5,0" />
-                                <Label Text="{Binding Begin}" />
-                                <Label Text="bis" Padding="5,0,5,0" />
-                                <Label Text="{Binding End}" />
-                            </HorizontalStackLayout>
+                                <HorizontalStackLayout Grid.Row="0" >
+                                    <Label Text="{Binding Day, StringFormat='{0:dddd, dd. MMMM}'}" />
+                                    <Label Text="von" Padding="5,0,5,0" />
+                                    <Label Text="{Binding Begin}" />
+                                    <Label Text="bis" Padding="5,0,5,0" />
+                                    <Label Text="{Binding End}" />
+                                </HorizontalStackLayout>
 
-                            <HorizontalStackLayout HorizontalOptions="FillAndExpand">
-                                <HorizontalStackLayout.Triggers>
-                                    <DataTrigger TargetType="HorizontalStackLayout" Binding="{Binding Approved}"
-                                                 Value="True">
-                                        <Setter Property="BackgroundColor" Value="LightCoral" />
-                                        <Setter Property="Padding" Value="4" />
-                                    </DataTrigger>
-                                </HorizontalStackLayout.Triggers>
-                                <Label Text="{Binding GemeindeAktiv.Name}" Margin="0,0,10,0"
+                                <HorizontalStackLayout Grid.Row="1" >
+                                    <!--<HorizontalStackLayout.IsVisible>
+                                        <MultiBinding Converter="{StaticResource AnyTrue}">
+                                            <Binding Path="Approved"/>
+                                            <Binding Path="BindingContext.GemeindeAktivSet" Source="{RelativeSource AncestorType={x:Type ContentPage}}"/>
+                                            <Binding Path="BindingContext.ProjektAktivSet" Source="{RelativeSource AncestorType={x:Type ContentPage}}"/>
+                                        </MultiBinding>
+                                    </HorizontalStackLayout.IsVisible>-->
+                                    <Label Text="{Binding GemeindeAktiv.Name}" Padding="0,0,10,0"
                                        IsVisible="{Binding Source={RelativeSource AncestorType={x:Type ContentPage}}, Path=BindingContext.GemeindeAktivSet}" />
-                                <Label Text="{Binding ProjektAktiv.Name}" Margin="0,0,10,0"
+                                    <Label Text="{Binding ProjektAktiv.Name}" Padding="0,0,10,0"
                                        IsVisible="{Binding Source={RelativeSource AncestorType={x:Type ContentPage}}, Path=BindingContext.ProjektAktivSet}" />
-                                <Label Text="{Binding FreistellungAktiv.Name}" IsVisible="{Binding Approved}" />
-                            </HorizontalStackLayout>
+                                    <Label Text="{Binding FreistellungAktiv.Name}" IsVisible="{Binding Approved}" />
+                                </HorizontalStackLayout>
+                                
+                                <!-- Ensure description row does not paint background -->
+                                <Label Text="{Binding Description}" Grid.Row="2" />
+
+                            </Grid>
+                        </Border>
 
-                            <Label Text="{Binding Description}" Padding="0,0,0,15" />
-                        </VerticalStackLayout>
                     </DataTemplate>
                 </CollectionView.ItemTemplate>
 
             </CollectionView>
 
-            <!--<BoxView HeightRequest="1" Grid.Row="2" Margin="0,5,0,15" />-->
+
             <Button Text="{Binding LoadOverview}"
                     Grid.Row="2"
                     Command="{Binding LoadDataCommand}"
                     TextColor="{AppThemeBinding Dark={StaticResource White}, Light={StaticResource White}}" />
             <Border Padding="2" Grid.Row="3" Margin="0,10,0,0">
-                <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,*" ColumnDefinitions="Auto,Auto,*,Auto" Margin="10,2">
+                <Grid RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="Auto,Auto,*" Margin="10,2">
                     <Label Grid.Row="0" Text="Soll:" />
                     <Label Grid.Row="1" Text="Summe:" />
                     <Label Grid.Row="2" Text="Differenz:" Margin="0,0,15,0" />
-                    <!--<BoxView Grid.Row="3" Grid.ColumnSpan="4" HeightRequest="1" Color="LightGrey" Margin="0,5"/>-->
+
                     <Label Grid.Row="0" Grid.Column="2" Text="Restüberstunden:" Margin="15,0,0,0" />
                     <Label Grid.Row="1" Grid.Column="2" Text="Zeitausgleich:" Margin="15,0,0,0" />
                     <Label Grid.Row="2" Grid.Column="2" Text="Resturlaub:" Margin="15,0,0,0" />
@@ -156,7 +159,7 @@
             </Border>
 
         </Grid>
-        <!--</VerticalStackLayout>-->
+
 
     </RefreshView>
 </ContentPage>
\ No newline at end of file