Use enum instead of constants & Use vm property

Author: Jack251970

Flow.Launcher.Core/Resource/Theme.cs

@@ -457,7 +457,7 @@ public void ColorizeWindow(string Mode)
                 // ✅ 설정의 ColorScheme을 우선 사용
                 int themeValue = (int)Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", 1);
                 bool isSystemDark = themeValue == 0;
-                bool useDarkMode = Mode == "Dark" || (Mode == "Auto" && _settings.ColorScheme == "System" && isSystemDark) || (_settings.ColorScheme == "Dark");
+                bool useDarkMode = Mode == "Dark" || (Mode == "Auto" && _settings.ColorScheme == ColorSchemes.System && isSystemDark) || (_settings.ColorScheme == ColorSchemes.Dark);
 
                 Color selectedBG = useDarkMode ? DarkBG : LightBG;
                 ApplyPreviewBackground(selectedBG);

Flow.Launcher.Infrastructure/Constant.cs

@@ -40,10 +40,6 @@ public static class Constant
 
         public const string DefaultTheme = "Win11Light";
 
-        public const string Light = "Light";
-        public const string Dark = "Dark";
-        public const string System = "System";
-
         public const string Themes = "Themes";
         public const string Settings = "Settings";
         public const string Logs = "Logs";

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -37,7 +37,7 @@ public void Save()
         private string _theme = Constant.DefaultTheme;
         public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}";
         public string OpenResultModifiers { get; set; } = KeyConstant.Alt;
-        public string ColorScheme { get; set; } = "System";
+        public ColorSchemes ColorScheme { get; set; } = ColorSchemes.System;
         public bool ShowOpenResultHotkey { get; set; } = true;
         public double WindowSize { get; set; } = 580;
         public string PreviewHotkey { get; set; } = $"F1";

Flow.Launcher/MainWindow.xaml.cs

@@ -998,11 +998,11 @@ private void MoveQueryTextToEnd()
 
         public void InitializeColorScheme()
         {
-            if (_settings.ColorScheme == Constant.Light)
+            if (_settings.ColorScheme == ColorSchemes.Light)
             {
                 ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Light;
             }
-            else if (_settings.ColorScheme == Constant.Dark)
+            else if (_settings.ColorScheme == ColorSchemes.Dark)
             {
                 ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Dark;
             }

Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs

@@ -15,8 +15,6 @@
 using ModernWpf;
 using ThemeManager = Flow.Launcher.Core.Resource.ThemeManager;
 using ThemeManagerForColorSchemeSwitch = ModernWpf.ThemeManager;
-using static Flow.Launcher.Core.Resource.Theme;
-using System.Windows.Interop;
 
 namespace Flow.Launcher.SettingPages.ViewModels;
 
@@ -38,8 +36,11 @@ public Theme.ThemeData SelectedTheme
             ThemeManager.Instance.ChangeTheme(value.FileNameWithoutExtension);
 
             if (ThemeManager.Instance.BlurEnabled && Settings.UseDropShadowEffect == false)
+            {
                 DropShadowEffect = true;
                 OnPropertyChanged(nameof(IsDropShadowEnabled));
+            }
+
             ThemeManager.Instance.RefreshFrame();
             //ThemeManager.Instance.SetBlurForWindow();
         }
@@ -107,6 +108,16 @@ public double ResultSubItemFontSize
     public class ColorSchemeData : DropdownDataGeneric<ColorSchemes> { }
 
     public List<ColorSchemeData> ColorSchemes { get; } = DropdownDataGeneric<ColorSchemes>.GetValues<ColorSchemeData>("ColorScheme");
+    public ColorSchemes ColorScheme
+    {
+        get => Settings.ColorScheme;
+        set
+        {
+            UpdateColorScheme();
+
+            Settings.ColorScheme = value;
+        }
+    }
 
     public List<string> TimeFormatList { get; } = new()
     {
@@ -463,13 +474,13 @@ private void OpenThemesFolder()
         App.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Themes));
     }
 
-    public void UpdateColorScheme()
+    private void UpdateColorScheme()
     {
         ThemeManagerForColorSchemeSwitch.Current.ApplicationTheme = Settings.ColorScheme switch
         {
-            Constant.Light => ApplicationTheme.Light,
-            Constant.Dark => ApplicationTheme.Dark,
-            Constant.System => null,
+            Infrastructure.UserSettings.ColorSchemes.Light => ApplicationTheme.Light,
+            Infrastructure.UserSettings.ColorSchemes.Dark => ApplicationTheme.Dark,
+            Infrastructure.UserSettings.ColorSchemes.System => null,
             _ => ThemeManagerForColorSchemeSwitch.Current.ApplicationTheme
         };
         ThemeManager.Instance.RefreshFrame();

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

@@ -688,9 +688,8 @@
                     DisplayMemberPath="Display"
                     FontSize="14"
                     ItemsSource="{Binding ColorSchemes}"
-                    SelectedValue="{Binding Settings.ColorScheme}"
-                    SelectedValuePath="Value"
-                    SelectionChanged="Selector_OnSelectionChanged" />
+                    SelectedValue="{Binding ColorScheme, Mode=TwoWay}"
+                    SelectedValuePath="Value" />
             </cc:Card>
 
             <!--  Theme folder  -->

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
 using System.Windows.Navigation;
 using Flow.Launcher.SettingPages.ViewModels;
 using Page = ModernWpf.Controls.Page;
@@ -25,9 +22,4 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 
         base.OnNavigatedTo(e);
     }
-
-    private void Selector_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
-    {
-        _viewModel.UpdateColorScheme();
-    }
 }