From bcb83af576ecd1460be158ba44a356e34401fc1a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 3 Apr 2024 17:34:06 +0800
Subject: [PATCH] ux: new style for statistics page

---
 src/Resources/Locales.Designer.cs |  4 +-
 src/Resources/Locales.en.resx     |  4 +-
 src/Resources/Locales.resx        |  4 +-
 src/Resources/Locales.zh.resx     |  4 +-
 src/Views/Statistics.axaml        | 79 ++++++++++++++++---------------
 src/Views/Statistics.axaml.cs     |  5 +-
 6 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/src/Resources/Locales.Designer.cs b/src/Resources/Locales.Designer.cs
index 95057ce3..1ac0e291 100644
--- a/src/Resources/Locales.Designer.cs
+++ b/src/Resources/Locales.Designer.cs
@@ -3607,7 +3607,7 @@ namespace SourceGit.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Total Commits.
+        ///   Looks up a localized string similar to COMMITS: .
         /// </summary>
         public static string Text_Statistics_TotalCommits {
             get {
@@ -3616,7 +3616,7 @@ namespace SourceGit.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Total Committers.
+        ///   Looks up a localized string similar to COMMITTERS: .
         /// </summary>
         public static string Text_Statistics_TotalCommitters {
             get {
diff --git a/src/Resources/Locales.en.resx b/src/Resources/Locales.en.resx
index 8849efe4..fc8f7760 100644
--- a/src/Resources/Locales.en.resx
+++ b/src/Resources/Locales.en.resx
@@ -1201,10 +1201,10 @@
     <value>YEAR</value>
   </data>
   <data xml:space="preserve" name="Text.Statistics.TotalCommitters">
-    <value>Total Committers</value>
+    <value>COMMITTERS: </value>
   </data>
   <data xml:space="preserve" name="Text.Statistics.TotalCommits">
-    <value>Total Commits</value>
+    <value>COMMITS: </value>
   </data>
   <data xml:space="preserve" name="Text.Statistics.Committer">
     <value>COMMITTER</value>
diff --git a/src/Resources/Locales.resx b/src/Resources/Locales.resx
index a251fd09..441988ec 100644
--- a/src/Resources/Locales.resx
+++ b/src/Resources/Locales.resx
@@ -1201,10 +1201,10 @@
     <value>YEAR</value>
   </data>
   <data xml:space="preserve" name="Text.Statistics.TotalCommitters">
-    <value>Total Committers</value>
+    <value>COMMITTERS: </value>
   </data>
   <data xml:space="preserve" name="Text.Statistics.TotalCommits">
-    <value>Total Commits</value>
+    <value>COMMITS: </value>
   </data>
   <data xml:space="preserve" name="Text.Statistics.Committer">
     <value>COMMITTER</value>
diff --git a/src/Resources/Locales.zh.resx b/src/Resources/Locales.zh.resx
index 6ca5b02b..b4f350ba 100644
--- a/src/Resources/Locales.zh.resx
+++ b/src/Resources/Locales.zh.resx
@@ -1198,10 +1198,10 @@
     <value>本年</value>
   </data>
   <data xml:space="preserve" name="Text.Statistics.TotalCommitters">
-    <value>提交者人数</value>
+    <value>提交者: </value>
   </data>
   <data xml:space="preserve" name="Text.Statistics.TotalCommits">
-    <value>总计提交次数</value>
+    <value>提交次数: </value>
   </data>
   <data xml:space="preserve" name="Text.Statistics.Committer">
     <value>提交者</value>
diff --git a/src/Views/Statistics.axaml b/src/Views/Statistics.axaml
index 90257549..2caa1d02 100644
--- a/src/Views/Statistics.axaml
+++ b/src/Views/Statistics.axaml
@@ -128,47 +128,52 @@
     <ContentControl Grid.Row="2" Content="{Binding SelectedReport, Mode=OneWay}">
       <ContentControl.DataTemplates>
         <DataTemplate DataType="m:StatisticsReport">
-          <Grid RowDefinitions="*,32" ColumnDefinitions="256,*" Margin="8">
-            <!-- Table By Committer -->
-            <DataGrid Grid.Row="0" Grid.Column="0"
-                      ItemsSource="{Binding ByCommitter}"
-                      SelectionMode="Single"
-                      CanUserReorderColumns="False"
-                      CanUserResizeColumns="False"
-                      CanUserSortColumns="False"
-                      HeadersVisibility="Column"
-                      GridLinesVisibility="All"
-                      BorderThickness="1"
-                      BorderBrush="{DynamicResource Brush.Border1}"
-                      Background="{DynamicResource Brush.Contents}"
-                      IsReadOnly="True"
-                      RowHeight="26"
-                      HorizontalScrollBarVisibility="Disabled"
-                      VerticalScrollBarVisibility="Auto">
-              <DataGrid.Columns>
-                <DataGridTextColumn Width="150" Header="{DynamicResource Text.Statistics.Committer}" Binding="{Binding Name}"/>
-                <DataGridTextColumn Width="*" Header="{DynamicResource Text.Statistics.CommitAmount}" Binding="{Binding Count}"/>
-              </DataGrid.Columns>
-            </DataGrid>
+          <Grid ColumnDefinitions="256,*" Margin="8,8,8,16">
+            <Grid Grid.Column="0" RowDefinitions="*,16">
+              <!-- Table By Committer -->
+              <DataGrid Grid.Row="0"
+                        ItemsSource="{Binding ByCommitter}"
+                        SelectionMode="Single"
+                        CanUserReorderColumns="False"
+                        CanUserResizeColumns="False"
+                        CanUserSortColumns="False"
+                        HeadersVisibility="Column"
+                        GridLinesVisibility="All"
+                        BorderThickness="1"
+                        BorderBrush="{DynamicResource Brush.Border1}"
+                        Background="{DynamicResource Brush.Contents}"
+                        IsReadOnly="True"
+                        RowHeight="26"
+                        HorizontalScrollBarVisibility="Disabled"
+                        VerticalScrollBarVisibility="Auto">
+                <DataGrid.Columns>
+                  <DataGridTextColumn Width="150" Header="{DynamicResource Text.Statistics.Committer}" Binding="{Binding Name}"/>
+                  <DataGridTextColumn Width="*" Header="{DynamicResource Text.Statistics.CommitAmount}" Binding="{Binding Count}"/>
+                </DataGrid.Columns>
+              </DataGrid>
 
-            <!-- Total Committers -->
-            <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal">
-              <TextBlock Text="{DynamicResource Text.Statistics.TotalCommitters}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
-              <TextBlock Text="{Binding ByCommitter.Count}" Margin="4,0,0,0"/>
-            </StackPanel>
+              <!-- Summary -->
+              <Grid Grid.Row="1" ColumnDefinitions="*,*">
+                <!-- Total Committers -->
+                <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Bottom">
+                  <TextBlock Classes="monospace" Text="{DynamicResource Text.Statistics.TotalCommitters}" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
+                  <TextBlock Classes="monospace" Text="{Binding ByCommitter.Count}" FontSize="11" Margin="4,0,0,0"/>
+                </StackPanel>
+
+                <!-- Total Commits -->
+                <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom">
+                  <TextBlock Classes="monospace" Text="{DynamicResource Text.Statistics.TotalCommits}" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
+                  <TextBlock Classes="monospace" Text="{Binding Total}" FontSize="11" Margin="4,0,0,0"/>
+                </StackPanel>
+              </Grid>
+            </Grid>            
 
             <!-- Graph -->
-            <v:Chart Grid.Row="0" Grid.Column="1"
-                     Margin="16,8,0,0"
-                     LineBrush="{DynamicResource Brush.FG1}"
+            <v:Chart Grid.Column="1"
+                     Margin="16,0,0,0"
+                     LineBrush="{DynamicResource Brush.Border1}"
                      ShapeBrush="{DynamicResource Brush.Accent1}"
-                     Samples="{Binding Samples}"/>
-
-            <!-- Total Commits -->
-            <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-              <TextBlock Text="{DynamicResource Text.Statistics.TotalCommits}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
-              <TextBlock Text="{Binding Total}" Margin="4,0,0,0"/>
-            </StackPanel>
+                     Samples="{Binding Samples}"/>            
           </Grid>
         </DataTemplate>
       </ContentControl.DataTemplates>
diff --git a/src/Views/Statistics.axaml.cs b/src/Views/Statistics.axaml.cs
index 6a5f16a0..b44da160 100644
--- a/src/Views/Statistics.axaml.cs
+++ b/src/Views/Statistics.axaml.cs
@@ -104,8 +104,7 @@ namespace SourceGit.Views
             var horizonStart = maxLabel.Width + 8;
             var labelHeight = maxLabel.Height;
             context.DrawText(maxLabel, new Point(0, -maxLabel.Height * 0.5));
-            context.DrawLine(pen, new Point(horizonStart, 0), new Point(horizonStart, height - labelHeight));
-            context.DrawLine(pen, new Point(horizonStart, height - labelHeight), new Point(width, height - labelHeight));
+            context.DrawRectangle(pen, new Rect(horizonStart, 0, width - horizonStart, height - labelHeight));
 
             if (samples.Count == 0)
                 return;
@@ -114,7 +113,7 @@ namespace SourceGit.Views
             var stepX = (width - horizonStart) / samples.Count;
             var stepV = (height - labelHeight) / 5;
             var labelStepV = maxV / 5;
-            var gridPen = new Pen(LineBrush, 1, new DashStyle());
+            var gridPen = new Pen(LineBrush, 1, new DashStyle() { Dashes = [2, 2, 0, 2], Offset = 1 });
             for (int i = 1; i < 5; i++)
             {
                 var vLabel = new FormattedText(