Remove badges

Author: TBM13

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -128,8 +128,6 @@ public string Theme
         public string ResultSubFontWeight { get; set; }
         public string ResultSubFontStretch { get; set; }
         public bool UseGlyphIcons { get; set; } = true;
-        public bool ShowBadges { get; set; } = false;
-        public bool ShowBadgesGlobalOnly { get; set; } = false;
 
         public bool FirstLaunch { get; set; } = true;
 

Flow.Launcher.Plugin/Result.cs

@@ -23,8 +23,6 @@ public class Result
 
         private string _copyText = string.Empty;
 
-        private string _badgeIcoPath;
-
         /// <summary>
         /// The title of the result. This is always required.
         /// </summary>
@@ -87,33 +85,6 @@ public string IcoPath
             }
         }
 
-        /// <summary>
-        /// The image to be displayed for the badge of the result.
-        /// </summary>
-        /// <value>Can be a local file path or a URL.</value>
-        /// <remarks>If null or empty, will use plugin icon</remarks>
-        public string BadgeIcoPath
-        {
-            get => _badgeIcoPath;
-            set
-            {
-                // As a standard this property will handle prepping and converting to absolute local path for icon image processing
-                if (!string.IsNullOrEmpty(value)
-                    && !string.IsNullOrEmpty(PluginDirectory)
-                    && !Path.IsPathRooted(value)
-                    && !value.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
-                    && !value.StartsWith("https://", StringComparison.OrdinalIgnoreCase)
-                    && !value.StartsWith("data:image", StringComparison.OrdinalIgnoreCase))
-                {
-                    _badgeIcoPath = Path.Combine(PluginDirectory, value);
-                }
-                else
-                {
-                    _badgeIcoPath = value;
-                }
-            }
-        }
-
         /// <summary>
         /// Determines if Icon has a border radius
         /// </summary>
@@ -130,11 +101,6 @@ public string BadgeIcoPath
         /// </summary>
         public IconDelegate Icon = null;
 
-        /// <summary>
-        /// Delegate to load an icon for the badge of this result.
-        /// </summary>
-        public IconDelegate BadgeIcon = null;
-
         /// <summary>
         /// Information for Glyph Icon (Prioritized than IcoPath/Icon if user enable Glyph Icons)
         /// </summary>
@@ -188,9 +154,8 @@ public string PluginDirectory
 
                 // When the Result object is returned from the query call, PluginDirectory is not provided until
                 // UpdatePluginMetadata call is made at PluginManager.cs L196. Once the PluginDirectory becomes available
-                // we need to update (only if not Uri path) the IcoPath and BadgeIcoPath with the full absolute path so the image can be loaded.
+                // we need to update (only if not Uri path) the IcoPath with the full absolute path so the image can be loaded.
                 IcoPath = _icoPath;
-                BadgeIcoPath = _badgeIcoPath;
             }
         }
 
@@ -251,12 +216,6 @@ public string PluginDirectory
         /// </summary>
         public string RecordKey { get; set; } = null;
 
-        /// <summary>
-        /// Determines if the badge icon should be shown.
-        /// If users want to show the result badges and here you set this to true, the results will show the badge icon.
-        /// </summary>
-        public bool ShowBadge { get; set; } = false;
-
         /// <summary>
         /// Run this result, asynchronously
         /// </summary>
@@ -286,10 +245,8 @@ public Result Clone()
                 CopyText = CopyText,
                 AutoCompleteText = AutoCompleteText,
                 IcoPath = IcoPath,
-                BadgeIcoPath = BadgeIcoPath,
                 RoundedIcon = RoundedIcon,
                 Icon = Icon,
-                BadgeIcon = BadgeIcon,
                 Glyph = Glyph,
                 Action = Action,
                 AsyncAction = AsyncAction,
@@ -307,7 +264,6 @@ public Result Clone()
                 Preview = Preview,
                 AddSelectedCount = AddSelectedCount,
                 RecordKey = RecordKey,
-                ShowBadge = ShowBadge,
             };
         }
 

Flow.Launcher/Languages/en.xaml

@@ -239,9 +239,6 @@
     <system:String x:Key="useGlyphUI">Use Segoe Fluent Icons</system:String>
     <system:String x:Key="useGlyphUIEffect">Use Segoe Fluent Icons for query results where supported</system:String>
     <system:String x:Key="flowlauncherPressHotkey">Press Key</system:String>
-    <system:String x:Key="showBadges">Show Result Badges</system:String>
-    <system:String x:Key="showBadgesToolTip">For supported plugins, badges are displayed to help distinguish them more easily.</system:String>
-    <system:String x:Key="showBadgesGlobalOnly">Show Result Badges for Global Query Only</system:String>
 
     <!--  Setting About  -->
     <system:String x:Key="about">About</system:String>

Flow.Launcher/ResultListBox.xaml

@@ -33,7 +33,6 @@
 
     <ListBox.Resources>
         <converter:SizeRatioConverter x:Key="SizeRatioConverter" />
-        <converter:BadgePositionConverter x:Key="BadgePositionConverter" />
         <converter:IconRadiusConverter x:Key="IconRadiusConverter" />
         <converter:DiameterToCenterPointConverter x:Key="DiameterToCenterPointConverter" />
         <converter:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
@@ -136,18 +135,6 @@
                                         Style="{DynamicResource ItemGlyph}"
                                         Text="{Binding Glyph.Glyph}"
                                         Visibility="{Binding ShowGlyph}" />
-
-                                    <Image
-                                        x:Name="BadgeIcon"
-                                        Width="{Binding ElementName=ImageIcon, Path=ActualWidth, Converter={StaticResource SizeRatioConverter}, ConverterParameter=0.6}"
-                                        Height="{Binding ElementName=ImageIcon, Path=ActualWidth, Converter={StaticResource SizeRatioConverter}, ConverterParameter=0.6}"
-                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                        Source="{Binding BadgeImage, TargetNullValue={x:Null}}"
-                                        Visibility="{Binding ShowBadge}">
-                                        <Image.RenderTransform>
-                                            <TranslateTransform X="{Binding ElementName=ImageIcon, Path=ActualWidth, Converter={StaticResource BadgePositionConverter}, ConverterParameter=1}" Y="{Binding ElementName=ImageIcon, Path=ActualWidth, Converter={StaticResource BadgePositionConverter}, ConverterParameter=2}" />
-                                        </Image.RenderTransform>
-                                    </Image>
                                 </Grid>
                             </Border>
 

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

@@ -494,26 +494,6 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <!--  Badges  -->
-            <cc:ExCard
-                Title="{DynamicResource showBadges}"
-                Margin="0 4 0 0"
-                Icon="&#xEC1B;"
-                Sub="{DynamicResource showBadgesToolTip}">
-                <cc:ExCard.SideContent>
-                    <ui:ToggleSwitch
-                        IsOn="{Binding Settings.ShowBadges}"
-                        OffContent="{DynamicResource disable}"
-                        OnContent="{DynamicResource enable}" />
-                </cc:ExCard.SideContent>
-                <cc:Card Title="{DynamicResource showBadgesGlobalOnly}" Type="InsideFit">
-                    <ui:ToggleSwitch
-                        IsOn="{Binding Settings.ShowBadgesGlobalOnly}"
-                        OffContent="{DynamicResource disable}"
-                        OnContent="{DynamicResource enable}" />
-                </cc:Card>
-            </cc:ExCard>
-
             <!--  Settings color scheme  -->
             <cc:Card
                 Title="{DynamicResource ColorScheme}"

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -246,14 +246,6 @@ public void RegisterResultsUpdatedEvent()
                     // make a clone to avoid possible issue that plugin will also change the list and items when updating view model
                     var resultsCopy = DeepCloneResults(e.Results, token);
 
-                    foreach (var result in resultsCopy)
-                    {
-                        if (string.IsNullOrEmpty(result.BadgeIcoPath))
-                        {
-                            result.BadgeIcoPath = pair.Metadata.IcoPath;
-                        }
-                    }
-
                     PluginManager.UpdatePluginMetadata(resultsCopy, pair.Metadata, e.Query);
 
                     if (token.IsCancellationRequested) return;
@@ -1238,14 +1230,6 @@ await PluginManager.QueryHomeForPluginAsync(plugin, query, token) :
                     resultsCopy = DeepCloneResults(results, token);
                 }
 
-                foreach (var result in resultsCopy)
-                {
-                    if (string.IsNullOrEmpty(result.BadgeIcoPath))
-                    {
-                        result.BadgeIcoPath = plugin.Metadata.IcoPath;
-                    }
-                }
-
                 if (token.IsCancellationRequested) return;
 
                 App.API.LogDebug(ClassName, $"Update results for plugin <{plugin.Metadata.Name}>");

Flow.Launcher/ViewModel/ResultViewModel.cs

@@ -91,7 +91,7 @@ public Visibility ShowPreviewImage
             {
                 if (PreviewImageAvailable)
                     return Visibility.Visible;
-                
+
                 // Fall back to icon
                 return ShowIcon;
             }
@@ -103,7 +103,7 @@ public double IconRadius
             {
                 if (Result.RoundedIcon)
                     return IconXY / 2;
-                
+
                 return IconXY;
             }
         }
@@ -121,32 +121,12 @@ public Visibility ShowGlyph
             }
         }
 
-        public Visibility ShowBadge
-        {
-            get
-            {
-                // If results do not allow badges, or user has disabled badges in settings,
-                // or badge icon is not available, then do not show badge
-                if (!Result.ShowBadge || !Settings.ShowBadges || !BadgeIconAvailable)
-                    return Visibility.Collapsed;
-
-                // If user has set to show badges only for global results, and this is not a global result,
-                // then do not show badge
-                if (Settings.ShowBadgesGlobalOnly && !IsGlobalQuery)
-                    return Visibility.Collapsed;
-
-                return Visibility.Visible;
-            }
-        }
-
         public bool IsGlobalQuery => string.IsNullOrEmpty(Result.OriginQuery.ActionKeyword);
 
         private bool GlyphAvailable => Glyph is not null;
 
         private bool ImgIconAvailable => !string.IsNullOrEmpty(Result.IcoPath) || Result.Icon is not null;
 
-        private bool BadgeIconAvailable => !string.IsNullOrEmpty(Result.BadgeIcoPath) || Result.BadgeIcon is not null;
-
         private bool PreviewImageAvailable => !string.IsNullOrEmpty(Result.Preview.PreviewImagePath) || Result.Preview.PreviewDelegate != null;
 
         public string ShowTitleToolTip => string.IsNullOrEmpty(Result.TitleToolTip)
@@ -158,11 +138,9 @@ public Visibility ShowBadge
             : Result.SubTitleToolTip;
 
         private volatile bool _imageLoaded;
-        private volatile bool _badgeImageLoaded;
         private volatile bool _previewImageLoaded;
 
         private ImageSource _image = ImageLoader.LoadingImage;
-        private ImageSource _badgeImage = ImageLoader.LoadingImage;
         private ImageSource _previewImage = ImageLoader.LoadingImage;
 
         public ImageSource Image
@@ -180,21 +158,6 @@ public ImageSource Image
             private set => _image = value;
         }
 
-        public ImageSource BadgeImage
-        {
-            get
-            {
-                if (!_badgeImageLoaded)
-                {
-                    _badgeImageLoaded = true;
-                    _ = LoadBadgeImageAsync();
-                }
-
-                return _badgeImage;
-            }
-            private set => _badgeImage = value;
-        }
-
         public ImageSource PreviewImage
         {
             get
@@ -251,21 +214,6 @@ private async Task LoadImageAsync()
             }
         }
 
-        private async Task LoadBadgeImageAsync()
-        {
-            var badgeImagePath = Result.BadgeIcoPath;
-            var badgeIconDelegate = Result.BadgeIcon;
-            if (ImageLoader.TryGetValue(badgeImagePath, false, out var img))
-            {
-                _badgeImage = img;
-            }
-            else
-            {
-                // We need to modify the property not field here to trigger the OnPropertyChanged event
-                BadgeImage = await LoadImageInternalAsync(badgeImagePath, badgeIconDelegate, false).ConfigureAwait(false);
-            }
-        }
-
         private async Task LoadPreviewImageAsync()
         {
             var imagePath = Result.Preview.PreviewImagePath ?? Result.IcoPath;