Moved out KeyFrames and Transitions namespaces back

to Avalonia.Animations

src/Avalonia.Animation/Animatable.cs

@@ -6,7 +6,7 @@ using Avalonia.Data;
 using System;
 using System.Reactive.Linq;
 using Avalonia.Collections;
-using Avalonia.Animation.Transitions;
+using Avalonia.Animation;
 using System.Collections.Generic;
 using System.Threading;
 using System.Collections.Concurrent;

src/Avalonia.Animation/Animation.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Avalonia.Animation.Easings;
-using Avalonia.Animation.Keyframes;
+using Avalonia.Animation;
 using Avalonia.Collections;
 using Avalonia.Metadata;
 using System;

src/Avalonia.Animation/Keyframes/Cue.cs → src/Avalonia.Animation/Cue.cs

@@ -4,7 +4,7 @@ using System.ComponentModel;
 using System.Globalization;
 using System.Text;
 
-namespace Avalonia.Animation.Keyframes
+namespace Avalonia.Animation
 {
     /// <summary>
     /// A Cue object for <see cref="KeyFrame"/>. 

src/Avalonia.Animation/Keyframes/DoubleKeyFrames.cs → src/Avalonia.Animation/DoubleKeyFrames.cs

@@ -7,7 +7,7 @@ using System.Diagnostics;
 using Avalonia.Animation.Utils;
 using Avalonia.Data;
 
-namespace Avalonia.Animation.Keyframes
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Key frames that handles <see cref="double"/> properties.

src/Avalonia.Animation/Transitions/DoubleTransition.cs → src/Avalonia.Animation/DoubleTransition.cs

@@ -5,7 +5,7 @@ using Avalonia.Metadata;
 using System;
 using System.Reactive.Linq;
 
-namespace Avalonia.Animation.Transitions
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Transition class that handles <see cref="AvaloniaProperty"/> with <see cref="double"/> types.

src/Avalonia.Animation/Transitions/FloatTransition.cs → src/Avalonia.Animation/FloatTransition.cs

@@ -5,7 +5,7 @@ using Avalonia.Metadata;
 using System;
 using System.Reactive.Linq;
 
-namespace Avalonia.Animation.Transitions
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Transition class that handles <see cref="AvaloniaProperty"/> with <see cref="float"/> types.

src/Avalonia.Animation/Keyframes/IKeyFrames.cs → src/Avalonia.Animation/IKeyFrames.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Avalonia.Animation.Keyframes
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Interface for Keyframe group object

src/Avalonia.Animation/Transitions/ITransition.cs → src/Avalonia.Animation/ITransition.cs

@@ -5,7 +5,7 @@ using Avalonia.Metadata;
 using System;
 using System.Reactive.Linq;
 
-namespace Avalonia.Animation.Transitions
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Interface for Transition objects.

src/Avalonia.Animation/Transitions/IntegerTransition.cs → src/Avalonia.Animation/IntegerTransition.cs

@@ -5,7 +5,7 @@ using Avalonia.Metadata;
 using System;
 using System.Reactive.Linq;
 
-namespace Avalonia.Animation.Transitions
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Transition class that handles <see cref="AvaloniaProperty"/> with <see cref="int"/> types.

src/Avalonia.Animation/Keyframes/KeyFrame.cs → src/Avalonia.Animation/KeyFrame.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.ComponentModel;
 
-namespace Avalonia.Animation.Keyframes
+namespace Avalonia.Animation
 {
 
     /// <summary>

src/Avalonia.Animation/Keyframes/KeyFramePair`1.cs → src/Avalonia.Animation/KeyFramePair`1.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using Avalonia.Data;
 using System.Reactive.Disposables;
 
-namespace Avalonia.Animation.Keyframes
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Represents a pair of keyframe, usually the

src/Avalonia.Animation/Keyframes/KeyFramesStateMachine`1.cs → src/Avalonia.Animation/KeyFramesStateMachine`1.cs

@@ -2,7 +2,7 @@ using System;
 using System.Linq;
 using Avalonia.Data;
 
-namespace Avalonia.Animation.Keyframes
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Provides statefulness for an iteration of a keyframe group animation.

src/Avalonia.Animation/Keyframes/KeyFrames`1.cs → src/Avalonia.Animation/KeyFrames`1.cs

@@ -9,13 +9,15 @@ using System.Linq;
 using Avalonia.Data;
 using System.Reactive.Disposables;
 
-namespace Avalonia.Animation.Keyframes
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Base class for KeyFrames objects
     /// </summary>
     public abstract class KeyFrames<T> : AvaloniaList<KeyFrame>, IKeyFrames
     {
+        
+        private bool _isVerfifiedAndConverted;
 
         /// <summary>
         /// Target property.
@@ -27,13 +29,10 @@ namespace Avalonia.Animation.Keyframes
         /// </summary>
         public Dictionary<double, T> ConvertedKeyframes = new Dictionary<double, T>();
 
-        private bool IsVerfifiedAndConverted;
-
-
         /// <inheritdoc/>
         public virtual IDisposable Apply(Animation animation, Animatable control, IObservable<bool> obsMatch)
         {
-            if (!IsVerfifiedAndConverted)
+            if (!_isVerfifiedAndConverted)
                 VerifyConvertKeyFrames(animation, typeof(T));
 
             return obsMatch
@@ -150,7 +149,7 @@ namespace Avalonia.Animation.Keyframes
             }
 
             SortKeyFrameCues(ConvertedKeyframes);
-            IsVerfifiedAndConverted = true;
+            _isVerfifiedAndConverted = true;
 
         }
 

src/Avalonia.Animation/Properties/AssemblyInfo.cs

@@ -5,9 +5,6 @@ using Avalonia.Metadata;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyTitle("Avalonia.Animation")]
 [assembly: InternalsVisibleTo("Avalonia.Visuals")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Keyframes")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Transitions")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Easings")]

src/Avalonia.Animation/Transitions/Transition`1.cs → src/Avalonia.Animation/Transition`1.cs

@@ -6,7 +6,7 @@ using System;
 using System.Reactive.Linq;
 using Avalonia.Animation.Easings;
 
-namespace Avalonia.Animation.Transitions
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Defines how a property should be animated using a transition.

src/Avalonia.Animation/Transitions/Transitions.cs → src/Avalonia.Animation/Transitions.cs

@@ -3,7 +3,7 @@
 
 using Avalonia.Collections;
 
-namespace Avalonia.Animation.Transitions
+namespace Avalonia.Animation
 {
     /// <summary>
     /// A collection of <see cref="ITransition"/> definitions.

src/Avalonia.Visuals/Animation/Transitions/PointTransition.cs → src/Avalonia.Visuals/Animation/PointTransition.cs

@@ -5,7 +5,7 @@ using Avalonia.Metadata;
 using System;
 using System.Reactive.Linq;
 
-namespace Avalonia.Animation.Transitions
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Transition class that handles <see cref="AvaloniaProperty"/> with <see cref="Point"/> type.

src/Avalonia.Visuals/Animation/Transitions/ThicknessTransition.cs → src/Avalonia.Visuals/Animation/ThicknessTransition.cs

@@ -5,7 +5,7 @@ using Avalonia.Metadata;
 using System;
 using System.Reactive.Linq;
 
-namespace Avalonia.Animation.Transitions
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Transition class that handles <see cref="AvaloniaProperty"/> with <see cref="Thickness"/> type.

src/Avalonia.Visuals/Animation/Keyframes/TransformKeyFrames.cs → src/Avalonia.Visuals/Animation/TransformKeyFrames.cs

@@ -8,7 +8,7 @@ using System.Reactive.Linq;
 using System.Linq;
 using Avalonia.Media;
 
-namespace Avalonia.Animation.Keyframes
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Key frames that handles <see cref="double"/> properties.

src/Avalonia.Visuals/Properties/AssemblyInfo.cs

@@ -8,8 +8,6 @@ using Avalonia.Metadata;
 [assembly: AssemblyTitle("Avalonia.Visuals")]
 [assembly: InternalsVisibleTo("Avalonia.Visuals.UnitTests")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Transitions")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Keyframes")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]