refactor: history filter icon

- Show a folder icon instead of branch icon for local/remote branch folder filter
- Show a warning icon if the branch/tag filter is not existed
- Fix the issue that wrong filter added after renaming a local branch

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/Models/HistoryFilter.cs

@@ -1,4 +1,5 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using System.Text.Json.Serialization;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.Models
 {
@@ -38,9 +39,11 @@ public FilterMode Mode
             set => SetProperty(ref _mode, value);
         }
 
-        public bool IsBranch
+        [JsonIgnore]
+        public bool IsValid
         {
-            get => Type != FilterType.Tag;
+            get => _isValid;
+            set => SetProperty(ref _isValid, value);
         }
 
         public HistoryFilter()
@@ -56,5 +59,6 @@ public HistoryFilter(string pattern, FilterType type, FilterMode mode)
 
         private string _pattern = string.Empty;
         private FilterMode _mode = FilterMode.None;
+        private bool _isValid = true;
     }
 }

src/Models/RepositoryUIStates.cs

@@ -376,7 +376,7 @@ public void RenameBranchFilter(string oldName, string newName)
                 if (filter.Type == FilterType.LocalBranch &&
                     filter.Pattern.Equals(oldName, StringComparison.Ordinal))
                 {
-                    filter.Pattern = $"refs/heads/{newName}";
+                    filter.Pattern = newName;
                     break;
                 }
             }

src/ViewModels/Repository.cs

@@ -1169,6 +1169,8 @@ public void RefreshBranches()
                     LocalBranchTrees = builder.Locals;
                     RemoteBranchTrees = builder.Remotes;
 
+                    ValidateHistoryFilters(true);
+
                     var localBranchesCount = 0;
                     foreach (var b in branches)
                     {
@@ -1214,6 +1216,7 @@ public void RefreshTags()
 
                     Tags = tags;
                     VisibleTags = BuildVisibleTags();
+                    ValidateHistoryFilters(false);
                 });
             }, token);
         }
@@ -1841,6 +1844,37 @@ private void ResetTagFilterMode()
             }
         }
 
+        private void ValidateHistoryFilters(bool forBranch)
+        {
+            if (_historyFilterMode == Models.FilterMode.None)
+                return;
+
+            var set = new HashSet<string>();
+
+            if (forBranch)
+            {
+                foreach (var b in _branches)
+                    set.Add(b.FullName);
+
+                foreach (var f in _uiStates.HistoryFilters)
+                {
+                    if (f.Type is Models.FilterType.LocalBranch or Models.FilterType.RemoteBranch)
+                        f.IsValid = set.Contains(f.Pattern);
+                }
+            }
+            else
+            {
+                foreach (var t in _tags)
+                    set.Add(t.Name);
+
+                foreach (var f in _uiStates.HistoryFilters)
+                {
+                    if (f.Type is Models.FilterType.Tag)
+                        f.IsValid = set.Contains(f.Pattern);
+                }
+            }
+        }
+
         private BranchTreeNode FindBranchNode(List<BranchTreeNode> nodes, string path)
         {
             if (string.IsNullOrEmpty(path))

src/Views/HistoryFilterIcon.cs

@@ -0,0 +1,96 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+
+namespace SourceGit.Views
+{
+    public class HistoryFilterIcon : ContentControl
+    {
+        public static readonly DirectProperty<HistoryFilterIcon, Models.HistoryFilter> FilterProperty =
+            AvaloniaProperty.RegisterDirect<HistoryFilterIcon, Models.HistoryFilter>(
+                nameof(Filter),
+                static o => o.Filter,
+                static (o, v) => o.Filter = v);
+
+        public Models.HistoryFilter Filter
+        {
+            get => _filter;
+            set => SetAndRaise(FilterProperty, ref _filter, value);
+        }
+
+        public static readonly DirectProperty<HistoryFilterIcon, bool> IsFilterValidProperty =
+            AvaloniaProperty.RegisterDirect<HistoryFilterIcon, bool>(
+                nameof(IsFilterValid),
+                static o => o.IsFilterValid,
+                static (o, v) => o.IsFilterValid = v);
+
+        public bool IsFilterValid
+        {
+            get => _isFilterValid;
+            set => SetAndRaise(IsFilterValidProperty, ref _isFilterValid, value);
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == FilterProperty || change.Property == IsFilterValidProperty)
+                UpdateContent();
+        }
+
+        private void UpdateContent()
+        {
+            if (_filter == null)
+            {
+                Content = null;
+                return;
+            }
+
+            if (_filter.Type is Models.FilterType.LocalBranch or Models.FilterType.RemoteBranch)
+            {
+                Padding = new Thickness(0);
+
+                if (_isFilterValid)
+                    CreateContent("Icons.Branch");
+                else
+                    CreateContent("Icons.Error", Brushes.DarkOrange);
+            }
+            else if (_filter.Type is Models.FilterType.Tag)
+            {
+                Padding = new Thickness(0);
+
+                if (_isFilterValid)
+                    CreateContent("Icons.Tag");
+                else
+                    CreateContent("Icons.Error", Brushes.DarkOrange);
+            }
+            else
+            {
+                Padding = new Thickness(0, 1, 0, 0);
+                CreateContent("Icons.Folder");
+            }
+        }
+
+        private void CreateContent(string iconKey, IBrush fill = null)
+        {
+            if (this.FindResource(iconKey) is not StreamGeometry geo)
+                return;
+
+            var path = new Path()
+            {
+                Width = 10,
+                Height = 10,
+                Data = geo,
+            };
+
+            if (fill != null)
+                path.Fill = fill;
+
+            Content = path;
+        }
+
+        private Models.HistoryFilter _filter = null;
+        private bool _isFilterValid = true;
+    }
+}

src/Views/Repository.axaml

@@ -960,8 +960,11 @@
                       <ColumnDefinition Width="Auto" MaxWidth="480"/>
                       <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <Path Grid.Column="0" Width="10" Height="10" Data="{StaticResource Icons.Branch}" IsVisible="{Binding IsBranch}"/>
-                    <Path Grid.Column="0" Width="10" Height="10" Data="{StaticResource Icons.Tag}" IsVisible="{Binding !IsBranch}"/>
+                    <v:HistoryFilterIcon Grid.Column="0"
+                                         Width="12" Height="12"
+                                         VerticalAlignment="Center"
+                                         Filter="{Binding, Mode=OneWay}"
+                                         IsFilterValid="{Binding IsValid, Mode=OneWay}"/>
 
                     <TextBlock Grid.Column="1"
                                Text="{Binding Pattern, Converter={x:Static c:StringConverters.TrimRefsPrefix}}"