Merge branch 'dev' into ui_wpf_modern

Author: Jack251970

Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

@@ -12,7 +12,7 @@
 
 namespace Flow.Launcher.Core.Plugin
 {
-    public class JsonRPCPluginSettings
+    public class JsonRPCPluginSettings : ISavable
     {
         public required JsonRpcConfigurationModel? Configuration { get; init; }
 

Flow.Launcher.Core/Resource/TranslationConverter.cs

@@ -220,5 +220,18 @@ public static async Task<HttpResponseMessage> SendAsync(HttpRequestMessage reque
                 return new HttpResponseMessage(HttpStatusCode.InternalServerError);
             }
         }
+
+        public static async Task<string> GetStringAsync(string url, CancellationToken token = default)
+        {
+            try
+            {
+                Log.Debug(ClassName, $"Url <{url}>");
+                return await client.GetStringAsync(url, token);
+            }
+            catch (System.Exception e)
+            {
+                return string.Empty;
+            }
+        }
     }
 }

Flow.Launcher.Infrastructure/Http/Http.cs

@@ -2,11 +2,13 @@
 using System.Threading.Tasks;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedCommands;
 
 namespace Flow.Launcher.Infrastructure.Storage
 {
-    public class FlowLauncherJsonStorage<T> : JsonStorage<T> where T : new()
+    // Expose ISaveable interface in derived class to make sure we are calling the new version of Save method
+    public class FlowLauncherJsonStorage<T> : JsonStorage<T>, ISavable where T : new()
     {
         private static readonly string ClassName = "FlowLauncherJsonStorage";
 

Flow.Launcher.Infrastructure/Storage/FlowLauncherJsonStorage.cs

@@ -1,11 +1,13 @@
 using System.IO;
 using System.Threading.Tasks;
 using Flow.Launcher.Infrastructure.Logger;
+using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedCommands;
 
 namespace Flow.Launcher.Infrastructure.Storage
 {
-    public class PluginBinaryStorage<T> : BinaryStorage<T> where T : new()
+    // Expose ISaveable interface in derived class to make sure we are calling the new version of Save method
+    public class PluginBinaryStorage<T> : BinaryStorage<T>, ISavable where T : new()
     {
         private static readonly string ClassName = "PluginBinaryStorage";
 

Flow.Launcher.Infrastructure/Storage/PluginBinaryStorage.cs

@@ -2,11 +2,13 @@
 using System.Threading.Tasks;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedCommands;
 
 namespace Flow.Launcher.Infrastructure.Storage
 {
-    public class PluginJsonStorage<T> : JsonStorage<T> where T : new()
+    // Expose ISaveable interface in derived class to make sure we are calling the new version of Save method
+    public class PluginJsonStorage<T> : JsonStorage<T>, ISavable where T : new()
     {
         // Use assembly name to check which plugin is using this storage
         public readonly string AssemblyName;

Flow.Launcher.Infrastructure/Storage/PluginJsonStorage.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Infrastructure.UserSettings
 {
@@ -53,6 +55,12 @@ public class BaseBuiltinShortcutModel : ShortcutBaseModel
     {
         public string Description { get; set; }
 
+        public string LocalizedDescription => API.GetTranslation(Description);
+
+        // We should not initialize API in static constructor because it will create another API instance
+        private static IPublicAPI api = null;
+        private static IPublicAPI API => api ??= Ioc.Default.GetRequiredService<IPublicAPI>();
+
         public BaseBuiltinShortcutModel(string key, string description)
         {
             Key = key;

Flow.Launcher.Infrastructure/UserSettings/CustomShortcutModel.cs

@@ -33,7 +33,6 @@ public void Save()
             _storage.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";
@@ -60,16 +59,20 @@ public string Language
             get => _language;
             set
             {
-                _language = value;
-                OnPropertyChanged();
+                if (_language != value)
+                {
+                    _language = value;
+                    OnPropertyChanged();
+                }
             }
         }
+        private string _theme = Constant.DefaultTheme;
         public string Theme
         {
             get => _theme;
             set
             {
-                if (value != _theme)
+                if (_theme != value)
                 {
                     _theme = value;
                     OnPropertyChanged();
@@ -79,6 +82,7 @@ public string Theme
         }
         public bool UseDropShadowEffect { get; set; } = true;
         public BackdropTypes BackdropType{ get; set; } = BackdropTypes.None;
+        public string ReleaseNotesVersion { get; set; } = string.Empty;
 
         /* Appearance Settings. It should be separated from the setting later.*/
         public double WindowHeightSize { get; set; } = 42;
@@ -297,9 +301,12 @@ public SearchPrecisionScore QuerySearchPrecision
             get => _querySearchPrecision;
             set
             {
-                _querySearchPrecision = value;
-                if (_stringMatcher != null)
-                    _stringMatcher.UserSettingSearchPrecision = value;
+                if (_querySearchPrecision != value)
+                {
+                    _querySearchPrecision = value;
+                    if (_stringMatcher != null)
+                        _stringMatcher.UserSettingSearchPrecision = value;
+                }
             }
         }
 
@@ -366,13 +373,30 @@ public bool HideNotifyIcon
             get => _hideNotifyIcon;
             set
             {
-                _hideNotifyIcon = value;
-                OnPropertyChanged();
+                if (_hideNotifyIcon != value)
+                {
+                    _hideNotifyIcon = value;
+                    OnPropertyChanged();
+                }
             }
         }
         public bool LeaveCmdOpen { get; set; }
         public bool HideWhenDeactivated { get; set; } = true;
 
+        private bool _showAtTopmost = true;
+        public bool ShowAtTopmost
+        {
+            get => _showAtTopmost;
+            set
+            {
+                if (_showAtTopmost != value)
+                {
+                    _showAtTopmost = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         public bool SearchQueryResultsWithDelay { get; set; }
         public int SearchDelayTime { get; set; } = 150;
 

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -84,6 +84,15 @@ public interface IPublicAPI
         /// <param name="subTitle">Optional message subtitle</param>
         void ShowMsgError(string title, string subTitle = "");
 
+        /// <summary>
+        /// Show the error message using Flow's standard error icon.
+        /// </summary>
+        /// <param name="title">Message title</param>
+        /// <param name="buttonText">Message button content</param>
+        /// <param name="buttonAction">Message button action</param>
+        /// <param name="subTitle">Optional message subtitle</param>
+        void ShowMsgErrorWithButton(string title, string buttonText, Action buttonAction, string subTitle = "");
+
         /// <summary>
         /// Show the MainWindow when hiding
         /// </summary>
@@ -127,6 +136,27 @@ public interface IPublicAPI
         /// <param name="useMainWindowAsOwner">when true will use main windows as the owner</param>
         void ShowMsg(string title, string subTitle, string iconPath, bool useMainWindowAsOwner = true);
 
+        /// <summary>
+        /// Show message box with button
+        /// </summary>
+        /// <param name="title">Message title</param>
+        /// <param name="buttonText">Message button content</param>
+        /// <param name="buttonAction">Message button action</param>
+        /// <param name="subTitle">Message subtitle</param>
+        /// <param name="iconPath">Message icon path (relative path to your plugin folder)</param>
+        void ShowMsgWithButton(string title, string buttonText, Action buttonAction, string subTitle = "", string iconPath = "");
+
+        /// <summary>
+        /// Show message box with button
+        /// </summary>
+        /// <param name="title">Message title</param>
+        /// <param name="buttonText">Message button content</param>
+        /// <param name="buttonAction">Message button action</param>
+        /// <param name="subTitle">Message subtitle</param>
+        /// <param name="iconPath">Message icon path (relative path to your plugin folder)</param>
+        /// <param name="useMainWindowAsOwner">when true will use main windows as the owner</param>
+        void ShowMsgWithButton(string title, string buttonText, Action buttonAction, string subTitle, string iconPath, bool useMainWindowAsOwner = true);
+
         /// <summary>
         /// Open setting dialog
         /// </summary>

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -171,6 +171,8 @@ await API.StopwatchLogInfoAsync(ClassName, "Startup cost", async () =>
                 Current.Resources["SettingWindowFont"] = new FontFamily(_settings.SettingWindowFont);
                 Current.Resources["ContentControlThemeFontFamily"] = new FontFamily(_settings.SettingWindowFont);
 
+                Notification.Install();
+
                 Ioc.Default.GetRequiredService<Portable>().PreStartCleanUpAfterPortabilityUpdate();
 
                 API.LogInfo(ClassName, "Begin Flow Launcher startup ----------------------------------------------------");