From 8c387d0d94b7db090013ceef679c6a0e518e3383 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 21 Mar 2025 07:58:00 +0800
Subject: [PATCH] Improve code quality & Add oneway bind mode

---
 .../Controls/InstalledPluginDisplay.xaml      | 41 ++++++++++---------
 Flow.Launcher/ViewModel/PluginViewModel.cs    | 36 +++++++++-------
 2 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/Flow.Launcher/Resources/Controls/InstalledPluginDisplay.xaml b/Flow.Launcher/Resources/Controls/InstalledPluginDisplay.xaml
index 66a3ad62e..b19c668e0 100644
--- a/Flow.Launcher/Resources/Controls/InstalledPluginDisplay.xaml
+++ b/Flow.Launcher/Resources/Controls/InstalledPluginDisplay.xaml
@@ -1,14 +1,16 @@
-<UserControl x:Class="Flow.Launcher.Resources.Controls.InstalledPluginDisplay"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:ui="http://schemas.modernwpf.com/2019"
-             xmlns:viewModel="clr-namespace:Flow.Launcher.ViewModel"
-             xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
-             mc:Ignorable="d"
-             d:DataContext="{d:DesignInstance viewModel:PluginViewModel}"
-             d:DesignHeight="300" d:DesignWidth="300">
+<UserControl
+    x:Class="Flow.Launcher.Resources.Controls.InstalledPluginDisplay"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
+    xmlns:viewModel="clr-namespace:Flow.Launcher.ViewModel"
+    d:DataContext="{d:DesignInstance viewModel:PluginViewModel}"
+    d:DesignHeight="300"
+    d:DesignWidth="300"
+    mc:Ignorable="d">
     <Expander
         Padding="0"
         BorderThickness="0"
@@ -28,7 +30,7 @@
                         Grid.Column="0"
                         Width="32"
                         Height="32"
-                        Source="{Binding Image, IsAsync=True}" />
+                        Source="{Binding Image, Mode=OneWay, IsAsync=True}" />
                     <StackPanel Grid.Column="1" Margin="16 0 14 0">
                         <TextBlock
                             Foreground="{DynamicResource Color05B}"
@@ -37,12 +39,15 @@
                             ToolTip="{Binding PluginPair.Metadata.Version}" />
                         <TextBlock
                             Margin="0 2 0 0"
-                            Foreground="{DynamicResource Color04B}"
                             FontSize="12"
+                            Foreground="{DynamicResource Color04B}"
                             Text="{Binding PluginPair.Metadata.Description}"
                             TextWrapping="WrapWithOverflow" />
                     </StackPanel>
-                    <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
+                    <StackPanel
+                        Grid.Column="2"
+                        HorizontalAlignment="Right"
+                        Orientation="Horizontal">
                         <TextBlock
                             Margin="0 0 8 0"
                             VerticalAlignment="Center"
@@ -70,9 +75,7 @@
                                     <Setter Property="FontWeight" Value="DemiBold" />
                                     <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
                                     <Style.Triggers>
-                                        <DataTrigger
-                                            Binding="{Binding ElementName=PriorityButton, UpdateSourceTrigger=PropertyChanged, Path=Content}"
-                                            Value="0">
+                                        <DataTrigger Binding="{Binding ElementName=PriorityButton, UpdateSourceTrigger=PropertyChanged, Path=Content}" Value="0">
                                             <Setter Property="Foreground" Value="{DynamicResource Color08B}" />
                                             <Setter Property="FontWeight" Value="Normal" />
                                         </DataTrigger>
@@ -98,9 +101,9 @@
             <ContentControl Content="{Binding BottomPart2}" />
 
             <Border
-                BorderThickness="0 1 0 0"
+                Background="{DynamicResource Color00B}"
                 BorderBrush="{DynamicResource Color03B}"
-                Background="{DynamicResource Color00B}">
+                BorderThickness="0 1 0 0">
                 <Border.Style>
                     <Style TargetType="Border">
                         <Style.Triggers>
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
index 29e66c4db..d8d235298 100644
--- a/Flow.Launcher/ViewModel/PluginViewModel.cs
+++ b/Flow.Launcher/ViewModel/PluginViewModel.cs
@@ -1,16 +1,16 @@
 using System.Linq;
-using System.Windows;
-using System.Windows.Media;
-using Flow.Launcher.Plugin;
-using Flow.Launcher.Infrastructure.Image;
-using Flow.Launcher.Core.Plugin;
-using System.Windows.Controls;
-using CommunityToolkit.Mvvm.Input;
-using Flow.Launcher.Core.Resource;
-using Flow.Launcher.Resources.Controls;
 using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.Mvvm.Input;
+using Flow.Launcher.Core.Plugin;
+using Flow.Launcher.Infrastructure.Image;
 using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.Plugin;
+using Flow.Launcher.Resources.Controls;
 
 namespace Flow.Launcher.ViewModel
 {
@@ -31,7 +31,7 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
-        private string PluginManagerActionKeyword
+        private static string PluginManagerActionKeyword
         {
             get
             {
@@ -46,9 +46,10 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
-        private async void LoadIconAsync()
+        private async Task LoadIconAsync()
         {
             Image = await ImageLoader.LoadAsync(PluginPair.Metadata.IcoPath);
+            OnPropertyChanged(nameof(Image));
         }
 
         public ImageSource Image
@@ -56,7 +57,7 @@ namespace Flow.Launcher.ViewModel
             get
             {
                 if (_image == ImageLoader.MissingImage)
-                    LoadIconAsync();
+                    _ = LoadIconAsync();
 
                 return _image;
             }
@@ -118,11 +119,16 @@ namespace Flow.Launcher.ViewModel
                 : null;
         private ImageSource _image = ImageLoader.MissingImage;
 
-        public Visibility ActionKeywordsVisibility => PluginPair.Metadata.HideActionKeywordPanel ? Visibility.Collapsed : Visibility.Visible;
+        public Visibility ActionKeywordsVisibility => PluginPair.Metadata.HideActionKeywordPanel ?
+            Visibility.Collapsed : Visibility.Visible;
         public string InitilizaTime => PluginPair.Metadata.InitTime + "ms";
         public string QueryTime => PluginPair.Metadata.AvgQueryTime + "ms";
-        public string Version => InternationalizationManager.Instance.GetTranslation("plugin_query_version") + " " + PluginPair.Metadata.Version;
-        public string InitAndQueryTime => InternationalizationManager.Instance.GetTranslation("plugin_init_time") + " " + PluginPair.Metadata.InitTime + "ms, " + InternationalizationManager.Instance.GetTranslation("plugin_query_time") + " " + PluginPair.Metadata.AvgQueryTime + "ms";
+        public string Version => App.API.GetTranslation("plugin_query_version") + " " + PluginPair.Metadata.Version;
+        public string InitAndQueryTime =>
+            App.API.GetTranslation("plugin_init_time") + " " +
+            PluginPair.Metadata.InitTime + "ms, " +
+            App.API.GetTranslation("plugin_query_time") + " " +
+            PluginPair.Metadata.AvgQueryTime + "ms";
         public string ActionKeywordsText => string.Join(Query.ActionKeywordSeparator, PluginPair.Metadata.ActionKeywords);
         public int Priority => PluginPair.Metadata.Priority;
         public Infrastructure.UserSettings.Plugin PluginSettingsObject { get; set; }