From 762e51de74f78febf6649396e5418309cf9e57e9 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 2 Apr 2021 19:29:05 +0800
Subject: [PATCH] optimize<WorkingCopy>: use animated icon instead of waiting
 panel for committing status

---
 src/Resources/Locales/en_US.xaml |  1 -
 src/Resources/Locales/zh_CN.xaml |  1 -
 src/UI/WorkingCopy.xaml          | 12 ++++++++++--
 src/UI/WorkingCopy.xaml.cs       | 16 +++++++++++-----
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/Resources/Locales/en_US.xaml b/src/Resources/Locales/en_US.xaml
index 376eae91..09702b2e 100644
--- a/src/Resources/Locales/en_US.xaml
+++ b/src/Resources/Locales/en_US.xaml
@@ -413,7 +413,6 @@
 
     <sys:String x:Key="Text.Waiting.UpdateSubmodule">WAITING SUBMOUDLE UPDATE COMPLETE...</sys:String>
     <sys:String x:Key="Text.Waiting.Staging">WAITING STAGE COMPLETE...</sys:String>
-    <sys:String x:Key="Text.Waiting.Commit">WAITING COMMIT COMPLETE ...</sys:String>
 
     <sys:String x:Key="Text.NotConfigured">Git has NOT been configured.\nPlease to go [Preference] and configure it first.</sys:String>
     <sys:String x:Key="Text.PathNotFound">Path[{0}] not exists!</sys:String>
diff --git a/src/Resources/Locales/zh_CN.xaml b/src/Resources/Locales/zh_CN.xaml
index 1abf5d71..83833b45 100644
--- a/src/Resources/Locales/zh_CN.xaml
+++ b/src/Resources/Locales/zh_CN.xaml
@@ -413,7 +413,6 @@
 
     <sys:String x:Key="Text.Waiting.UpdateSubmodule">等待子模块更新完成...</sys:String>
     <sys:String x:Key="Text.Waiting.Staging">等待暂存完成 ...</sys:String>
-    <sys:String x:Key="Text.Waiting.Commit">等待提交完成 ...</sys:String>
 
     <sys:String x:Key="Text.NotConfigured">GIT尚未配置。请打开【偏好设置】配置GIT路径。</sys:String>
 	<sys:String x:Key="Text.PathNotFound">路径（{0}）不存在或不可读取!</sys:String>
diff --git a/src/UI/WorkingCopy.xaml b/src/UI/WorkingCopy.xaml
index 68b00bdf..6e14a1d0 100644
--- a/src/UI/WorkingCopy.xaml
+++ b/src/UI/WorkingCopy.xaml
@@ -418,6 +418,7 @@
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
 
                 <Button Grid.Column="0" Width="16" Height="16" Margin="0,0,8,0" Click="OpenCommitMessageSelector" ToolTip="{StaticResource Text.WorkingCopy.MessageHistories}">
@@ -426,8 +427,15 @@
 
                 <CheckBox Grid.Column="1" x:Name="chkAmend" HorizontalAlignment="Left" Content="{StaticResource Text.WorkingCopy.Amend}" Checked="StartAmend" Unchecked="EndAmend"/>
 
-                <Button Grid.Column="3" Height="26" Click="Commit" Style="{StaticResource Style.Button.AccentBordered}" Content="{StaticResource Text.WorkingCopy.Commit}"/>
-                <Button Grid.Column="4" x:Name="btnCommitAndPush" Height="26" Click="CommitAndPush" Style="{StaticResource Style.Button.Bordered}" Content="{StaticResource Text.WorkingCopy.CommitAndPush}" Margin="8,0,0,0"/>
+                <!-- Loading tip -->
+                <Path x:Name="iconCommiting" Grid.Column="3" Visibility="Collapsed" Margin="8,0" Data="{StaticResource Icon.Loading}" RenderTransformOrigin=".5,.5">
+                    <Path.RenderTransform>
+                        <RotateTransform Angle="0"/>
+                    </Path.RenderTransform>
+                </Path>
+                
+                <Button Grid.Column="4" Height="26" Click="Commit" Style="{StaticResource Style.Button.AccentBordered}" Content="{StaticResource Text.WorkingCopy.Commit}"/>
+                <Button Grid.Column="5" x:Name="btnCommitAndPush" Height="26" Click="CommitAndPush" Style="{StaticResource Style.Button.Bordered}" Content="{StaticResource Text.WorkingCopy.CommitAndPush}" Margin="8,0,0,0"/>
             </Grid>
         </Grid>
     </Grid>
diff --git a/src/UI/WorkingCopy.xaml.cs b/src/UI/WorkingCopy.xaml.cs
index 41274d90..940d0ed3 100644
--- a/src/UI/WorkingCopy.xaml.cs
+++ b/src/UI/WorkingCopy.xaml.cs
@@ -11,6 +11,7 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Media.Animation;
 
 namespace SourceGit.UI {
 
@@ -914,7 +915,7 @@ namespace SourceGit.UI {
             }
         }
 
-        private void Commit(object sender, RoutedEventArgs e) {
+        private async void Commit(object sender, RoutedEventArgs e) {
             foreach (var c in UnstagedListData) {
                 if (c.IsConflit) {
                     App.RaiseError("You have unsolved conflicts in your working copy!");
@@ -933,10 +934,15 @@ namespace SourceGit.UI {
             txtCommitMsg.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             if (Validation.GetHasError(txtCommitMsg)) return;
 
-            Waiting.Show(Repo, "Text.Waiting.Commit", () => {
-                bool succ = Repo.DoCommit(CommitMessage, amend);
-                if (succ) Dispatcher.Invoke(ClearMessage);
-            });
+            DoubleAnimation anim = new DoubleAnimation(0, 360, TimeSpan.FromSeconds(1));
+            anim.RepeatBehavior = RepeatBehavior.Forever;
+            iconCommiting.RenderTransform.BeginAnimation(RotateTransform.AngleProperty, anim);
+            iconCommiting.Visibility = Visibility.Visible;
+
+            bool succ = await Task.Run(() => Repo.DoCommit(CommitMessage, amend));
+            if (succ) Dispatcher.Invoke(ClearMessage);
+            iconCommiting.RenderTransform.BeginAnimation(RotateTransform.AngleProperty, null);
+            iconCommiting.Visibility = Visibility.Collapsed;
         }
 
         private async void CommitAndPush(object sender, RoutedEventArgs e) {