From 0fa6e12422828d03a88615226b34ac859c15300e Mon Sep 17 00:00:00 2001
From: Slavasil <subvia@proton.me>
Date: Wed, 29 Apr 2026 21:35:11 +0300
Subject: [PATCH] theme improvements

- force Light theme variant (temporary) to match the actual UI look
- define some colors and brushes in AppTheme to avoid repetition
- fix text color in AboutWindow
---
 src/KeyKeeper/AboutWindow.cs        |  3 ++-
 src/KeyKeeper/App.axaml             |  4 ++--
 src/KeyKeeper/Styles/AppTheme.axaml | 24 +++++++++++++++++++-----
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/KeyKeeper/AboutWindow.cs b/src/KeyKeeper/AboutWindow.cs
index b082668..ef3c58a 100644
--- a/src/KeyKeeper/AboutWindow.cs
+++ b/src/KeyKeeper/AboutWindow.cs
@@ -15,7 +15,8 @@ public class AboutWindow : Window
         this.MinWidth = 450;
         this.MinHeight = 250;
 
-        this.Background = new SolidColorBrush(Color.Parse("#2328c4"));
+        this.Background = this.FindResource("KeyKeeperAboutWindowBackgroundBrush") as IBrush;
+        this.Foreground = this.FindResource("KeyKeeperAboutWindowForegroundBrush") as IBrush;
 
         var AboutKeyKeeper = new TextBlock
         {
diff --git a/src/KeyKeeper/App.axaml b/src/KeyKeeper/App.axaml
index 9f89dbc..77cdcd5 100644
--- a/src/KeyKeeper/App.axaml
+++ b/src/KeyKeeper/App.axaml
@@ -2,7 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="KeyKeeper.App"
              xmlns:local="using:KeyKeeper"
-             RequestedThemeVariant="Default">
+             RequestedThemeVariant="Light">
              <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
 
     <Application.DataTemplates>
@@ -16,4 +16,4 @@
             <Setter Property="Icon" Value="/Assets/icon.ico"/>
         </Style>
     </Application.Styles>
-</Application>
\ No newline at end of file
+</Application>
diff --git a/src/KeyKeeper/Styles/AppTheme.axaml b/src/KeyKeeper/Styles/AppTheme.axaml
index fd9f190..78dd1f0 100644
--- a/src/KeyKeeper/Styles/AppTheme.axaml
+++ b/src/KeyKeeper/Styles/AppTheme.axaml
@@ -5,9 +5,24 @@
             <Button Classes="" Content="contentъ"/>
         </Border>
     </Design.PreviewWith>
-    
+
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentTheme.xaml"/>
-    
+
+    <Styles.Resources>
+      <ResourceDictionary>
+        <ResourceDictionary.ThemeDictionaries>
+          <ResourceDictionary x:Key="Default">
+            <Color x:Key="KeyKeeperAccentColor">#FF2328C4</Color>
+            <Color x:Key="KeyKeeperForeground">#00000000</Color>
+            <Color x:Key="KeyKeeperBackground">#FFFFFFFF</Color>
+
+            <SolidColorBrush x:Key="KeyKeeperAboutWindowBackgroundBrush" Color="{DynamicResource KeyKeeperAccentColor}" />
+            <SolidColorBrush x:Key="KeyKeeperAboutWindowForegroundBrush" Color="#FFFFFFFF" />
+          </ResourceDictionary>
+        </ResourceDictionary.ThemeDictionaries>
+      </ResourceDictionary>
+    </Styles.Resources>
+
     <Style Selector="Button:not(.dummy) /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="Background" Value="#cccccc" />
         <Setter Property="Foreground" Value="#000000" />
@@ -20,7 +35,6 @@
         <Setter Property="Background" Value="#444444" />
         <Setter Property="Foreground" Value="#ffffff" />
     </Style>
-
     <Style Selector="Button.accentSidebarButton /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="Background" Value="#00000000" />
         <Setter Property="Foreground" Value="white" />
@@ -33,6 +47,6 @@
         <Setter Property="CornerRadius" Value="9" />
         <Setter Property="BorderBrush" Value="white" />
         <Setter Property="Background" Value="white"/>
-        <Setter Property="Foreground" Value="#2328C4"/>
+        <Setter Property="Foreground" Value="{DynamicResource KeyKeeperAccentColor}"/>
     </Style>
-</Styles>
\ No newline at end of file
+</Styles>