Skip to content

Commit c17dcad

Browse files
committed
Revert "Use enum instead of constants"
1 parent 8484c2b commit c17dcad

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

Flow.Launcher.Core/Resource/Theme.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ public void ColorizeWindow(string Mode)
457457
// ✅ 설정의 ColorScheme을 우선 사용
458458
int themeValue = (int)Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", 1);
459459
bool isSystemDark = themeValue == 0;
460-
bool useDarkMode = Mode == "Dark" || (Mode == "Auto" && _settings.ColorScheme == ColorSchemes.System && isSystemDark) || (_settings.ColorScheme == ColorSchemes.Dark);
460+
bool useDarkMode = Mode == "Dark" || (Mode == "Auto" && _settings.ColorScheme == "System" && isSystemDark) || (_settings.ColorScheme == "Dark");
461461

462462
Color selectedBG = useDarkMode ? DarkBG : LightBG;
463463
ApplyPreviewBackground(selectedBG);

Flow.Launcher.Infrastructure/Constant.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ public static class Constant
4040

4141
public const string DefaultTheme = "Win11Light";
4242

43+
public const string Light = "Light";
44+
public const string Dark = "Dark";
45+
public const string System = "System";
46+
4347
public const string Themes = "Themes";
4448
public const string Settings = "Settings";
4549
public const string Logs = "Logs";

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void Save()
3737
private string _theme = Constant.DefaultTheme;
3838
public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}";
3939
public string OpenResultModifiers { get; set; } = KeyConstant.Alt;
40-
public ColorSchemes ColorScheme { get; set; } = ColorSchemes.System;
40+
public string ColorScheme { get; set; } = "System";
4141
public bool ShowOpenResultHotkey { get; set; } = true;
4242
public double WindowSize { get; set; } = 580;
4343
public string PreviewHotkey { get; set; } = $"F1";

Flow.Launcher/MainWindow.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -998,11 +998,11 @@ private void MoveQueryTextToEnd()
998998

999999
public void InitializeColorScheme()
10001000
{
1001-
if (_settings.ColorScheme == ColorSchemes.Light)
1001+
if (_settings.ColorScheme == Constant.Light)
10021002
{
10031003
ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Light;
10041004
}
1005-
else if (_settings.ColorScheme == ColorSchemes.Dark)
1005+
else if (_settings.ColorScheme == Constant.Dark)
10061006
{
10071007
ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Dark;
10081008
}

Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,16 @@ public double ResultSubItemFontSize
108108
public class ColorSchemeData : DropdownDataGeneric<ColorSchemes> { }
109109

110110
public List<ColorSchemeData> ColorSchemes { get; } = DropdownDataGeneric<ColorSchemes>.GetValues<ColorSchemeData>("ColorScheme");
111-
public ColorSchemes ColorScheme
111+
public string ColorScheme
112112
{
113113
get => Settings.ColorScheme;
114114
set
115115
{
116116
ThemeManagerForColorSchemeSwitch.Current.ApplicationTheme = value switch
117117
{
118-
Infrastructure.UserSettings.ColorSchemes.Light => ApplicationTheme.Light,
119-
Infrastructure.UserSettings.ColorSchemes.Dark => ApplicationTheme.Dark,
120-
Infrastructure.UserSettings.ColorSchemes.System => null,
118+
Constant.Light => ApplicationTheme.Light,
119+
Constant.Dark => ApplicationTheme.Dark,
120+
Constant.System => null,
121121
_ => ThemeManagerForColorSchemeSwitch.Current.ApplicationTheme
122122
};
123123

0 commit comments

Comments
 (0)