Animations (#1436)

* Initial Animations Pass * Added more lerps. Cleaned up the old ones * Cleaned up animation initialization * Fixed so many tests * fixed final animation tests * Fixed version mangling by VSMac * Updated the Windows Native Ticker * Fixed null crap * Update NativeTicker.cs * fix tests * Update src/Core/src/Platform/Android/NativeTicker.cs Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> * Fixed nullability * Code cleanup Co-authored-by: Jonathan Dick <jond@hey.com> Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com>
dotnet · Jun 24, 2021 · 3c85507 · 3c85507
1 parent c3083b9
commit 3c85507
Show file tree

Hide file tree

Showing 53 changed files with 1,272 additions and 610 deletions.
diff --git a/src/Compatibility/Core/src/Android/AndroidTicker.cs b/src/Compatibility/Core/src/Android/AndroidTicker.cs
diff --git a/src/Compatibility/Core/src/Android/Forms.cs b/src/Compatibility/Core/src/Android/Forms.cs
@@ -361,7 +361,6 @@ static void SetupInit(
 			Device.SetFlags(s_flags);
 
 			Profile.FramePartition("AndroidTicker");
-			Ticker.SetDefault(null);
 
 			Profile.FramePartition("RegisterAll");
 
@@ -670,11 +669,6 @@ public void BeginInvokeOnMainThread(Action action)
 				s_handler.Post(action);
 			}
 
-			public Ticker CreateTicker()
-			{
-				return new AndroidTicker();
-			}
-
 			public Assembly[] GetAssemblies()
 			{
 				return AppDomain.CurrentDomain.GetAssemblies();

diff --git a/src/Compatibility/Core/src/Android/PowerSaveModeBroadcastReceiver.cs b/src/Compatibility/Core/src/Android/PowerSaveModeBroadcastReceiver.cs
@@ -1,4 +1,5 @@
 using Android.Content;
+using Microsoft.Maui.Animations;
 using Microsoft.Maui.Controls.Internals;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
@@ -13,7 +14,7 @@ public override void OnReceive(Context context, Intent intent)
 
 		public void CheckAnimationEnabledStatus()
 		{
-			((AndroidTicker)Ticker.Default).CheckAnimationEnabledStatus();
+			NativeTicker.CheckPowerSaveModeStatus();
 		}
 	}
 }
diff --git a/src/Compatibility/Core/src/Compatibility.csproj b/src/Compatibility/Core/src/Compatibility.csproj
@@ -68,7 +68,7 @@
     <Compile Include="RendererToHandlerShim.cs" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup>    
     <PackageReference Include="Microsoft.Extensions.Configuration" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />

diff --git a/src/Compatibility/Core/src/WinUI/WindowsBasePlatformServices.cs b/src/Compatibility/Core/src/WinUI/WindowsBasePlatformServices.cs
@@ -60,11 +60,6 @@ public void BeginInvokeOnMainThread(Action action)
 			//await TryAllDispatchers(action);
 		}
 
-		public Ticker CreateTicker()
-		{
-			return new WindowsTicker();
-		}
-
 		public virtual Assembly[] GetAssemblies()
 		{
 

diff --git a/src/Compatibility/Core/src/WinUI/WindowsTicker.cs b/src/Compatibility/Core/src/WinUI/WindowsTicker.cs
diff --git a/src/Compatibility/Core/src/iOS/CADisplayLinkTicker.cs b/src/Compatibility/Core/src/iOS/CADisplayLinkTicker.cs
diff --git a/src/Compatibility/Core/src/iOS/Forms.cs b/src/Compatibility/Core/src/iOS/Forms.cs
@@ -15,6 +15,7 @@
 using Microsoft.Maui.Controls.PlatformConfiguration;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Animations;
 
 #if __MOBILE__
 using UIKit;
@@ -330,11 +331,6 @@ public void BeginInvokeOnMainThread(Action action)
 				NSRunLoop.Main.BeginInvokeOnMainThread(action.Invoke);
 			}
 
-			public Ticker CreateTicker()
-			{
-				return new CADisplayLinkTicker();
-			}
-
 			public Assembly[] GetAssemblies()
 			{
 				return AppDomain.CurrentDomain.GetAssemblies();

diff --git a/src/Compatibility/Core/src/iOS/VisualElementTracker.cs b/src/Compatibility/Core/src/iOS/VisualElementTracker.cs
@@ -343,7 +343,7 @@ void update()
 
 #if __MOBILE__
 			if (thread)
-				CADisplayLinkTicker.Default.Invoke(update);
+				view.Dispatcher.Dispatch(update);
 			else
 				update();
 #else

diff --git a/src/Controls/samples/Controls.Sample.Droid/Controls.Sample.Droid.csproj b/src/Controls/samples/Controls.Sample.Droid/Controls.Sample.Droid.csproj
@@ -83,7 +83,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Compatibility\Core\src\Compatibility.csproj">
-      <Project>{8e86f0da-ed1c-409e-a7a9-df3e58498620}</Project>
+      <Project>{9FAA9654-80E6-4664-9702-47998A04E8FE}</Project>
       <Name>Compatibility</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Essentials\src\Essentials.csproj">
@@ -99,7 +99,7 @@
       <Name>Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\Controls.Sample\Controls.Sample.csproj">
-      <Project>{90b727dd-4c7b-4462-950f-61842a87de8a}</Project>
+      <Project>{8e86f0da-ed1c-409e-a7a9-df3e58498620}</Project>
       <Name>Controls.Sample</Name>
     </ProjectReference>
   </ItemGroup>

diff --git a/src/Controls/src/Core/AnimatableKey.cs b/src/Controls/src/Core/AnimatableKey.cs
@@ -1,4 +1,5 @@
 using System;
+using Microsoft.Maui.Animations;
 
 namespace Microsoft.Maui.Controls
 {