Clean up

Author: Tyrrrz

YoutubeDownloader/App.axaml

@@ -14,16 +14,11 @@
     </Application.DataTemplates>
 
     <Application.Styles>
-        <!--  Hack: this brush is missing on initialization for some reason  -->
-        <Style>
-            <Style.Resources>
-                <ResourceDictionary>
-                    <SolidColorBrush x:Key="MaterialPaperBrush" Color="#FF303030" />
-                </ResourceDictionary>
-            </Style.Resources>
-        </Style>
-
-        <materialStyles:MaterialThemeBase />
+        <!--  This theme is used as a stub to pre-load default resources, the actual colors are set through code  -->
+        <materialStyles:MaterialTheme
+            BaseTheme="Light"
+            PrimaryColor="Grey"
+            SecondaryColor="DeepOrange" />
         <materialIcons:MaterialIconStyles />
         <dialogHostAvalonia:DialogHostStyles />
 

YoutubeDownloader/App.axaml.cs

@@ -105,30 +105,35 @@ private void InitializeTheme()
             _ => PlatformSettings?.GetColorValues().ThemeVariant
         };
 
-        if (actualTheme == PlatformThemeVariant.Light)
+        this.LocateMaterialTheme<MaterialThemeBase>().CurrentTheme = actualTheme switch
         {
-            this.LocateMaterialTheme<MaterialThemeBase>().CurrentTheme = Theme.Create(
-                Theme.Light,
-                Color.Parse("#343838"),
-                Color.Parse("#F9A825")
-            );
-
-            Resources["SuccessBrush"] = new SolidColorBrush(Colors.DarkGreen);
-            Resources["CanceledBrush"] = new SolidColorBrush(Colors.DarkOrange);
-            Resources["FailedBrush"] = new SolidColorBrush(Colors.DarkRed);
-        }
-        else
+            PlatformThemeVariant.Light
+                => Theme.Create(Theme.Light, Color.Parse("#343838"), Color.Parse("#F9A825")),
+            PlatformThemeVariant.Dark
+                => Theme.Create(Theme.Dark, Color.Parse("#E8E8E8"), Color.Parse("#F9A825")),
+            _ => throw new InvalidOperationException($"Unknown theme '{actualTheme}'.")
+        };
+
+        Resources["SuccessBrush"] = actualTheme switch
+        {
+            PlatformThemeVariant.Light => new SolidColorBrush(Colors.DarkGreen),
+            PlatformThemeVariant.Dark => new SolidColorBrush(Colors.LightGreen),
+            _ => throw new InvalidOperationException($"Unknown theme '{actualTheme}'.")
+        };
+
+        Resources["CanceledBrush"] = actualTheme switch
         {
-            this.LocateMaterialTheme<MaterialThemeBase>().CurrentTheme = Theme.Create(
-                Theme.Dark,
-                Color.Parse("#E8E8E8"),
-                Color.Parse("#F9A825")
-            );
-
-            Resources["SuccessBrush"] = new SolidColorBrush(Colors.LightGreen);
-            Resources["CanceledBrush"] = new SolidColorBrush(Colors.Orange);
-            Resources["FailedBrush"] = new SolidColorBrush(Colors.OrangeRed);
-        }
+            PlatformThemeVariant.Light => new SolidColorBrush(Colors.DarkOrange),
+            PlatformThemeVariant.Dark => new SolidColorBrush(Colors.Orange),
+            _ => throw new InvalidOperationException($"Unknown theme '{actualTheme}'.")
+        };
+
+        Resources["FailedBrush"] = actualTheme switch
+        {
+            PlatformThemeVariant.Light => new SolidColorBrush(Colors.DarkRed),
+            PlatformThemeVariant.Dark => new SolidColorBrush(Colors.OrangeRed),
+            _ => throw new InvalidOperationException($"Unknown theme '{actualTheme}'.")
+        };
     }
 
     public override void OnFrameworkInitializationCompleted()