From a91cb08248544829c735d0e4c64efdd98f53f0d2 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Fri, 7 Sep 2018 15:53:08 +0800
Subject: [PATCH] Fix naming on Animations & Transitions to better reflect
 their purpose.

Make RenderDemo & ControlCatalog's TabItems opacity transition faster.
---
 samples/ControlCatalog/SideBar.xaml                      | 2 +-
 samples/RenderDemo/SideBar.xaml                          | 2 +-
 .../{AnimationsEngine`1.cs => AnimationInstance`1.cs}    | 4 ++--
 src/Avalonia.Animation/Animator`1.cs                     | 4 ++--
 .../{TransitionsEngine.cs => TransitionInstance.cs}      | 9 ++++-----
 src/Avalonia.Animation/Transition`1.cs                   | 2 +-
 6 files changed, 11 insertions(+), 12 deletions(-)
 rename src/Avalonia.Animation/{AnimationsEngine`1.cs => AnimationInstance`1.cs} (97%)
 rename src/Avalonia.Animation/{TransitionsEngine.cs => TransitionInstance.cs} (81%)

diff --git a/samples/ControlCatalog/SideBar.xaml b/samples/ControlCatalog/SideBar.xaml
index 7d72d1821b..cc3c31d13a 100644
--- a/samples/ControlCatalog/SideBar.xaml
+++ b/samples/ControlCatalog/SideBar.xaml
@@ -36,7 +36,7 @@
     <Setter Property="Opacity" Value="0.5"/>
     <Setter Property="Transitions">
       <Transitions>
-        <DoubleTransition Property="Opacity" Duration="0:0:0.5"/>
+        <DoubleTransition Property="Opacity" Duration="0:0:0.2"/>
       </Transitions>
     </Setter>
   </Style>
diff --git a/samples/RenderDemo/SideBar.xaml b/samples/RenderDemo/SideBar.xaml
index b5f8ccaf01..26da2cc556 100644
--- a/samples/RenderDemo/SideBar.xaml
+++ b/samples/RenderDemo/SideBar.xaml
@@ -37,7 +37,7 @@
     <Setter Property="Opacity" Value="0.5"/>
     <Setter Property="Transitions">
       <Transitions>
-        <DoubleTransition Property="Opacity" Duration="0:0:0.5"/>
+        <DoubleTransition Property="Opacity" Duration="0:0:0.2"/>
       </Transitions>
     </Setter>
   </Style>
diff --git a/src/Avalonia.Animation/AnimationsEngine`1.cs b/src/Avalonia.Animation/AnimationInstance`1.cs
similarity index 97%
rename from src/Avalonia.Animation/AnimationsEngine`1.cs
rename to src/Avalonia.Animation/AnimationInstance`1.cs
index e724fe52d5..5a72904ed2 100644
--- a/src/Avalonia.Animation/AnimationsEngine`1.cs
+++ b/src/Avalonia.Animation/AnimationInstance`1.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Animation
     /// Handles interpolatoin and time-related functions 
     /// for keyframe animations.
     /// </summary>
-    internal class AnimationsEngine<T> : SingleSubscriberObservableBase<T>
+    internal class AnimationInstance<T> : SingleSubscriberObservableBase<T>
     {
         private T _lastInterpValue;
         private T _firstKFValue;
@@ -37,7 +37,7 @@ namespace Avalonia.Animation
         private Func<double, T, T> _interpolator;
         private IDisposable _timerSubscription;
 
-        public AnimationsEngine(Animation animation, Animatable control, Animator<T> animator, Action OnComplete, Func<double, T, T> Interpolator)
+        public AnimationInstance(Animation animation, Animatable control, Animator<T> animator, Action OnComplete, Func<double, T, T> Interpolator)
         {
             if (animation.SpeedRatio <= 0)
                 throw new InvalidOperationException("Speed ratio cannot be negative or zero.");
diff --git a/src/Avalonia.Animation/Animator`1.cs b/src/Avalonia.Animation/Animator`1.cs
index 2c95571dc8..f0ef55aa9e 100644
--- a/src/Avalonia.Animation/Animator`1.cs
+++ b/src/Avalonia.Animation/Animator`1.cs
@@ -103,8 +103,8 @@ namespace Avalonia.Animation
         /// </summary>
         private IDisposable RunKeyFrames(Animation animation, Animatable control, Action onComplete)
         {
-            var stateMachine = new AnimationsEngine<T>(animation, control, this, onComplete, DoInterpolation);
-            return control.Bind<T>((AvaloniaProperty<T>)Property, stateMachine, BindingPriority.Animation);
+            var instance = new AnimationInstance<T>(animation, control, this, onComplete, DoInterpolation);
+            return control.Bind<T>((AvaloniaProperty<T>)Property, instance, BindingPriority.Animation);
         }
 
         /// <summary>
diff --git a/src/Avalonia.Animation/TransitionsEngine.cs b/src/Avalonia.Animation/TransitionInstance.cs
similarity index 81%
rename from src/Avalonia.Animation/TransitionsEngine.cs
rename to src/Avalonia.Animation/TransitionInstance.cs
index b73cbe1a5a..4a89ff8f6b 100644
--- a/src/Avalonia.Animation/TransitionsEngine.cs
+++ b/src/Avalonia.Animation/TransitionInstance.cs
@@ -13,13 +13,13 @@ namespace Avalonia.Animation
     /// <summary>
     /// Handles the timing and lifetime of a <see cref="Transition{T}"/>.
     /// </summary>
-    public class TransitionsEngine : SingleSubscriberObservableBase<double>
+    internal class TransitionIteration : SingleSubscriberObservableBase<double>
     {
         private IDisposable timerSubscription;
         private TimeSpan startTime;
         private TimeSpan duration;
 
-        public TransitionsEngine(TimeSpan Duration)
+        public TransitionIteration(TimeSpan Duration)
         {
             duration = Duration;
         }
@@ -46,9 +46,8 @@ namespace Avalonia.Animation
         protected override void Subscribed()
         {
             startTime = Timing.GetTickCount();
-            timerSubscription = Timing
-                                .AnimationsTimer
-                                .Subscribe(t => TimerTick(t));
+            timerSubscription = Timing.AnimationsTimer
+                                      .Subscribe(t => TimerTick(t));
             PublishNext(0.0d);
         }
     }
diff --git a/src/Avalonia.Animation/Transition`1.cs b/src/Avalonia.Animation/Transition`1.cs
index aac85c7e09..1f0eb814e4 100644
--- a/src/Avalonia.Animation/Transition`1.cs
+++ b/src/Avalonia.Animation/Transition`1.cs
@@ -51,7 +51,7 @@ namespace Avalonia.Animation
         /// <inheritdocs/>
         public virtual IDisposable Apply(Animatable control, object oldValue, object newValue)
         {
-            var transition = DoTransition(new TransitionsEngine(Duration), (T)oldValue, (T)newValue);
+            var transition = DoTransition(new TransitionIteration(Duration), (T)oldValue, (T)newValue);
             return control.Bind<T>((AvaloniaProperty<T>)Property, transition, Data.BindingPriority.Animation);
         }