Windows-App

Jugenddienst Stunden/Jugenddienst Stunden.csproj

@@ -143,6 +143,9 @@
 		<!-- Splash Screen -->
 		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#F7931D" BaseSize="128,128" />
 		
+		<!-- Splash Screen (Windows fix) -->
+		<!--<MauiImage Include="Resources\Images\logo_splash_win.svg" Color="#F7931D" BaseSize="208,208" />-->
+
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />
 		<MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" />
@@ -154,6 +157,52 @@
 		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <None Remove="Resources\Windows\%24placeholder%24.scale-100.png" />
+	  <None Remove="Resources\Windows\%24placeholder%24.scale-125.png" />
+	  <None Remove="Resources\Windows\%24placeholder%24.scale-150.png" />
+	  <None Remove="Resources\Windows\%24placeholder%24.scale-200.png" />
+	  <None Remove="Resources\Windows\%24placeholder%24.scale-400.png" />
+	  <None Remove="Resources\Windows\Small\%24placeholder%24.scale-100.png" />
+	  <None Remove="Resources\Windows\Small\%24placeholder%24.scale-125.png" />
+	  <None Remove="Resources\Windows\Small\%24placeholder%24.scale-150.png" />
+	  <None Remove="Resources\Windows\Small\%24placeholder%24.scale-200.png" />
+	  <None Remove="Resources\Windows\Small\%24placeholder%24.scale-400.png" />
+	  <None Remove="Resources\Windows\Splash\%24placeholder%24.scale-100.png" />
+	  <None Remove="Resources\Windows\Splash\%24placeholder%24.scale-125.png" />
+	  <None Remove="Resources\Windows\Splash\%24placeholder%24.scale-150.png" />
+	  <None Remove="Resources\Windows\Splash\%24placeholder%24.scale-200.png" />
+	  <None Remove="Resources\Windows\Splash\%24placeholder%24.scale-400.png" />
+	  <None Remove="Resources\Windows\Wide\%24placeholder%24.scale-100.png" />
+	  <None Remove="Resources\Windows\Wide\%24placeholder%24.scale-125.png" />
+	  <None Remove="Resources\Windows\Wide\%24placeholder%24.scale-150.png" />
+	  <None Remove="Resources\Windows\Wide\%24placeholder%24.scale-200.png" />
+	  <None Remove="Resources\Windows\Wide\%24placeholder%24.scale-400.png" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Content Include="Resources\Windows\$placeholder$.scale-100.png" />
+	  <Content Include="Resources\Windows\$placeholder$.scale-125.png" />
+	  <Content Include="Resources\Windows\$placeholder$.scale-150.png" />
+	  <Content Include="Resources\Windows\$placeholder$.scale-200.png" />
+	  <Content Include="Resources\Windows\$placeholder$.scale-400.png" />
+	  <Content Include="Resources\Windows\Small\$placeholder$.scale-100.png" />
+	  <Content Include="Resources\Windows\Small\$placeholder$.scale-125.png" />
+	  <Content Include="Resources\Windows\Small\$placeholder$.scale-150.png" />
+	  <Content Include="Resources\Windows\Small\$placeholder$.scale-200.png" />
+	  <Content Include="Resources\Windows\Small\$placeholder$.scale-400.png" />
+	  <Content Include="Resources\Windows\Splash\$placeholder$.scale-100.png" />
+	  <Content Include="Resources\Windows\Splash\$placeholder$.scale-125.png" />
+	  <Content Include="Resources\Windows\Splash\$placeholder$.scale-150.png" />
+	  <Content Include="Resources\Windows\Splash\$placeholder$.scale-200.png" />
+	  <Content Include="Resources\Windows\Splash\$placeholder$.scale-400.png" />
+	  <Content Include="Resources\Windows\Wide\$placeholder$.scale-100.png" />
+	  <Content Include="Resources\Windows\Wide\$placeholder$.scale-125.png" />
+	  <Content Include="Resources\Windows\Wide\$placeholder$.scale-150.png" />
+	  <Content Include="Resources\Windows\Wide\$placeholder$.scale-200.png" />
+	  <Content Include="Resources\Windows\Wide\$placeholder$.scale-400.png" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <None Include="..\paket_icon.png">
 	    <Pack>True</Pack>

Jugenddienst Stunden/Platforms/Windows/Package.appxmanifest

@@ -6,14 +6,14 @@
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
-  <Identity Name="maui-package-name-placeholder" Publisher="CN=User Name" Version="0.0.0.0" />
+  <Identity Name="JugenddienstStunden" Publisher="CN=User Name" Version="0.0.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="4BA4D7D7-E3C2-4BBF-92EF-0EDB5DB5CDB4" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>$placeholder$</DisplayName>
     <PublisherDisplayName>Daniel Pichler</PublisherDisplayName>
-    <Logo>$placeholder$.png</Logo>
+    <Logo>Resources\Windows\$placeholder$.png</Logo>
   </Properties>
 
   <Dependencies>
@@ -30,11 +30,11 @@
       <uap:VisualElements
         DisplayName="$placeholder$"
         Description="$placeholder$"
-        Square150x150Logo="$placeholder$.png"
+        Square150x150Logo="Resources\Windows\$placeholder$.png"
-        Square44x44Logo="$placeholder$.png"
+        Square44x44Logo="Resources\Windows\$placeholder$.png"
         BackgroundColor="transparent">
-        <uap:DefaultTile Square71x71Logo="$placeholder$.png" Wide310x150Logo="$placeholder$.png" Square310x310Logo="$placeholder$.png" />
+        <uap:DefaultTile Square71x71Logo="Resources\Windows\Small\$placeholder$.png" Wide310x150Logo="Resources\Windows\Wide\$placeholder$.png" Square310x310Logo="Resources\Windows\$placeholder$.png"  ShortName="Stunden"/>
-        <uap:SplashScreen Image="$placeholder$.png" />
+        <uap:SplashScreen Image="Resources\Windows\Splash\$placeholder$.png"  BackgroundColor="#F7931D"/>
       </uap:VisualElements>
     </Application>
   </Applications>

Jugenddienst Stunden/Resources/Images/logo_splash_win.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g>
+        <g transform="matrix(12.0607,0,0,12.0607,201.169,356)">
+            <path d="M0,-11.938L0,-4.95C0,-3.918 -0.071,-3.151 -0.214,-2.644C-0.359,-2.069 -0.604,-1.583 -0.95,-1.184C-1.624,-0.397 -2.515,0 -3.626,0C-4.117,0 -4.588,-0.075 -5.04,-0.226L-5.04,-2.305L-4.999,-2.375C-4.509,-2.048 -4.052,-1.884 -3.626,-1.884C-3.026,-1.884 -2.612,-2.112 -2.382,-2.565C-2.141,-3.019 -2.02,-3.817 -2.02,-4.95L-2.02,-11.938L0,-11.938" style="fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(0,12.0607,12.0607,0,187.688,117.519)">
+            <path d="M1.249,-1.246C0.559,-1.246 -0.002,-0.687 -0.002,0.002C-0.002,0.692 0.559,1.249 1.249,1.249C1.936,1.249 2.497,0.692 2.497,0.002C2.497,-0.687 1.936,-1.246 1.249,-1.246" style="fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(12.0607,0,0,12.0607,132.432,205.748)">
+            <path d="M0,-5.018C0.88,-4.169 2.079,-3.647 3.398,-3.647C6.103,-3.647 8.293,-5.838 8.293,-8.539L8.288,-8.768L10.103,-8.768L10.107,-8.539C10.107,-5.953 8.64,-3.705 6.49,-2.586C7.743,-2.48 8.98,-2.02 10.042,-1.19L10.221,-1.044L9.103,0.384L8.926,0.242C6.796,-1.425 3.719,-1.044 2.055,1.084C1.43,1.878 1.096,2.811 1.03,3.75L-0.788,3.75C-0.72,2.42 -0.256,1.095 0.626,-0.033C1.239,-0.816 1.992,-1.427 2.82,-1.857C1.229,-1.993 -0.204,-2.685 -1.283,-3.737L0,-5.018" style="fill:rgb(247,147,29);fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(12.0607,0,0,12.0607,132.432,205.748)">
+            <path d="M0,-5.018C0.88,-4.169 2.079,-3.647 3.398,-3.647C6.103,-3.647 8.293,-5.838 8.293,-8.539L8.288,-8.768L10.103,-8.768L10.107,-8.539C10.107,-5.953 8.64,-3.705 6.49,-2.586C7.743,-2.48 8.98,-2.02 10.042,-1.19L10.221,-1.044L9.103,0.384L8.926,0.242C6.796,-1.425 3.719,-1.044 2.055,1.084C1.43,1.878 1.096,2.811 1.03,3.75L-0.788,3.75C-0.72,2.42 -0.256,1.095 0.626,-0.033C1.239,-0.816 1.992,-1.427 2.82,-1.857C1.229,-1.993 -0.204,-2.685 -1.283,-3.737L0,-5.018" style="fill:white;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(12.0607,0,0,12.0607,209.437,186.708)">
+            <path d="M0,7.464C0,4.526 2.384,2.142 5.325,2.142C6.633,2.142 7.832,2.61 8.758,3.395L8.758,-5.324L10.746,-5.324L10.746,12.598L8.758,12.598L8.758,11.534C7.832,12.318 6.633,12.788 5.325,12.788C2.384,12.788 0,10.404 0,7.464M2.113,7.401C2.113,9.234 3.598,10.719 5.432,10.719C7.263,10.719 8.747,9.234 8.747,7.401C8.747,5.569 7.263,4.083 5.432,4.083C3.598,4.083 2.113,5.569 2.113,7.401" style="fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>

Jugenddienst Stunden/ViewModels/StundeViewModel.cs

@@ -5,6 +5,9 @@ using Jugenddienst_Stunden.Types;
 using System.Windows.Input;
 
 namespace Jugenddienst_Stunden.ViewModels;
+/// <summary>
+/// Viewmodel für die einzelnen Stundeneinträge / Bearbeitung
+/// </summary>
 public class StundeViewModel : ObservableObject, IQueryAttributable {
 
     public int Id { get; set; }

Jugenddienst Stunden/ViewModels/StundenViewModel.cs

@@ -12,7 +12,7 @@ using System.Windows.Input;
 
 namespace Jugenddienst_Stunden.ViewModels;
 /// <summary>
-/// Stundenliste
+/// ViewModel für die Stundenliste
 /// </summary>
 internal class StundenViewModel : ObservableObject, IQueryAttributable, INotifyPropertyChanged {
 

Jugenddienst Stunden/Views/StundenPage.xaml.cs

@@ -7,6 +7,8 @@ namespace Jugenddienst_Stunden.Views;
 /// </summary>
 public partial class StundenPage : ContentPage {
 
+    private int heightValue;
+
     /// <summary>
     /// CTOR
     /// </summary>
@@ -26,6 +28,16 @@ public partial class StundenPage : ContentPage {
         //var desiredHeight = screenHeight - 450; // Abz<62>glich der Stunden<65>bersicht
         //stundeItems.HeightRequest = desiredHeight;
 
+        #if ANDROID
+                heightValue = 280;
+        #elif IOS
+                heightValue = 280;
+        #elif WINDOWS
+                heightValue = 320;
+        #else
+                heightValue = 300;
+        #endif
+
         SizeChanged += OnPageSizeChanged;
     }
 
@@ -59,6 +71,6 @@ public partial class StundenPage : ContentPage {
 
     private void AdjustLayout(double height) {
         // Passen Sie Ihre UI-Elemente basierend auf der Fensterh<72>he an
-        stundeItems.HeightRequest = height - 280; //Datepicker Height 50, Monatssummen Height 125, Titel + Navigation Height xyz
+        stundeItems.HeightRequest = height - heightValue; //Datepicker Height 50, Monatssummen Height 125, Titel + Navigation Height xyz
     }
 }