Use theme dictionaries

Tyrrrz · May 15, 2024 · 3bc6110 · 3bc6110
1 parent ccfaf2c
commit 3bc6110
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/YoutubeDownloader/App.axaml.cs b/YoutubeDownloader/App.axaml.cs
@@ -105,21 +105,6 @@ private void InitializeTheme()
             actualTheme == PlatformThemeVariant.Light
                 ? Theme.Create(Theme.Light, Color.Parse("#343838"), Color.Parse("#F9A825"))
                 : Theme.Create(Theme.Dark, Color.Parse("#E8E8E8"), Color.Parse("#F9A825"));
-
-        Resources["SuccessBrush"] =
-            actualTheme == PlatformThemeVariant.Light
-                ? new SolidColorBrush(Colors.DarkGreen)
-                : new SolidColorBrush(Colors.LightGreen);
-
-        Resources["CanceledBrush"] =
-            actualTheme == PlatformThemeVariant.Light
-                ? new SolidColorBrush(Colors.DarkOrange)
-                : new SolidColorBrush(Colors.Orange);
-
-        Resources["FailedBrush"] =
-            actualTheme == PlatformThemeVariant.Light
-                ? new SolidColorBrush(Colors.DarkRed)
-                : new SolidColorBrush(Colors.OrangeRed);
     }
 
     public override void OnFrameworkInitializationCompleted()

diff --git a/YoutubeDownloader/Views/Components/DashboardView.axaml b/YoutubeDownloader/Views/Components/DashboardView.axaml
@@ -208,6 +208,22 @@
                                         Classes.started="{Binding Status, Converter={x:Static converters:EqualityConverter.Equality}, ConverterParameter={x:Static components:DownloadStatus.Started}}"
                                         PointerReleased="StatusTextBlock_OnPointerReleased"
                                         TextTrimming="CharacterEllipsis">
+                                        <TextBlock.Resources>
+                                            <ResourceDictionary>
+                                                <ResourceDictionary.ThemeDictionaries>
+                                                    <ResourceDictionary x:Key="Default">
+                                                        <SolidColorBrush x:Key="SuccessBrush" Color="DarkGreen" />
+                                                        <SolidColorBrush x:Key="CanceledBrush" Color="DarkOrange" />
+                                                        <SolidColorBrush x:Key="FailedBrush" Color="DarkRed" />
+                                                    </ResourceDictionary>
+                                                    <ResourceDictionary x:Key="Dark">
+                                                        <SolidColorBrush x:Key="SuccessBrush" Color="LightGreen" />
+                                                        <SolidColorBrush x:Key="CanceledBrush" Color="Orange" />
+                                                        <SolidColorBrush x:Key="FailedBrush" Color="OrangeRed" />
+                                                    </ResourceDictionary>
+                                                </ResourceDictionary.ThemeDictionaries>
+                                            </ResourceDictionary>
+                                        </TextBlock.Resources>
                                         <TextBlock.Styles>
                                             <Style Selector="TextBlock">
                                                 <Style Selector="^.enqueued">