Improve code quality

Author: Jack251970

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj

@@ -37,41 +37,11 @@
   </PropertyGroup>
 
   <Target Name="RemoveUnnecessaryRuntimesAfterBuild" AfterTargets="Build">
-    <RemoveDir Directories="$(OutputPath)runtimes\browser-wasm;
-                            $(OutputPath)runtimes\linux-arm;
-                            $(OutputPath)runtimes\linux-arm64;
-                            $(OutputPath)runtimes\linux-armel;
-                            $(OutputPath)runtimes\linux-mips64;
-                            $(OutputPath)runtimes\linux-musl-arm;
-                            $(OutputPath)runtimes\linux-musl-arm64;
-                            $(OutputPath)runtimes\linux-musl-x64;
-                            $(OutputPath)runtimes\linux-ppc64le;
-                            $(OutputPath)runtimes\linux-s390x;
-                            $(OutputPath)runtimes\linux-x64;
-                            $(OutputPath)runtimes\linux-x86;
-                            $(OutputPath)runtimes\maccatalyst-arm64;
-                            $(OutputPath)runtimes\maccatalyst-x64;
-                            $(OutputPath)runtimes\osx-arm64;
-                            $(OutputPath)runtimes\osx-x64"/>
+    <RemoveDir Directories="$(OutputPath)runtimes\browser-wasm;&#xD;&#xA;                            $(OutputPath)runtimes\linux-arm;&#xD;&#xA;                            $(OutputPath)runtimes\linux-arm64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-armel;&#xD;&#xA;                            $(OutputPath)runtimes\linux-mips64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-musl-arm;&#xD;&#xA;                            $(OutputPath)runtimes\linux-musl-arm64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-musl-x64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-ppc64le;&#xD;&#xA;                            $(OutputPath)runtimes\linux-s390x;&#xD;&#xA;                            $(OutputPath)runtimes\linux-x64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-x86;&#xD;&#xA;                            $(OutputPath)runtimes\maccatalyst-arm64;&#xD;&#xA;                            $(OutputPath)runtimes\maccatalyst-x64;&#xD;&#xA;                            $(OutputPath)runtimes\osx-arm64;&#xD;&#xA;                            $(OutputPath)runtimes\osx-x64" />
   </Target>
 
   <Target Name="RemoveUnnecessaryRuntimesAfterPublish" AfterTargets="Publish">
-    <RemoveDir Directories="$(PublishDir)runtimes\browser-wasm;
-                            $(PublishDir)runtimes\linux-arm;
-                            $(PublishDir)runtimes\linux-arm64;
-                            $(PublishDir)runtimes\linux-armel;
-                            $(PublishDir)runtimes\linux-mips64;
-                            $(PublishDir)runtimes\linux-musl-arm;
-                            $(PublishDir)runtimes\linux-musl-arm64;
-                            $(PublishDir)runtimes\linux-musl-x64;
-                            $(PublishDir)runtimes\linux-ppc64le;
-                            $(PublishDir)runtimes\linux-s390x;
-                            $(PublishDir)runtimes\linux-x64;
-                            $(PublishDir)runtimes\linux-x86;
-                            $(PublishDir)runtimes\maccatalyst-arm64;
-                            $(PublishDir)runtimes\maccatalyst-x64;
-                            $(PublishDir)runtimes\osx-arm64;
-                            $(PublishDir)runtimes\osx-x64"/>
+    <RemoveDir Directories="$(PublishDir)runtimes\browser-wasm;&#xD;&#xA;                            $(PublishDir)runtimes\linux-arm;&#xD;&#xA;                            $(PublishDir)runtimes\linux-arm64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-armel;&#xD;&#xA;                            $(PublishDir)runtimes\linux-mips64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-musl-arm;&#xD;&#xA;                            $(PublishDir)runtimes\linux-musl-arm64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-musl-x64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-ppc64le;&#xD;&#xA;                            $(PublishDir)runtimes\linux-s390x;&#xD;&#xA;                            $(PublishDir)runtimes\linux-x64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-x86;&#xD;&#xA;                            $(PublishDir)runtimes\maccatalyst-arm64;&#xD;&#xA;                            $(PublishDir)runtimes\maccatalyst-x64;&#xD;&#xA;                            $(PublishDir)runtimes\osx-arm64;&#xD;&#xA;                            $(PublishDir)runtimes\osx-x64" />
   </Target>
 
   <ItemGroup>
@@ -95,6 +65,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.3" />
   </ItemGroup>
 

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs

@@ -1,12 +1,13 @@
 using System.Windows;
-using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using System.Windows.Input;
-using System.ComponentModel;
 using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Views;
 
-public partial class SettingsControl : INotifyPropertyChanged
+[INotifyPropertyChanged]
+public partial class SettingsControl
 {
     public Settings Settings { get; }
     public CustomBrowser SelectedCustomBrowser { get; set; }
@@ -53,12 +54,10 @@ public bool OpenInNewBrowserWindow
         set
         {
             Settings.OpenInNewBrowserWindow = value;
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(OpenInNewBrowserWindow)));
+            OnPropertyChanged();
         }
     }
 
-    public event PropertyChangedEventHandler PropertyChanged;
-
     private void NewCustomBrowser(object sender, RoutedEventArgs e)
     {
         var newBrowser = new CustomBrowser();