draft(animations): draft commit

whitecat346 · whitecat346 · commit b20b46e2f076 · 2025-06-06T12:25:57.000+08:00
ive gave up this rebuilding... too hard!
diff --git a/PCL.Neo/Animations/BaseAnimation.cs b/PCL.Neo/Animations/BaseAnimation.cs
@@ -1,14 +1,13 @@
 using Avalonia.Animation;
 using Avalonia.Animation.Easings;
-using Avalonia.Threading;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace PCL.Neo.Animations
 {
     public abstract class BaseAnimation(
-        WeakReference<Animatable> control,
+        Animatable control,
         double begin,
         double end,
         Easing easing,
@@ -23,7 +22,7 @@ public abstract class BaseAnimation(
         public bool Wait { get; } = wait;
 
         private readonly CancellationTokenSource _cancellationTokenSource = new();
-        private WeakReference<Animatable> Control { get; } = control;
+        private Animatable Control { get; } = control;
         protected TimeSpan Duration { get; } = duration;
         protected double? Begin { get; } = begin;
         protected double? End { get; } = end;
@@ -36,11 +35,7 @@ public abstract class BaseAnimation(
         /// <inheritdoc />
         public async Task RunAsync()
         {
-            Control.TryGetTarget(out var target);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                await AnimationBuilder().RunAsync(target, _cancellationTokenSource.Token);
-            });
+            await AnimationBuilder().RunAsync(Control, _cancellationTokenSource.Token);
         }
 
         /// <inheritdoc />
diff --git a/PCL.Neo/Animations/MarginAnimation.cs b/PCL.Neo/Animations/MarginAnimation.cs
@@ -13,7 +13,7 @@ namespace PCL.Neo.Animations
     /// </summary>
     /// <param name="begin">请自行添加 <see cref="GetCurrentMargin"/></param>
     public class MarginAnimation(
-        WeakReference<Animatable> control,
+        Animatable control,
         double begin,
         double end,
         Easing easing,
diff --git a/PCL.Neo/Animations/OpacityAnimation.cs b/PCL.Neo/Animations/OpacityAnimation.cs
@@ -7,7 +7,7 @@
 namespace PCL.Neo.Animations
 {
     public class OpacityAnimation(
-        WeakReference<Animatable> control,
+        Animatable control,
         double begin,
         double end,
         Easing easing,
diff --git a/PCL.Neo/Animations/RotateTransformAngleAnimation.cs b/PCL.Neo/Animations/RotateTransformAngleAnimation.cs
@@ -7,7 +7,7 @@
 namespace PCL.Neo.Animations
 {
     public class RotateTransformAngleAnimation(
-        WeakReference<Animatable> control,
+        Animatable control,
         double begin,
         double end,
         Easing easing,
diff --git a/PCL.Neo/Animations/ScaleTransformScaleAnimation.cs b/PCL.Neo/Animations/ScaleTransformScaleAnimation.cs
@@ -9,7 +9,7 @@ namespace PCL.Neo.Animations
     public record ScaleRate(double X, double Y);
 
     public class ScaleTransformScaleAnimation(
-        WeakReference<Animatable> control,
+        Animatable control,
         ScaleRate begin,
         ScaleRate end,
         Easing easing,
diff --git a/PCL.Neo/Animations/ScaleTransformScaleXAnimation.cs b/PCL.Neo/Animations/ScaleTransformScaleXAnimation.cs
@@ -7,7 +7,7 @@
 namespace PCL.Neo.Animations
 {
     public class ScaleTransformScaleXAnimation(
-        WeakReference<Animatable> control,
+        Animatable control,
         double begin,
         double end,
         Easing easing,
diff --git a/PCL.Neo/Animations/ScaleTransformScaleYAnimation.cs b/PCL.Neo/Animations/ScaleTransformScaleYAnimation.cs
@@ -7,7 +7,7 @@
 namespace PCL.Neo.Animations
 {
     public class ScaleTransformScaleYAnimation(
-        WeakReference<Animatable> control,
+        Animatable control,
         double begin,
         double end,
         Easing easing,
diff --git a/PCL.Neo/Animations/TranslateTransformAnimation.cs b/PCL.Neo/Animations/TranslateTransformAnimation.cs
@@ -9,7 +9,7 @@ namespace PCL.Neo.Animations
     public record Pos(double X, double Y);
 
     public class TranslateTransformAnimation(
-        WeakReference<Animatable> control,
+        Animatable control,
         Pos begin,
         Pos end,
         Easing easing,
diff --git a/PCL.Neo/Animations/TranslateTransformXAnimation.cs b/PCL.Neo/Animations/TranslateTransformXAnimation.cs
@@ -7,7 +7,7 @@
 namespace PCL.Neo.Animations
 {
     public class TranslateTransformXAnimation(
-        WeakReference<Animatable> control,
+        Animatable control,
         double begin,
         double end,
         Easing easing,
diff --git a/PCL.Neo/Animations/TranslateTransformYAnimation.cs b/PCL.Neo/Animations/TranslateTransformYAnimation.cs
@@ -7,7 +7,7 @@
 namespace PCL.Neo.Animations
 {
     public class TranslateTransformYAnimation(
-        WeakReference<Animatable> control,
+        Animatable control,
         double begin,
         double end,
         Easing easing,
diff --git a/PCL.Neo/Animations/XAnimation.cs b/PCL.Neo/Animations/XAnimation.cs
@@ -8,7 +8,7 @@
 namespace PCL.Neo.Animations
 {
     public class XAnimation(
-        WeakReference<Animatable> control,
+        Animatable control,
         Thickness begin,
         Thickness end,
         Easing easing,
diff --git a/PCL.Neo/Animations/YAnimation.cs b/PCL.Neo/Animations/YAnimation.cs
@@ -8,7 +8,7 @@
 namespace PCL.Neo.Animations
 {
     public class YAnimation(
-        WeakReference<Animatable> control,
+        Animatable control,
         Thickness begin,
         Thickness end,
         Easing easing,
diff --git a/PCL.Neo/Controls/MyLoading.axaml.cs b/PCL.Neo/Controls/MyLoading.axaml.cs
@@ -132,19 +132,21 @@ private void StartAnimation()
 
         private async Task AnimationErrorToLoadingAsync()
         {
-            // TODO: remake animation system
-            //_pathPickaxe.Animate().RotateTo(-20d, durationMs: 350, easing: new MyBackEaseIn()).RunAsync();
-            //_pathError.Animate().FadeTo(targetOpacity: 0d, durationMs: 100).ScaleTo(0.5d).RunAsync();
-
             await _pathPickaxe!.Animate()
-                .RotateFromTo(55d, -20d, duration: 350, easing: new MyBackEaseIn(EasePower.Weak)).RunAsync();
-            await _pathError!.Animate().FadeTo(1d, 100).ScaleFromTo(1d, 0.5d, 400).ScaleFromTo(1d, 0.5d, 100)
-                .ScaleFromTo(1d, 0.5d, 400).RunAsync();
+                .RotateFromTo(55d, -20d, duration: 350, easing: new MyBackEaseIn(EasePower.Weak))
+                .RunAsync();
+
+            await _pathError!.Animate()
+                .FadeTo(1d, 100)
+                .ScaleFromTo(1d, 0.5d, 100)
+                .ScaleFromTo(1d, 0.5d, 400)
+                .RunAsync();
             //_animation.CancelAndClear();
             //_animation.Animations.AddRange(
             //[
             //    new RotateTransformAngleAnimation(this._pathPickaxe!, duration: TimeSpan.FromMilliseconds(350),
             //        before: 55d, after: -20d, easing: new MyBackEaseIn(EasePower.Weak)),
+
             //    new OpacityAnimation(this._pathError!, duration: TimeSpan.FromMilliseconds(100), before: 0d),
             //    new ScaleTransformScaleXAnimation(this._pathError!, duration: TimeSpan.FromMilliseconds(100),
             //        before: 1d, after: 0.5d),
@@ -156,21 +158,21 @@ private async Task AnimationErrorToLoadingAsync()
 
         private async Task AnimationLoadingToErrorAsync()
         {
-            // TODO: remake animation system
-            //_pathPickaxe.Animate().RotateTo(55d, durationMs: 900, easing: new CubicEaseOut()).RunAsync();
-            //_pathError.Animate()
-            //    .FadeTo(targetOpacity: 1d, durationMs: 300)
-            //    .ScaleTo(1d, easing: new MyBackEaseOut())
-            //    .RunAsync();
-
-            await _pathPickaxe!.Animate().RotateTo(55d, duration: 900, easing: new CubicEaseOut()).RunAsync();
-            await _pathError!.Animate().FadeTo(1d, 300).ScaleFromTo(0.5d, 1d, 400, easing: new MyBackEaseOut())
-                .ScaleFromTo(0.5d, 1d, 400, easing: new MyBackEaseOut()).RunAsync();
+            await _pathPickaxe!.Animate()
+                .RotateTo(55d, duration: 900, easing: new CubicEaseOut())
+                .RunAsync();
+
+            await _pathError!.Animate()
+                .FadeTo(1d, 300)
+                .ScaleFromTo(0.5d, 1d, 400, easing: new MyBackEaseOut())
+                .ScaleFromTo(0.5d, 1d, 400, easing: new MyBackEaseOut())
+                .RunAsync();
             //_animation.CancelAndClear();
             //_animation.Animations.AddRange(
             //[
             //    new RotateTransformAngleAnimation(this._pathPickaxe!, duration: TimeSpan.FromMilliseconds(900),
             //        after: 55d, easing: new CubicEaseOut()),
+
             //    new OpacityAnimation(this._pathError!, duration: TimeSpan.FromMilliseconds(300), after: 1d),
             //    new ScaleTransformScaleXAnimation(this._pathError!, duration: TimeSpan.FromMilliseconds(400),
             //        before: 0.5d, after: 1d,
@@ -184,27 +186,28 @@ private async Task AnimationLoadingToErrorAsync()
         private async Task AnimationLoadingAsync()
         {
             // 循环动画，听说这里折磨龙猫很久(doge)
-            //_pathPickaxe.Animate()
-            //    .RotateTo(-20d, durationMs: 350, new MyBackEaseOut())
-            //    .RotateTo(55d, durationMs: 900, easing: new ElasticEaseOut())
-            //    .RotateTo(30d, durationMs: 180)
-            //    .RunAsync();
-            // TODO: implement loop animation
-
-            await _pathPickaxe!.LoopAnimate()
+
+            _ = _pathPickaxe!.Animate()
                 .RotateFromTo(55d, -20d, duration: 350, easing: new MyBackEaseIn(EasePower.Weak))
                 .RotateFromTo(30d, 55d, duration: 900, easing: new ElasticEaseOut())
-                .RotateFromTo(-20d, 30d, duration: 180).RunAsync();
-            await _pathLeft!.LoopAnimate().FadeFromTo(1d, 0d, duration: 100, easing: new LinearEasing())
+                .RotateFromTo(-20d, 30d, duration: 180)
+                .RunAsync();
+
+            _ = _pathLeft!.Animate()
+                .FadeFromTo(1d, 0d, duration: 100, easing: new LinearEasing())
                 .MarginXTo(-5d, 180, easing: new CubicEaseOut())
-                .MarginYTo(-6d, 180, easing: new CubicEaseOut()).RunAsync();
+                .MarginYTo(-6d, 180, easing: new CubicEaseOut())
+                .RunAsync();
 
-            await _pathRight!.LoopAnimate().FadeFromTo(1d, 0d, duration: 100, easing: new LinearEasing())
+            _ = _pathRight!.Animate()
+                .FadeFromTo(1d, 0d, duration: 100, easing: new LinearEasing())
                 .MarginXTo(5d, 180, easing: new CubicEaseOut())
-                .MarginYTo(-6d, 180, easing: new CubicEaseOut()).RunAsync();
+                .MarginYTo(-6d, 180, easing: new CubicEaseOut())
+                .RunAsync();
 
 
             //_animation.CancelAndClear();
+
             //_animation.Animations.AddRange(
             //[
             //    new RotateTransformAngleAnimation(this._pathPickaxe!, duration: TimeSpan.FromMilliseconds(350),
@@ -213,6 +216,7 @@ private async Task AnimationLoadingAsync()
             //        before: 30d, after: 55d, easing: new ElasticEaseOut()),
             //    new RotateTransformAngleAnimation(this._pathPickaxe!, duration: TimeSpan.FromMilliseconds(180),
             //        before: -20d, after: 30d),
+
             //    new OpacityAnimation(new WeakReference<Animatable>(_pathLeft!),
             //        duration: TimeSpan.FromMilliseconds(100),
             //        delay: TimeSpan.FromMilliseconds(50), before: 1d,
@@ -223,6 +227,7 @@ private async Task AnimationLoadingAsync()
             //    new YAnimation(new WeakReference<Animatable>(this._pathLeft!), duration: TimeSpan.FromMilliseconds(180),
             //        value: -6d,
             //        easing: new CubicEaseOut()),
+
             //    new OpacityAnimation(new WeakReference<Animatable>(this._pathRight!),
             //        duration: TimeSpan.FromMilliseconds(100),
             //        delay: TimeSpan.FromMilliseconds(50),
@@ -234,6 +239,7 @@ private async Task AnimationLoadingAsync()
             //        duration: TimeSpan.FromMilliseconds(180), value: -6d,
             //        easing: new CubicEaseOut())
             //]);
+
             //await _animation.RunAsync();
             this._pathLeft!.Margin = new Thickness(7, 41, 0, 0);
             this._pathRight!.Margin = new Thickness(14, 41, 0, 0);
diff --git a/PCL.Neo/Helpers/Animation/AnimationChain.cs b/PCL.Neo/Helpers/Animation/AnimationChain.cs
@@ -6,13 +6,12 @@
 
 namespace PCL.Neo.Helpers.Animation
 {
-    public class AnimationChain(Animatable control) : IAnimationChain, IDisposable
+    public class AnimationChain(Animatable control) : IDisposable
     {
-        public Animatable Control { get; init; } = control;
-        public List<IAnimation> Animations { get; } = [];
-        public bool IsLoop { get; init; }
-        public bool IsComplete { get; set; }
-        public CancellationTokenSource CancellationToken { get; } = new();
+        internal Animatable Control { get; } = control;
+        internal List<IAnimation> Animations { get; } = [];
+        public bool IsComplete { get; internal set; }
+        internal CancellationTokenSource CancellationToken { get; } = new();
 
         public void Cancel()
         {
diff --git a/PCL.Neo/Helpers/Animation/AnimationExtensions.cs b/PCL.Neo/Helpers/Animation/AnimationExtensions.cs
diff --git a/PCL.Neo/Helpers/Animation/AnimationHelper.cs b/PCL.Neo/Helpers/Animation/AnimationHelper.cs
diff --git a/PCL.Neo/Helpers/Animation/IAnimationChain.cs b/PCL.Neo/Helpers/Animation/IAnimationChain.cs
diff --git a/PCL.Neo/ViewModels/HomeViewModel.cs b/PCL.Neo/ViewModels/HomeViewModel.cs

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace PCL.Neo.Animations`
`8`	`8`	`{`
`9`	`9`	`public class OpacityAnimation(`
`10`		`- WeakReference<Animatable> control,`
	`10`	`+ Animatable control,`
`11`	`11`	`double begin,`
`12`	`12`	`double end,`
`13`	`13`	`Easing easing,`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace PCL.Neo.Animations`
`8`	`8`	`{`
`9`	`9`	`public class RotateTransformAngleAnimation(`
`10`		`- WeakReference<Animatable> control,`
	`10`	`+ Animatable control,`
`11`	`11`	`double begin,`
`12`	`12`	`double end,`
`13`	`13`	`Easing easing,`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace PCL.Neo.Animations`
`8`	`8`	`{`
`9`	`9`	`public class ScaleTransformScaleXAnimation(`
`10`		`- WeakReference<Animatable> control,`
	`10`	`+ Animatable control,`
`11`	`11`	`double begin,`
`12`	`12`	`double end,`
`13`	`13`	`Easing easing,`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace PCL.Neo.Animations`
`8`	`8`	`{`
`9`	`9`	`public class ScaleTransformScaleYAnimation(`
`10`		`- WeakReference<Animatable> control,`
	`10`	`+ Animatable control,`
`11`	`11`	`double begin,`
`12`	`12`	`double end,`
`13`	`13`	`Easing easing,`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace PCL.Neo.Animations`
`8`	`8`	`{`
`9`	`9`	`public class TranslateTransformXAnimation(`
`10`		`- WeakReference<Animatable> control,`
	`10`	`+ Animatable control,`
`11`	`11`	`double begin,`
`12`	`12`	`double end,`
`13`	`13`	`Easing easing,`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace PCL.Neo.Animations`
`8`	`8`	`{`
`9`	`9`	`public class TranslateTransformYAnimation(`
`10`		`- WeakReference<Animatable> control,`
	`10`	`+ Animatable control,`
`11`	`11`	`double begin,`
`12`	`12`	`double end,`
`13`	`13`	`Easing easing,`