From 0e753fdb163f061d177f23909edc1791237c5fe6 Mon Sep 17 00:00:00 2001
From: bijington <shaunrlawrence@gmail.com>
Date: Wed, 21 Jul 2021 21:49:29 +0100
Subject: [PATCH 1/9] Initial attempt at an Animations sample section

---
 .../Pages/Animations/AnimationPage.xaml       | 32 ++++++++++
 .../Pages/Animations/AnimationPage.xaml.cs    | 10 +++
 .../Animations/AnimationDetailViewModel.cs    | 18 ++++++
 .../Animations/AnimationViewModel.cs          | 64 +++++++++++++++++++
 .../{ => Views/Tabs}/WelcomeViewModel.cs      |  4 ++
 5 files changed, 128 insertions(+)
 create mode 100644 samples/XCT.Sample/Pages/Animations/AnimationPage.xaml
 create mode 100644 samples/XCT.Sample/Pages/Animations/AnimationPage.xaml.cs
 create mode 100644 samples/XCT.Sample/ViewModels/Animations/AnimationDetailViewModel.cs
 create mode 100644 samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs
 rename samples/XCT.Sample/ViewModels/{ => Views/Tabs}/WelcomeViewModel.cs (90%)

diff --git a/samples/XCT.Sample/Pages/Animations/AnimationPage.xaml b/samples/XCT.Sample/Pages/Animations/AnimationPage.xaml
new file mode 100644
index 000000000..9710d8bab
--- /dev/null
+++ b/samples/XCT.Sample/Pages/Animations/AnimationPage.xaml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<pages:BasePage xmlns="http://xamarin.com/schemas/2014/forms"
+                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                xmlns:pages="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages"
+                xmlns:vm="clr-namespace:Xamarin.CommunityToolkit.Sample.ViewModels.Animations"
+                x:Class="Xamarin.CommunityToolkit.Sample.Pages.Animations.AnimationPage"
+                x:DataType="{x:Null}">
+    <pages:BasePage.BindingContext>
+        <vm:AnimationViewModel />
+    </pages:BasePage.BindingContext>
+
+    <Grid RowDefinitions="*,*">
+        <Label Text="Select an animation below and then tap start."
+               HorizontalTextAlignment="Center"
+               x:Name="Lab"/>
+
+        <StackLayout Grid.Row="1">
+            <Picker ItemsSource="{Binding Animations}"
+                    SelectedItem="{Binding SelectedAnimation}"
+                    ItemDisplayBinding="{Binding Name}"/>
+
+            <Button Text="Start"
+                    Command="{Binding StartAnimationCommand}"
+                    CommandParameter="{x:Reference Name=Lab}"/>
+
+            <Button Text="Stop"
+                    Command="{Binding StopAnimationCommand}"/>
+        </StackLayout>
+        
+
+    </Grid>
+</pages:BasePage>
diff --git a/samples/XCT.Sample/Pages/Animations/AnimationPage.xaml.cs b/samples/XCT.Sample/Pages/Animations/AnimationPage.xaml.cs
new file mode 100644
index 000000000..88fa3fe3c
--- /dev/null
+++ b/samples/XCT.Sample/Pages/Animations/AnimationPage.xaml.cs
@@ -0,0 +1,10 @@
+namespace Xamarin.CommunityToolkit.Sample.Pages.Animations
+{
+	public partial class AnimationPage : BasePage
+	{
+		public AnimationPage()
+		{
+			InitializeComponent();
+		}
+	}
+}
diff --git a/samples/XCT.Sample/ViewModels/Animations/AnimationDetailViewModel.cs b/samples/XCT.Sample/ViewModels/Animations/AnimationDetailViewModel.cs
new file mode 100644
index 000000000..57d7b08ea
--- /dev/null
+++ b/samples/XCT.Sample/ViewModels/Animations/AnimationDetailViewModel.cs
@@ -0,0 +1,18 @@
+using System;
+using Xamarin.CommunityToolkit.Animations;
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Sample.ViewModels.Animations
+{
+	public class AnimationDetailViewModel : BaseViewModel
+	{
+		public string Name { get; }
+		public Func<View, Action<double, bool>, AnimationBase> CreateAnimation { get; }
+
+		public AnimationDetailViewModel(string name, Func<View, Action<double, bool>, AnimationBase> createAnimation)
+		{
+			Name = name;
+			CreateAnimation = createAnimation;
+		}
+	}
+}
diff --git a/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs b/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs
new file mode 100644
index 000000000..f4b65a50b
--- /dev/null
+++ b/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs
@@ -0,0 +1,64 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+using Xamarin.CommunityToolkit.Animations;
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Sample.ViewModels.Animations
+{
+	public class AnimationViewModel : BaseViewModel
+	{
+		AnimationBase? currentAnimation;
+		AnimationDetailViewModel? selectedAnimation;
+
+		public ObservableCollection<AnimationDetailViewModel> Animations { get; }
+
+		public AnimationDetailViewModel? SelectedAnimation
+		{
+			get => selectedAnimation;
+			set => SetProperty(ref selectedAnimation, value);
+		}
+
+		public Command StartAnimationCommand { get; }
+		public Command StopAnimationCommand { get; }
+
+		public AnimationViewModel()
+		{
+			Animations = new ObservableCollection<AnimationDetailViewModel>
+			{
+				new AnimationDetailViewModel("Tada", (view, onFinished) => new TadaAnimation(onFinished: onFinished, views: view)),
+				new AnimationDetailViewModel("RubberBand", (view, onFinished) => new RubberBandAnimation(onFinished: onFinished, views: view))
+			};
+
+			SelectedAnimation = Animations.First();
+			StartAnimationCommand = new Command<View>(OnStart, (view) => !(SelectedAnimation is null) && currentAnimation?.IsRunning != true);
+			StopAnimationCommand = new Command(OnStop, () => currentAnimation?.IsRunning == true);
+		}
+
+		void OnStart(View view)
+		{
+			if (currentAnimation != null)
+			{
+				currentAnimation.Abort();
+			}
+
+			currentAnimation = SelectedAnimation!.CreateAnimation(view, (d, b) =>
+			{
+				StartAnimationCommand.ChangeCanExecute();
+				StopAnimationCommand.ChangeCanExecute();
+			});
+
+			currentAnimation.Commit();
+
+			StopAnimationCommand.ChangeCanExecute();
+		}
+
+		void OnStop()
+		{
+			if (currentAnimation != null)
+			{
+				currentAnimation.Abort();
+			}
+		}
+	}
+}
+
diff --git a/samples/XCT.Sample/ViewModels/WelcomeViewModel.cs b/samples/XCT.Sample/ViewModels/Views/Tabs/WelcomeViewModel.cs
similarity index 90%
rename from samples/XCT.Sample/ViewModels/WelcomeViewModel.cs
rename to samples/XCT.Sample/ViewModels/Views/Tabs/WelcomeViewModel.cs
index 55db7141c..43f9d5af6 100644
--- a/samples/XCT.Sample/ViewModels/WelcomeViewModel.cs
+++ b/samples/XCT.Sample/ViewModels/Views/Tabs/WelcomeViewModel.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Xamarin.CommunityToolkit.Sample.Models;
+using Xamarin.CommunityToolkit.Sample.Pages.Animations;
 using Xamarin.CommunityToolkit.Sample.Pages.Behaviors;
 using Xamarin.CommunityToolkit.Sample.Pages.Converters;
 using Xamarin.CommunityToolkit.Sample.Pages.Effects;
@@ -14,6 +15,9 @@ public class WelcomeViewModel : BaseGalleryViewModel
 	{
 		protected override IEnumerable<SectionModel> CreateItems() => new[]
 		{
+			new SectionModel(typeof(AnimationPage), "Animations", Color.FromHex("#41337A"),
+				"A set of pre-built animations to give your app a real edge."),
+
 			new SectionModel(typeof(BehaviorsGalleryPage), "Behaviors", Color.FromHex("#8E8CD8"),
 				"Behaviors lets you add functionality to user interface controls without having to subclass them. Behaviors are written in code and added to controls in XAML or code"),
 

From face88eaa45035e835212557e037aa8b8d827a78 Mon Sep 17 00:00:00 2001
From: bijington <shaunrlawrence@gmail.com>
Date: Wed, 21 Jul 2021 22:51:22 +0100
Subject: [PATCH 2/9] Move all responsibility to AnimationTypes

---
 .../AnimationTypes/AnimationBase.shared.cs    | 25 ++++++++-
 .../TadaAnimationType.shared.cs               | 53 +++++++++++++++----
 .../Animations/AnimationWrapper.shared.cs     | 53 +++++++++++++++++++
 3 files changed, 120 insertions(+), 11 deletions(-)
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationWrapper.shared.cs

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs
index 9d31b42ac..1e1039a10 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs
@@ -1,4 +1,6 @@
-using System.Threading.Tasks;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
 using Xamarin.Forms;
 
 namespace Xamarin.CommunityToolkit.Behaviors
@@ -32,6 +34,27 @@ static object GetDefaultDurationProperty(BindableObject bindable)
 		protected abstract uint DefaultDuration { get; set; }
 
 		public abstract Task Animate(TView? view);
+
+		// TODO: Wrap this (no pun intended) in another base class just for the pre-built types.
+		public AnimationWrapper CreateAnimation(
+			uint rate = 16,
+			Action<double, bool>? onFinished = null,
+			Func<bool>? shouldRepeat = null,
+			params View[] views) =>
+			new AnimationWrapper(
+				CreateAnimation(views),
+				Guid.NewGuid().ToString(),
+				views.First(),
+				rate,
+				Duration,
+				Easing,
+				onFinished,
+				shouldRepeat);
+
+		protected virtual Animation CreateAnimation(params View[] views)
+		{
+			return new Animation();
+		}
 	}
 
 	public abstract class AnimationBase : AnimationBase<View>
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs
index cdba159e4..62f860d50 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Xamarin.CommunityToolkit.Animations;
 using Xamarin.Forms;
 
 namespace Xamarin.CommunityToolkit.Behaviors
@@ -9,6 +8,7 @@ public class TadaAnimationType : AnimationBase
 		public static readonly BindableProperty IsRepeatedProperty =
 		   BindableProperty.Create(nameof(IsRepeated), typeof(bool), typeof(TadaAnimationType), default, BindingMode.TwoWay);
 
+		// TODO: RepeatingAnimationBase...
 		public bool IsRepeated
 		{
 			get => (bool)GetValue(IsRepeatedProperty);
@@ -16,7 +16,7 @@ public bool IsRepeated
 		}
 
 		public static readonly BindableProperty MaximumScaleProperty =
-		   BindableProperty.Create(nameof(MaximumScale), typeof(double), typeof(TadaAnimationType), TadaAnimation.DefaultMaximumScale, BindingMode.TwoWay);
+		   BindableProperty.Create(nameof(MaximumScale), typeof(double), typeof(TadaAnimationType), 1.1, BindingMode.TwoWay);
 
 		public double MaximumScale
 		{
@@ -25,7 +25,7 @@ public double MaximumScale
 		}
 
 		public static readonly BindableProperty MinimumScaleProperty =
-		   BindableProperty.Create(nameof(MinimumScale), typeof(double), typeof(TadaAnimationType), TadaAnimation.DefaultMinimumScale, BindingMode.TwoWay);
+		   BindableProperty.Create(nameof(MinimumScale), typeof(double), typeof(TadaAnimationType), 0.9, BindingMode.TwoWay);
 
 		public double MinimumScale
 		{
@@ -34,7 +34,7 @@ public double MinimumScale
 		}
 
 		public static readonly BindableProperty RotationAngleProperty =
-		   BindableProperty.Create(nameof(RotationAngle), typeof(double), typeof(TadaAnimationType), TadaAnimation.DefaultRotationAngle, BindingMode.TwoWay);
+		   BindableProperty.Create(nameof(RotationAngle), typeof(double), typeof(TadaAnimationType), 3.0, BindingMode.TwoWay);
 
 		public double RotationAngle
 		{
@@ -42,7 +42,7 @@ public double RotationAngle
 			set => SetValue(RotationAngleProperty, value);
 		}
 
-		protected override uint DefaultDuration { get; set; } = TadaAnimation.DefaultLength;
+		protected override uint DefaultDuration { get; set; } = 1000;
 
 		public override Task Animate(View? view)
 		{
@@ -50,17 +50,50 @@ public override Task Animate(View? view)
 			{
 				var taskCompletionSource = new TaskCompletionSource<bool>();
 
-				new TadaAnimation(
-					rotationAngle: RotationAngle,
-					length: Duration,
+				CreateAnimation(
+					16,
+					onFinished: (v, c) =>
+					{
+						if (IsRepeated)
+						{
+							return;
+						}
+
+						taskCompletionSource.SetResult(c);
+					},
 					shouldRepeat: () => IsRepeated,
-					onFinished: (v, c) => taskCompletionSource.SetResult(c),
-					views: view).Commit();
+					view).Commit();
 
 				return taskCompletionSource.Task;
 			}
 
 			return Task.FromResult(false);
 		}
+
+		protected override Animation CreateAnimation(params View[] views) => Create(RotationAngle, MinimumScale, MaximumScale, views);
+
+		static Animation Create(double rotationAngle, double minimumScale, double maximumScale, params View[] views)
+		{
+			var animation = new Animation();
+
+			foreach (var view in views)
+			{
+				animation.Add(0, 0.1, new Animation(v => view.Scale = v, 1, minimumScale));
+				animation.Add(0.2, 0.3, new Animation(v => view.Scale = v, minimumScale, maximumScale));
+				animation.Add(0.9, 1.0, new Animation(v => view.Scale = v, maximumScale, 1));
+
+				animation.Add(0, 0.2, new Animation(v => view.Rotation = v, 0, -rotationAngle));
+				animation.Add(0.2, 0.3, new Animation(v => view.Rotation = v, -rotationAngle, rotationAngle));
+				animation.Add(0.3, 0.4, new Animation(v => view.Rotation = v, rotationAngle, -rotationAngle));
+				animation.Add(0.4, 0.5, new Animation(v => view.Rotation = v, -rotationAngle, rotationAngle));
+				animation.Add(0.5, 0.6, new Animation(v => view.Rotation = v, rotationAngle, -rotationAngle));
+				animation.Add(0.6, 0.7, new Animation(v => view.Rotation = v, -rotationAngle, rotationAngle));
+				animation.Add(0.7, 0.8, new Animation(v => view.Rotation = v, rotationAngle, -rotationAngle));
+				animation.Add(0.8, 0.9, new Animation(v => view.Rotation = v, -rotationAngle, rotationAngle));
+				animation.Add(0.9, 1.0, new Animation(v => view.Rotation = v, rotationAngle, 0));
+			}
+
+			return animation;
+		}
 	}
 }
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationWrapper.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationWrapper.shared.cs
new file mode 100644
index 000000000..aff718172
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationWrapper.shared.cs
@@ -0,0 +1,53 @@
+using System;
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Behaviors
+{
+	public class AnimationWrapper
+	{
+		readonly Easing? easing;
+		readonly uint length = 250;
+		readonly Action<double, bool>? onFinished;
+		readonly Animation animation;
+		readonly IAnimatable owner;
+		readonly uint rate = 16;
+		readonly Func<bool>? shouldRepeat;
+		readonly string name;
+
+		public AnimationWrapper(
+			Animation animation,
+			string name,
+			IAnimatable owner,
+			uint rate = 16,
+			uint length = 250,
+			Easing? easing = null,
+			Action<double, bool>? onFinished = null,
+			Func<bool>? shouldRepeat = null)
+		{
+			this.name = name + Guid.NewGuid().ToString();
+			this.length = length;
+			this.easing = easing;
+			this.onFinished = onFinished;
+			this.animation = animation;
+			this.owner = owner;
+			this.rate = rate;
+			this.shouldRepeat = shouldRepeat;
+		}
+
+		/// <summary>
+		/// Stops the animation.
+		/// </summary>
+		/// <returns>True if successful, false otherwise.</returns>
+		public bool Abort() => owner.AbortAnimation(name);
+
+		/// <summary>
+		/// Runs the animation.
+		/// </summary>
+		public void Commit() => animation.Commit(owner, name, rate, length, easing, onFinished, shouldRepeat);
+
+		/// <summary>
+		/// Gets a value indicating whether the animation is running.
+		/// </summary>
+		public bool IsRunning => owner.AnimationIsRunning(name);
+	}
+}

From edd5e659993f250f6a1b330c4ae680f61c7b6585 Mon Sep 17 00:00:00 2001
From: bijington <shaunrlawrence@gmail.com>
Date: Wed, 21 Jul 2021 22:55:09 +0100
Subject: [PATCH 3/9] Code tidy up

---
 .../Pages/Behaviors/AnimationBehaviorPage.xaml    | 11 +++--------
 .../Pages/Behaviors/AnimationBehaviorPage.xaml.cs | 15 +--------------
 .../Animations/AnimationDetailViewModel.cs        |  6 +++---
 .../ViewModels/Animations/AnimationViewModel.cs   |  8 ++++----
 .../Animations/TadaAnimation.shared.cs            |  2 +-
 5 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/samples/XCT.Sample/Pages/Behaviors/AnimationBehaviorPage.xaml b/samples/XCT.Sample/Pages/Behaviors/AnimationBehaviorPage.xaml
index 0303ee664..5834fcc62 100644
--- a/samples/XCT.Sample/Pages/Behaviors/AnimationBehaviorPage.xaml
+++ b/samples/XCT.Sample/Pages/Behaviors/AnimationBehaviorPage.xaml
@@ -14,12 +14,7 @@
                      Spacing="10">
 
             <Label Text="This sample demonstrates how to use ViewTappedAnimationBehaviour applying it in different UI elements."
-                   Padding="10,10,10,50"
-                   BackgroundColor="Red">
-                 <Label.GestureRecognizers>
-                     <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped" />
-                 </Label.GestureRecognizers>
-             </Label>
+                   Padding="10,10,10,50"/>
 
             <Button Text="Tada"
                     FontSize="40"
@@ -30,8 +25,8 @@
                       <xct:AnimationBehavior EventName="Clicked">
                             <xct:AnimationBehavior.AnimationType>
                                 <xct:TadaAnimationType Easing="{x:Static Easing.Linear}"
-                                                       Duration="1000"
-                                                       RotationAngle="100"/>
+                                                       IsRepeated="True"
+                                                       Duration="1000"/>
                             </xct:AnimationBehavior.AnimationType>
                         </xct:AnimationBehavior>
                 </Button.Behaviors>
diff --git a/samples/XCT.Sample/Pages/Behaviors/AnimationBehaviorPage.xaml.cs b/samples/XCT.Sample/Pages/Behaviors/AnimationBehaviorPage.xaml.cs
index 66d376325..5893a66cd 100644
--- a/samples/XCT.Sample/Pages/Behaviors/AnimationBehaviorPage.xaml.cs
+++ b/samples/XCT.Sample/Pages/Behaviors/AnimationBehaviorPage.xaml.cs
@@ -1,20 +1,7 @@
-using Xamarin.CommunityToolkit.Animations;
-using Xamarin.Forms;
-
-namespace Xamarin.CommunityToolkit.Sample.Pages.Behaviors
+namespace Xamarin.CommunityToolkit.Sample.Pages.Behaviors
 {
 	public partial class AnimationBehaviorPage : BasePage
 	{
 		public AnimationBehaviorPage() => InitializeComponent();
-
-        private async void TapGestureRecognizer_Tapped(object sender, System.EventArgs e)
-        {
-            var label = (View)sender;
-
-			new TadaAnimation(
-				rotationAngle: 30,
-				length: 1000,
-				views: label).Commit();
-        }
     }
 }
\ No newline at end of file
diff --git a/samples/XCT.Sample/ViewModels/Animations/AnimationDetailViewModel.cs b/samples/XCT.Sample/ViewModels/Animations/AnimationDetailViewModel.cs
index 57d7b08ea..016a9fb97 100644
--- a/samples/XCT.Sample/ViewModels/Animations/AnimationDetailViewModel.cs
+++ b/samples/XCT.Sample/ViewModels/Animations/AnimationDetailViewModel.cs
@@ -1,5 +1,5 @@
 using System;
-using Xamarin.CommunityToolkit.Animations;
+using Xamarin.CommunityToolkit.Behaviors;
 using Xamarin.Forms;
 
 namespace Xamarin.CommunityToolkit.Sample.ViewModels.Animations
@@ -7,9 +7,9 @@ namespace Xamarin.CommunityToolkit.Sample.ViewModels.Animations
 	public class AnimationDetailViewModel : BaseViewModel
 	{
 		public string Name { get; }
-		public Func<View, Action<double, bool>, AnimationBase> CreateAnimation { get; }
+		public Func<View, Action<double, bool>, AnimationWrapper> CreateAnimation { get; }
 
-		public AnimationDetailViewModel(string name, Func<View, Action<double, bool>, AnimationBase> createAnimation)
+		public AnimationDetailViewModel(string name, Func<View, Action<double, bool>, AnimationWrapper> createAnimation)
 		{
 			Name = name;
 			CreateAnimation = createAnimation;
diff --git a/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs b/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs
index f4b65a50b..d283e6c10 100644
--- a/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs
+++ b/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs
@@ -1,13 +1,13 @@
 using System.Collections.ObjectModel;
 using System.Linq;
-using Xamarin.CommunityToolkit.Animations;
+using Xamarin.CommunityToolkit.Behaviors;
 using Xamarin.Forms;
 
 namespace Xamarin.CommunityToolkit.Sample.ViewModels.Animations
 {
 	public class AnimationViewModel : BaseViewModel
 	{
-		AnimationBase? currentAnimation;
+		AnimationWrapper? currentAnimation;
 		AnimationDetailViewModel? selectedAnimation;
 
 		public ObservableCollection<AnimationDetailViewModel> Animations { get; }
@@ -25,8 +25,8 @@ public AnimationViewModel()
 		{
 			Animations = new ObservableCollection<AnimationDetailViewModel>
 			{
-				new AnimationDetailViewModel("Tada", (view, onFinished) => new TadaAnimation(onFinished: onFinished, views: view)),
-				new AnimationDetailViewModel("RubberBand", (view, onFinished) => new RubberBandAnimation(onFinished: onFinished, views: view))
+				new AnimationDetailViewModel("Tada", (view, onFinished) => new TadaAnimationType().CreateAnimation(onFinished: onFinished, views: view)),
+				//new AnimationDetailViewModel("RubberBand", (view, onFinished) => new RubberBandAnimation(onFinished: onFinished, views: view))
 			};
 
 			SelectedAnimation = Animations.First();
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/TadaAnimation.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/TadaAnimation.shared.cs
index 651b8d40a..b55b33a2c 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/TadaAnimation.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/TadaAnimation.shared.cs
@@ -5,7 +5,7 @@ namespace Xamarin.CommunityToolkit.Animations
 {
     public class TadaAnimation : AnimationBase
     {
-        internal const uint DefaultLength = 500;
+        internal const uint DefaultLength = 1000;
         internal const double DefaultMaximumScale = 1.1;
         internal const double DefaultMinimumScale = 0.9;
         internal const double DefaultRotationAngle = 3.0;

From c1d363e3c04bfb36e7b4ad5278ebc4a9ab003bff Mon Sep 17 00:00:00 2001
From: Pedro Jesus <pedrojesus.cefet@gmail.com>
Date: Mon, 26 Jul 2021 19:40:11 -0300
Subject: [PATCH 4/9] changed the null and empty verification to be more
 performant

---
 .../Animations/AnimationBase.shared.cs        | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/AnimationBase.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/AnimationBase.shared.cs
index a66cfca84..41f8452ef 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/AnimationBase.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/AnimationBase.shared.cs
@@ -4,63 +4,63 @@
 
 namespace Xamarin.CommunityToolkit.Animations
 {
-    /// <summary>
+	/// <summary>
 	/// Base class representation of a pre-built animation.
 	/// </summary>
-    public abstract class AnimationBase
-    {
-        readonly Easing? easing;
-        readonly uint length = 250;
-        readonly Action<double, bool>? onFinished;
-        readonly IAnimatable? owner;
-        readonly uint rate = 16;
-        readonly Func<bool>? shouldRepeat;
-        readonly string name;
-        protected readonly View[] views;
+	public abstract class AnimationBase
+	{
+		readonly Easing? easing;
+		readonly uint length = 250;
+		readonly Action<double, bool>? onFinished;
+		readonly IAnimatable? owner;
+		readonly uint rate = 16;
+		readonly Func<bool>? shouldRepeat;
+		readonly string name;
+		protected readonly View[] views;
 
-        protected AnimationBase(
-            string name,
-            IAnimatable? owner = null,
-            uint rate = 16,
-            uint length = 250,
-            Easing? easing = null,
-            Action<double, bool>? onFinished = null,
-            Func<bool>? shouldRepeat = null,
-            params View[] views)
-        {
-            if (views is null || !views.Any())
+		protected AnimationBase(
+			string name,
+			IAnimatable? owner = null,
+			uint rate = 16,
+			uint length = 250,
+			Easing? easing = null,
+			Action<double, bool>? onFinished = null,
+			Func<bool>? shouldRepeat = null,
+			params View[] views)
+		{
+			if (views == null || views.Length == 0)
 			{
-                throw new ArgumentException("Views cannot be null or empty.", nameof(views));
+				throw new ArgumentException("Views cannot be null or empty.", nameof(views));
 			}
 
-            this.name = name + Guid.NewGuid().ToString();
-            this.length = length;
-            this.views = views;
-            this.easing = easing;
-            this.onFinished = onFinished;
-            this.owner = owner;
-            this.rate = rate;
-            this.shouldRepeat = shouldRepeat;
-        }
+			this.name = name + Guid.NewGuid().ToString();
+			this.length = length;
+			this.views = views;
+			this.easing = easing;
+			this.onFinished = onFinished;
+			this.owner = owner;
+			this.rate = rate;
+			this.shouldRepeat = shouldRepeat;
+		}
 
-        /// <summary>
+		/// <summary>
 		/// Stops the animation.
 		/// </summary>
 		/// <returns>True if successful, false otherwise.</returns>
-        public bool Abort() => GetOwner().AbortAnimation(name);
+		public bool Abort() => GetOwner().AbortAnimation(name);
 
-        /// <summary>
+		/// <summary>
 		/// Runs the animation.
 		/// </summary>
-        public void Commit() => Create().Commit(GetOwner(), name, rate, length, easing, onFinished, shouldRepeat);
+		public void Commit() => Create().Commit(GetOwner(), name, rate, length, easing, onFinished, shouldRepeat);
 
-        /// <summary>
+		/// <summary>
 		/// Gets a value indicating whether the animation is running.
 		/// </summary>
-        public bool IsRunning => GetOwner().AnimationIsRunning(name);
+		public bool IsRunning => GetOwner().AnimationIsRunning(name);
 
-        protected abstract Animation Create();
+		protected abstract Animation Create();
 
-        IAnimatable GetOwner() => owner ?? views.First();
-    }
+		IAnimatable GetOwner() => owner ?? views.First();
+	}
 }
\ No newline at end of file

From 557f836bbb613299f452c7828d629fde80afdc6d Mon Sep 17 00:00:00 2001
From: Pedro Jesus <pedrojesus.cefet@gmail.com>
Date: Mon, 26 Jul 2021 19:40:51 -0300
Subject: [PATCH 5/9] Inverted `if` to make the code more readable

---
 .../TadaAnimationType.shared.cs               | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs
index 62f860d50..5a7e620f9 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs
@@ -46,28 +46,26 @@ public double RotationAngle
 
 		public override Task Animate(View? view)
 		{
-			if (view != null)
-			{
-				var taskCompletionSource = new TaskCompletionSource<bool>();
+			if (view == null)
+				return Task.FromResult(false);
 
-				CreateAnimation(
-					16,
-					onFinished: (v, c) =>
-					{
-						if (IsRepeated)
-						{
-							return;
-						}
+			var taskCompletionSource = new TaskCompletionSource<bool>();
 
-						taskCompletionSource.SetResult(c);
-					},
-					shouldRepeat: () => IsRepeated,
-					view).Commit();
+			CreateAnimation(
+				16,
+				onFinished: (v, c) =>
+				{
+					if (IsRepeated)
+					{
+						return;
+					}
 
-				return taskCompletionSource.Task;
-			}
+					taskCompletionSource.SetResult(c);
+				},
+				shouldRepeat: () => IsRepeated,
+				view).Commit();
 
-			return Task.FromResult(false);
+			return taskCompletionSource.Task;
 		}
 
 		protected override Animation CreateAnimation(params View[] views) => Create(RotationAngle, MinimumScale, MaximumScale, views);

From 6b0a52904c5b06dc95ef39f335be2aa14282c26c Mon Sep 17 00:00:00 2001
From: bijington <shaunrlawrence@gmail.com>
Date: Wed, 28 Jul 2021 20:45:24 +0100
Subject: [PATCH 6/9] An attempt at async with cancellation

---
 .../Animations/AnimationDetailViewModel.cs    |  5 +-
 .../Animations/AnimationViewModel.cs          | 38 ++++++---
 .../Animations/AnimationBase.shared.cs        | 66 ---------------
 .../Animations/RubberBandAnimation.shared.cs  | 59 -------------
 .../Animations/TadaAnimation.shared.cs        | 68 ---------------
 .../Animations/AnimationBehavior.shared.cs    |  7 +-
 .../AnimationTypes/AnimationBase.shared.cs    | 83 ++++++++++++++++---
 .../RubberBandAnimationType.shared.cs         | 48 ++++++-----
 .../TadaAnimationType.shared.cs               | 41 +--------
 .../Animations/AnimationWrapper.shared.cs     |  2 +-
 10 files changed, 138 insertions(+), 279 deletions(-)
 delete mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/AnimationBase.shared.cs
 delete mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/RubberBandAnimation.shared.cs
 delete mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/TadaAnimation.shared.cs

diff --git a/samples/XCT.Sample/ViewModels/Animations/AnimationDetailViewModel.cs b/samples/XCT.Sample/ViewModels/Animations/AnimationDetailViewModel.cs
index 016a9fb97..0ddd31af0 100644
--- a/samples/XCT.Sample/ViewModels/Animations/AnimationDetailViewModel.cs
+++ b/samples/XCT.Sample/ViewModels/Animations/AnimationDetailViewModel.cs
@@ -7,9 +7,10 @@ namespace Xamarin.CommunityToolkit.Sample.ViewModels.Animations
 	public class AnimationDetailViewModel : BaseViewModel
 	{
 		public string Name { get; }
-		public Func<View, Action<double, bool>, AnimationWrapper> CreateAnimation { get; }
 
-		public AnimationDetailViewModel(string name, Func<View, Action<double, bool>, AnimationWrapper> createAnimation)
+		public Func<View, Action<double, bool>, PreBuiltAnimationBase> CreateAnimation { get; }
+
+		public AnimationDetailViewModel(string name, Func<View, Action<double, bool>, PreBuiltAnimationBase> createAnimation)
 		{
 			Name = name;
 			CreateAnimation = createAnimation;
diff --git a/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs b/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs
index d283e6c10..cc450fe18 100644
--- a/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs
+++ b/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs
@@ -1,13 +1,17 @@
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Xamarin.CommunityToolkit.Behaviors;
+using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
 
 namespace Xamarin.CommunityToolkit.Sample.ViewModels.Animations
 {
 	public class AnimationViewModel : BaseViewModel
 	{
-		AnimationWrapper? currentAnimation;
+		PreBuiltAnimationBase? currentAnimation;
+		CancellationTokenSource? cancellationTokenSource;
 		AnimationDetailViewModel? selectedAnimation;
 
 		public ObservableCollection<AnimationDetailViewModel> Animations { get; }
@@ -18,27 +22,33 @@ public AnimationDetailViewModel? SelectedAnimation
 			set => SetProperty(ref selectedAnimation, value);
 		}
 
-		public Command StartAnimationCommand { get; }
+		public AsyncCommand<View> StartAnimationCommand { get; }
+
 		public Command StopAnimationCommand { get; }
 
 		public AnimationViewModel()
 		{
 			Animations = new ObservableCollection<AnimationDetailViewModel>
 			{
-				new AnimationDetailViewModel("Tada", (view, onFinished) => new TadaAnimationType().CreateAnimation(onFinished: onFinished, views: view)),
-				//new AnimationDetailViewModel("RubberBand", (view, onFinished) => new RubberBandAnimation(onFinished: onFinished, views: view))
+				new AnimationDetailViewModel("Tada", (view, onFinished) => new TadaAnimationType()),
+				new AnimationDetailViewModel("RubberBand", (view, onFinished) => new RubberBandAnimationType())
 			};
 
 			SelectedAnimation = Animations.First();
-			StartAnimationCommand = new Command<View>(OnStart, (view) => !(SelectedAnimation is null) && currentAnimation?.IsRunning != true);
-			StopAnimationCommand = new Command(OnStop, () => currentAnimation?.IsRunning == true);
+			StartAnimationCommand = new AsyncCommand<View>(v => OnStart(v), (view) => !(SelectedAnimation is null));
+			StopAnimationCommand = new Command(OnStop, () => cancellationTokenSource != null);
 		}
 
-		void OnStart(View view)
+		async Task OnStart(View? view)
 		{
-			if (currentAnimation != null)
+			if (view is null)
+			{
+				return;
+			}
+
+			if (cancellationTokenSource != null)
 			{
-				currentAnimation.Abort();
+				cancellationTokenSource.Cancel();
 			}
 
 			currentAnimation = SelectedAnimation!.CreateAnimation(view, (d, b) =>
@@ -47,16 +57,20 @@ void OnStart(View view)
 				StopAnimationCommand.ChangeCanExecute();
 			});
 
-			currentAnimation.Commit();
+			cancellationTokenSource = new CancellationTokenSource();
+			StopAnimationCommand.ChangeCanExecute();
+
+			await currentAnimation.Animate(cancellationTokenSource.Token, view);
 
+			cancellationTokenSource = null;
 			StopAnimationCommand.ChangeCanExecute();
 		}
 
 		void OnStop()
 		{
-			if (currentAnimation != null)
+			if (cancellationTokenSource != null)
 			{
-				currentAnimation.Abort();
+				cancellationTokenSource.Cancel();
 			}
 		}
 	}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/AnimationBase.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/AnimationBase.shared.cs
deleted file mode 100644
index a66cfca84..000000000
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/AnimationBase.shared.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Linq;
-using Xamarin.Forms;
-
-namespace Xamarin.CommunityToolkit.Animations
-{
-    /// <summary>
-	/// Base class representation of a pre-built animation.
-	/// </summary>
-    public abstract class AnimationBase
-    {
-        readonly Easing? easing;
-        readonly uint length = 250;
-        readonly Action<double, bool>? onFinished;
-        readonly IAnimatable? owner;
-        readonly uint rate = 16;
-        readonly Func<bool>? shouldRepeat;
-        readonly string name;
-        protected readonly View[] views;
-
-        protected AnimationBase(
-            string name,
-            IAnimatable? owner = null,
-            uint rate = 16,
-            uint length = 250,
-            Easing? easing = null,
-            Action<double, bool>? onFinished = null,
-            Func<bool>? shouldRepeat = null,
-            params View[] views)
-        {
-            if (views is null || !views.Any())
-			{
-                throw new ArgumentException("Views cannot be null or empty.", nameof(views));
-			}
-
-            this.name = name + Guid.NewGuid().ToString();
-            this.length = length;
-            this.views = views;
-            this.easing = easing;
-            this.onFinished = onFinished;
-            this.owner = owner;
-            this.rate = rate;
-            this.shouldRepeat = shouldRepeat;
-        }
-
-        /// <summary>
-		/// Stops the animation.
-		/// </summary>
-		/// <returns>True if successful, false otherwise.</returns>
-        public bool Abort() => GetOwner().AbortAnimation(name);
-
-        /// <summary>
-		/// Runs the animation.
-		/// </summary>
-        public void Commit() => Create().Commit(GetOwner(), name, rate, length, easing, onFinished, shouldRepeat);
-
-        /// <summary>
-		/// Gets a value indicating whether the animation is running.
-		/// </summary>
-        public bool IsRunning => GetOwner().AnimationIsRunning(name);
-
-        protected abstract Animation Create();
-
-        IAnimatable GetOwner() => owner ?? views.First();
-    }
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/RubberBandAnimation.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/RubberBandAnimation.shared.cs
deleted file mode 100644
index 86d1e73fc..000000000
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/RubberBandAnimation.shared.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using Xamarin.Forms;
-
-namespace Xamarin.CommunityToolkit.Animations
-{
-	public class RubberBandAnimation : AnimationBase
-	{
-        internal const uint DefaultLength = 1000;
-
-        public RubberBandAnimation(
-            string? name = null,
-            uint length = DefaultLength,
-            Easing? easing = null,
-            Action<double, bool>? onFinished = null,
-            IAnimatable? owner = null,
-            uint rate = 16,
-            Func<bool>? shouldRepeat = null,
-            params View[] views)
-            : base(
-                  name ?? nameof(RubberBandAnimation),
-                  owner,
-                  rate,
-                  length,
-                  easing,
-                  onFinished,
-                  shouldRepeat,
-                  views)
-        {
-        }
-
-        protected override Animation Create()
-        {
-            var animation = new Animation();
-
-            foreach (var label in views)
-            {
-                animation.Add(0, 0.3, new Animation(v => label.ScaleX = v, 1, 1.25));
-                animation.Add(0, 0.3, new Animation(v => label.ScaleY = v, 1, 0.75));
-
-                animation.Add(0.3, 0.4, new Animation(v => label.ScaleX = v, 1.25, 0.75));
-                animation.Add(0.3, 0.4, new Animation(v => label.ScaleY = v, 0.75, 1.25));
-
-                animation.Add(0.4, 0.5, new Animation(v => label.ScaleX = v, 0.75, 1.15));
-                animation.Add(0.4, 0.5, new Animation(v => label.ScaleY = v, 1.25, 0.85));
-
-                animation.Add(0.5, 0.65, new Animation(v => label.ScaleX = v, 1.15, 0.95));
-                animation.Add(0.5, 0.65, new Animation(v => label.ScaleY = v, 0.85, 1.05));
-
-                animation.Add(0.65, 0.75, new Animation(v => label.ScaleX = v, 0.95, 1.05));
-                animation.Add(0.65, 0.75, new Animation(v => label.ScaleY = v, 1.05, 0.95));
-
-                animation.Add(0.75, 1, new Animation(v => label.ScaleX = v, 1.05, 1));
-                animation.Add(0.75, 1, new Animation(v => label.ScaleY = v, 0.95, 1));
-            }
-
-            return animation;
-        }
-    }
-}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/TadaAnimation.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/TadaAnimation.shared.cs
deleted file mode 100644
index b55b33a2c..000000000
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Animations/TadaAnimation.shared.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using Xamarin.Forms;
-
-namespace Xamarin.CommunityToolkit.Animations
-{
-    public class TadaAnimation : AnimationBase
-    {
-        internal const uint DefaultLength = 1000;
-        internal const double DefaultMaximumScale = 1.1;
-        internal const double DefaultMinimumScale = 0.9;
-        internal const double DefaultRotationAngle = 3.0;
-
-        readonly double maximumScale = 1.1;
-        readonly double minimumScale = 0.9;
-        readonly double rotationAngle = DefaultRotationAngle;
-
-        public TadaAnimation(
-            double maximumScale = 1.1,
-            double minimumScale = 0.9,
-            double rotationAngle = 3.0,
-            string? name = null,
-            uint length = DefaultLength,
-            Easing? easing = null,
-            Action<double, bool>? onFinished = null,
-            IAnimatable? owner = null,
-            uint rate = 16,
-            Func<bool>? shouldRepeat = null,
-            params View[] views)
-            : base(
-                  name ?? nameof(TadaAnimation),
-                  owner,
-                  rate,
-                  length,
-                  easing,
-                  onFinished,
-                  shouldRepeat,
-                  views)
-        {
-            this.maximumScale = maximumScale;
-            this.minimumScale = minimumScale;
-            this.rotationAngle = rotationAngle;
-        }
-
-        protected override Animation Create()
-        {
-            var animation = new Animation();
-
-            foreach (var label in views)
-            {
-                animation.Add(0, 0.1, new Animation(v => label.Scale = v, 1, minimumScale));
-                animation.Add(0.2, 0.3, new Animation(v => label.Scale = v, minimumScale, maximumScale));
-                animation.Add(0.9, 1.0, new Animation(v => label.Scale = v, maximumScale, 1));
-
-                animation.Add(0, 0.2, new Animation(v => label.Rotation = v, 0, -rotationAngle));
-                animation.Add(0.2, 0.3, new Animation(v => label.Rotation = v, -rotationAngle, rotationAngle));
-                animation.Add(0.3, 0.4, new Animation(v => label.Rotation = v, rotationAngle, -rotationAngle));
-                animation.Add(0.4, 0.5, new Animation(v => label.Rotation = v, -rotationAngle, rotationAngle));
-                animation.Add(0.5, 0.6, new Animation(v => label.Rotation = v, rotationAngle, -rotationAngle));
-                animation.Add(0.6, 0.7, new Animation(v => label.Rotation = v, -rotationAngle, rotationAngle));
-                animation.Add(0.7, 0.8, new Animation(v => label.Rotation = v, rotationAngle, -rotationAngle));
-                animation.Add(0.8, 0.9, new Animation(v => label.Rotation = v, -rotationAngle, rotationAngle));
-                animation.Add(0.9, 1.0, new Animation(v => label.Rotation = v, rotationAngle, 0));
-            }
-
-            return animation;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationBehavior.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationBehavior.shared.cs
index bc53b9054..ba6fc9566 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationBehavior.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationBehavior.shared.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Input;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
@@ -65,13 +66,13 @@ static object CreateAnimateCommand(BindableObject bindable)
 
 		async Task OnAnimate()
 		{
-			if (isAnimating)
+			if (isAnimating || View is not View typedView)
 				return;
 
 			isAnimating = true;
 
 			if (AnimationType != null)
-				await AnimationType.Animate((View?)View);
+				await AnimationType.Animate(typedView);
 
 			isAnimating = false;
 		}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs
index 1e1039a10..cb28d4edf 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Xamarin.Forms;
 
@@ -34,9 +35,78 @@ static object GetDefaultDurationProperty(BindableObject bindable)
 		protected abstract uint DefaultDuration { get; set; }
 
 		public abstract Task Animate(TView? view);
+	}
+
+	public abstract class AnimationBase : AnimationBase<View>
+	{
+	}
+
+	public abstract class PreBuiltAnimationBase : AnimationBase
+	{
+		public static readonly BindableProperty IsRepeatedProperty =
+		   BindableProperty.Create(nameof(IsRepeated), typeof(bool), typeof(PreBuiltAnimationBase), default, BindingMode.TwoWay);
+
+		public bool IsRepeated
+		{
+			get => (bool)GetValue(IsRepeatedProperty);
+			set => SetValue(IsRepeatedProperty, value);
+		}
+
+		public override Task Animate(View? view) => Animate(CancellationToken.None, view!);
+
+		public async Task Animate(CancellationToken? cancellationToken, params View[]? views)
+		{
+			if (views != null)
+			{
+				AnimationWrapper? animation = null;
+
+				try
+				{
+					var taskCompletionSource = new TaskCompletionSource<bool>();
 
-		// TODO: Wrap this (no pun intended) in another base class just for the pre-built types.
-		public AnimationWrapper CreateAnimation(
+					if (cancellationToken is null)
+						cancellationToken = CancellationToken.None;
+
+					animation = CreateAnimation(
+						16,
+						onFinished: (v, c) =>
+						{
+							try
+							{
+								if (cancellationToken != null)
+								{
+									cancellationToken.Value.ThrowIfCancellationRequested();
+								}
+
+								if (IsRepeated)
+								{
+									return;
+								}
+
+								taskCompletionSource.SetResult(c);
+							}
+							catch (OperationCanceledException)
+							{
+								taskCompletionSource.SetCanceled();
+								animation?.Abort();
+							}
+						},
+						shouldRepeat: () => IsRepeated,
+						views);
+
+					animation.Commit();
+
+					// Does not take in to account IsRepeated
+					await Task.WhenAny(Task.Delay((int)Duration, cancellationToken.Value), taskCompletionSource.Task).Unwrap();
+				}
+				catch (OperationCanceledException)
+				{
+					animation?.Abort();
+				}
+			}
+		}
+
+		AnimationWrapper CreateAnimation(
 			uint rate = 16,
 			Action<double, bool>? onFinished = null,
 			Func<bool>? shouldRepeat = null,
@@ -51,13 +121,6 @@ public AnimationWrapper CreateAnimation(
 				onFinished,
 				shouldRepeat);
 
-		protected virtual Animation CreateAnimation(params View[] views)
-		{
-			return new Animation();
-		}
-	}
-
-	public abstract class AnimationBase : AnimationBase<View>
-	{
+		protected abstract Animation CreateAnimation(params View[] views);
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/RubberBandAnimationType.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/RubberBandAnimationType.shared.cs
index 526f1da1f..b45664461 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/RubberBandAnimationType.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/RubberBandAnimationType.shared.cs
@@ -1,29 +1,39 @@
-using System;
-using System.Threading.Tasks;
-using Xamarin.CommunityToolkit.Animations;
-using Xamarin.Forms;
+using Xamarin.Forms;
 
-namespace Xamarin.CommunityToolkit.Behaviors.Animations.AnimationTypes
+namespace Xamarin.CommunityToolkit.Behaviors
 {
-	public class RubberBandAnimationType : AnimationBase
+	public class RubberBandAnimationType : PreBuiltAnimationBase
 	{
-		protected override uint DefaultDuration { get; set; } = RubberBandAnimation.DefaultLength;
+        protected override uint DefaultDuration { get; set; } = 1000;
 
-		public override Task Animate(View? view)
+        protected override Animation CreateAnimation(params View[] views) => Create(views);
+
+		static Animation Create(params View[] views)
 		{
-			if (view != null)
-			{
-				var taskCompletionSource = new TaskCompletionSource<bool>();
+            var animation = new Animation();
+
+            foreach (var view in views)
+            {
+                animation.Add(0, 0.3, new Animation(v => view.ScaleX = v, 1, 1.25));
+                animation.Add(0, 0.3, new Animation(v => view.ScaleY = v, 1, 0.75));
+
+                animation.Add(0.3, 0.4, new Animation(v => view.ScaleX = v, 1.25, 0.75));
+                animation.Add(0.3, 0.4, new Animation(v => view.ScaleY = v, 0.75, 1.25));
+
+                animation.Add(0.4, 0.5, new Animation(v => view.ScaleX = v, 0.75, 1.15));
+                animation.Add(0.4, 0.5, new Animation(v => view.ScaleY = v, 1.25, 0.85));
+
+                animation.Add(0.5, 0.65, new Animation(v => view.ScaleX = v, 1.15, 0.95));
+                animation.Add(0.5, 0.65, new Animation(v => view.ScaleY = v, 0.85, 1.05));
 
-				new RubberBandAnimation(
-					length: Duration,
-					onFinished: (v, c) => taskCompletionSource.SetResult(c),
-					views: view).Commit();
+                animation.Add(0.65, 0.75, new Animation(v => view.ScaleX = v, 0.95, 1.05));
+                animation.Add(0.65, 0.75, new Animation(v => view.ScaleY = v, 1.05, 0.95));
 
-				return taskCompletionSource.Task;
-			}
+                animation.Add(0.75, 1, new Animation(v => view.ScaleX = v, 1.05, 1));
+                animation.Add(0.75, 1, new Animation(v => view.ScaleY = v, 0.95, 1));
+            }
 
-			return Task.FromResult(false);
-		}
+            return animation;
+        }
 	}
 }
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs
index 62f860d50..0009b1d08 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs
@@ -1,20 +1,9 @@
-using System.Threading.Tasks;
-using Xamarin.Forms;
+using Xamarin.Forms;
 
 namespace Xamarin.CommunityToolkit.Behaviors
 {
-	public class TadaAnimationType : AnimationBase
+	public class TadaAnimationType : PreBuiltAnimationBase
 	{
-		public static readonly BindableProperty IsRepeatedProperty =
-		   BindableProperty.Create(nameof(IsRepeated), typeof(bool), typeof(TadaAnimationType), default, BindingMode.TwoWay);
-
-		// TODO: RepeatingAnimationBase...
-		public bool IsRepeated
-		{
-			get => (bool)GetValue(IsRepeatedProperty);
-			set => SetValue(IsRepeatedProperty, value);
-		}
-
 		public static readonly BindableProperty MaximumScaleProperty =
 		   BindableProperty.Create(nameof(MaximumScale), typeof(double), typeof(TadaAnimationType), 1.1, BindingMode.TwoWay);
 
@@ -44,32 +33,6 @@ public double RotationAngle
 
 		protected override uint DefaultDuration { get; set; } = 1000;
 
-		public override Task Animate(View? view)
-		{
-			if (view != null)
-			{
-				var taskCompletionSource = new TaskCompletionSource<bool>();
-
-				CreateAnimation(
-					16,
-					onFinished: (v, c) =>
-					{
-						if (IsRepeated)
-						{
-							return;
-						}
-
-						taskCompletionSource.SetResult(c);
-					},
-					shouldRepeat: () => IsRepeated,
-					view).Commit();
-
-				return taskCompletionSource.Task;
-			}
-
-			return Task.FromResult(false);
-		}
-
 		protected override Animation CreateAnimation(params View[] views) => Create(RotationAngle, MinimumScale, MaximumScale, views);
 
 		static Animation Create(double rotationAngle, double minimumScale, double maximumScale, params View[] views)
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationWrapper.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationWrapper.shared.cs
index aff718172..dc09cd252 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationWrapper.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationWrapper.shared.cs
@@ -3,7 +3,7 @@
 
 namespace Xamarin.CommunityToolkit.Behaviors
 {
-	public class AnimationWrapper
+	class AnimationWrapper
 	{
 		readonly Easing? easing;
 		readonly uint length = 250;

From 93fad83092a6e6a4d67229392ae8a9c035946854 Mon Sep 17 00:00:00 2001
From: bijington <shaunrlawrence@gmail.com>
Date: Thu, 29 Jul 2021 09:25:54 +0100
Subject: [PATCH 7/9] Remove the need for Task.Delay

---
 .../AnimationTypes/AnimationBase.shared.cs    | 76 ++++++++++---------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs
index cb28d4edf..caa665f69 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs
@@ -60,49 +60,43 @@ public async Task Animate(CancellationToken? cancellationToken, params View[]? v
 			{
 				AnimationWrapper? animation = null;
 
-				try
-				{
-					var taskCompletionSource = new TaskCompletionSource<bool>();
+				var taskCompletionSource = new TaskCompletionSource<bool>();
 
-					if (cancellationToken is null)
-						cancellationToken = CancellationToken.None;
+				if (cancellationToken is null)
+					cancellationToken = CancellationToken.None;
 
-					animation = CreateAnimation(
-						16,
-						onFinished: (v, c) =>
+				animation = CreateAnimation(
+					16,
+					onFinished: (v, c) =>
+					{
+						try
 						{
-							try
+							if (cancellationToken != null)
 							{
-								if (cancellationToken != null)
-								{
-									cancellationToken.Value.ThrowIfCancellationRequested();
-								}
-
-								if (IsRepeated)
-								{
-									return;
-								}
-
-								taskCompletionSource.SetResult(c);
+								cancellationToken.Value.ThrowIfCancellationRequested();
 							}
-							catch (OperationCanceledException)
+
+							if (IsRepeated)
 							{
-								taskCompletionSource.SetCanceled();
-								animation?.Abort();
+								return;
 							}
-						},
-						shouldRepeat: () => IsRepeated,
-						views);
-
-					animation.Commit();
-
-					// Does not take in to account IsRepeated
-					await Task.WhenAny(Task.Delay((int)Duration, cancellationToken.Value), taskCompletionSource.Task).Unwrap();
-				}
-				catch (OperationCanceledException)
-				{
-					animation?.Abort();
-				}
+
+							animation = null;
+							taskCompletionSource.SetResult(c);
+						}
+						catch (OperationCanceledException)
+						{
+							taskCompletionSource.SetCanceled();
+							animation?.Abort();
+						}
+					},
+					shouldRepeat: () => IsRepeated,
+					views);
+
+				animation.Commit();
+
+				await Task.WhenAny(cancellationToken.Value.WhenCanceled(), taskCompletionSource.Task);
+				animation?.Abort();
 			}
 		}
 
@@ -123,4 +117,14 @@ AnimationWrapper CreateAnimation(
 
 		protected abstract Animation CreateAnimation(params View[] views);
 	}
+
+	public static class TaskExtensions
+	{
+		public static Task WhenCanceled(this CancellationToken cancellationToken)
+		{
+			var tcs = new TaskCompletionSource<bool>();
+			cancellationToken.Register(s => ((TaskCompletionSource<bool>)s).SetResult(true), tcs);
+			return tcs.Task;
+		}
+	}
 }
\ No newline at end of file

From 58b4e488911cf52f7f9689a440a38bf4379d06ca Mon Sep 17 00:00:00 2001
From: bijington <shaunrlawrence@gmail.com>
Date: Thu, 12 Aug 2021 21:49:28 +0100
Subject: [PATCH 8/9] Removed the Type suffix

---
 .../XCT.Sample/Pages/Behaviors/AnimationBehaviorPage.xaml | 6 +++---
 .../ViewModels/Animations/AnimationViewModel.cs           | 4 ++--
 ...mationType.shared.cs => RubberBandAnimation.shared.cs} | 2 +-
 ...adaAnimationType.shared.cs => TadaAnimation.shared.cs} | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/{RubberBandAnimationType.shared.cs => RubberBandAnimation.shared.cs} (96%)
 rename src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/{TadaAnimationType.shared.cs => TadaAnimation.shared.cs} (91%)

diff --git a/samples/XCT.Sample/Pages/Behaviors/AnimationBehaviorPage.xaml b/samples/XCT.Sample/Pages/Behaviors/AnimationBehaviorPage.xaml
index 5834fcc62..ddaeccf50 100644
--- a/samples/XCT.Sample/Pages/Behaviors/AnimationBehaviorPage.xaml
+++ b/samples/XCT.Sample/Pages/Behaviors/AnimationBehaviorPage.xaml
@@ -24,9 +24,9 @@
                  <Button.Behaviors>
                       <xct:AnimationBehavior EventName="Clicked">
                             <xct:AnimationBehavior.AnimationType>
-                                <xct:TadaAnimationType Easing="{x:Static Easing.Linear}"
-                                                       IsRepeated="True"
-                                                       Duration="1000"/>
+                                <xct:TadaAnimation Easing="{x:Static Easing.Linear}"
+                                                   IsRepeated="True"
+                                                   Duration="1000"/>
                             </xct:AnimationBehavior.AnimationType>
                         </xct:AnimationBehavior>
                 </Button.Behaviors>
diff --git a/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs b/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs
index cc450fe18..5e7e2dbff 100644
--- a/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs
+++ b/samples/XCT.Sample/ViewModels/Animations/AnimationViewModel.cs
@@ -30,8 +30,8 @@ public AnimationViewModel()
 		{
 			Animations = new ObservableCollection<AnimationDetailViewModel>
 			{
-				new AnimationDetailViewModel("Tada", (view, onFinished) => new TadaAnimationType()),
-				new AnimationDetailViewModel("RubberBand", (view, onFinished) => new RubberBandAnimationType())
+				new AnimationDetailViewModel("Tada", (view, onFinished) => new TadaAnimation()),
+				new AnimationDetailViewModel("RubberBand", (view, onFinished) => new RubberBandAnimation())
 			};
 
 			SelectedAnimation = Animations.First();
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/RubberBandAnimationType.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/RubberBandAnimation.shared.cs
similarity index 96%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/RubberBandAnimationType.shared.cs
rename to src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/RubberBandAnimation.shared.cs
index b45664461..84cffa33b 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/RubberBandAnimationType.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/RubberBandAnimation.shared.cs
@@ -2,7 +2,7 @@
 
 namespace Xamarin.CommunityToolkit.Behaviors
 {
-	public class RubberBandAnimationType : PreBuiltAnimationBase
+	public class RubberBandAnimation : PreBuiltAnimationBase
 	{
         protected override uint DefaultDuration { get; set; } = 1000;
 
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimation.shared.cs
similarity index 91%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs
rename to src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimation.shared.cs
index 0009b1d08..e8569854e 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimationType.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimation.shared.cs
@@ -2,10 +2,10 @@
 
 namespace Xamarin.CommunityToolkit.Behaviors
 {
-	public class TadaAnimationType : PreBuiltAnimationBase
+	public class TadaAnimation : PreBuiltAnimationBase
 	{
 		public static readonly BindableProperty MaximumScaleProperty =
-		   BindableProperty.Create(nameof(MaximumScale), typeof(double), typeof(TadaAnimationType), 1.1, BindingMode.TwoWay);
+		   BindableProperty.Create(nameof(MaximumScale), typeof(double), typeof(TadaAnimation), 1.1, BindingMode.TwoWay);
 
 		public double MaximumScale
 		{
@@ -14,7 +14,7 @@ public double MaximumScale
 		}
 
 		public static readonly BindableProperty MinimumScaleProperty =
-		   BindableProperty.Create(nameof(MinimumScale), typeof(double), typeof(TadaAnimationType), 0.9, BindingMode.TwoWay);
+		   BindableProperty.Create(nameof(MinimumScale), typeof(double), typeof(TadaAnimation), 0.9, BindingMode.TwoWay);
 
 		public double MinimumScale
 		{
@@ -23,7 +23,7 @@ public double MinimumScale
 		}
 
 		public static readonly BindableProperty RotationAngleProperty =
-		   BindableProperty.Create(nameof(RotationAngle), typeof(double), typeof(TadaAnimationType), 3.0, BindingMode.TwoWay);
+		   BindableProperty.Create(nameof(RotationAngle), typeof(double), typeof(TadaAnimation), 3.0, BindingMode.TwoWay);
 
 		public double RotationAngle
 		{

From 2b8b12ebabedb57d6dff892e9713482c32d0fd13 Mon Sep 17 00:00:00 2001
From: bijington <shaunrlawrence@gmail.com>
Date: Thu, 12 Aug 2021 22:21:51 +0100
Subject: [PATCH 9/9] Code tidy up and xml docs

---
 .../Animations/AnimationBehavior.shared.cs    |   3 +-
 .../AnimationTypes/AnimationBase.shared.cs    |  92 +--------------
 .../PreBuiltAnimationBase.shared.cs           | 111 ++++++++++++++++++
 .../RubberBandAnimation.shared.cs             |  12 +-
 .../AnimationTypes/TadaAnimation.shared.cs    |  28 +++++
 .../Animations/AnimationWrapper.shared.cs     |   2 +-
 .../Extensions/TaskExtensions.shared.cs       |  20 ++++
 .../Xamarin.CommunityToolkit.csproj           |   8 ++
 8 files changed, 181 insertions(+), 95 deletions(-)
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/PreBuiltAnimationBase.shared.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/TaskExtensions.shared.cs

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationBehavior.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationBehavior.shared.cs
index ba6fc9566..102c6934d 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationBehavior.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationBehavior.shared.cs
@@ -1,5 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using System.Windows.Input;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs
index caa665f69..9d31b42ac 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/AnimationBase.shared.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Xamarin.Forms;
 
 namespace Xamarin.CommunityToolkit.Behaviors
@@ -40,91 +37,4 @@ static object GetDefaultDurationProperty(BindableObject bindable)
 	public abstract class AnimationBase : AnimationBase<View>
 	{
 	}
-
-	public abstract class PreBuiltAnimationBase : AnimationBase
-	{
-		public static readonly BindableProperty IsRepeatedProperty =
-		   BindableProperty.Create(nameof(IsRepeated), typeof(bool), typeof(PreBuiltAnimationBase), default, BindingMode.TwoWay);
-
-		public bool IsRepeated
-		{
-			get => (bool)GetValue(IsRepeatedProperty);
-			set => SetValue(IsRepeatedProperty, value);
-		}
-
-		public override Task Animate(View? view) => Animate(CancellationToken.None, view!);
-
-		public async Task Animate(CancellationToken? cancellationToken, params View[]? views)
-		{
-			if (views != null)
-			{
-				AnimationWrapper? animation = null;
-
-				var taskCompletionSource = new TaskCompletionSource<bool>();
-
-				if (cancellationToken is null)
-					cancellationToken = CancellationToken.None;
-
-				animation = CreateAnimation(
-					16,
-					onFinished: (v, c) =>
-					{
-						try
-						{
-							if (cancellationToken != null)
-							{
-								cancellationToken.Value.ThrowIfCancellationRequested();
-							}
-
-							if (IsRepeated)
-							{
-								return;
-							}
-
-							animation = null;
-							taskCompletionSource.SetResult(c);
-						}
-						catch (OperationCanceledException)
-						{
-							taskCompletionSource.SetCanceled();
-							animation?.Abort();
-						}
-					},
-					shouldRepeat: () => IsRepeated,
-					views);
-
-				animation.Commit();
-
-				await Task.WhenAny(cancellationToken.Value.WhenCanceled(), taskCompletionSource.Task);
-				animation?.Abort();
-			}
-		}
-
-		AnimationWrapper CreateAnimation(
-			uint rate = 16,
-			Action<double, bool>? onFinished = null,
-			Func<bool>? shouldRepeat = null,
-			params View[] views) =>
-			new AnimationWrapper(
-				CreateAnimation(views),
-				Guid.NewGuid().ToString(),
-				views.First(),
-				rate,
-				Duration,
-				Easing,
-				onFinished,
-				shouldRepeat);
-
-		protected abstract Animation CreateAnimation(params View[] views);
-	}
-
-	public static class TaskExtensions
-	{
-		public static Task WhenCanceled(this CancellationToken cancellationToken)
-		{
-			var tcs = new TaskCompletionSource<bool>();
-			cancellationToken.Register(s => ((TaskCompletionSource<bool>)s).SetResult(true), tcs);
-			return tcs.Task;
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/PreBuiltAnimationBase.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/PreBuiltAnimationBase.shared.cs
new file mode 100644
index 000000000..bf19591b3
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/PreBuiltAnimationBase.shared.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Xamarin.CommunityToolkit.Extensions;
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Behaviors
+{
+	/// <summary>
+	/// Represents a complex animation that can be used to animate multiple <see cref="View"/>s.
+	/// </summary>
+	public abstract class PreBuiltAnimationBase : AnimationBase
+	{
+		/// <summary>
+		/// The <see cref="BindableProperty"/> backing store for the <see cref="IsRepeated"/> property.
+		/// </summary>
+		public static readonly BindableProperty IsRepeatedProperty =
+		   BindableProperty.Create(nameof(IsRepeated), typeof(bool), typeof(PreBuiltAnimationBase), default, BindingMode.TwoWay);
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the animation will repeat.
+		/// </summary>
+		public bool IsRepeated
+		{
+			get => (bool)GetValue(IsRepeatedProperty);
+			set => SetValue(IsRepeatedProperty, value);
+		}
+
+		/// <inheritdoc />
+		public override Task Animate(View? view) => Animate(CancellationToken.None, view!);
+
+		/// <summary>
+		/// Runs the animation with the supplied parameters.
+		/// </summary>
+		/// <param name="cancellationToken">A <see cref="CancellationToken"/> to allow for cancelling of the animation.</param>
+		/// <param name="views">All <see cref="View"/>s to be animated.</param>
+		/// <returns>A task that represents the asynchronous operation.</returns>
+		public async Task Animate(CancellationToken? cancellationToken, params View[]? views)
+		{
+			if (views is null || views.Length == 0)
+			{
+				return;
+			}
+
+			AnimationWrapper? animation = null;
+
+			var taskCompletionSource = new TaskCompletionSource<bool>();
+
+			if (cancellationToken is null)
+			{
+				cancellationToken = CancellationToken.None;
+			}
+
+			animation = CreateAnimation(
+				16,
+				onFinished: (v, c) =>
+				{
+					try
+					{
+						if (cancellationToken != null)
+						{
+							cancellationToken.Value.ThrowIfCancellationRequested();
+						}
+
+						if (IsRepeated)
+						{
+							return;
+						}
+
+						animation = null;
+						taskCompletionSource.SetResult(c);
+					}
+					catch (OperationCanceledException)
+					{
+						taskCompletionSource.SetCanceled();
+						animation?.Abort();
+					}
+				},
+				shouldRepeat: () => IsRepeated,
+				views);
+
+			animation.Commit();
+
+			await Task.WhenAny(cancellationToken.Value.WhenCanceled(), taskCompletionSource.Task);
+			animation?.Abort();
+		}
+
+		AnimationWrapper CreateAnimation(
+			uint rate = 16,
+			Action<double, bool>? onFinished = null,
+			Func<bool>? shouldRepeat = null,
+			params View[] views) =>
+			new AnimationWrapper(
+				CreateAnimation(views),
+				Guid.NewGuid().ToString(),
+				views.First(),
+				rate,
+				Duration,
+				Easing,
+				onFinished,
+				shouldRepeat);
+
+		/// <summary>
+		/// Creates the animation ready for running.
+		/// </summary>
+		/// <param name="views">All <see cref="View"/>s to be animated.</param>
+		/// <returns>The <see cref="Animation"/> that will be run.</returns>
+		protected abstract Animation CreateAnimation(params View[] views);
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/RubberBandAnimation.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/RubberBandAnimation.shared.cs
index 84cffa33b..d3a50c0b3 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/RubberBandAnimation.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/RubberBandAnimation.shared.cs
@@ -2,13 +2,23 @@
 
 namespace Xamarin.CommunityToolkit.Behaviors
 {
+    /// <summary>
+	/// A 'Rubber band' animation. Results in:
+	/// <list type="bullet">
+	/// <item>stretching the width and squashing the height</item>
+	/// <item>swapping to squash the width and stretch the height</item>
+	/// <item>gradually swap until we reach 100% width and height again</item>
+	/// </list>
+	/// </summary>
 	public class RubberBandAnimation : PreBuiltAnimationBase
 	{
+        /// <inheritdoc />
         protected override uint DefaultDuration { get; set; } = 1000;
 
+        /// <inheritdoc />
         protected override Animation CreateAnimation(params View[] views) => Create(views);
 
-		static Animation Create(params View[] views)
+        static Animation Create(params View[] views)
 		{
             var animation = new Animation();
 
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimation.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimation.shared.cs
index e8569854e..b6b4f3d88 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimation.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationTypes/TadaAnimation.shared.cs
@@ -2,37 +2,65 @@
 
 namespace Xamarin.CommunityToolkit.Behaviors
 {
+	/// <summary>
+	/// A 'Tada' animation. Results in:
+	/// <list type="bullet">
+	/// <item>reducing the scale of the view(s)</item>
+	/// <item>wobbling the view(s) while scaling up</item>
+	/// <item>scaling back down to 100%</item>
+	/// </list>
+	/// </summary>
 	public class TadaAnimation : PreBuiltAnimationBase
 	{
+		/// <summary>
+		/// The <see cref="BindableProperty"/> backing store for the <see cref="MaximumScale"/> property.
+		/// </summary>
 		public static readonly BindableProperty MaximumScaleProperty =
 		   BindableProperty.Create(nameof(MaximumScale), typeof(double), typeof(TadaAnimation), 1.1, BindingMode.TwoWay);
 
+		/// <summary>
+		/// Gets or sets the maximum value the views will be scaled to during the animation.
+		/// </summary>
 		public double MaximumScale
 		{
 			get => (double)GetValue(MaximumScaleProperty);
 			set => SetValue(MaximumScaleProperty, value);
 		}
 
+		/// <summary>
+		/// The <see cref="BindableProperty"/> backing store for the <see cref="MinimumScale"/> property.
+		/// </summary>
 		public static readonly BindableProperty MinimumScaleProperty =
 		   BindableProperty.Create(nameof(MinimumScale), typeof(double), typeof(TadaAnimation), 0.9, BindingMode.TwoWay);
 
+		/// <summary>
+		/// Gets or sets the minimum value the views will be scaled to during the animation.
+		/// </summary>
 		public double MinimumScale
 		{
 			get => (double)GetValue(MinimumScaleProperty);
 			set => SetValue(MinimumScaleProperty, value);
 		}
 
+		/// <summary>
+		/// The <see cref="BindableProperty"/> backing store for the <see cref="RotationAngle"/> property.
+		/// </summary>
 		public static readonly BindableProperty RotationAngleProperty =
 		   BindableProperty.Create(nameof(RotationAngle), typeof(double), typeof(TadaAnimation), 3.0, BindingMode.TwoWay);
 
+		/// <summary>
+		/// Gets or sets the angle the views will be rotated by during the animation.
+		/// </summary>
 		public double RotationAngle
 		{
 			get => (double)GetValue(RotationAngleProperty);
 			set => SetValue(RotationAngleProperty, value);
 		}
 
+		/// <inheritdoc />
 		protected override uint DefaultDuration { get; set; } = 1000;
 
+		/// <inheritdoc />
 		protected override Animation CreateAnimation(params View[] views) => Create(RotationAngle, MinimumScale, MaximumScale, views);
 
 		static Animation Create(double rotationAngle, double minimumScale, double maximumScale, params View[] views)
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationWrapper.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationWrapper.shared.cs
index dc09cd252..c1e90e2cf 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationWrapper.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Behaviors/Animations/AnimationWrapper.shared.cs
@@ -24,7 +24,7 @@ public AnimationWrapper(
 			Action<double, bool>? onFinished = null,
 			Func<bool>? shouldRepeat = null)
 		{
-			this.name = name + Guid.NewGuid().ToString();
+			this.name = name;
 			this.length = length;
 			this.easing = easing;
 			this.onFinished = onFinished;
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/TaskExtensions.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/TaskExtensions.shared.cs
new file mode 100644
index 000000000..00a7ab33c
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/TaskExtensions.shared.cs
@@ -0,0 +1,20 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Xamarin.CommunityToolkit.Extensions
+{
+	public static class TaskExtensions
+	{
+		/// <summary>
+		/// Provides a mechanism to await until the supplied <paramref name="cancellationToken"/> has been cancelled.
+		/// </summary>
+		/// <param name="cancellationToken">The <see cref="CancellationToken"/> to await.</param>
+		/// <returns>A task that represents the asynchronous operation.</returns>
+		public static Task WhenCanceled(this CancellationToken cancellationToken)
+		{
+			var completionSource = new TaskCompletionSource<bool>();
+			cancellationToken.Register(s => ((TaskCompletionSource<bool>)s).SetResult(true), completionSource);
+			return completionSource.Task;
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj b/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj
index bad141a8f..9ab28addb 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj
@@ -213,5 +213,13 @@
     <Compile Remove="build\*.cs" />
     <None Include="build\**\*.cs;build\**\*.targets" Pack="true" PackagePath="build" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Extensions\TaskExtensions.shared.cs">
+      <SubType></SubType>
+    </Compile>
+    <Compile Update="Behaviors\Animations\AnimationTypes\PreBuiltAnimationBase.shared.cs">
+      <SubType></SubType>
+    </Compile>
+  </ItemGroup>
   <Import Project="..\..\mdoc.targets" Condition=" '$(OS)' == 'Windows_NT' AND '$(GenerateApiDocs)' == 'true'" />
 </Project>