feat: Add support for Lottie on macOS

unoplatform · Mar 25, 2020 · 1b8c6e5 · 1b8c6e5
1 parent 17df575
commit 1b8c6e5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/src/AddIns/Uno.UI.Lottie/LottieVisualSource.cs b/src/AddIns/Uno.UI.Lottie/LottieVisualSource.cs
@@ -46,7 +46,7 @@ public async Task SetSourceAsync(Uri sourceUri)
 		}
 
 
-#if !(__WASM__ || __ANDROID__ || __IOS__)
+#if !(__WASM__ || __ANDROID__ || __IOS__ || __MACOS__)
 
 		private void Update()
 		{

diff --git a/...s/Uno.UI.Lottie/LottieVisualSource.iOS.cs → ....UI.Lottie/LottieVisualSource.iOSmacOS.cs b/...s/Uno.UI.Lottie/LottieVisualSource.iOS.cs → ....UI.Lottie/LottieVisualSource.iOSmacOS.cs
@@ -3,6 +3,12 @@
 using Windows.UI.Xaml.Controls;
 using Airbnb.Lottie;
 
+#if __IOS__
+using _ViewContentMode = UIKit.UIViewContentMode;
+#else
+using _ViewContentMode = Airbnb.Lottie.LOTViewContentMode;
+#endif
+
 namespace Microsoft.Toolkit.Uwp.UI.Lottie
 {
 	partial class LottieVisualSource
@@ -29,8 +35,11 @@ public void Update(AnimatedVisualPlayer player)
 				_animation = new LOTAnimationView();
 				//_animation.Scale = (float)Scale;
 				SetProperties();
-
+#if __IOS__
 				player.Add(_animation);
+#else
+				player.AddSubview(_animation);
+#endif
 			}
 			else
 			{
@@ -44,18 +53,17 @@ void SetProperties()
 				switch (player.Stretch)
 				{
 					case Windows.UI.Xaml.Media.Stretch.None:
-						_animation.ContentMode = UIKit.UIViewContentMode.Center;
+						_animation.ContentMode = _ViewContentMode.Center;
 						break;
 					case Windows.UI.Xaml.Media.Stretch.Uniform:
-						_animation.ContentMode = UIKit.UIViewContentMode.ScaleAspectFit;
+						_animation.ContentMode = _ViewContentMode.ScaleAspectFit;
 						break;
 					case Windows.UI.Xaml.Media.Stretch.Fill:
-						_animation.ContentMode = UIKit.UIViewContentMode.ScaleToFill;
+						_animation.ContentMode = _ViewContentMode.ScaleToFill;
 						break;
 					case Windows.UI.Xaml.Media.Stretch.UniformToFill:
-						_animation.ContentMode = UIKit.UIViewContentMode.ScaleAspectFill;
+						_animation.ContentMode = _ViewContentMode.ScaleAspectFill;
 						break;
-
 				}
 
 
@@ -116,7 +124,7 @@ public void Unload()
 
 		Size IAnimatedVisualSource.Measure(Size availableSize)
 		{
-			throw new NotImplementedException();
+			return availableSize;
 		}
 	}
 }
diff --git a/src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.csproj b/src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.csproj
@@ -36,7 +36,7 @@
 		<PackageReference Include="Com.Airbnb.Android.Lottie" Version="2.5.2.1" PrivateAssets="none" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'xamarinios10'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'xamarinios10' or '$(TargetFramework)' == 'xamarinmac20'">
 		<PackageReference Include="Com.Airbnb.iOS.Lottie" Version="2.5.10" PrivateAssets="none" />
 	</ItemGroup>