ux: add loading icon

Author: love-linger

src/ViewModels/BranchCompare.cs

@@ -12,6 +12,12 @@ namespace SourceGit.ViewModels
 {
     public class BranchCompare : ObservableObject
     {
+        public bool IsLoading
+        {
+            get => _isLoading;
+            private set => SetProperty(ref _isLoading, value);
+        }
+
         public Models.Branch Base
         {
             get => _based;
@@ -101,6 +107,8 @@ public void NavigateTo(string commitSHA)
         public void Swap()
         {
             (Base, To) = (_to, _based);
+
+            VisibleChanges = [];
             SelectedChanges = [];
 
             if (_baseHead != null)
@@ -166,6 +174,7 @@ public ContextMenu CreateChangeContextMenu()
                 await App.CopyTextAsync(change.Path);
                 ev.Handled = true;
             };
+            menu.Items.Add(new MenuItem() { Header = "-" });
             menu.Items.Add(copyPath);
 
             var copyFullPath = new MenuItem();
@@ -184,6 +193,8 @@ public ContextMenu CreateChangeContextMenu()
 
         private void Refresh()
         {
+            IsLoading = true;
+
             Task.Run(async () =>
             {
                 if (_baseHead == null)
@@ -221,6 +232,7 @@ private void Refresh()
                 Dispatcher.UIThread.Post(() =>
                 {
                     VisibleChanges = visible;
+                    IsLoading = false;
 
                     if (VisibleChanges.Count > 0)
                         SelectedChanges = [VisibleChanges[0]];
@@ -253,6 +265,7 @@ private void RefreshVisible()
         }
 
         private string _repo;
+        private bool _isLoading = true;
         private Models.Branch _based = null;
         private Models.Branch _to = null;
         private Models.Commit _baseHead = null;

src/Views/Avatar.cs

@@ -96,7 +96,7 @@ public override void Render(DrawingContext context)
 
         public void OnAvatarResourceChanged(string email, Bitmap image)
         {
-            if (User.Email.Equals(email, StringComparison.Ordinal))
+            if (email.Equals(User?.Email, StringComparison.Ordinal))
             {
                 _img = image;
                 InvalidateVisual();

src/Views/BranchCompare.axaml

@@ -38,7 +38,7 @@
 
     <!-- Compare Targets -->
     <Border Grid.Row="1">
-      <Grid Margin="48,8,48,8" ColumnDefinitions="*,48,*">
+      <Grid Margin="8" ColumnDefinitions="*,48,*">
         <Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Diff.DeletedHighlight}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
           <Grid RowDefinitions="Auto,*">
             <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
@@ -129,6 +129,12 @@
                                     SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
                                     ContextRequested="OnChangeContextRequested"/>
           </Border>
+
+          <!-- Loading Status Icon -->
+          <v:LoadingIcon Grid.Row="1"
+                         Width="48" Height="48"
+                         HorizontalAlignment="Center" VerticalAlignment="Center"
+                         IsVisible="{Binding IsLoading}"/>
         </Grid>
 
         <GridSplitter Grid.Column="1"

src/Views/DirHistories.axaml

@@ -107,6 +107,12 @@
         </ListBox.ItemTemplate>
       </ListBox>
 
+      <!-- Loading Status Icon -->
+      <v:LoadingIcon Grid.Column="0"
+                     Width="48" Height="48"
+                     HorizontalAlignment="Center" VerticalAlignment="Center"
+                     IsVisible="{Binding IsLoading}"/>
+
       <GridSplitter Grid.Column="1"
                     MinWidth="1"
                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
@@ -115,7 +121,7 @@
                     BorderBrush="{DynamicResource Brush.Border0}"/>
 
       <!-- Commit Detail -->
-      <Border Grid.Column="2" Padding="0,4,4,8">
+      <Border Grid.Column="2" Padding="0,4,4,8" IsVisible="{Binding !IsLoading}">
         <ContentControl Content="{Binding Detail, Mode=OneWay}">
           <ContentControl.DataTemplates>
             <DataTemplate DataType="vm:CommitDetail">