enhance: avoid crashing due to invalid bookmark value in preferences.json

Signed-off-by: leo <[email protected]>

Author: love-linger

src/Converters/IntConverters.cs

@@ -32,12 +32,6 @@ public static class IntConverters
             new FuncValueConverter<int, Thickness>(v => new Thickness(v * 16, 0, 0, 0));
 
         public static readonly FuncValueConverter<int, IBrush> ToBookmarkBrush =
-            new FuncValueConverter<int, IBrush>(bookmark =>
-            {
-                if (bookmark == 0)
-                    return Application.Current?.FindResource("Brush.FG1") as IBrush;
-                else
-                    return Models.Bookmarks.Brushes[bookmark];
-            });
+            new FuncValueConverter<int, IBrush>(v => Models.Bookmarks.Get(v) ?? App.Current?.FindResource("Brush.FG1") as IBrush);
     }
 }

src/Models/Bookmarks.cs

@@ -1,11 +1,9 @@
-using System.Collections.Generic;
-
-namespace SourceGit.Models
+namespace SourceGit.Models
 {
     public static class Bookmarks
     {
         public static readonly Avalonia.Media.IBrush[] Brushes = [
-            Avalonia.Media.Brushes.Transparent,
+            null,
             Avalonia.Media.Brushes.Red,
             Avalonia.Media.Brushes.Orange,
             Avalonia.Media.Brushes.Gold,
@@ -15,12 +13,9 @@ public static class Bookmarks
             Avalonia.Media.Brushes.Purple,
         ];
 
-        public static readonly List<int> Supported = new List<int>();
-
-        static Bookmarks()
+        public static Avalonia.Media.IBrush Get(int i)
         {
-            for (int i = 0; i < Brushes.Length; i++)
-                Supported.Add(i);
+            return (i >= 0 && i < Brushes.Length) ? Brushes[i] : null;
         }
     }
 }

src/Models/Branch.cs

@@ -24,13 +24,9 @@ public class Branch
         public bool IsUpstreamGone { get; set; }
         public string WorktreePath { get; set; }
 
-        public bool IsTrackStatusVisible
-        {
-            get
-            {
-                return Ahead.Count + Behind.Count > 0;
-            }
-        }
+        public bool HasWorktree => !IsCurrent && !string.IsNullOrEmpty(WorktreePath);
+        public string FriendlyName => IsLocal ? Name : $"{Remote}/{Name}";
+        public bool IsTrackStatusVisible => Ahead.Count + Behind.Count > 0;
 
         public string TrackStatusDescription
         {
@@ -44,8 +40,5 @@ public string TrackStatusDescription
                 return behind > 0 ? $"{behind}↓" : string.Empty;
             }
         }
-
-        public bool HasWorktree => !IsCurrent && !string.IsNullOrEmpty(WorktreePath);
-        public string FriendlyName => IsLocal ? Name : $"{Remote}/{Name}";
     }
 }

src/ViewModels/EditRepositoryNode.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
@@ -18,6 +19,11 @@ public string Name
             set => SetProperty(ref _name, value, true);
         }
 
+        public List<int> Bookmarks
+        {
+            get;
+        }
+
         public int Bookmark
         {
             get => _bookmark;
@@ -37,6 +43,10 @@ public EditRepositoryNode(RepositoryNode node)
             _name = node.Name;
             _isRepository = node.IsRepository;
             _bookmark = node.Bookmark;
+
+            Bookmarks = new List<int>();
+            for (var i = 0; i < Models.Bookmarks.Brushes.Length; i++)
+                Bookmarks.Add(i);
         }
 
         public override Task<bool> Sure()

src/Views/EditRepositoryNode.axaml

@@ -34,16 +34,16 @@
       <ComboBox Grid.Column="1"
                 BorderThickness="0"
                 Height="28"
-                ItemsSource="{x:Static m:Bookmarks.Supported}"
+                ItemsSource="{Binding Bookmarks}"
                 SelectedIndex="{Binding Bookmark, Mode=TwoWay}">
         <ComboBox.ItemTemplate>
           <DataTemplate>
-            <Border Height="20" VerticalAlignment="Center">
+            <Grid Height="20">
               <Path Width="12" Height="12"
                     Fill="{Binding Converter={x:Static c:IntConverters.ToBookmarkBrush}}"
                     HorizontalAlignment="Center" VerticalAlignment="Center"
                     Data="{StaticResource Icons.Bookmark}"/>
-            </Border>
+            </Grid>
           </DataTemplate>
         </ComboBox.ItemTemplate>
       </ComboBox>

src/Views/LauncherTabBar.axaml.cs

@@ -269,12 +269,12 @@ private void OnTabContextRequested(object sender, ContextRequestedEventArgs e)
                     bookmark.Header = App.Text("PageTabBar.Tab.Bookmark");
                     bookmark.Icon = App.CreateMenuIcon("Icons.Bookmark");
 
-                    for (int i = 0; i < Models.Bookmarks.Supported.Count; i++)
+                    for (int i = 0; i < Models.Bookmarks.Brushes.Length; i++)
                     {
+                        var brush = Models.Bookmarks.Brushes[i];
                         var icon = App.CreateMenuIcon("Icons.Bookmark");
-
-                        if (i != 0)
-                            icon.Fill = Models.Bookmarks.Brushes[i];
+                        if (brush != null)
+                            icon.Fill = brush;
 
                         var dupIdx = i;
                         var setter = new MenuItem();