Use public current theme

Author: Jack251970

Flow.Launcher.Core/Resource/Theme.cs

@@ -12,7 +12,6 @@
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Core.Resource
@@ -35,6 +34,8 @@ public class Theme
         private string DirectoryPath => Path.Combine(Constant.ProgramDirectory, Folder);
         private string UserDirectoryPath => Path.Combine(DataLocation.DataDirectory(), Folder);
 
+        public string CurrentTheme => _settings.Theme;
+
         public bool BlurEnabled { get; set; }
 
         private double mainWindowWidth;

Plugins/Flow.Launcher.Plugin.Sys/ThemeSelector.cs

@@ -3,15 +3,13 @@
 using System.Linq;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Core.Resource;
-using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.Plugin.Sys
 {
     public class ThemeSelector : IDisposable
     {
         public const string Keyword = "fltheme";
 
-        private readonly Settings _settings;
         private readonly Theme _theme;
         private readonly PluginInitContext _context;
 
@@ -21,7 +19,6 @@ public ThemeSelector(PluginInitContext context)
         {
             _context = context;
             _theme = Ioc.Default.GetRequiredService<Theme>();
-            _settings = Ioc.Default.GetRequiredService<Settings>();
             context.API.VisibilityChanged += OnVisibilityChanged;
         }
 
@@ -69,7 +66,7 @@ private void LoadThemes()
         private Result CreateThemeResult(string theme, int score, IList<int> highlightData)
         {
             string title;
-            if (theme == _settings.Theme)
+            if (theme == _theme.CurrentTheme)
             {
                 title = $"{theme} ★";
                 score = 2000;