Merge branch 'dev' into check_plugin_modified

Author: jjw24

Flow.Launcher.Plugin/EventHandler.cs

@@ -39,7 +39,14 @@ namespace Flow.Launcher.Plugin
     /// <param name="sender"></param>
     /// <param name="args"></param>
     public delegate void VisibilityChangedEventHandler(object sender, VisibilityChangedEventArgs args);
-    
+
+    /// <summary>
+    /// A delegate for when the actual application theme is changed
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="args"></param>
+    public delegate void ActualApplicationThemeChangedEventHandler(object sender, ActualApplicationThemeChangedEventArgs args);
+
     /// <summary>
     /// The event args for <see cref="VisibilityChangedEventHandler"/>
     /// </summary>
@@ -77,4 +84,15 @@ public class FlowLauncherQueryEventArgs
         /// </summary>
         public Query Query { get; set; }
     }
+
+    /// <summary>
+    /// The event args for <see cref="ActualApplicationThemeChangedEventHandler"/>
+    /// </summary>
+    public class ActualApplicationThemeChangedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// <see langword="true"/> if the application has changed actual theme
+        /// </summary>
+        public bool IsDark { get; init; }
+    }
 }

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -595,5 +595,16 @@ public interface IPublicAPI
         /// </summary>
         /// <returns>The time taken to execute the method in milliseconds</returns>
         public Task<long> StopwatchLogInfoAsync(string className, string message, Func<Task> action, [CallerMemberName] string methodName = "");
+
+        /// <summary>
+        /// Representing whether the application is using a dark theme
+        /// </summary>
+        /// <returns></returns>
+        bool IsApplicationDarkTheme();
+
+        /// <summary>
+        /// Invoked when the actual theme of the application has changed. Currently, the plugin will continue to be subscribed even if it is turned off. 
+        /// </summary>
+        event ActualApplicationThemeChangedEventHandler ActualApplicationThemeChanged;
     }
 }

Flow.Launcher/MainWindow.xaml.cs

@@ -20,6 +20,7 @@
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.Image;
 using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedCommands;
 using Flow.Launcher.ViewModel;
 using Microsoft.Win32;
@@ -91,8 +92,8 @@ public MainWindow()
 
             InitSoundEffects();
             DataObject.AddPastingHandler(QueryTextBox, QueryTextBox_OnPaste);
-            ModernWpf.ThemeManager.Current.ActualApplicationThemeChanged += ThemeManager_ActualApplicationThemeChanged;
             SystemEvents.PowerModeChanged += SystemEvents_PowerModeChanged;
+            _viewModel.ActualApplicationThemeChanged += ViewModel_ActualApplicationThemeChanged;
         }
 
         #endregion
@@ -101,7 +102,7 @@ public MainWindow()
 
 #pragma warning disable VSTHRD100 // Avoid async void methods
 
-        private void ThemeManager_ActualApplicationThemeChanged(ModernWpf.ThemeManager sender, object args)
+        private void ViewModel_ActualApplicationThemeChanged(object sender, ActualApplicationThemeChangedEventArgs args)
         {
             _ = _theme.RefreshFrameAsync();
         }
@@ -1351,7 +1352,7 @@ protected virtual void Dispose(bool disposing)
                     _notifyIcon?.Dispose();
                     animationSoundWMP?.Close();
                     animationSoundWPF?.Dispose();
-                    ModernWpf.ThemeManager.Current.ActualApplicationThemeChanged -= ThemeManager_ActualApplicationThemeChanged;
+                    _viewModel.ActualApplicationThemeChanged -= ViewModel_ActualApplicationThemeChanged;
                     SystemEvents.PowerModeChanged -= SystemEvents_PowerModeChanged;
                 }
 

Flow.Launcher/PublicAPIInstance.cs

@@ -14,23 +14,24 @@
 using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Core;
+using Flow.Launcher.Core.ExternalPlugins;
 using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Core.Resource;
-using Flow.Launcher.Core.ExternalPlugins;
 using Flow.Launcher.Core.Storage;
 using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure;
-using Flow.Launcher.Infrastructure.Http;
 using Flow.Launcher.Infrastructure.Hotkey;
+using Flow.Launcher.Infrastructure.Http;
 using Flow.Launcher.Infrastructure.Image;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
-using Flow.Launcher.Plugin.SharedModels;
 using Flow.Launcher.Plugin.SharedCommands;
+using Flow.Launcher.Plugin.SharedModels;
 using Flow.Launcher.ViewModel;
 using JetBrains.Annotations;
+using ModernWpf;
 using Squirrel;
 using Stopwatch = Flow.Launcher.Infrastructure.Stopwatch;
 
@@ -587,6 +588,17 @@ public long StopwatchLogInfo(string className, string message, Action action, [C
         public Task<long> StopwatchLogInfoAsync(string className, string message, Func<Task> action, [CallerMemberName] string methodName = "") =>
             Stopwatch.InfoAsync(className, message, action, methodName);
 
+        public bool IsApplicationDarkTheme()
+        {
+            return ThemeManager.Current.ActualApplicationTheme == ApplicationTheme.Dark;
+        }
+
+        public event ActualApplicationThemeChangedEventHandler ActualApplicationThemeChanged
+        {
+            add => _mainVM.ActualApplicationThemeChanged += value;
+            remove => _mainVM.ActualApplicationThemeChanged -= value;
+        }
+
         #endregion
 
         #region Private Methods

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -22,6 +22,7 @@
 using Flow.Launcher.Plugin.SharedCommands;
 using Flow.Launcher.Storage;
 using Microsoft.VisualStudio.Threading;
+using ModernWpf;
 
 namespace Flow.Launcher.ViewModel
 {
@@ -195,6 +196,18 @@ public MainViewModel()
 
             RegisterViewUpdate();
             _ = RegisterClockAndDateUpdateAsync();
+
+            ThemeManager.Current.ActualApplicationThemeChanged += ThemeManager_ActualApplicationThemeChanged;
+        }
+
+        private void ThemeManager_ActualApplicationThemeChanged(ThemeManager sender, object args)
+        {
+            ActualApplicationThemeChanged?.Invoke(
+                Application.Current,
+                new ActualApplicationThemeChangedEventArgs()
+                {
+                    IsDark = sender.ActualApplicationTheme == ApplicationTheme.Dark
+                });
         }
 
         private void RegisterViewUpdate()
@@ -821,6 +834,7 @@ private ResultsViewModel SelectedResults
         public bool MainWindowVisibilityStatus { get; set; } = true;
 
         public event VisibilityChangedEventHandler VisibilityChanged;
+        public event ActualApplicationThemeChangedEventHandler ActualApplicationThemeChanged;
 
         public Visibility ClockPanelVisibility { get; set; }
         public Visibility SearchIconVisibility { get; set; }
@@ -1975,6 +1989,7 @@ protected virtual void Dispose(bool disposing)
                     {
                         _resultsViewUpdateTask.Dispose();
                     }
+                    ThemeManager.Current.ActualApplicationThemeChanged -= ThemeManager_ActualApplicationThemeChanged;
                     _disposed = true;
                 }
             }

Plugins/Flow.Launcher.Plugin.Program/Main.cs

@@ -104,7 +104,7 @@ public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
                             .Where(p => HideDuplicatedWindowsAppFilter(p, uwpsDirectories))
                             .Where(p => p.Enabled)
                             .Select(p => p.Result(query.Search, Context.API))
-                            .Where(r => r?.Score > 0)
+                            .Where(r => string.IsNullOrEmpty(query.Search) || r?.Score > 0)
                             .ToList();
                     }
                     catch (OperationCanceledException)

Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs

@@ -424,7 +424,7 @@ public Result Result(string query, IPublicAPI api)
                 }
             }
 
-            if (!matchResult.IsSearchPrecisionScoreMet())
+            if (!matchResult.IsSearchPrecisionScoreMet() && !string.IsNullOrEmpty(query))
                 return null;
 
             var result = new Result
@@ -468,7 +468,6 @@ public Result Result(string query, IPublicAPI api)
                 }
             };
 
-
             return result;
         }
 

Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs

@@ -136,7 +136,7 @@ public Result Result(string query, IPublicAPI api)
 
             List<string> candidates = new List<string>();
 
-            if (!matchResult.IsSearchPrecisionScoreMet())
+            if (!matchResult.IsSearchPrecisionScoreMet() && !string.IsNullOrEmpty(query))
             {
                 if (ExecutableName != null) // only lnk program will need this one
                 {