Merge branch 'dev' into quickswitch

Author: Jack251970

.github/workflows/dotnet.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set Flow.Launcher.csproj version
         id: update
-        uses: vers-one/dotnet-project-version-updater@v1.5
+        uses: vers-one/dotnet-project-version-updater@v1.7
         with:
           file: |
             "**/SolutionAssemblyInfo.cs"

Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

@@ -113,7 +113,7 @@ public void UpdateSettings(IReadOnlyDictionary<string, object> settings)
                                 // If can parse the default value to bool, use it, otherwise use false
                                 : value is string stringValue && bool.TryParse(stringValue, out var boolValueFromString)
                                     && boolValueFromString;
-                            checkBox.Dispatcher.Invoke(() =>checkBox.IsChecked = isChecked);
+                            checkBox.Dispatcher.Invoke(() => checkBox.IsChecked = isChecked);
                             break;
                     }
                 }
@@ -154,8 +154,7 @@ public bool NeedCreateSettingPanel()
 
         public Control CreateSettingPanel()
         {
-            // No need to check if NeedCreateSettingPanel is true because CreateSettingPanel will only be called if it's true
-            // if (!NeedCreateSettingPanel()) return null;
+            if (!NeedCreateSettingPanel()) return null!;
 
             // Create main grid with two columns (Column 1: Auto, Column 2: *)
             var mainPanel = new Grid { Margin = SettingPanelMargin, VerticalAlignment = VerticalAlignment.Center };

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -2,6 +2,7 @@
 using System.Collections.ObjectModel;
 using System.Text.Json.Serialization;
 using System.Windows;
+using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.Logger;
@@ -31,7 +32,7 @@ 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;
@@ -104,6 +105,22 @@ public string Theme
         public bool ShowBadges { get; set; } = false;
         public bool ShowBadgesGlobalOnly { get; set; } = false;
 
+        private string _settingWindowFont { get; set; } = Win32Helper.GetSystemDefaultFont(false);
+        public string SettingWindowFont
+        {
+            get => _settingWindowFont;
+            set
+            {
+                if (_settingWindowFont != value)
+                {
+                    _settingWindowFont = value;
+                    OnPropertyChanged();
+                    Application.Current.Resources["SettingWindowFont"] = new FontFamily(value);
+                    Application.Current.Resources["ContentControlThemeFontFamily"] = new FontFamily(value);
+                }
+            }
+        }
+
         public bool UseClock { get; set; } = true;
         public bool UseDate { get; set; } = false;
         public string TimeFormat { get; set; } = "hh:mm tt";

Flow.Launcher.Infrastructure/Win32Helper.cs

@@ -643,21 +643,33 @@ public static void OpenImeSettings()
             { "pt", "Noto Sans" }
         };
 
-        public static string GetSystemDefaultFont()
+        /// <summary>
+        /// Gets the system default font.
+        /// </summary>
+        /// <param name="useNoto">
+        /// If true, it will try to find the Noto font for the current culture.
+        /// </param>
+        /// <returns>
+        /// The name of the system default font.
+        /// </returns>
+        public static string GetSystemDefaultFont(bool useNoto = true)
         {
             try
             {
-                var culture = CultureInfo.CurrentCulture;
-                var language = culture.Name; // e.g., "zh-TW"
-                var langPrefix = language.Split('-')[0]; // e.g., "zh"
-
-                // First, try to find by full name, and if not found, fallback to prefix
-                if (TryGetNotoFont(language, out var notoFont) || TryGetNotoFont(langPrefix, out notoFont))
+                if (useNoto)
                 {
-                    // If the font is installed, return it
-                    if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals(notoFont)))
+                    var culture = CultureInfo.CurrentCulture;
+                    var language = culture.Name; // e.g., "zh-TW"
+                    var langPrefix = language.Split('-')[0]; // e.g., "zh"
+
+                    // First, try to find by full name, and if not found, fallback to prefix
+                    if (TryGetNotoFont(language, out var notoFont) || TryGetNotoFont(langPrefix, out notoFont))
                     {
-                        return notoFont;
+                        // If the font is installed, return it
+                        if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals(notoFont)))
+                        {
+                            return notoFont;
+                        }
                     }
                 }
 

Flow.Launcher/ActionKeywords.xaml

@@ -53,11 +53,11 @@
                         </Button>
                     </Grid>
                 </StackPanel>
-                <StackPanel Margin="26,12,26,0">
-                    <StackPanel Grid.Row="0" Margin="0,0,0,12">
+                <StackPanel Margin="26 12 26 0">
+                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
                         <TextBlock
                             Grid.Column="0"
-                            Margin="0,0,0,0"
+                            Margin="0 0 0 0"
                             FontSize="20"
                             FontWeight="SemiBold"
                             Text="{DynamicResource actionKeywordsTitle}"
@@ -71,7 +71,7 @@
                             TextWrapping="WrapWithOverflow" />
                     </StackPanel>
 
-                    <StackPanel Margin="0,18,0,0" Orientation="Horizontal">
+                    <StackPanel Margin="0 18 0 0" Orientation="Horizontal">
                         <TextBlock
                             Grid.Row="0"
                             Grid.Column="1"
@@ -83,14 +83,14 @@
                             x:Name="tbOldActionKeyword"
                             Grid.Row="0"
                             Grid.Column="1"
-                            Margin="14,10,10,10"
+                            Margin="14 10 10 10"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
                             FontWeight="SemiBold"
                             Foreground="{DynamicResource Color05B}" />
                     </StackPanel>
-                    <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
+                    <StackPanel Margin="0 0 0 10" Orientation="Horizontal">
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="1"
@@ -101,7 +101,7 @@
                         <TextBox
                             x:Name="tbAction"
                             Width="105"
-                            Margin="10,10,15,10"
+                            Margin="10 10 15 10"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center" />
                     </StackPanel>
@@ -112,20 +112,20 @@
             Grid.Row="1"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
                     Width="145"
                     Height="30"
-                    Margin="10,0,5,0"
+                    Margin="10 0 5 0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnDone"
                     Width="145"
                     Height="30"
-                    Margin="5,0,10,0"
+                    Margin="5 0 10 0"
                     Click="btnDone_OnClick"
                     Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />

Flow.Launcher/App.xaml.cs

@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Core;
 using Flow.Launcher.Core.Configuration;
@@ -19,6 +20,7 @@
 using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
+using Flow.Launcher.SettingPages.ViewModels;
 using Flow.Launcher.ViewModel;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -30,6 +32,7 @@ public partial class App : IDisposable, ISingleInstanceApp
         #region Public Properties
 
         public static IPublicAPI API { get; private set; }
+        public static bool Exiting => _mainWindow.CanClose;
 
         #endregion
 
@@ -38,7 +41,7 @@ public partial class App : IDisposable, ISingleInstanceApp
         private static readonly string ClassName = nameof(App);
 
         private static bool _disposed;
-        private MainWindow _mainWindow;
+        private static MainWindow _mainWindow;
         private readonly MainViewModel _mainVM;
         private readonly Settings _settings;
 
@@ -74,14 +77,27 @@ public App()
                         .AddSingleton(_ => _settings)
                         .AddSingleton(sp => new Updater(sp.GetRequiredService<IPublicAPI>(), Launcher.Properties.Settings.Default.GithubRepo))
                         .AddSingleton<Portable>()
-                        .AddSingleton<SettingWindowViewModel>()
                         .AddSingleton<IAlphabet, PinyinAlphabet>()
                         .AddSingleton<StringMatcher>()
                         .AddSingleton<Internationalization>()
                         .AddSingleton<IPublicAPI, PublicAPIInstance>()
-                        .AddSingleton<MainViewModel>()
                         .AddSingleton<Theme>()
+                        // Use one instance for main window view model because we only have one main window
+                        .AddSingleton<MainViewModel>()
+                        // Use one instance for welcome window view model & setting window view model because
+                        // pages in welcome window & setting window need to share the same instance and
+                        // these two view models do not need to be reset when creating new windows
                         .AddSingleton<WelcomeViewModel>()
+                        .AddSingleton<SettingWindowViewModel>()
+                        // Use transient instance for setting window page view models because
+                        // pages in setting window need to be recreated when setting window is closed
+                        .AddTransient<SettingsPaneAboutViewModel>()
+                        .AddTransient<SettingsPaneGeneralViewModel>()
+                        .AddTransient<SettingsPaneHotkeyViewModel>()
+                        .AddTransient<SettingsPanePluginsViewModel>()
+                        .AddTransient<SettingsPanePluginStoreViewModel>()
+                        .AddTransient<SettingsPaneProxyViewModel>()
+                        .AddTransient<SettingsPaneThemeViewModel>()
                     ).Build();
                 Ioc.Default.ConfigureServices(host.Services);
             }
@@ -147,10 +163,14 @@ await API.StopwatchLogInfoAsync(ClassName, "Startup cost", async () =>
 
                 Log.SetLogLevel(_settings.LogLevel);
 
+                // Update dynamic resources base on settings
+                Current.Resources["SettingWindowFont"] = new FontFamily(_settings.SettingWindowFont);
+                Current.Resources["ContentControlThemeFontFamily"] = new FontFamily(_settings.SettingWindowFont);
+
                 Ioc.Default.GetRequiredService<Portable>().PreStartCleanUpAfterPortabilityUpdate();
 
                 API.LogInfo(ClassName, "Begin Flow Launcher startup ----------------------------------------------------");
-                API.LogInfo(ClassName, "Runtime info:{ErrorReporting.RuntimeInfo()}");
+                API.LogInfo(ClassName, $"Runtime info:{ErrorReporting.RuntimeInfo()}");
 
                 RegisterAppDomainExceptions();
                 RegisterDispatcherUnhandledException();
@@ -170,19 +190,16 @@ await API.StopwatchLogInfoAsync(ClassName, "Startup cost", async () =>
                 await PluginManager.InitializePluginsAsync();
 
                 // Change language after all plugins are initialized because we need to update plugin title based on their api
-                // TODO: Clean InternationalizationManager.Instance and InternationalizationManager.Instance.GetTranslation in future
                 await Ioc.Default.GetRequiredService<Internationalization>().InitializeLanguageAsync();
 
                 await imageLoadertask;
 
                 _mainWindow = new MainWindow();
 
-                API.LogInfo(ClassName, "Dependencies Info:{ErrorReporting.DependenciesInfo()}");
-
                 Current.MainWindow = _mainWindow;
                 Current.MainWindow.Title = Constant.FlowLauncher;
 
-                // main windows needs initialized before theme change because of blur settings
+                // Main windows needs initialized before theme change because of blur settings
                 Ioc.Default.GetRequiredService<Theme>().ChangeTheme();
 
                 QuickSwitch.InitializeQuickSwitch();
@@ -203,7 +220,7 @@ await API.StopwatchLogInfoAsync(ClassName, "Startup cost", async () =>
 #pragma warning restore VSTHRD100 // Avoid async void methods
 
         /// <summary>
-        /// check startup only for Release
+        /// Check startup only for Release
         /// </summary>
         [Conditional("RELEASE")]
         private void AutoStartup()
@@ -269,7 +286,7 @@ private void RegisterExitEvents()
         }
 
         /// <summary>
-        /// let exception throw as normal is better for Debug
+        /// Let exception throw as normal is better for Debug
         /// </summary>
         [Conditional("RELEASE")]
         private void RegisterDispatcherUnhandledException()
@@ -278,7 +295,7 @@ private void RegisterDispatcherUnhandledException()
         }
 
         /// <summary>
-        /// let exception throw as normal is better for Debug
+        /// Let exception throw as normal is better for Debug
         /// </summary>
         [Conditional("RELEASE")]
         private static void RegisterAppDomainExceptions()
@@ -287,7 +304,7 @@ private static void RegisterAppDomainExceptions()
         }
 
         /// <summary>
-        /// let exception throw as normal is better for Debug
+        /// Let exception throw as normal is better for Debug
         /// </summary>
         [Conditional("RELEASE")]
         private static void RegisterTaskSchedulerUnhandledException()

Flow.Launcher/CustomQueryHotkeySetting.xaml.cs

@@ -1,16 +1,17 @@
-using Flow.Launcher.Helper;
-using Flow.Launcher.Infrastructure.UserSettings;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Controls;
+using Flow.Launcher.Helper;
+using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher
 {
     public partial class CustomQueryHotkeySetting : Window
     {
         private readonly Settings _settings;
+
         private bool update;
         private CustomPluginHotkey updateCustomHotkey;