Use property change event for settings & Use INotifyPropertyChanged instead

Author: Jack251970

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -96,14 +96,27 @@ public string Theme
         public string ResultSubFontStyle { get; set; }
         public string ResultSubFontWeight { get; set; }
         public string ResultSubFontStretch { get; set; }
-        public string SettingWindowFont { get; set; } = Win32Helper.GetSystemDefaultFont(false);
         public bool UseGlyphIcons { get; set; } = true;
         public bool UseAnimation { get; set; } = true;
         public bool UseSound { get; set; } = true;
         public double SoundVolume { get; set; } = 50;
         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();
+                }
+            }
+        }
+
         public bool UseClock { get; set; } = true;
         public bool UseDate { get; set; } = false;
         public string TimeFormat { get; set; } = "hh:mm tt";

Flow.Launcher/CustomQueryHotkeySetting.xaml

@@ -4,11 +4,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:flowlauncher="clr-namespace:Flow.Launcher"
-    FontFamily="{Binding SettingWindowFont, Mode=TwoWay}"
     Title="{DynamicResource customeQueryHotkeyTitle}"
     Width="530"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    FontFamily="{Binding Settings.SettingWindowFont, Mode=TwoWay}"
     Foreground="{DynamicResource PopupTextColor}"
     Icon="Images\app.png"
     MouseDown="window_MouseDown"

Flow.Launcher/CustomQueryHotkeySetting.xaml.cs

@@ -1,41 +1,23 @@
-using Flow.Launcher.Helper;
-using Flow.Launcher.Infrastructure.UserSettings;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
+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;
+        public Settings Settings { get; set; }
+
         private bool update;
         private CustomPluginHotkey updateCustomHotkey;
-        public event PropertyChangedEventHandler PropertyChanged;
-        
-        public string SettingWindowFont
-        {
-            get => _settings.SettingWindowFont;
-            set
-            {
-                if (_settings.SettingWindowFont != value)
-                {
-                    _settings.SettingWindowFont = value;
-                    OnPropertyChanged(nameof(SettingWindowFont));
-                }
-            }
-        }
-        
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
+
         public CustomQueryHotkeySetting(Settings settings)
         {
-            _settings = settings;
+            Settings = settings;
             InitializeComponent();
         }
 
@@ -48,13 +30,13 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
         {
             if (!update)
             {
-                _settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();
+                Settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();
 
                 var pluginHotkey = new CustomPluginHotkey
                 {
                     Hotkey = HotkeyControl.CurrentHotkey.ToString(), ActionKeyword = tbAction.Text
                 };
-                _settings.CustomPluginHotkeys.Add(pluginHotkey);
+                Settings.CustomPluginHotkeys.Add(pluginHotkey);
 
                 HotKeyMapper.SetCustomQueryHotkey(pluginHotkey);
             }
@@ -73,7 +55,7 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
 
         public void UpdateItem(CustomPluginHotkey item)
         {
-            updateCustomHotkey = _settings.CustomPluginHotkeys.FirstOrDefault(o =>
+            updateCustomHotkey = Settings.CustomPluginHotkeys.FirstOrDefault(o =>
                 o.ActionKeyword == item.ActionKeyword && o.Hotkey == item.Hotkey);
             if (updateCustomHotkey == null)
             {

Flow.Launcher/CustomShortcutSetting.xaml

@@ -7,6 +7,7 @@
     Width="530"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    FontFamily="{Binding Settings.SettingWindowFont, Mode=TwoWay}"
     Foreground="{DynamicResource PopupTextColor}"
     Icon="Images\app.png"
     ResizeMode="NoResize"
@@ -56,11 +57,11 @@
                     </Button>
                 </Grid>
             </StackPanel>
-            <StackPanel Margin="26,0,26,0">
-                <StackPanel Grid.Row="0" Margin="0,0,0,12">
+            <StackPanel Margin="26 0 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 customQueryShortcut}"
@@ -73,18 +74,18 @@
                         TextAlignment="Left"
                         TextWrapping="WrapWithOverflow" />
                     <TextBlock
-                        Margin="0,20,0,0"
+                        Margin="0 20 0 0"
                         FontSize="14"
                         Text="{DynamicResource customeQueryShortcutGuide}"
                         TextAlignment="Left"
                         TextWrapping="WrapWithOverflow" />
                     <Image
                         Width="478"
-                        Margin="0,20,0,0"
+                        Margin="0 20 0 0"
                         Source="/Images/illustration_02.png" />
                 </StackPanel>
 
-                <StackPanel Margin="0,10,0,10" Orientation="Horizontal">
+                <StackPanel Margin="0 10 0 10" Orientation="Horizontal">
                     <Grid Width="478">
                         <Grid.RowDefinitions>
                             <RowDefinition />
@@ -124,14 +125,14 @@
                             LastChildFill="True">
                             <Button
                                 x:Name="btnTestShortcut"
-                                Margin="0,0,10,0"
-                                Padding="10,5,10,5"
+                                Margin="0 0 10 0"
+                                Padding="10 5 10 5"
                                 Click="BtnTestShortcut_OnClick"
                                 Content="{DynamicResource preview}"
                                 DockPanel.Dock="Right" />
                             <TextBox
                                 x:Name="tbExpand"
-                                Margin="10,0,10,0"
+                                Margin="10 0 10 0"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
                                 Text="{Binding Value}" />
@@ -142,21 +143,21 @@
         </StackPanel>
         <Border
             Grid.Row="1"
-            Margin="0,10,0,0"
+            Margin="0 10 0 0"
             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"
                     MinWidth="140"
-                    Margin="10,0,5,0"
+                    Margin="10 0 5 0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnAdd"
                     MinWidth="140"
-                    Margin="5,0,10,0"
+                    Margin="5 0 10 0"
                     Click="BtnAdd_OnClick"
                     Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />

Flow.Launcher/CustomShortcutSetting.xaml.cs

@@ -1,41 +1,22 @@
-using System;
-using System.ComponentModel;
-using System.Windows;
+using System.Windows;
 using System.Windows.Input;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.SettingPages.ViewModels;
 
 namespace Flow.Launcher
 {
     public partial class CustomShortcutSetting : Window
     {
-        private static readonly Settings _settings = Ioc.Default.GetRequiredService<Settings>();
+        public Settings Settings { get; set; } = Ioc.Default.GetRequiredService<Settings>();
 
         private readonly SettingsPaneHotkeyViewModel _hotkeyVm;
-        public string Key { get; set; } = String.Empty;
-        public string Value { get; set; } = String.Empty;
+        public string Key { get; set; } = string.Empty;
+        public string Value { get; set; } = string.Empty;
         private string originalKey { get; } = null;
         private string originalValue { get; } = null;
         private bool update { get; } = false;
-        public event PropertyChangedEventHandler PropertyChanged;
-        
-        public string SettingWindowFont
-        {
-            get => _settings.SettingWindowFont;
-            set
-            {
-                if (_settings.SettingWindowFont != value)
-                {
-                    _settings.SettingWindowFont = value;
-                    OnPropertyChanged(nameof(SettingWindowFont));
-                }
-            }
-        }
-        
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
+
         public CustomShortcutSetting(SettingsPaneHotkeyViewModel vm)
         {
             _hotkeyVm = vm;

Flow.Launcher/SelectBrowserWindow.xaml

@@ -10,7 +10,7 @@
     Width="550"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
-    FontFamily="{Binding SettingWindowFont, Mode=TwoWay}"
+    FontFamily="{Binding Settings.SettingWindowFont, Mode=TwoWay}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     SizeToContent="Height"

Flow.Launcher/SelectBrowserWindow.xaml.cs

@@ -1,42 +1,25 @@
-using Flow.Launcher.Infrastructure.UserSettings;
-using System;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher
 {
-    public partial class SelectBrowserWindow : Window, INotifyPropertyChanged
+    [INotifyPropertyChanged]
+    public partial class SelectBrowserWindow : Window
     {
-        private int selectedCustomBrowserIndex;
+        public Settings Settings { get; }
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        private int selectedCustomBrowserIndex;
 
-        public Settings Settings { get; }
-        public string SettingWindowFont
-        {
-            get => Settings.SettingWindowFont;
-            set
-            {
-                if (Settings.SettingWindowFont != value)
-                {
-                    Settings.SettingWindowFont = value;
-                    OnPropertyChanged(nameof(SettingWindowFont));
-                }
-            }
-        }
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
         public int SelectedCustomBrowserIndex
         {
             get => selectedCustomBrowserIndex; set
             {
                 selectedCustomBrowserIndex = value;
-                PropertyChanged?.Invoke(this, new(nameof(CustomBrowser)));
+                OnPropertyChanged(nameof(CustomBrowser));
             }
         }
         public ObservableCollection<CustomBrowserViewModel> CustomBrowsers { get; set; }
@@ -79,8 +62,7 @@ private void btnDelete_Click(object sender, RoutedEventArgs e)
         private void btnBrowseFile_Click(object sender, RoutedEventArgs e)
         {
             Microsoft.Win32.OpenFileDialog dlg = new Microsoft.Win32.OpenFileDialog();
-            Nullable<bool> result = dlg.ShowDialog();
-
+            var result = dlg.ShowDialog();
             if (result == true)
             {
                 TextBox path = (TextBox)(((FrameworkElement)sender).Parent as FrameworkElement).FindName("PathTextBox");

Flow.Launcher/SelectFileManagerWindow.xaml

@@ -10,7 +10,7 @@
     Width="600"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
-    FontFamily="{Binding SettingWindowFont, Mode=TwoWay}"
+    FontFamily="{Binding Settings.SettingWindowFont, Mode=TwoWay}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     SizeToContent="Height"

Flow.Launcher/SelectFileManagerWindow.xaml.cs

@@ -1,44 +1,27 @@
-using Flow.Launcher.Infrastructure.UserSettings;
-using Flow.Launcher.ViewModel;
-using System;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher
 {
-    public partial class SelectFileManagerWindow : Window, INotifyPropertyChanged
+    [INotifyPropertyChanged]
+    public partial class SelectFileManagerWindow : Window
     {
-        private int selectedCustomExplorerIndex;
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
         public Settings Settings { get; }
 
-        public string SettingWindowFont
-        {
-            get => Settings.SettingWindowFont;
-            set
-            {
-                if (Settings.SettingWindowFont != value)
-                {
-                    Settings.SettingWindowFont = value;
-                    OnPropertyChanged(nameof(SettingWindowFont));
-                }
-            }
-        }
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
+        private int selectedCustomExplorerIndex;
+
         public int SelectedCustomExplorerIndex
         {
             get => selectedCustomExplorerIndex; set
             {
                 selectedCustomExplorerIndex = value;
-                PropertyChanged?.Invoke(this, new(nameof(CustomExplorer)));
+                OnPropertyChanged(nameof(CustomExplorer));
             }
         }
         public ObservableCollection<CustomExplorerViewModel> CustomExplorers { get; set; }
@@ -81,8 +64,7 @@ private void btnDelete_Click(object sender, RoutedEventArgs e)
         private void btnBrowseFile_Click(object sender, RoutedEventArgs e)
         {
             Microsoft.Win32.OpenFileDialog dlg = new Microsoft.Win32.OpenFileDialog();
-            Nullable<bool> result = dlg.ShowDialog();
-
+            var result = dlg.ShowDialog();
             if (result == true)
             {
                 TextBox path = (TextBox)(((FrameworkElement)sender).Parent as FrameworkElement).FindName("PathTextBox");