Remove mvvm command for code quality

Author: Jack251970

Flow.Launcher/ViewModel/RelayCommand.cs

@@ -46,6 +46,7 @@
 
   <ItemGroup>
     <!-- Do not upgrade System.Data.OleDb since we are .Net7.0 -->
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="System.Data.OleDb" Version="8.0.1" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
     <PackageReference Include="tlbimp-Microsoft.Search.Interop" Version="1.0.0" />

Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj

@@ -1,9 +1,4 @@
 #nullable enable
-using Flow.Launcher.Plugin.Explorer.Search;
-using Flow.Launcher.Plugin.Explorer.Search.Everything;
-using Flow.Launcher.Plugin.Explorer.Search.Everything.Exceptions;
-using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
-using Flow.Launcher.Plugin.Explorer.Views;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -13,11 +8,16 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Forms;
-using System.Windows.Input;
+using CommunityToolkit.Mvvm.Input;
+using Flow.Launcher.Plugin.Explorer.Search;
+using Flow.Launcher.Plugin.Explorer.Search.Everything;
+using Flow.Launcher.Plugin.Explorer.Search.Everything.Exceptions;
+using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
+using Flow.Launcher.Plugin.Explorer.Views;
 
 namespace Flow.Launcher.Plugin.Explorer.ViewModels
 {
-    public class SettingsViewModel : BaseModel
+    public partial class SettingsViewModel : BaseModel
     {
         public Settings Settings { get; set; }
 
@@ -36,7 +36,6 @@ public SettingsViewModel(PluginInitContext context, Settings settings)
             InitializeActionKeywordModels();
         }
 
-
         public void Save()
         {
             Context.API.SaveSettingJsonStorage<Settings>();
@@ -48,7 +47,6 @@ public void Save()
         private EnumBindingModel<Settings.ContentIndexSearchEngineOption> _selectedContentSearchEngine;
         private EnumBindingModel<Settings.PathEnumerationEngineOption> _selectedPathEnumerationEngine;
 
-
         public EnumBindingModel<Settings.IndexSearchEngineOption> SelectedIndexSearchEngine
         {
             get => _selectedIndexSearchEngine;
@@ -261,8 +259,7 @@ private void InitializeActionKeywordModels()
 
         public ActionKeywordModel? SelectedActionKeyword { get; set; }
 
-        public ICommand EditActionKeywordCommand => new RelayCommand(EditActionKeyword);
-
+        [RelayCommand]
         private void EditActionKeyword(object obj)
         {
             if (SelectedActionKeyword is not { } actionKeyword)
@@ -307,12 +304,6 @@ private void EditActionKeyword(object obj)
         public AccessLink? SelectedQuickAccessLink { get; set; }
         public AccessLink? SelectedIndexSearchExcludedPath { get; set; }
 
-
-
-        public ICommand RemoveLinkCommand => new RelayCommand(RemoveLink);
-        public ICommand EditLinkCommand => new RelayCommand(EditLink);
-        public ICommand AddLinkCommand => new RelayCommand(AddLink);
-
         public void AppendLink(string containerName, AccessLink link)
         {
             var container = containerName switch
@@ -324,6 +315,7 @@ public void AppendLink(string containerName, AccessLink link)
             container.Add(link);
         }
 
+        [RelayCommand]
         private void EditLink(object commandParameter)
         {
             var (selectedLink, collection) = commandParameter switch
@@ -360,7 +352,7 @@ private void ShowUnselectedMessage()
             Context.API.ShowMsgBox(warning);
         }
 
-
+        [RelayCommand]
         private void AddLink(object commandParameter)
         {
             var container = commandParameter switch
@@ -385,6 +377,7 @@ private void AddLink(object commandParameter)
             container.Add(newAccessLink);
         }
 
+        [RelayCommand]
         private void RemoveLink(object obj)
         {
             if (obj is not string container) return;
@@ -435,7 +428,6 @@ private void RemoveLink(object obj)
             return path;
         }
 
-
         internal static void OpenWindowsIndexingOptions()
         {
             var psi = new ProcessStartInfo
@@ -448,39 +440,35 @@ internal static void OpenWindowsIndexingOptions()
             Process.Start(psi);
         }
 
-        private ICommand? _openFileEditorPathCommand;
-
-        public ICommand OpenFileEditorPath => _openFileEditorPathCommand ??= new RelayCommand(_ =>
+        [RelayCommand]
+        private void OpenFileEditorPath()
         {
             var path = PromptUserSelectPath(ResultType.File, Settings.EditorPath != null ? Path.GetDirectoryName(Settings.EditorPath) : null);
             if (path is null)
                 return;
 
             FileEditorPath = path;
-        });
-
-        private ICommand? _openFolderEditorPathCommand;
+        }
 
-        public ICommand OpenFolderEditorPath => _openFolderEditorPathCommand ??= new RelayCommand(_ =>
+        [RelayCommand]
+        private void OpenFolderEditorPath()
         {
             var path = PromptUserSelectPath(ResultType.File, Settings.FolderEditorPath != null ? Path.GetDirectoryName(Settings.FolderEditorPath) : null);
             if (path is null)
                 return;
 
             FolderEditorPath = path;
-        });
-
-        private ICommand? _openShellPathCommand;
+        }
 
-        public ICommand OpenShellPath => _openShellPathCommand ??= new RelayCommand(_ =>
+        [RelayCommand]
+        private void OpenShellPath()
         {
             var path = PromptUserSelectPath(ResultType.File, Settings.EditorPath != null ? Path.GetDirectoryName(Settings.EditorPath) : null);
             if (path is null)
                 return;
 
             ShellPath = path;
-        });
-
+        }
 
         public string FileEditorPath
         {
@@ -537,7 +525,6 @@ public int MaxResult
             }
         }
 
-
         #region Everything FastSortWarning
 
         public Visibility FastSortWarningVisibility
@@ -593,7 +580,5 @@ public string EverythingInstalledPath
         }
 
         #endregion
-
-
     }
 }

Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/RelayCommand.cs

@@ -245,7 +245,7 @@
                             Margin="{StaticResource SettingPanelItemLeftMargin}"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
-                            Command="{Binding OpenFileEditorPath}"
+                            Command="{Binding OpenFileEditorPathCommand}"
                             Content="{DynamicResource select}" />
                     </StackPanel>
 
@@ -272,7 +272,7 @@
                             Margin="{StaticResource SettingPanelItemLeftMargin}"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
-                            Command="{Binding OpenFolderEditorPath}"
+                            Command="{Binding OpenFolderEditorPathCommand}"
                             Content="{DynamicResource select}" />
                     </StackPanel>
 
@@ -299,7 +299,7 @@
                             Margin="{StaticResource SettingPanelItemLeftMargin}"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
-                            Command="{Binding OpenShellPath}"
+                            Command="{Binding OpenShellPathCommand}"
                             Content="{DynamicResource select}" />
                     </StackPanel>