Merge pull request #3495 from Flow-Launcher/fody_property

Jack251970 · web-flow · commit f45e6ac1d5b2 · 2025-04-30T12:00:58.000+08:00
Improve PropertyChanged.Fody Code Quality
diff --git a/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj b/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
@@ -66,7 +66,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NLog" Version="4.7.10" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
+    <PackageReference Include="PropertyChanged.Fody" Version="3.4.0">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="SharpVectors.Wpf" Version="1.8.4.2" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
     <!--ToolGood.Words.Pinyin v3.0.2.6 results in high memory usage when search with pinyin is enabled-->
diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
@@ -76,7 +76,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
+    <PackageReference Include="PropertyChanged.Fody" Version="3.4.0">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>
diff --git a/Flow.Launcher/ActionKeywords.xaml.cs b/Flow.Launcher/ActionKeywords.xaml.cs
@@ -80,7 +80,7 @@ private void ReplaceActionKeyword(string id, IReadOnlyList<string> removedAction
             }
 
             // Update action keywords text and close window
-            _pluginViewModel.OnActionKeywordsChanged();
+            _pluginViewModel.OnActionKeywordsTextChanged();
             Close();
         }
     }
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
@@ -98,7 +98,9 @@
     <!-- https://github.com/Flow-Launcher/Flow.Launcher/issues/1772#issuecomment-1502440801 -->
     <PackageReference Include="ModernWpfUI" Version="0.9.4" />
     <PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
+    <PackageReference Include="PropertyChanged.Fody" Version="3.4.0">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="SemanticVersioning" Version="3.0.0" />
     <PackageReference Include="TaskScheduler" Version="2.12.1" />
     <PackageReference Include="VirtualizingWrapPanel" Version="2.1.1" />
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
@@ -155,16 +155,11 @@ public Control SettingControl
         public bool SearchDelayEnabled => Settings.SearchQueryResultsWithDelay;
         public string DefaultSearchDelay => Settings.SearchDelayTime.ToString();
 
-        public void OnActionKeywordsChanged()
+        public void OnActionKeywordsTextChanged()
         {
             OnPropertyChanged(nameof(ActionKeywordsText));
         }
 
-        public void OnSearchDelayTimeChanged()
-        {
-            OnPropertyChanged(nameof(SearchDelayTimeText));
-        }
-
         [RelayCommand]
         private void OpenPluginDirectory()
         {

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ private void ReplaceActionKeyword(string id, IReadOnlyList<string> removedAction`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`// Update action keywords text and close window`
`83`		`- _pluginViewModel.OnActionKeywordsChanged();`
	`83`	`+ _pluginViewModel.OnActionKeywordsTextChanged();`
`84`	`84`	`Close();`
`85`	`85`	`}`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,16 +155,11 @@ public Control SettingControl`
`155`	`155`	`public bool SearchDelayEnabled => Settings.SearchQueryResultsWithDelay;`
`156`	`156`	`public string DefaultSearchDelay => Settings.SearchDelayTime.ToString();`
`157`	`157`
`158`		`- public void OnActionKeywordsChanged()`
	`158`	`+ public void OnActionKeywordsTextChanged()`
`159`	`159`	`{`
`160`	`160`	`OnPropertyChanged(nameof(ActionKeywordsText));`
`161`	`161`	`}`
`162`	`162`
`163`		`- public void OnSearchDelayTimeChanged()`
`164`		`- {`
`165`		`- OnPropertyChanged(nameof(SearchDelayTimeText));`
`166`		`- }`
`167`		`-`
`168`	`163`	`[RelayCommand]`
`169`	`164`	`private void OpenPluginDirectory()`
`170`	`165`	`{`