diff --git a/Project_Periodensystem.Model/Theme.cs b/Project_Periodensystem.Model/Theme.cs
new file mode 100644
index 0000000..b54600b
--- /dev/null
+++ b/Project_Periodensystem.Model/Theme.cs
@@ -0,0 +1,9 @@
+namespace Project_Periodensystem.Model
+{
+ public enum AppTheme
+ {
+ Dark,
+ Light,
+ Classic
+ }
+}
\ No newline at end of file
diff --git a/Project_Periodensystem.View/AboutPage.axaml b/Project_Periodensystem.View/AboutPage.axaml
index 150e586..ca2170e 100644
--- a/Project_Periodensystem.View/AboutPage.axaml
+++ b/Project_Periodensystem.View/AboutPage.axaml
@@ -4,14 +4,35 @@
xmlns:i="using:Avalonia.Interactivity"
x:Class="Project_Periodensystem.View.AboutPage"
Background="#5C5144">
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+ FontSize="20"
+ Foreground="White"
+ HorizontalAlignment="Center"
+ Margin="0,0,0,10"/>
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Project_Periodensystem.View/AboutPage.axaml.cs b/Project_Periodensystem.View/AboutPage.axaml.cs
index 418e7a7..0de901c 100644
--- a/Project_Periodensystem.View/AboutPage.axaml.cs
+++ b/Project_Periodensystem.View/AboutPage.axaml.cs
@@ -3,6 +3,7 @@ using Avalonia.Controls;
using Avalonia.Interactivity;
using Avalonia.Markup.Xaml;
using Avalonia.VisualTree;
+using Project_Periodensystem.Model;
namespace Project_Periodensystem.View
{
@@ -14,26 +15,30 @@ namespace Project_Periodensystem.View
}
private void InitializeComponent()
- => AvaloniaXamlLoader.Load(this);
-
- private void BackButton_Click(object sender, RoutedEventArgs e)
{
- try
+ AvaloniaXamlLoader.Load(this);
+ }
+
+ private void BackButton_Click(object? sender, RoutedEventArgs e)
+ {
+ if (this.Parent is ContentControl content && content.Parent is MainWindow mainWindow)
{
- var mainWindow = this.FindAncestorOfType();
- if (mainWindow != null)
- {
- mainWindow.ShowLanding();
- }
- else
- {
- Console.WriteLine("MainWindow nicht gefunden!");
- }
+ mainWindow.ShowLandingPage();
}
- catch (Exception ex)
+ }
+
+ private void ThemeButton_Click(object? sender, RoutedEventArgs e)
+ {
+ var nextTheme = MainWindow.CurrentTheme switch
{
- Console.WriteLine($"Fehler in BackButton_Click: {ex.Message}");
- Console.WriteLine($"StackTrace: {ex.StackTrace}");
+ AppTheme.Dark => AppTheme.Light,
+ AppTheme.Light => AppTheme.Classic,
+ _ => AppTheme.Dark
+ };
+
+ if (this.Parent is ContentControl content && content.Parent is MainWindow mainWindow)
+ {
+ mainWindow.UpdateTheme(nextTheme);
}
}
}
diff --git a/Project_Periodensystem.View/Converters/SeriesToColorConverter.cs b/Project_Periodensystem.View/Converters/SeriesToColorConverter.cs
index d6cabe7..b191b6d 100644
--- a/Project_Periodensystem.View/Converters/SeriesToColorConverter.cs
+++ b/Project_Periodensystem.View/Converters/SeriesToColorConverter.cs
@@ -1,7 +1,7 @@
-using System;
-using System.Globalization;
using Avalonia.Data.Converters;
using Avalonia.Media;
+using System;
+using System.Globalization;
namespace Project_Periodensystem.View.Converters
{
@@ -9,26 +9,27 @@ namespace Project_Periodensystem.View.Converters
{
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
{
- if (value is not string series)
- return new SolidColorBrush(Color.Parse("#222222")); // fallback
-
- return series switch
+ if (value == null) return new SolidColorBrush(Colors.Gray);
+
+ return value.ToString() switch
{
- "Nichtmetall" => new SolidColorBrush(Color.Parse("#3e6418")),
- "Metall" => new SolidColorBrush(Color.Parse("#711019")), // Übergangsmetall
- "Post-Übergangsmetall" => new SolidColorBrush(Color.Parse("#555555")), // neu hinzugefügt
- "Halbmetall" => new SolidColorBrush(Color.Parse("#015146")),
- "Edelgas" => new SolidColorBrush(Color.Parse("#3a2151")),
- "Halogen" => new SolidColorBrush(Color.Parse("#846011")),
- "Alkalimetall" => new SolidColorBrush(Color.Parse("#6c3b01")),
- "Erdalkalimetall" => new SolidColorBrush(Color.Parse("#846011")),
- "Lanthanoid" => new SolidColorBrush(Color.Parse("#402c17")),
- "Actinoid" => new SolidColorBrush(Color.Parse("#732e4c")),
- _ => new SolidColorBrush(Color.Parse("#222222")),
+ "Nichtmetall" => new SolidColorBrush(Color.Parse("#3e6418")),
+ "Metall" => new SolidColorBrush(Color.Parse("#711019")),
+ "Post-Übergangsmetall" => new SolidColorBrush(Color.Parse("#555555")),
+ "Halbmetall" => new SolidColorBrush(Color.Parse("#015146")),
+ "Edelgas" => new SolidColorBrush(Color.Parse("#3a2151")),
+ "Halogen" => new SolidColorBrush(Color.Parse("#846011")),
+ "Alkalimetall" => new SolidColorBrush(Color.Parse("#6c3b01")),
+ "Erdalkalimetall" => new SolidColorBrush(Color.Parse("#846011")),
+ "Lanthanoid" => new SolidColorBrush(Color.Parse("#402c17")),
+ "Actinoid" => new SolidColorBrush(Color.Parse("#732e4c")),
+ _ => new SolidColorBrush(Color.Parse("#222222"))
};
}
- public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) =>
+ public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+ {
throw new NotImplementedException();
+ }
}
}
diff --git a/Project_Periodensystem.View/LandingPage.axaml b/Project_Periodensystem.View/LandingPage.axaml
index fe02edd..34374fa 100644
--- a/Project_Periodensystem.View/LandingPage.axaml
+++ b/Project_Periodensystem.View/LandingPage.axaml
@@ -2,30 +2,56 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="Project_Periodensystem.View.LandingPage"
Background="#5C5144">
+
+
+
+
+
+
-
-
diff --git a/Project_Periodensystem.View/LandingPage.axaml.cs b/Project_Periodensystem.View/LandingPage.axaml.cs
index a78ce8c..eadabfe 100644
--- a/Project_Periodensystem.View/LandingPage.axaml.cs
+++ b/Project_Periodensystem.View/LandingPage.axaml.cs
@@ -2,21 +2,35 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Interactivity;
using Avalonia.Markup.Xaml;
-using Avalonia.VisualTree;
+using Avalonia.Media;
+using Project_Periodensystem.Model;
using System;
+using System.Collections.Generic;
namespace Project_Periodensystem.View
{
public partial class LandingPage : UserControl
{
+ private readonly Random random = new();
+ private readonly Dictionary themeColors;
+ private AppTheme currentTheme;
private Button? startButton;
private DateTime lastClickTime = DateTime.MinValue;
private const int DEBOUNCE_MS = 500;
public LandingPage()
{
- Logger.Log("=== LandingPage wird initialisiert ===");
+ Logger.Log($"=== LandingPage wird initialisiert am {DateTime.Now:dd.MM.yyyy HH:mm:ss} ===");
InitializeComponent();
+
+ themeColors = new Dictionary
+ {
+ { AppTheme.Dark, "#5C5144" },
+ { AppTheme.Light, "#E8DFD8" },
+ { AppTheme.Classic, "#7B8B6F" }
+ };
+
+ SetRandomTheme();
startButton = this.Find