From fdc41515b7389a3d4ab10388a2cd820cff048517 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 29 May 2024 17:08:41 +0800
Subject: [PATCH 1/5] ux: remove text decorators of commit SHA in the left
 panel of FileHistories

---
 src/Views/FileHistories.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml
index 436ca4b1..a2557275 100644
--- a/src/Views/FileHistories.axaml
+++ b/src/Views/FileHistories.axaml
@@ -86,7 +86,7 @@
                     <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto">
                       <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
                       <TextBlock Grid.Column="1" Classes="monospace" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                      <TextBlock Grid.Column="2" Classes="monospace" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand"/>
+                      <TextBlock Grid.Column="2" Classes="monospace" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
                       <TextBlock Grid.Column="3" Classes="monospace" Text="{Binding AuthorTimeShortStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
                     </Grid>
 

From 7154221946fbc86ca08343a2d1a3fea9d4ddf1f9 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 29 May 2024 17:31:01 +0800
Subject: [PATCH 2/5] ux: new style for ChangeViewModeSwitcher

---
 src/Resources/Styles.axaml             | 6 ++++++
 src/Views/ChangeViewModeSwitcher.axaml | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 2f8bb671..85bf7602 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -60,6 +60,12 @@
       </Animation>
     </Style.Animations>
   </Style>
+  <Style Selector="Path.change_mode_switcher_icon">
+    <Setter Property="Fill" Value="{DynamicResource Brush.FG2}"/>
+  </Style>
+  <Style Selector="Button:pointerover Path.change_mode_switcher_icon">
+    <Setter Property="Fill" Value="{DynamicResource Brush.Accent}"/>
+  </Style>
 
   <Style Selector="TextBlock">
     <Setter Property="HorizontalAlignment" Value="Left"/>
diff --git a/src/Views/ChangeViewModeSwitcher.axaml b/src/Views/ChangeViewModeSwitcher.axaml
index 32d4f1e9..07617536 100644
--- a/src/Views/ChangeViewModeSwitcher.axaml
+++ b/src/Views/ChangeViewModeSwitcher.axaml
@@ -14,22 +14,22 @@
       <MenuFlyout Placement="BottomEdgeAlignedLeft">
         <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.List}" Command="{Binding SwitchMode}" CommandParameter="{x:Static m:ChangeViewMode.List}">
           <MenuItem.Icon>
-            <Path Width="12" Height="12" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.List}"/>
+            <Path Width="12" Height="12" Data="{StaticResource Icons.List}"/>
           </MenuItem.Icon>
         </MenuItem>
         <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.Grid}" Command="{Binding SwitchMode}" CommandParameter="{x:Static m:ChangeViewMode.Grid}">
           <MenuItem.Icon>
-            <Path Width="12" Height="12" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Grid}"/>
+            <Path Width="12" Height="12" Data="{StaticResource Icons.Grid}"/>
           </MenuItem.Icon>
         </MenuItem>
         <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.Tree}" Command="{Binding SwitchMode}" CommandParameter="{x:Static m:ChangeViewMode.Tree}">
           <MenuItem.Icon>
-            <Path Width="12" Height="12" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Tree}"/>
+            <Path Width="12" Height="12" Data="{StaticResource Icons.Tree}"/>
           </MenuItem.Icon>
         </MenuItem>
       </MenuFlyout>
     </Button.Flyout>
 
-    <Path Stretch="Uniform" Fill="{DynamicResource Brush.FG2}" Data="{Binding ViewMode, Converter={x:Static c:ChangeViewModeConverters.ToIcon}}"/>
+    <Path Classes="change_mode_switcher_icon" Stretch="Uniform" Data="{Binding ViewMode, Converter={x:Static c:ChangeViewModeConverters.ToIcon}}"/>
   </Button>
 </UserControl>

From 2f7ef1ef2b05c56e442a766602e0799aef5f0991 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Wed, 29 May 2024 17:00:17 +0800
Subject: [PATCH 3/5] feat: show tooltip if git version too low

---
 src/Converters/StringConverters.cs | 17 +++++++++++++++++
 src/Resources/Locales/en_US.axaml  |  1 +
 src/Resources/Locales/zh_CN.axaml  |  1 +
 src/Views/Preference.axaml         |  9 +++++++--
 src/Views/Preference.axaml.cs      | 13 +++++++++++--
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/Converters/StringConverters.cs b/src/Converters/StringConverters.cs
index f743f69f..e2c788ae 100644
--- a/src/Converters/StringConverters.cs
+++ b/src/Converters/StringConverters.cs
@@ -69,5 +69,22 @@ namespace SourceGit.Converters
 
         public static readonly FuncValueConverter<string, string> ToShortSHA =
             new FuncValueConverter<string, string>(v => v.Length > 10 ? v.Substring(0, 10) : v);
+        
+        public static readonly FuncValueConverter<string, bool> UnderRecommendGitVersion =
+            new(v =>
+            {
+                if (string.IsNullOrEmpty(v))
+                    return true;
+                var versionParts = v.Split(new[] { '.', '-' }, StringSplitOptions.RemoveEmptyEntries);
+                if (versionParts.Length < 3)
+                    return true;
+                if (!int.TryParse(versionParts[0], out var major) ||
+                    !int.TryParse(versionParts[1], out var minor) ||
+                    !int.TryParse(versionParts[2], out var build))
+                    return true;
+                var gitVersion = new Version(major, minor, build);
+                var targetVersion = new Version(2, 23, 0);
+                return gitVersion < targetVersion;
+            });
     }
 }
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index d302b4e4..b379bb96 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -308,6 +308,7 @@
   <x:String x:Key="Text.Preference.Git.User" xml:space="preserve">User Name</x:String>
   <x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">Global git user name</x:String>
   <x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Git version</x:String>
+  <x:String x:Key="Text.Preference.Git.VersionUnderRecommend" xml:space="preserve">Git version is empty or lower than the recommended 2.23.0, exceptions may occur</x:String>
   <x:String x:Key="Text.Preference.GPG" xml:space="preserve">GPG SIGNING</x:String>
   <x:String x:Key="Text.Preference.GPG.Enabled" xml:space="preserve">Commit GPG signing</x:String>
   <x:String x:Key="Text.Preference.GPG.Path" xml:space="preserve">Install Path</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 6c288f7c..0c3ac3d1 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -308,6 +308,7 @@
   <x:String x:Key="Text.Preference.Git.User" xml:space="preserve">用户名</x:String>
   <x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">默认GIT用户名</x:String>
   <x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Git 版本</x:String>
+  <x:String x:Key="Text.Preference.Git.VersionUnderRecommend" xml:space="preserve">Git 版本为空或低于推荐的2.23.0，可能出现异常</x:String>
   <x:String x:Key="Text.Preference.GPG" xml:space="preserve">GPG签名</x:String>
   <x:String x:Key="Text.Preference.GPG.Enabled" xml:space="preserve">启用提交签名</x:String>
   <x:String x:Key="Text.Preference.GPG.Path" xml:space="preserve">可执行文件位置</x:String>
diff --git a/src/Views/Preference.axaml b/src/Views/Preference.axaml
index 60ecf610..39afd4ea 100644
--- a/src/Views/Preference.axaml
+++ b/src/Views/Preference.axaml
@@ -251,8 +251,13 @@
                        Text="{DynamicResource Text.Preference.Git.Version}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
-            <TextBlock Grid.Row="1" Grid.Column="1"
-                       x:Name="txtVersion"/>
+            <Grid Grid.Row="1" Grid.Column="1" ColumnDefinitions="Auto,Auto">
+              <TextBlock Grid.Column="0" Text="{Binding #me.GitVersion, Mode=TwoWay}"/>
+              <Grid Grid.Column="1" ToolTip.Tip="{DynamicResource Text.Preference.Git.VersionUnderRecommend}" HorizontalAlignment="Left"
+                    Background="Transparent" IsVisible="{Binding #me.GitVersion, Converter={x:Static c:StringConverters.UnderRecommendGitVersion}}">
+                <Path Width="14" Height="14" Margin="10,0,0,0" Data="{StaticResource Icons.Error}" Fill="Red"/>
+              </Grid>
+            </Grid>
 
             <Border Grid.Row="2" Grid.Column="0"
                     Height="32"
diff --git a/src/Views/Preference.axaml.cs b/src/Views/Preference.axaml.cs
index 1b5a432c..4a6fbfca 100644
--- a/src/Views/Preference.axaml.cs
+++ b/src/Views/Preference.axaml.cs
@@ -45,6 +45,15 @@ namespace SourceGit.Views
             set;
         }
 
+        public static readonly StyledProperty<string> GitVersionProperty =
+            AvaloniaProperty.Register<Preference, string>(nameof(GitVersion));
+
+        public string GitVersion
+        {
+            get => GetValue(GitVersionProperty);
+            set => SetValue(GitVersionProperty, value);
+        }
+
         public bool EnableGPGSigning
         {
             get;
@@ -140,7 +149,7 @@ namespace SourceGit.Views
             }
 
             InitializeComponent();
-            txtVersion.Text = ver;
+            GitVersion = ver;
         }
 
         private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
@@ -189,7 +198,7 @@ namespace SourceGit.Views
             if (selected.Count == 1)
             {
                 ViewModels.Preference.Instance.GitInstallPath = selected[0].Path.LocalPath;
-                txtVersion.Text = new Commands.Version().Query();
+                GitVersion = new Commands.Version().Query();
             }
 
             e.Handled = true;

From 025d468b404158847bb2c1b6be1aa3e244000a22 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 29 May 2024 18:53:38 +0800
Subject: [PATCH 4/5] code_review: PR (#152)

---
 src/Converters/StringConverters.cs | 31 +++++++++++++++++-------------
 src/Resources/Locales/en_US.axaml  |  2 +-
 src/Resources/Locales/zh_CN.axaml  |  2 +-
 src/Views/Preference.axaml         | 19 +++++++++++-------
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/Converters/StringConverters.cs b/src/Converters/StringConverters.cs
index e2c788ae..364d856b 100644
--- a/src/Converters/StringConverters.cs
+++ b/src/Converters/StringConverters.cs
@@ -1,12 +1,13 @@
 using System;
 using System.Globalization;
+using System.Text.RegularExpressions;
 
 using Avalonia.Data.Converters;
 using Avalonia.Styling;
 
 namespace SourceGit.Converters
 {
-    public static class StringConverters
+    public static partial class StringConverters
     {
         public class ToLocaleConverter : IValueConverter
         {
@@ -73,18 +74,22 @@ namespace SourceGit.Converters
         public static readonly FuncValueConverter<string, bool> UnderRecommendGitVersion =
             new(v =>
             {
-                if (string.IsNullOrEmpty(v))
-                    return true;
-                var versionParts = v.Split(new[] { '.', '-' }, StringSplitOptions.RemoveEmptyEntries);
-                if (versionParts.Length < 3)
-                    return true;
-                if (!int.TryParse(versionParts[0], out var major) ||
-                    !int.TryParse(versionParts[1], out var minor) ||
-                    !int.TryParse(versionParts[2], out var build))
-                    return true;
-                var gitVersion = new Version(major, minor, build);
-                var targetVersion = new Version(2, 23, 0);
-                return gitVersion < targetVersion;
+                var match = REG_GIT_VERSION().Match(v ?? "");
+                if (match.Success)
+                {
+                    var major = int.Parse(match.Groups[1].Value);
+                    var minor = int.Parse(match.Groups[2].Value);
+                    var build = int.Parse(match.Groups[3].Value);
+
+                    return new Version(major, minor, build) < MINIMAL_GIT_VERSION;
+                }
+
+                return true;
             });
+
+        [GeneratedRegex(@"^[\s\w]*(\d+)\.(\d+)\.(\d+).*$")]
+        private static partial Regex REG_GIT_VERSION();
+
+        private static readonly Version MINIMAL_GIT_VERSION = new Version(2, 23, 0);
     }
 }
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index b379bb96..e0c6cf95 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -308,7 +308,7 @@
   <x:String x:Key="Text.Preference.Git.User" xml:space="preserve">User Name</x:String>
   <x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">Global git user name</x:String>
   <x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Git version</x:String>
-  <x:String x:Key="Text.Preference.Git.VersionUnderRecommend" xml:space="preserve">Git version is empty or lower than the recommended 2.23.0, exceptions may occur</x:String>
+  <x:String x:Key="Text.Preference.Git.Invalid" xml:space="preserve">Git (>= 2.23.0) is required by this app</x:String>
   <x:String x:Key="Text.Preference.GPG" xml:space="preserve">GPG SIGNING</x:String>
   <x:String x:Key="Text.Preference.GPG.Enabled" xml:space="preserve">Commit GPG signing</x:String>
   <x:String x:Key="Text.Preference.GPG.Path" xml:space="preserve">Install Path</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 0c3ac3d1..5f0dfbe9 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -308,7 +308,7 @@
   <x:String x:Key="Text.Preference.Git.User" xml:space="preserve">用户名</x:String>
   <x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">默认GIT用户名</x:String>
   <x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Git 版本</x:String>
-  <x:String x:Key="Text.Preference.Git.VersionUnderRecommend" xml:space="preserve">Git 版本为空或低于推荐的2.23.0，可能出现异常</x:String>
+  <x:String x:Key="Text.Preference.Git.Invalid" xml:space="preserve">本软件要求GIT最低版本为2.23.0</x:String>
   <x:String x:Key="Text.Preference.GPG" xml:space="preserve">GPG签名</x:String>
   <x:String x:Key="Text.Preference.GPG.Enabled" xml:space="preserve">启用提交签名</x:String>
   <x:String x:Key="Text.Preference.GPG.Path" xml:space="preserve">可执行文件位置</x:String>
diff --git a/src/Views/Preference.axaml b/src/Views/Preference.axaml
index 39afd4ea..6500e3e1 100644
--- a/src/Views/Preference.axaml
+++ b/src/Views/Preference.axaml
@@ -251,13 +251,18 @@
                        Text="{DynamicResource Text.Preference.Git.Version}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
-            <Grid Grid.Row="1" Grid.Column="1" ColumnDefinitions="Auto,Auto">
-              <TextBlock Grid.Column="0" Text="{Binding #me.GitVersion, Mode=TwoWay}"/>
-              <Grid Grid.Column="1" ToolTip.Tip="{DynamicResource Text.Preference.Git.VersionUnderRecommend}" HorizontalAlignment="Left"
-                    Background="Transparent" IsVisible="{Binding #me.GitVersion, Converter={x:Static c:StringConverters.UnderRecommendGitVersion}}">
-                <Path Width="14" Height="14" Margin="10,0,0,0" Data="{StaticResource Icons.Error}" Fill="Red"/>
-              </Grid>
-            </Grid>
+            <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal">
+              <TextBlock Classes="monospace" 
+                         Margin="0,0,8,0"
+                         Text="{Binding #me.GitVersion}" 
+                         IsVisible="{Binding #me.GitVersion, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+
+              <Border Background="Transparent"
+                      ToolTip.Tip="{DynamicResource Text.Preference.Git.Invalid}"
+                      IsVisible="{Binding #me.GitVersion, Converter={x:Static c:StringConverters.UnderRecommendGitVersion}}">
+                <Path Width="14" Height="14" Data="{StaticResource Icons.Error}" Fill="Red"/>
+              </Border>
+            </StackPanel>
 
             <Border Grid.Row="2" Grid.Column="0"
                     Height="32"

From ec2d9c4cbe6eede3a858ac91da054b6008150b59 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 29 May 2024 19:43:46 +0800
Subject: [PATCH 5/5] enhance: the character between version's minor and build
 part maybe '-'

---
 src/Converters/StringConverters.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Converters/StringConverters.cs b/src/Converters/StringConverters.cs
index 364d856b..35491a16 100644
--- a/src/Converters/StringConverters.cs
+++ b/src/Converters/StringConverters.cs
@@ -87,7 +87,7 @@ namespace SourceGit.Converters
                 return true;
             });
 
-        [GeneratedRegex(@"^[\s\w]*(\d+)\.(\d+)\.(\d+).*$")]
+        [GeneratedRegex(@"^[\s\w]*(\d+)\.(\d+)[\.\-](\d+).*$")]
         private static partial Regex REG_GIT_VERSION();
 
         private static readonly Version MINIMAL_GIT_VERSION = new Version(2, 23, 0);