Update Rive version

matmork · Aug 20, 2024 · 3cb539a · 3cb539a
1 parent 590005b
commit 3cb539a
Show file tree

Hide file tree

Showing 57 changed files with 6,352 additions and 3,596 deletions.
diff --git a/samples/Example/MauiProgram.cs b/samples/Example/MauiProgram.cs
@@ -10,7 +10,7 @@ public static MauiApp CreateMauiApp()
         var builder = MauiApp.CreateBuilder();
         builder
             .UseMauiApp<App>()
-            .UseRive()
+            .UseRive(riveAndroidRendererType: RiveAndroidRendererType.Skia)
             .ConfigureFonts(fonts =>
             {
                 fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");

diff --git a/src/Rive.Android/README.MD b/src/Rive.Android/README.MD
@@ -1,4 +1,4 @@
 # Rive.Android
 
 Current version
-[9.3.4](https://github.com/rive-app/rive-android/blob/master/CHANGELOG.md)
+[9.6.4](https://central.sonatype.com/artifact/app.rive/rive-android/9.6.4)
diff --git a/src/Rive.Android/Rive.Android.csproj b/src/Rive.Android/Rive.Android.csproj
@@ -8,7 +8,7 @@
 		<PackageId>Rive.Android</PackageId>
 		<Title>Rive Android</Title>
 		<Description>Wrapper around the Android runtime</Description>
-		<VersionPrefix>1.0.0</VersionPrefix>
+		<VersionPrefix>1.0.1</VersionPrefix>
 		<PackageProjectUrl>https://github.com/matmork/rive-maui</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/matmork/rive-maui</RepositoryUrl>
 		<IncludeSymbols>true</IncludeSymbols>

diff --git a/src/Rive.Android/rive-android-9.3.4.aar → src/Rive.Android/rive-android-9.6.4.aar b/src/Rive.Android/rive-android-9.3.4.aar → src/Rive.Android/rive-android-9.6.4.aar
diff --git a/src/Rive.Maui/MauiAppBuilderExtensions.cs b/src/Rive.Maui/MauiAppBuilderExtensions.cs
@@ -2,23 +2,30 @@
 {
     public static class MauiAppBuilderExtensions
     {
-        public static MauiAppBuilder UseRive(this MauiAppBuilder builder, RiveRendererType rendererType = RiveRendererType.Skia)
+        public static MauiAppBuilder UseRive(
+            this MauiAppBuilder builder,
+            RiveAndroidRendererType riveAndroidRendererType = RiveAndroidRendererType.Rive,
+            RiveIOSRendererType riveIosRendererType = RiveIOSRendererType.Rive)
         {
 #if ANDROID
-            var renderer = rendererType switch
+            var renderer = riveAndroidRendererType switch
             {
-                RiveRendererType.Rive => Android.Core.RendererType.Rive!,
-                RiveRendererType.Skia => Android.Core.RendererType.Skia!
+                RiveAndroidRendererType.Rive => Android.Core.RendererType.Rive!,
+                RiveAndroidRendererType.Skia => Android.Core.RendererType.Skia!,
+                RiveAndroidRendererType.Canvas => Android.Core.RendererType.Canvas!,
             };
 
             Android.Core.Rive.Instance.Init(Platform.AppContext, renderer);
 #endif
 
 #if IOS
-            // At this time, the Rive Renderer is not supported in simulator environments, default is Skia
-            // See https://help.rive.app/runtimes/renderer
-            if (rendererType == RiveRendererType.Rive && DeviceInfo.DeviceType == DeviceType.Physical)
-                Rive.iOS.RenderContextManager.Shared.DefaultRenderer = Rive.iOS.RendererType.riveRenderer;
+            var renderer = riveIosRendererType switch
+            {
+                RiveIOSRendererType.Rive => Rive.iOS.RendererType.riveRenderer,
+                RiveIOSRendererType.CoreGraphics => Rive.iOS.RendererType.cgRenderer,
+            };
+
+            Rive.iOS.RenderContextManager.Shared.DefaultRenderer = renderer;
 #endif
 
             builder.ConfigureMauiHandlers(handlers => handlers.AddHandler<RivePlayer, RivePlayerRenderer>());

diff --git a/src/Rive.Maui/Rive.Maui.csproj b/src/Rive.Maui/Rive.Maui.csproj
@@ -13,7 +13,7 @@
 		<PackageId>Rive.Maui</PackageId>
 		<Title>Rive Maui</Title>
 		<Description>Rive animations in Maui using iOS/Android runtimes</Description>
-		<VersionPrefix>1.0.0</VersionPrefix>
+		<VersionPrefix>1.0.1</VersionPrefix>
 		<PackageProjectUrl>https://github.com/matmork/rive-maui</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/matmork/rive-maui</RepositoryUrl>
 		<IncludeSymbols>true</IncludeSymbols>

diff --git a/src/Rive.Maui/RivePlayerEnums.cs b/src/Rive.Maui/RivePlayerEnums.cs
@@ -39,10 +39,17 @@ public enum RivePlayerAlignment
     BottomRight
 }
 
-public enum RiveRendererType
+public enum RiveAndroidRendererType
 {
+    Rive,
     Skia,
-    Rive
+    Canvas
+}
+
+public enum RiveIOSRendererType
+{
+    Rive,
+    CoreGraphics
 }
 
 public enum RivePlayerEvent