Adjust Label / Fix Order

Author: onesounds

Flow.Launcher/Languages/en.xaml

@@ -95,7 +95,6 @@
     <system:String x:Key="installbtn">Install</system:String>
     <system:String x:Key="uninstallbtn">Uninstall</system:String>
     <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 Version</system:String>
     <system:String x:Key="LabelNewToolTip">This plug-in has been updated within the last 7 days</system:String>

Flow.Launcher/SettingWindow.xaml

@@ -1558,19 +1558,15 @@
                                                         Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
                                                     <Border
                                                         x:Name="Labelinstalled"
+                                                        Height="12"
                                                         Margin="0,10,8,0"
                                                         Padding="6,2,6,2"
                                                         HorizontalAlignment="Right"
                                                         VerticalAlignment="Top"
                                                         Background="{DynamicResource ToggleSwitchFillOn}"
-                                                        CornerRadius="4"
+                                                        CornerRadius="36"
                                                         ToolTip="{DynamicResource LabelInstalledToolTip}"
-                                                        Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}">
-                                                        <TextBlock
-                                                            FontSize="11"
-                                                            Foreground="{DynamicResource Color01B}"
-                                                            Text="{DynamicResource LabelInstalled}" />
-                                                    </Border>
+                                                        Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}" />
                                                 </StackPanel>
 
                                                 <StackPanel

Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs

@@ -27,9 +27,7 @@ public PluginStoreItemViewModel(UserPlugin plugin)
         public string IcoPath => _plugin.IcoPath;
 
         public bool LabelInstalled => PluginManager.GetPluginForId(_plugin.ID) != null;
-        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.
-
+        public bool LabelUpdate => LabelInstalled && _plugin.Version != PluginManager.GetPluginForId(_plugin.ID).Metadata.Version;        
         public string Category
         {
             get

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

@@ -296,9 +296,10 @@ public IList<PluginStoreItemViewModel> ExternalPlugins
         private  IList<PluginStoreItemViewModel> LabelMaker(IList<UserPlugin> list)
         {
             return list.Select(p=>new PluginStoreItemViewModel(p))
-                .OrderByDescending(p=>p.LabelNew)
-                .ThenByDescending(p=>p.LabelUpdate)
-                .ThenBy(p=>p.LabelInstalled)
+                .OrderByDescending(p => p.Category == "NewRelease")
+                .ThenByDescending(p=>p.Category == "RecentlyUpdated")
+                .ThenByDescending(p => p.Category == "None")
+                .ThenByDescending(p => p.Category == "Installed")
                 .ToList();
         }