Use the new Skottie animation builder (#277)

The new builder supports loading embedded images as well as caching any images or files if they are re-used.
mono · Apr 16, 2024 · 7d14149 · 7d14149
1 parent 4e03974
commit 7d14149
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/samples/SkiaSharpDemo/Demos/Lottie/LottiePage.xaml b/samples/SkiaSharpDemo/Demos/Lottie/LottiePage.xaml
@@ -8,7 +8,7 @@
     <Grid RowDefinitions="*,Auto">
 
         <controls:SKLottieView x:Name="lottieView"
-                               Source="Lottie/trophy.json"
+                               Source="Lottie/dotnetbot.json"
                                Duration="{Binding Duration}"
                                Progress="{Binding Progress}"
                                IsAnimationEnabled="{Binding IsBusy}"

diff --git a/samples/SkiaSharpDemo/Resources/Raw/Lottie/dotnetbot.json b/samples/SkiaSharpDemo/Resources/Raw/Lottie/dotnetbot.json
diff --git a/source/SkiaSharp.Extended.UI.Maui/Controls/Lottie/SKFileLottieImageSource.shared.cs b/source/SkiaSharp.Extended.UI.Maui/Controls/Lottie/SKFileLottieImageSource.shared.cs
@@ -26,7 +26,7 @@ public override async Task<SKLottieAnimation> LoadAnimationAsync(CancellationTok
 			if (stream is null)
 				throw new FileLoadException($"Unable to load Lottie animation file \"{File}\".");
 
-			var animation = Skottie.Animation.Create(stream);
+			var animation = CreateAnimationBuilder().Build(stream);
 			if (animation is null)
 				throw new FileLoadException($"Unable to parse Lottie animation \"{File}\".");
 

diff --git a/source/SkiaSharp.Extended.UI.Maui/Controls/Lottie/SKLottieImageSource.shared.cs b/source/SkiaSharp.Extended.UI.Maui/Controls/Lottie/SKLottieImageSource.shared.cs
@@ -1,4 +1,5 @@
-
+using SkiaSharp.Resources;
+
 namespace SkiaSharp.Extended.UI.Controls;
 
 [TypeConverter(typeof(Converters.SKLottieImageSourceConverter))]
@@ -10,6 +11,11 @@ public abstract class SKLottieImageSource : Element
 
 	public abstract Task<SKLottieAnimation> LoadAnimationAsync(CancellationToken cancellationToken = default);
 
+	internal Skottie.AnimationBuilder CreateAnimationBuilder() =>
+		Skottie.Animation.CreateBuilder()
+			.SetResourceProvider(new CachingResourceProvider(new DataUriResourceProvider()))
+			.SetFontManager(SKFontManager.Default);
+
 	public static object FromUri(Uri uri) =>
 		new SKUriLottieImageSource { Uri = uri };
 

diff --git a/source/SkiaSharp.Extended.UI.Maui/Controls/Lottie/SKStreamLottieImageSource.shared.cs b/source/SkiaSharp.Extended.UI.Maui/Controls/Lottie/SKStreamLottieImageSource.shared.cs
@@ -23,7 +23,7 @@ public override async Task<SKLottieAnimation> LoadAnimationAsync(CancellationTok
 		if (stream is null)
 			throw new FileLoadException($"Unable to load Lottie animation stream.");
 
-		var animation = Skottie.Animation.Create(stream);
+		var animation = CreateAnimationBuilder().Build(stream);
 		if (animation is null)
 			throw new FileLoadException($"Unable to parse Lottie animation.");
 

diff --git a/source/SkiaSharp.Extended.UI.Maui/Controls/Lottie/SKUriLottieImageSource.shared.cs b/source/SkiaSharp.Extended.UI.Maui/Controls/Lottie/SKUriLottieImageSource.shared.cs
@@ -30,7 +30,7 @@ public override async Task<SKLottieAnimation> LoadAnimationAsync(CancellationTok
 			if (stream is null)
 				throw new FileLoadException($"Unable to load Lottie animation uri \"{Uri}\".");
 
-			var animation = Skottie.Animation.Create(stream);
+			var animation = CreateAnimationBuilder().Build(stream);
 			if (animation is null)
 				throw new FileLoadException($"Unable to parse Lottie animation \"{Uri}\".");