Fix color scheme change issue & Code cleanup

Author: Jack251970

Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs

@@ -113,7 +113,15 @@ public ColorSchemes ColorScheme
         get => Settings.ColorScheme;
         set
         {
-            UpdateColorScheme();
+            ThemeManagerForColorSchemeSwitch.Current.ApplicationTheme = value switch
+            {
+                Infrastructure.UserSettings.ColorSchemes.Light => ApplicationTheme.Light,
+                Infrastructure.UserSettings.ColorSchemes.Dark => ApplicationTheme.Dark,
+                Infrastructure.UserSettings.ColorSchemes.System => null,
+                _ => ThemeManagerForColorSchemeSwitch.Current.ApplicationTheme
+            };
+
+            ThemeManager.Instance.RefreshFrame();
 
             Settings.ColorScheme = value;
         }
@@ -220,9 +228,8 @@ public void ApplyBackdrop()
     public BackdropTypes BackdropType
     {
         get => Enum.IsDefined(typeof(BackdropTypes), Settings.BackdropType)
-               ? (BackdropTypes)Settings.BackdropType
+               ? Settings.BackdropType
                : BackdropTypes.None;
-
         set
         {
             if (!Enum.IsDefined(typeof(BackdropTypes), value))
@@ -241,9 +248,6 @@ public BackdropTypes BackdropType
         }
     }
 
-
-
-
     public bool UseSound
     {
         get => Settings.UseSound;
@@ -468,27 +472,15 @@ public FamilyTypeface SelectedResultSubFontFaces
 
     public string ThemeImage => Constant.QueryTextBoxIconImagePath;
 
-    [RelayCommand]
-    private void OpenThemesFolder()
-    {
-        App.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Themes));
-    }
-
-    private void UpdateColorScheme()
+    public SettingsPaneThemeViewModel(Settings settings)
     {
-        ThemeManagerForColorSchemeSwitch.Current.ApplicationTheme = Settings.ColorScheme switch
-        {
-            Infrastructure.UserSettings.ColorSchemes.Light => ApplicationTheme.Light,
-            Infrastructure.UserSettings.ColorSchemes.Dark => ApplicationTheme.Dark,
-            Infrastructure.UserSettings.ColorSchemes.System => null,
-            _ => ThemeManagerForColorSchemeSwitch.Current.ApplicationTheme
-        };
-        ThemeManager.Instance.RefreshFrame();
+        Settings = settings;
     }
 
-    public SettingsPaneThemeViewModel(Settings settings)
+    [RelayCommand]
+    private void OpenThemesFolder()
     {
-        Settings = settings;
+        App.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Themes));
     }
 
     [RelayCommand]