From f830da7799dce88cb435d2ac082a5a936f14fde9 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 5 Sep 2024 18:41:55 +0800
Subject: [PATCH] feat: animation.

---
 src/Ursa.Themes.Semi/Controls/Toast.axaml     | 35 +++++++++----------
 src/Ursa/Controls/Toast/Toast.cs              |  3 +-
 src/Ursa/Controls/Toast/WindowToastManager.cs |  2 +-
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/Toast.axaml b/src/Ursa.Themes.Semi/Controls/Toast.axaml
index e05f082..256140b 100644
--- a/src/Ursa.Themes.Semi/Controls/Toast.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Toast.axaml
@@ -99,21 +99,18 @@
             <Animation
                 Easing="QuadraticEaseIn"
                 FillMode="Forward"
-                Duration="0:0:0.45">
+                Duration="0:0:0.3">
                 <KeyFrame Cue="0%">
                     <Setter Property="Opacity" Value="0" />
-                    <Setter Property="TranslateTransform.Y" Value="20" />
-                    <Setter Property="ScaleTransform.ScaleX" Value="0.85" />
-                    <Setter Property="ScaleTransform.ScaleY" Value="0.85" />
-                </KeyFrame>
-                <KeyFrame Cue="30%">
-                    <Setter Property="TranslateTransform.Y" Value="-20" />
                 </KeyFrame>
                 <KeyFrame Cue="100%">
                     <Setter Property="Opacity" Value="1" />
+                </KeyFrame>
+                <KeyFrame KeySpline="0.22,0.57,0.02,1.2" Cue="0%">
+                    <Setter Property="TranslateTransform.Y" Value="-100" />
+                </KeyFrame>
+                <KeyFrame KeySpline="0.22,0.57,0.02,1.2" Cue="100%">
                     <Setter Property="TranslateTransform.Y" Value="0" />
-                    <Setter Property="ScaleTransform.ScaleX" Value="1" />
-                    <Setter Property="ScaleTransform.ScaleY" Value="1" />
                 </KeyFrame>
             </Animation>
         </ControlTheme.Animations>
@@ -124,18 +121,18 @@
                 <Animation
                     Easing="QuadraticEaseOut"
                     FillMode="Forward"
-                    Duration="0:0:0.75">
+                    Duration="0:0:0.3">
                     <KeyFrame Cue="0%">
-                        <Setter Property="TranslateTransform.X" Value="0" />
-                        <Setter Property="ScaleTransform.ScaleY" Value="1" />
-                    </KeyFrame>
-                    <KeyFrame Cue="70%">
-                        <Setter Property="TranslateTransform.X" Value="800" />
-                        <Setter Property="ScaleTransform.ScaleY" Value="1" />
+                        <Setter Property="Opacity" Value="1" />
                     </KeyFrame>
                     <KeyFrame Cue="100%">
-                        <Setter Property="ScaleTransform.ScaleY" Value="0" />
-                        <Setter Property="TranslateTransform.X" Value="800" />
+                        <Setter Property="Opacity" Value="0" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.22,0.57,0.02,1.2" Cue="0%">
+                        <Setter Property="TranslateTransform.Y" Value="0" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.22,0.57,0.02,1.2" Cue="100%">
+                        <Setter Property="TranslateTransform.Y" Value="-100" />
                     </KeyFrame>
                 </Animation>
             </Style.Animations>
@@ -146,7 +143,7 @@
                 <Animation
                     Easing="QuadraticEaseOut"
                     FillMode="Forward"
-                    Duration="0:0:1.25">
+                    Duration="0:0:0.3">
                     <KeyFrame Cue="100%">
                         <Setter Property="IsClosed" Value="True" />
                     </KeyFrame>
diff --git a/src/Ursa/Controls/Toast/Toast.cs b/src/Ursa/Controls/Toast/Toast.cs
index 1ec0acd..8352272 100644
--- a/src/Ursa/Controls/Toast/Toast.cs
+++ b/src/Ursa/Controls/Toast/Toast.cs
@@ -35,7 +35,8 @@ public class Toast : IToast, INotifyPropertyChanged
     {
         Content = content;
         Type = type;
-        Expiration = expiration ?? TimeSpan.FromSeconds(5);
+        Expiration = expiration ?? TimeSpan.FromSeconds(3);
+        ShowClose = showClose;
         OnClick = onClick;
         OnClose = onClose;
     }
diff --git a/src/Ursa/Controls/Toast/WindowToastManager.cs b/src/Ursa/Controls/Toast/WindowToastManager.cs
index 5d803a6..85d492f 100644
--- a/src/Ursa/Controls/Toast/WindowToastManager.cs
+++ b/src/Ursa/Controls/Toast/WindowToastManager.cs
@@ -146,7 +146,7 @@ public class WindowToastManager : TemplatedControl, IManagedToastManager
             return;
         }
 
-        await Task.Delay(expiration ?? TimeSpan.FromSeconds(5));
+        await Task.Delay(expiration ?? TimeSpan.FromSeconds(3));
 
         toastControl.Close();
     }