From b970fdc7f096f12c7084b9c7bb4b3d25a0ed81d7 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 12 Oct 2022 00:08:13 +0900
Subject: [PATCH] - rename LabelUpdate from LabelUpdated - Changed 'New' logic.
 - Fix order - Adjust Strings

---
 Flow.Launcher/Languages/en.xaml               |  8 +++---
 Flow.Launcher/SettingWindow.xaml              | 28 +++++++++----------
 .../ViewModel/PluginStoreItemViewModel.cs     |  6 ++--
 .../ViewModel/SettingWindowViewModel.cs       |  4 +--
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index d141ba82c..517edd65f 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -93,10 +93,10 @@
     <system:String x:Key="updatebtn">Update</system:String>
     <system:String x:Key="LabelInstalled">Installed</system:String>
     <system:String x:Key="LabelInstalledToolTip">Plug-in already installed</system:String>
-    <system:String x:Key="LabelNew">New</system:String>
-    <system:String x:Key="LabelNewToolTip">This is a newly registered plug-in in 7 days</system:String>
-    <system:String x:Key="LabelUpdated">Updated</system:String>
-    <system:String x:Key="LabelUpdatedToolTip">This plug-in has been updated within the last 5 days</system:String>
+    <system:String x:Key="LabelNew">New Version</system:String>
+    <system:String x:Key="LabelNewToolTip">This plug-in has been updated within the last 7 days</system:String>
+    <system:String x:Key="LabelUpdate">Update</system:String>
+    <system:String x:Key="LabelUpdateToolTip">New Update is Available</system:String>
 
 
 
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 067c69c5a..e6ad509eb 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1534,19 +1534,19 @@
                                                             Text="{DynamicResource LabelNew}" />
                                                     </Border>
                                                     <Border
-                                                        x:Name="LabelUpdated"
+                                                        x:Name="LabelUpdate"
                                                         Margin="0,10,8,0"
                                                         Padding="6,2,6,2"
                                                         HorizontalAlignment="Right"
                                                         VerticalAlignment="Top"
                                                         Background="#45BD59"
                                                         CornerRadius="4"
-                                                        ToolTip="{DynamicResource LabelUpdatedToolTip}"
-                                                        Visibility="{Binding LabelUpdated, Converter={StaticResource BoolToVisibilityConverter}}">
+                                                        ToolTip="{DynamicResource LabelUpdateToolTip}"
+                                                        Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}">
                                                         <TextBlock
                                                             FontSize="11"
                                                             Foreground="{DynamicResource Color01B}"
-                                                            Text="{DynamicResource LabelUpdated}" />
+                                                            Text="{DynamicResource LabelUpdate}" />
                                                     </Border>
                                                     <Border
                                                         x:Name="Labelinstalled"
@@ -1689,15 +1689,6 @@
                                                             </StackPanel>
                                                         </StackPanel>
                                                         <Grid Grid.Row="0" Grid.Column="1">
-                                                            <Button
-                                                                MinHeight="40"
-                                                                Margin="0,70,20,0"
-                                                                Padding="15,5,15,5"
-                                                                HorizontalAlignment="Right"
-                                                                VerticalAlignment="Center"
-                                                                Click="OnExternalPluginUninstallClick"
-                                                                Content="{DynamicResource uninstallbtn}"
-                                                                Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}" />
                                                             <Button
                                                                 MinHeight="40"
                                                                 Margin="0,70,20,0"
@@ -1707,6 +1698,15 @@
                                                                 Click="OnExternalPluginInstallClick"
                                                                 Content="{DynamicResource installbtn}"
                                                                 Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='!'}" />
+                                                            <Button
+                                                                MinHeight="40"
+                                                                Margin="0,70,20,0"
+                                                                Padding="15,5,15,5"
+                                                                HorizontalAlignment="Right"
+                                                                VerticalAlignment="Center"
+                                                                Click="OnExternalPluginUninstallClick"
+                                                                Content="{DynamicResource uninstallbtn}"
+                                                                Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}" />
                                                             <Button
                                                                 MinHeight="40"
                                                                 Margin="0,70,20,0"
@@ -1715,7 +1715,7 @@
                                                                 VerticalAlignment="Center"
                                                                 Click="OnExternalPluginUpdateClick"
                                                                 Content="{DynamicResource updatebtn}"
-                                                                Visibility="{Binding UpdateBtn, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                                                Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
                                                             <!--  Hide Install Button when installed Item  -->
                                                         </Grid>
                                                     </Grid>
diff --git a/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs b/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs
index c0a876378..09022862e 100644
--- a/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs
+++ b/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using Flow.Launcher.Core.ExternalPlugins;
 using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Plugin;
@@ -25,9 +26,8 @@ namespace Flow.Launcher.ViewModel
         public string UrlSourceCode => _plugin.UrlSourceCode;
         public string IcoPath => _plugin.IcoPath;
 
-        public bool LabelNew => _plugin.LatestReleaseDate - DateTime.Now < TimeSpan.FromDays(7);
         public bool LabelInstalled => PluginManager.GetPluginForId(_plugin.ID) != null;
-        public bool LabelUpdated => _plugin.DateAdded - DateTime.Now < TimeSpan.FromDays(5) && !LabelNew;
-        public bool UpdateBtn => LabelUpdated && LabelInstalled && _plugin.Version != PluginManager.GetPluginForId(_plugin.ID).Metadata.Version;
+        public bool LabelUpdate => LabelInstalled && _plugin.Version != PluginManager.GetPluginForId(_plugin.ID).Metadata.Version;
+        public bool LabelNew => DateTime.Now - _plugin.LatestReleaseDate < TimeSpan.FromDays(7) && !LabelUpdate; // Show Update Label show first.
     }
 }
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 99a05548f..11c2d5329 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -294,8 +294,8 @@ namespace Flow.Launcher.ViewModel
         private  IList<PluginStoreItemViewModel> LabelMaker(IList<UserPlugin> list)
         {
             return list.Select(p=>new PluginStoreItemViewModel(p))
-                .OrderBy(p=>p.LabelNew)
-                .ThenByDescending(p=>p.LabelUpdated)
+                .OrderByDescending(p=>p.LabelNew)
+                .ThenByDescending(p=>p.LabelUpdate)
                 .ThenBy(p=>p.LabelInstalled)
                 .ToList();
         }