Style.xaml weitere Aufteilung styles

AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.Controller")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+67f35114ec96b6521eedc2b38b8ea3a37e870853")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+11a5b29c0ae037ed61425f951969e580f3040869")]
 [assembly: System.Reflection.AssemblyProductAttribute("AquaCare.Controller")]
 [assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.Controller")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfoInputs.cache

@@ -1 +1 @@
-caff15ac345dd2bc3812fd87ffcc8b9a3e3506a1bdd0b3b4593c9d83f1ecdccc
+801a73e485f3a20a695ba14798717439568fab3a3d94621b6357d7b2719b5888

AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.Model")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+67f35114ec96b6521eedc2b38b8ea3a37e870853")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+11a5b29c0ae037ed61425f951969e580f3040869")]
 [assembly: System.Reflection.AssemblyProductAttribute("AquaCare.Model")]
 [assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.Model")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfoInputs.cache

@@ -1 +1 @@
-967d078032273b32f96cc5689ccc61d0b8e59c26222984cac69101eaa9290150
+e81d9b36841d44d07e3957f74a410bf85ce39a9b97788eb697ae00f8d5b1e87d

AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.Persistence")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+67f35114ec96b6521eedc2b38b8ea3a37e870853")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+11a5b29c0ae037ed61425f951969e580f3040869")]
 [assembly: System.Reflection.AssemblyProductAttribute("AquaCare.Persistence")]
 [assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.Persistence")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfoInputs.cache

@@ -1 +1 @@
-4eff4ebe9e7384446099aa584b3ce23479ce98a7550b62856a8ed81baae8274d
+fc4aad57d203ab1df9a0883b07157bf1dfc3fa6c0167a10d281fd992462a2d38

AquaCare.View/MainWindow.axaml

@@ -3,13 +3,13 @@
         x:Class="AquaCare.View.MainWindow"
         Title="AquaCare - Nasse Ärmel in Vertretung"
         Width="1280" Height="720"
-        Icon="Ressourcen/ProgrammIcon.ico">
+        Icon="Ressourcen/Bilder/ProgrammIcon.ico">
 
     <Grid>
-        <!-- Hintergrundbild-->
+        <!-- Hintergrundbild
         <Grid.Background>
-            <ImageBrush Source="avares://AquaCare.View/Ressourcen/WillkommenHintergrund.jpg" Stretch="UniformToFill"/>
+            <ImageBrush Source="avares://AquaCare.View/Ressourcen/Bilder/WillkommenHintergrund.jpg" Stretch="UniformToFill"/>
-        </Grid.Background>
+        </Grid.Background>-->
 
         <!-- Grid-Aufteilung -->
         <Grid.RowDefinitions>
@@ -21,13 +21,12 @@
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
 
-        <!-- Button oben links -->
+        <!-- Button oben links (Einstellungen)-->
-        <Button Content="Einstellungen"
+            <Button Classes="ImageButton" Click="buttonEinstellungenClick" Width="100" Height="50">
-                Width="150" Height="40"
+                <Image Source="avares://AquaCare.View/Ressourcen/Bilder/EinstellungenImage.png"
-                HorizontalAlignment="Left"
+                    HorizontalAlignment="Center" VerticalAlignment="Center"
-                Margin="20"
+                    Stretch="Fill"/>
-                Click="buttonEinstellungenClick" />
+            </Button>
-
 
         <!-- Zentrierter Inhalt -->
         <StackPanel Grid.Row="1" Grid.ColumnSpan="2"
@@ -35,18 +34,18 @@
                     VerticalAlignment="Center"
                     Spacing="30">
 
-            <TextBlock Text="Willkommen bei AquaCare"
+            <TextBlock Text="Willkommen bei AquaCare" HorizontalAlignment="Center" Classes="ÜberschriftText"/>
-                       HorizontalAlignment="Center"/>
 
-            <Button Content="Pflege" Width="200" Height="40" HorizontalAlignment="Center"
+
+            <Button Content="Pflege" Width="200" Height="50" HorizontalAlignment="Center"
                     Click="buttonPflegeClick"/>
                     
 
-            <Button Content="Werte" Width="200" Height="40" HorizontalAlignment="Center"
+            <Button Content="Werte" Width="200" Height="50" HorizontalAlignment="Center"
                     Click="buttonWerteClick"/>
 
 
-            <Button Content="Tutorials" Width="200" Height="40" HorizontalAlignment="Center"
+            <Button Content="Tutorials" Width="200" Height="50" HorizontalAlignment="Center"
                     Click="buttonTutorialsClick"/>
 
         </StackPanel>

AquaCare.View/Style.xaml

@@ -1,22 +1,38 @@
 <Style xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-
     <!-- Allgemeiner Button-Style -->
     <Style Selector="Button">
-        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="FontSize" Value="30"/>
-        <Setter Property="Background" Value="#50A3B9CC"/>
+        <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Foreground" Value="#BEBEBE"/>
         <Setter Property="FontWeight" Value="Bold"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
     </Style>
 
-    <!-- Allgemeiner TextBlock-Style -->
+    <!-- Image Button-Style -->
-    <Style Selector="TextBlock">
+    <Style Selector="Button.ImageButton">
-        <Setter Property="FontSize" Value="18"/>
+        <Setter Property="Background" Value="Transparent"/>
+    </Style>
+
+    <!-- Überschrift-TextBlock-Style -->
+    <Style Selector="TextBlock.ÜberschriftText">
+        <Setter Property="FontSize" Value="50"/>
         <Setter Property="FontWeight" Value="Bold"/>
-        <Setter Property="Foreground" Value="#80BEBEBE"/>
+        <Setter Property="Foreground" Value="#BEBEBE"/>
+        <Setter Property="TextDecorations" Value="Underline"/>
+    </Style>
+
+    <!-- Allgemeiner TextBlock-Style (Buttons usw.) -->
+    <Style Selector="TextBlock">
+        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="Foreground" Value="#BEBEBE"/>
+    </Style>
+    <!--Default Hintergrundfarbe-->
+    <Style Selector="Window">
+        <Setter Property="Background" Value="#1C1C1C"/>
     </Style>
 
 </Style>

AquaCare.View/obj/Debug/net9.0/AquaCare.View.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.View")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+67f35114ec96b6521eedc2b38b8ea3a37e870853")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+11a5b29c0ae037ed61425f951969e580f3040869")]
 [assembly: System.Reflection.AssemblyProductAttribute("AquaCare.View")]
 [assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.View")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

AquaCare.View/obj/Debug/net9.0/AquaCare.View.AssemblyInfoInputs.cache

@@ -1 +1 @@
-ab09d381c05215b3562adf58a872d97cc4b835ba968bab0f69aeef30a7c68a61
+41f6315c9692112227b0dfbf1b410479de47434a9269b2e90db57e631e7e6555

AquaCare.View/obj/Debug/net9.0/AquaCare.View.csproj.FileListAbsolute.txt

@@ -214,16 +214,6 @@ C:\Users\HP 15-db1305ng\Desktop\AquaCare\AquaCare\aquacare.view\obj\Debug\net9.0
 C:\Users\HP 15-db1305ng\Desktop\AquaCare\AquaCare\aquacare.view\obj\Debug\net9.0\AquaCare.49F230C4.Up2Date
 C:\Users\HP 15-db1305ng\Desktop\AquaCare\AquaCare\aquacare.view\obj\Debug\net9.0\AquaCare.View.genruntimeconfig.cache
 C:\Users\HP 15-db1305ng\Desktop\AquaCare\AquaCare\aquacare.view\obj\Debug\net9.0\ref\AquaCare.View.dll
-C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\AquaCare.View.csproj.AssemblyReference.cache
-C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\Avalonia\Resources.Inputs.cache
-C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\Avalonia\resources
-C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\AquaCare.View.GeneratedMSBuildEditorConfig.editorconfig
-C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\AquaCare.View.AssemblyInfoInputs.cache
-C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\AquaCare.View.AssemblyInfo.cs
-C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\AquaCare.View.csproj.CoreCompileInputs.cache
-C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\Avalonia\AquaCare.View.dll
-C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\Avalonia\AquaCare.View.pdb
-C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\refint\Avalonia\AquaCare.View.dll
 C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\bin\Debug\net9.0\AquaCare.View.exe
 C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\bin\Debug\net9.0\AquaCare.View.deps.json
 C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\bin\Debug\net9.0\AquaCare.View.runtimeconfig.json
@@ -283,6 +273,16 @@ C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\bin\Debug\n
 C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\bin\Debug\net9.0\AquaCare.Controller.pdb
 C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\bin\Debug\net9.0\AquaCare.Model.pdb
 C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\bin\Debug\net9.0\AquaCare.Persistence.pdb
+C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\AquaCare.View.csproj.AssemblyReference.cache
+C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\Avalonia\Resources.Inputs.cache
+C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\Avalonia\resources
+C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\AquaCare.View.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\AquaCare.View.AssemblyInfoInputs.cache
+C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\AquaCare.View.AssemblyInfo.cs
+C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\AquaCare.View.csproj.CoreCompileInputs.cache
+C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\Avalonia\AquaCare.View.dll
+C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\Avalonia\AquaCare.View.pdb
+C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\refint\Avalonia\AquaCare.View.dll
 C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\AquaCare.49F230C4.Up2Date
 C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\AquaCare.View.genruntimeconfig.cache
 C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare\AquaCare.View\obj\Debug\net9.0\ref\AquaCare.View.dll

AquaCare.View/obj/Debug/net9.0/Avalonia/Resources.Inputs.cache

@@ -1 +1 @@
-c2578d65b3c5794ae06bd1ab6de2b89912cab35ba7a5b7b6a7f19f18932a7f85
+cff4442003afd3eaade8e0c7955809ed9c21a10c8f7f9ecc9fcde1a5e594474b