fix(catalyst): Move to newer Preview 14 API breaking changes

unoplatform · Feb 21, 2022 · 89e70c1 · 89e70c1
1 parent 00144d4
commit 89e70c1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/Uno.UI.Composition/Composition/CoreAnimation.iOSmacOS.cs b/src/Uno.UI.Composition/Composition/CoreAnimation.iOSmacOS.cs
@@ -155,7 +155,13 @@ private void StartAnimation(float from, float to, float delayMilliseconds, float
 				var discreteAnim = CAKeyFrameAnimation.FromKeyPath(_property);
 				discreteAnim.KeyTimes = new NSNumber[] {new NSNumber(0.0), new NSNumber(1.0)};
 				discreteAnim.Values = new NSObject[] {_nsValueConversion(to)};
-				discreteAnim.CalculationMode = CAKeyFrameAnimation.AnimationDescrete;
+
+				discreteAnim.CalculationMode
+#if NET6_0_OR_GREATER
+					 = CAKeyFrameAnimation.AnimationDiscrete;
+#else
+					 = CAKeyFrameAnimation.AnimationDescrete;
+#endif
 
 				animation = discreteAnim;
 			}

diff --git a/src/Uno.UI/UI/Xaml/Media/Animation/Animators/DisplayLinkValueAnimator.iOSmacOS.cs b/src/Uno.UI/UI/Xaml/Media/Animation/Animators/DisplayLinkValueAnimator.iOSmacOS.cs
@@ -194,10 +194,15 @@ private void ReleaseDisplayLink()
 		{
 			if (_isAttachedToLooper)
 			{
-#if __IOS__
 				//Detach the _displayLink to the MainLoop (uiThread).
+#if __IOS__
+#if NET6_0_OR_GREATER
+				_displayLink?.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoopMode.Default);//detaches from the UI thread
+				_displayLink?.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoopMode.UITracking);
+#else
 				_displayLink?.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoop.NSDefaultRunLoopMode);//detaches from the UI thread
 				_displayLink?.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoop.UITrackingRunLoopMode);
+#endif
 				_displayLink = null;
 #endif
 				_isAttachedToLooper = false;

diff --git a/src/Uno.UI/UI/Xaml/Media/CompositionTarget.iOS.cs b/src/Uno.UI/UI/Xaml/Media/CompositionTarget.iOS.cs
@@ -32,8 +32,13 @@ public static event EventHandler<object> Rendering
 
 				if(_handlers.Count == 0)
 				{
+#if NET6_0_OR_GREATER
+					_displayLink.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoopMode.Default);
+					_displayLink.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoopMode.UITracking);
+#else
 					_displayLink.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoop.NSDefaultRunLoopMode);
 					_displayLink.RemoveFromRunLoop(NSRunLoop.Main, NSRunLoop.UITrackingRunLoopMode);
+#endif
 					_displayLink = null;
 				}
 			}