[Avalonia] Switching themes, work in progress

Ruben2776 · Sep 21, 2024 · 991371d · 991371d
1 parent e165f83
commit 991371d
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 45 deletions.
diff --git a/src/PicView.Avalonia.Win32/App.axaml b/src/PicView.Avalonia.Win32/App.axaml
@@ -1,5 +1,5 @@
 <Application
-    RequestedThemeVariant="Default"
+    RequestedThemeVariant="Dark"
     x:Class="PicView.Avalonia.Win32.App"
     x:CompileBindings="True"
     xmlns="https://github.com/avaloniaui"

diff --git a/src/PicView.Avalonia/PicViewTheme/DarkColors.axaml b/src/PicView.Avalonia/PicViewTheme/DarkColors.axaml
@@ -0,0 +1,50 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Color x:Key="AccentColor">#FFDB5B3D</Color>
+    <Color x:Key="SecondaryAccentColor">#e0755a</Color>
+    <Color x:Key="LogoAccentColor">#FFf8af3c</Color>
+
+    <Color x:Key="MainTextColor">#FFf6f4f4</Color>
+    <Color x:Key="MainTextColorFaded">#d6d4d4</Color>
+
+    <Color x:Key="MainIconColor">#eeebebeb</Color>
+    <Color x:Key="SecondaryIconColor">#eeebebeb</Color>
+
+    <Color x:Key="MainBackgroundColor">#CC2b2b2b</Color>
+    <Color x:Key="SecondaryBackgroundColor">#CC252525</Color>
+    <Color x:Key="TertiaryBackgroundColor">#CC3d3d3d</Color>
+    <Color x:Key="FadedBackgroundColor">#FF333333</Color>
+    <Color x:Key="BackgroundHoverColor">#FF4B4B4B</Color>
+    <Color x:Key="AltBackgroundHoverColor">#22FFFFFF</Color>
+    <Color x:Key="AltBackgroundColor">#A7222222</Color>
+
+    <Color x:Key="MainButtonBackgroundColor">#FF2e2e2e</Color>
+
+    <Color x:Key="MainBorderColor">#FF3A3A3A</Color>
+    <Color x:Key="SecondaryBorderColor">#777</Color>
+    <Color x:Key="TertiaryBorderColor">#555</Color>
+
+    <Color x:Key="ButtonForegroundPointerOver">#FFF</Color>
+
+    <Color x:Key="BackgroundAlpha">#442e2e2e</Color>
+
+    <Color x:Key="MenuBackgroundColor">#292929</Color>
+    <Color x:Key="ContextMenuBackgroundColor">#EE2b2b2b</Color>
+
+    <Color x:Key="WindowBackgroundColor">#66000000</Color>
+    <ImageBrush
+        DestinationRect="0,0,100,100"
+        Opacity=".6"
+        Source="/PicViewTheme/Resources/noisy-texture-200x200-o4-d31-c-161616-t0.png"
+        SourceRect="0,0,200,200"
+        Stretch="Fill"
+        TileMode="FlipXY"
+        x:Key="NoisyTexture" />
+
+    <DropShadowEffect
+        BlurRadius="5"
+        Color="#112e2e2e"
+        OffsetX="2"
+        OffsetY="2"
+        x:Key="MenuShadowButtonBorder" />
+</ResourceDictionary>
diff --git a/src/PicView.Avalonia/PicViewTheme/LightColors.axaml b/src/PicView.Avalonia/PicViewTheme/LightColors.axaml
@@ -0,0 +1,50 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Color x:Key="AccentColor">#FFDB5B3D</Color>
+    <Color x:Key="SecondaryAccentColor">#e0755a</Color>
+    <Color x:Key="LogoAccentColor">#FFf8af3c</Color>
+
+    <Color x:Key="MainTextColor">#FFf6f4f4</Color>
+    <Color x:Key="MainTextColorFaded">#d6d4d4</Color>
+
+    <Color x:Key="MainIconColor">#eeebebeb</Color>
+    <Color x:Key="SecondaryIconColor">#eeebebeb</Color>
+
+    <Color x:Key="MainBackgroundColor">White</Color>
+    <Color x:Key="SecondaryBackgroundColor">WhiteSmoke</Color>
+    <Color x:Key="TertiaryBackgroundColor">#CC3d3d3d</Color>
+    <Color x:Key="FadedBackgroundColor">#FF333333</Color>
+    <Color x:Key="BackgroundHoverColor">#FF4B4B4B</Color>
+    <Color x:Key="AltBackgroundHoverColor">#22FFFFFF</Color>
+    <Color x:Key="AltBackgroundColor">#A7222222</Color>
+
+    <Color x:Key="MainButtonBackgroundColor">#FF2e2e2e</Color>
+
+    <Color x:Key="MainBorderColor">#FF3A3A3A</Color>
+    <Color x:Key="SecondaryBorderColor">#777</Color>
+    <Color x:Key="TertiaryBorderColor">#555</Color>
+
+    <Color x:Key="ButtonForegroundPointerOver">#FFF</Color>
+
+    <Color x:Key="BackgroundAlpha">#442e2e2e</Color>
+
+    <Color x:Key="MenuBackgroundColor">#292929</Color>
+    <Color x:Key="ContextMenuBackgroundColor">#EE2b2b2b</Color>
+
+    <Color x:Key="WindowBackgroundColor">#66000000</Color>
+    <ImageBrush
+        DestinationRect="0,0,100,100"
+        Opacity=".6"
+        Source="/PicViewTheme/Resources/noisy-texture-200x200-o4-d31-c-161616-t0.png"
+        SourceRect="0,0,200,200"
+        Stretch="Fill"
+        TileMode="FlipXY"
+        x:Key="NoisyTexture" />
+
+    <DropShadowEffect
+        BlurRadius="5"
+        Color="#112e2e2e"
+        OffsetX="2"
+        OffsetY="2"
+        x:Key="MenuShadowButtonBorder" />
+</ResourceDictionary>
diff --git a/src/PicView.Avalonia/PicViewTheme/Main.axaml b/src/PicView.Avalonia/PicViewTheme/Main.axaml
@@ -5,47 +5,13 @@
     <Styles.Resources>
         <ResourceDictionary>
 
-            <Color x:Key="AccentColor">#FFDB5B3D</Color>
-            <Color x:Key="SecondaryAccentColor">#e0755a</Color>
-            <Color x:Key="LogoAccentColor">#FFf8af3c</Color>
-
-            <Color x:Key="MainTextColor">#FFf6f4f4</Color>
-            <Color x:Key="MainTextColorFaded">#d6d4d4</Color>
-
-            <Color x:Key="MainIconColor">#eeebebeb</Color>
-            <Color x:Key="SecondaryIconColor">#eeebebeb</Color>
-
-            <Color x:Key="MainBackgroundColor">#CC2b2b2b</Color>
-            <Color x:Key="SecondaryBackgroundColor">#CC252525</Color>
-            <Color x:Key="TertiaryBackgroundColor">#CC3d3d3d</Color>
-            <Color x:Key="FadedBackgroundColor">#FF333333</Color>
-            <Color x:Key="BackgroundHoverColor">#FF4B4B4B</Color>
-            <Color x:Key="AltBackgroundHoverColor">#22FFFFFF</Color>
-            <Color x:Key="AltBackgroundColor">#A7222222</Color>
-
-            <Color x:Key="MainButtonBackgroundColor">#FF2e2e2e</Color>
-
-            <Color x:Key="MainBorderColor">#FF3A3A3A</Color>
-            <Color x:Key="SecondaryBorderColor">#777</Color>
-            <Color x:Key="TertiaryBorderColor">#555</Color>
-
-            <Color x:Key="ButtonForegroundPointerOver">#FFF</Color>
+            <ResourceDictionary.MergedDictionaries>
 
-            <Color x:Key="BackgroundAlpha">#442e2e2e</Color>
+                <!--  TODO: Figure out switching themes  -->
+                <ResourceInclude Source="/PicViewTheme/DarkColors.axaml" />
+                <!--  TODO: Figure out switching themes  -->
 
-            <Color x:Key="MenuBackgroundColor">#292929</Color>
-            <Color x:Key="ContextMenuBackgroundColor">#EE2b2b2b</Color>
 
-            <Color x:Key="WindowBackgroundColor">#66000000</Color>
-            <ImageBrush
-                DestinationRect="0,0,100,100"
-                Opacity=".6"
-                Source="/PicViewTheme/Resources/noisy-texture-200x200-o4-d31-c-161616-t0.png"
-                SourceRect="0,0,200,200"
-                Stretch="Fill"
-                TileMode="FlipXY"
-                x:Key="NoisyTexture" />
-            <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="/PicViewTheme/Controls/AutoScrollViewer.axaml" />
                 <ResourceInclude Source="/PicViewTheme/Controls/Border.axaml" />
                 <ResourceInclude Source="/PicViewTheme/Controls/Button.axaml" />
@@ -69,12 +35,6 @@
                 <ResourceInclude Source="/PicViewTheme/Controls/Window.axaml" />
                 <ResourceInclude Source="/PicViewTheme/Icons.axaml" />
             </ResourceDictionary.MergedDictionaries>
-            <DropShadowEffect
-                BlurRadius="5"
-                Color="#112e2e2e"
-                OffsetX="2"
-                OffsetY="2"
-                x:Key="MenuShadowButtonBorder" />
         </ResourceDictionary>
     </Styles.Resources>
     <Style Selector="Window">