rebuild(animation): implement base animation chained calling

Author: whitecat346

PCL.Neo/.editorconfig

@@ -27,7 +27,7 @@ dotnet_search_reference_assemblies = true
 # 组织 Using
 dotnet_separate_import_directive_groups = false
 dotnet_sort_system_directives_first = false
-file_header_template = unset
+file_header_template = 
 
 # this. 和 Me. 首选项
 dotnet_style_qualification_for_event = false
@@ -219,28 +219,31 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
 
 dotnet_naming_symbols.interface.applicable_kinds = interface
 dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.interface.required_modifiers =
+dotnet_naming_symbols.interface.required_modifiers = 
 
 dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
 dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.types.required_modifiers =
+dotnet_naming_symbols.types.required_modifiers = 
 
 dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
 dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.non_field_members.required_modifiers =
+dotnet_naming_symbols.non_field_members.required_modifiers = 
 
 # 命名样式
 
-dotnet_naming_style.pascal_case.required_prefix =
-dotnet_naming_style.pascal_case.required_suffix =
-dotnet_naming_style.pascal_case.word_separator =
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
 dotnet_naming_style.pascal_case.capitalization = pascal_case
 
 dotnet_naming_style.begins_with_i.required_prefix = I
-dotnet_naming_style.begins_with_i.required_suffix =
-dotnet_naming_style.begins_with_i.word_separator =
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
 dotnet_naming_style.begins_with_i.capitalization = pascal_case
 
+# ReSharper properties
+resharper_int_align = false
+
 [*.{cs,vb}]
 end_of_line = crlf
 dotnet_style_qualification_for_field = false:silent

PCL.Neo/Animations/AnimationExtensions.cs

@@ -6,7 +6,6 @@
 using Avalonia.Styling;
 using PCL.Neo.Animations.Easings;
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace PCL.Neo.Animations
@@ -28,7 +27,7 @@ public static Easing GetEasing(this EasingType easingType)
                 EasingType.CubicEaseOut => new CubicEaseOut(),
                 EasingType.CubicEaseInOut => new CubicEaseInOut(),
                 EasingType.QuarticEaseIn => new QuarticEaseIn(),
-                EasingType.QuarticEaseOut => new QuarticEaseOut(), 
+                EasingType.QuarticEaseOut => new QuarticEaseOut(),
                 EasingType.QuarticEaseInOut => new QuarticEaseInOut(),
                 EasingType.QuinticEaseIn => new QuinticEaseIn(),
                 EasingType.QuinticEaseOut => new QuinticEaseOut(),
@@ -65,56 +64,52 @@ public static async Task SlideInFromRightAsync(this Control control, int duratio
             // 保存原始状态
             var originalOpacity = control.Opacity;
             var originalTransform = control.RenderTransform;
-            
+
             // 设置初始状态
             control.Opacity = 0;
             control.RenderTransform = new TranslateTransform(100, 0);
-            
+
             // 等待UI更新
             await Task.Delay(10);
-            
+
             // 创建不透明度动画
             var opacityAnimation = new Animation
             {
                 Duration = TimeSpan.FromMilliseconds(duration),
                 FillMode = FillMode.Forward,
                 Easing = easingType.GetEasing()
             };
-            
+
             // 使用正确的Setter语法
-            var opacityFrame1 = new KeyFrame();
-            opacityFrame1.Cue = new Cue(0d);
+            var opacityFrame1 = new KeyFrame { Cue = new Cue(0d) };
             opacityFrame1.Setters.Add(new Setter(Visual.OpacityProperty, 0d));
             opacityAnimation.Children.Add(opacityFrame1);
-            
-            var opacityFrame2 = new KeyFrame();
-            opacityFrame2.Cue = new Cue(1d);
+
+            var opacityFrame2 = new KeyFrame { Cue = new Cue(1d) };
             opacityFrame2.Setters.Add(new Setter(Visual.OpacityProperty, originalOpacity));
             opacityAnimation.Children.Add(opacityFrame2);
-            
+
             // 创建位移动画
             var translateAnimation = new Animation
             {
                 Duration = TimeSpan.FromMilliseconds(duration),
                 FillMode = FillMode.Forward,
                 Easing = easingType.GetEasing()
             };
-            
-            var translateFrame1 = new KeyFrame();
-            translateFrame1.Cue = new Cue(0d);
+
+            var translateFrame1 = new KeyFrame { Cue = new Cue(0d) };
             translateFrame1.Setters.Add(new Setter(Visual.RenderTransformProperty, new TranslateTransform(100, 0)));
             translateAnimation.Children.Add(translateFrame1);
-            
-            var translateFrame2 = new KeyFrame();
-            translateFrame2.Cue = new Cue(1d);
+
+            var translateFrame2 = new KeyFrame { Cue = new Cue(1d) };
             translateFrame2.Setters.Add(new Setter(Visual.RenderTransformProperty, originalTransform ?? new TranslateTransform(0, 0)));
             translateAnimation.Children.Add(translateFrame2);
-            
+
             // 执行动画
             await opacityAnimation.RunAsync(control);
             await translateAnimation.RunAsync(control);
         }
-        
+
         /// <summary>
         /// 从左侧滑入动画
         /// </summary>
@@ -125,55 +120,51 @@ public static async Task SlideInFromLeftAsync(this Control control, int duration
             // 保存原始状态
             var originalOpacity = control.Opacity;
             var originalTransform = control.RenderTransform;
-            
+
             // 设置初始状态
             control.Opacity = 0;
             control.RenderTransform = new TranslateTransform(-100, 0);
-            
+
             // 等待UI更新
             await Task.Delay(10);
-            
+
             // 创建不透明度动画
             var opacityAnimation = new Animation
             {
                 Duration = TimeSpan.FromMilliseconds(duration),
                 FillMode = FillMode.Forward,
                 Easing = easingType.GetEasing()
             };
-            
-            var opacityFrame1 = new KeyFrame();
-            opacityFrame1.Cue = new Cue(0d);
+
+            var opacityFrame1 = new KeyFrame { Cue = new Cue(0d) };
             opacityFrame1.Setters.Add(new Setter(Visual.OpacityProperty, 0d));
             opacityAnimation.Children.Add(opacityFrame1);
-            
-            var opacityFrame2 = new KeyFrame();
-            opacityFrame2.Cue = new Cue(1d);
+
+            var opacityFrame2 = new KeyFrame { Cue = new Cue(1d) };
             opacityFrame2.Setters.Add(new Setter(Visual.OpacityProperty, originalOpacity));
             opacityAnimation.Children.Add(opacityFrame2);
-            
+
             // 创建位移动画
             var translateAnimation = new Animation
             {
                 Duration = TimeSpan.FromMilliseconds(duration),
                 FillMode = FillMode.Forward,
                 Easing = easingType.GetEasing()
             };
-            
-            var translateFrame1 = new KeyFrame();
-            translateFrame1.Cue = new Cue(0d);
+
+            var translateFrame1 = new KeyFrame { Cue = new Cue(0d) };
             translateFrame1.Setters.Add(new Setter(Visual.RenderTransformProperty, new TranslateTransform(-100, 0)));
             translateAnimation.Children.Add(translateFrame1);
-            
-            var translateFrame2 = new KeyFrame();
-            translateFrame2.Cue = new Cue(1d);
+
+            var translateFrame2 = new KeyFrame { Cue = new Cue(1d) };
             translateFrame2.Setters.Add(new Setter(Visual.RenderTransformProperty, originalTransform ?? new TranslateTransform(0, 0)));
             translateAnimation.Children.Add(translateFrame2);
-            
+
             // 执行动画
             await opacityAnimation.RunAsync(control);
             await translateAnimation.RunAsync(control);
         }
-        
+
         /// <summary>
         /// 淡入动画
         /// </summary>
@@ -183,35 +174,33 @@ public static async Task FadeInAsync(this Control control, int duration = 300, E
 
             // 保存原始状态
             var originalOpacity = control.Opacity;
-            
+
             // 设置初始状态
             control.Opacity = 0;
-            
+
             // 等待UI更新
             await Task.Delay(10);
-            
+
             // 创建不透明度动画
             var opacityAnimation = new Animation
             {
                 Duration = TimeSpan.FromMilliseconds(duration),
                 FillMode = FillMode.Forward,
                 Easing = easingType.GetEasing()
             };
-            
-            var opacityFrame1 = new KeyFrame();
-            opacityFrame1.Cue = new Cue(0d);
+
+            var opacityFrame1 = new KeyFrame { Cue = new Cue(0d) };
             opacityFrame1.Setters.Add(new Setter(Visual.OpacityProperty, 0d));
             opacityAnimation.Children.Add(opacityFrame1);
-            
-            var opacityFrame2 = new KeyFrame();
-            opacityFrame2.Cue = new Cue(1d);
+
+            var opacityFrame2 = new KeyFrame { Cue = new Cue(1d) };
             opacityFrame2.Setters.Add(new Setter(Visual.OpacityProperty, originalOpacity));
             opacityAnimation.Children.Add(opacityFrame2);
-            
+
             // 执行动画
             await opacityAnimation.RunAsync(control);
         }
-        
+
         /// <summary>
         /// 淡出动画
         /// </summary>
@@ -221,33 +210,31 @@ public static async Task FadeOutAsync(this Control control, int duration = 300,
 
             // 保存原始状态
             var originalOpacity = control.Opacity;
-            
+
             // 等待UI更新
             await Task.Delay(10);
-            
+
             // 创建不透明度动画
             var opacityAnimation = new Animation
             {
                 Duration = TimeSpan.FromMilliseconds(duration),
                 FillMode = FillMode.Forward,
                 Easing = easingType.GetEasing()
             };
-            
-            var opacityFrame1 = new KeyFrame();
-            opacityFrame1.Cue = new Cue(0d);
+
+            var opacityFrame1 = new KeyFrame { Cue = new Cue(0d) };
             opacityFrame1.Setters.Add(new Setter(Visual.OpacityProperty, originalOpacity));
             opacityAnimation.Children.Add(opacityFrame1);
-            
-            var opacityFrame2 = new KeyFrame();
-            opacityFrame2.Cue = new Cue(1d);
+
+            var opacityFrame2 = new KeyFrame { Cue = new Cue(1d) };
             opacityFrame2.Setters.Add(new Setter(Visual.OpacityProperty, 0d));
             opacityAnimation.Children.Add(opacityFrame2);
-            
+
             // 执行动画
             await opacityAnimation.RunAsync(control);
-            
+
             // 设置最终状态
             control.Opacity = 0;
         }
     }
-} 
+}

PCL.Neo/Animations/BaseAnimation.cs

@@ -7,41 +7,38 @@
 namespace PCL.Neo.Animations
 {
     public abstract class BaseAnimation(
-        Animatable control,
-        double? before = null,
-        double? after = null,
-        Easing? easing = null,
-        TimeSpan? duration = null,
-        TimeSpan? delay = null,
-        bool wait = true)
+        WeakReference<Animatable> control,
+        double begin,
+        double end,
+        Easing easing,
+        TimeSpan duration,
+        TimeSpan delay)
         : IAnimation
     {
         /// <inheritdoc />
-        public bool Wait { get; set; } = wait;
-
-        /// <inheritdoc />
-        public TimeSpan Delay { get; set; } = delay ?? TimeSpan.Zero;
+        public TimeSpan Delay { get; set; } = delay;
 
         private readonly CancellationTokenSource _cancellationTokenSource = new();
-        public Animatable Control { get; set; } = control;
-        public TimeSpan Duration { get; set; } = duration ?? TimeSpan.FromMilliseconds(250);
-        public double? Before { get; set; } = before ?? 0d;
-        public double? After { get; set; } = after ?? 0.953d;
-        public Easing Easing { get; set; } = easing ?? new LinearEasing();
+        private WeakReference<Animatable> Control { get; } = control;
+        protected TimeSpan Duration { get; } = duration;
+        protected double? Begin { get; } = begin;
+        protected double? End { get; } = end;
+        protected Easing Easing { get; } = easing;
 
-        /// <summary>
-        /// Build the animation
-        /// </summary>
-        /// <returns><see cref="Animation"/> The animation</returns>
+        /// <inheritdoc />
         public abstract Animation AnimationBuilder();
 
         /// <inheritdoc />
-        public async Task RunAsync() => await AnimationBuilder().RunAsync(Control, _cancellationTokenSource.Token);
+        public async Task RunAsync()
+        {
+            Control.TryGetTarget(out var target);
+            await AnimationBuilder().RunAsync(target, _cancellationTokenSource.Token);
+        }
 
         /// <inheritdoc />
         public void Cancel()
         {
             _cancellationTokenSource.Cancel();
         }
     }
-}
+}

PCL.Neo/Animations/Easings/EasingType.cs

@@ -34,4 +34,4 @@ public enum EasingType
         BounceEaseOut,
         BounceEaseInOut
     }
-} 
+}

PCL.Neo/Animations/IAnimation.cs

@@ -1,3 +1,4 @@
+using Avalonia.Animation;
 using System;
 using System.Threading.Tasks;
 
@@ -9,14 +10,18 @@ public interface IAnimation
     /// 延迟。
     /// </summary>
     TimeSpan Delay { get; set; }
+
     /// <summary>
-    /// 指示动画是否要等待上一个动画完成后再执行。与 AnimationHelper 搭配使用。
+    /// Build the animation
     /// </summary>
-    bool Wait { get; set; }
+    /// <returns><see cref="Animation"/> The animation</returns>
+    public abstract Animation AnimationBuilder();
+
     /// <summary>
     /// 异步形式执行动画。
     /// </summary>
     Task RunAsync();
+
     /// <summary>
     /// 取消动画。
     /// </summary>