diff --git a/Jugenddienst Stunden/Jugenddienst Stunden.csproj b/Jugenddienst Stunden/Jugenddienst Stunden.csproj index aed0932..6de232a 100644 --- a/Jugenddienst Stunden/Jugenddienst Stunden.csproj +++ b/Jugenddienst Stunden/Jugenddienst Stunden.csproj @@ -142,6 +142,9 @@ + + + @@ -154,6 +157,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True diff --git a/Jugenddienst Stunden/Platforms/Windows/Package.appxmanifest b/Jugenddienst Stunden/Platforms/Windows/Package.appxmanifest index 2aca8ac..6e8e704 100644 --- a/Jugenddienst Stunden/Platforms/Windows/Package.appxmanifest +++ b/Jugenddienst Stunden/Platforms/Windows/Package.appxmanifest @@ -6,14 +6,14 @@ xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap"> - + $placeholder$ Daniel Pichler - $placeholder$.png + Resources\Windows\$placeholder$.png @@ -30,11 +30,11 @@ - - + + diff --git a/Jugenddienst Stunden/Resources/Images/logo_splash_win.svg b/Jugenddienst Stunden/Resources/Images/logo_splash_win.svg new file mode 100644 index 0000000..3f66ad2 --- /dev/null +++ b/Jugenddienst Stunden/Resources/Images/logo_splash_win.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-16.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-16.png new file mode 100644 index 0000000..d569378 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-16.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-24.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-24.png new file mode 100644 index 0000000..f072900 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-24.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-256.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-256.png new file mode 100644 index 0000000..0e49f9e Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-256.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-32.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-32.png new file mode 100644 index 0000000..6ca5609 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-32.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-48.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-48.png new file mode 100644 index 0000000..af965a9 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-lightunplated_targetsize-48.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-16.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-16.png new file mode 100644 index 0000000..d569378 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-16.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-24.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-24.png new file mode 100644 index 0000000..f072900 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-24.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-256.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-256.png new file mode 100644 index 0000000..0e49f9e Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-256.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-32.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-32.png new file mode 100644 index 0000000..6ca5609 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-32.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-48.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-48.png new file mode 100644 index 0000000..af965a9 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.altform-unplated_targetsize-48.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-100.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-100.png new file mode 100644 index 0000000..abea4e4 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-100.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-125.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-125.png new file mode 100644 index 0000000..072e208 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-125.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-150.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-150.png new file mode 100644 index 0000000..7b2eb9e Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-150.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-200.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-200.png new file mode 100644 index 0000000..5f95380 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-200.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-400.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-400.png new file mode 100644 index 0000000..9b3b4bf Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.scale-400.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-16.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-16.png new file mode 100644 index 0000000..8e5d62d Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-16.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-24.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-24.png new file mode 100644 index 0000000..0a52213 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-24.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-256.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-256.png new file mode 100644 index 0000000..b2c747a Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-256.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-32.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-32.png new file mode 100644 index 0000000..c86db1d Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-32.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-48.png b/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-48.png new file mode 100644 index 0000000..bb9a39c Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/$placeholder$.targetsize-48.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-100.png b/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-100.png new file mode 100644 index 0000000..abea4e4 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-100.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-125.png b/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-125.png new file mode 100644 index 0000000..072e208 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-125.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-150.png b/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-150.png new file mode 100644 index 0000000..7b2eb9e Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-150.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-200.png b/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-200.png new file mode 100644 index 0000000..5f95380 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-200.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-400.png b/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-400.png new file mode 100644 index 0000000..9b3b4bf Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Small/$placeholder$.scale-400.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-100.png b/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-100.png new file mode 100644 index 0000000..6324b7b Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-100.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-125.png b/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-125.png new file mode 100644 index 0000000..1f4427c Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-125.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-150.png b/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-150.png new file mode 100644 index 0000000..76bc87a Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-150.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-200.png b/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-200.png new file mode 100644 index 0000000..3c2e81e Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-200.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-400.png b/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-400.png new file mode 100644 index 0000000..7a1d3c4 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Splash/$placeholder$.scale-400.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-100.png b/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-100.png new file mode 100644 index 0000000..ad2801d Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-100.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-125.png b/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-125.png new file mode 100644 index 0000000..822fc00 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-125.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-150.png b/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-150.png new file mode 100644 index 0000000..6a626e0 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-150.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-200.png b/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-200.png new file mode 100644 index 0000000..fc257ff Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-200.png differ diff --git a/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-400.png b/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-400.png new file mode 100644 index 0000000..0ef6005 Binary files /dev/null and b/Jugenddienst Stunden/Resources/Windows/Wide/$placeholder$.scale-400.png differ diff --git a/Jugenddienst Stunden/ViewModels/StundeViewModel.cs b/Jugenddienst Stunden/ViewModels/StundeViewModel.cs index 3169cd4..7523b17 100644 --- a/Jugenddienst Stunden/ViewModels/StundeViewModel.cs +++ b/Jugenddienst Stunden/ViewModels/StundeViewModel.cs @@ -5,6 +5,9 @@ using Jugenddienst_Stunden.Types; using System.Windows.Input; namespace Jugenddienst_Stunden.ViewModels; +/// +/// Viewmodel für die einzelnen Stundeneinträge / Bearbeitung +/// public class StundeViewModel : ObservableObject, IQueryAttributable { public int Id { get; set; } diff --git a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs index 812a0e7..a7a8f32 100644 --- a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs +++ b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs @@ -12,7 +12,7 @@ using System.Windows.Input; namespace Jugenddienst_Stunden.ViewModels; /// -/// Stundenliste +/// ViewModel für die Stundenliste /// internal class StundenViewModel : ObservableObject, IQueryAttributable, INotifyPropertyChanged { diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml.cs b/Jugenddienst Stunden/Views/StundenPage.xaml.cs index aab83d9..4a25a47 100644 --- a/Jugenddienst Stunden/Views/StundenPage.xaml.cs +++ b/Jugenddienst Stunden/Views/StundenPage.xaml.cs @@ -7,6 +7,8 @@ namespace Jugenddienst_Stunden.Views; /// public partial class StundenPage : ContentPage { + private int heightValue; + /// /// CTOR /// @@ -26,6 +28,16 @@ public partial class StundenPage : ContentPage { //var desiredHeight = screenHeight - 450; // Abzüglich der Stundenü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ö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 } } \ No newline at end of file diff --git a/splash.pdf b/splash.pdf new file mode 100644 index 0000000..f216e77 Binary files /dev/null and b/splash.pdf differ