Byte[] dynamic asset

Author: matmork

src/Rive.Maui/DynamicAsset.cs

@@ -2,18 +2,8 @@ namespace Rive.Maui;
 
 public class DynamicAsset
 {
-    public DynamicAsset()
-    {
-    }
-
-    public DynamicAsset(string name, string filename, string extension)
-    {
-        Name = name;
-        Filename = filename;
-        Extension = extension;
-    }
-
     public required string Name { get; set; }
-    public required string Filename { get; set; }
-    public required string Extension { get; set; }
+    public string? Filename { get; set; }
+    public string? FileExtension { get; set; }
+    public byte[]? FileBytes { get; set; }
 }

src/Rive.Maui/EventReceivedArgs.cs

@@ -1,3 +1,3 @@
 namespace Rive.Maui;
 
-public record EventReceivedArgs(string Name, RivePlayerEvent Type, Dictionary<string, object>? Properties);
+public record StateMachineEventReceivedArgs(string Name, RivePlayerEvent Type, Dictionary<string, object>? Properties);

src/Rive.Maui/Platforms/Android/AssetLoader.cs

@@ -20,27 +20,39 @@ public override bool LoadContents(FileAsset asset, byte[] inBandBytes)
         if (dynamicAsset == null)
             return false;
 
-        var resourceIdentifier = _context.Resources?.GetIdentifier(dynamicAsset.Filename, "drawable", _context.PackageName) ?? 0;
-        if (resourceIdentifier == 0)
-            return false;
+        byte[]? newData = null;
+        if (!string.IsNullOrWhiteSpace(dynamicAsset.Filename))
+        {
+            var resourceIdentifier = _context.Resources?.GetIdentifier(dynamicAsset.Filename, "drawable", _context.PackageName) ?? 0;
+            if (resourceIdentifier == 0)
+                return false;
 
-        using var stream = _context.Resources?.OpenRawResource(resourceIdentifier);
-        if (stream == null)
-            return false;
+            using var stream = _context.Resources?.OpenRawResource(resourceIdentifier);
+            if (stream == null)
+                return false;
 
-        using var memoryStream = new MemoryStream();
-        stream.CopyTo(memoryStream);
+            using var memoryStream = new MemoryStream();
+            stream.CopyTo(memoryStream);
+
+            newData = memoryStream.ToArray();
+        }
+
+        if (dynamicAsset.FileBytes != null)
+            newData = dynamicAsset.FileBytes;
+
+        if (newData == null)
+            return false;
 
         switch (asset)
         {
             case ImageAsset imageAsset:
-                imageAsset.Decode(memoryStream.ToArray());
+                imageAsset.Decode(newData);
                 return true;
             case FontAsset fontAsset:
-                fontAsset.Decode(memoryStream.ToArray());
+                fontAsset.Decode(newData);
                 return true;
             case AudioAsset audioAsset:
-                audioAsset.Decode(memoryStream.ToArray());
+                audioAsset.Decode(newData);
                 return true;
             default:
                 return false;

src/Rive.Maui/Platforms/Android/EventListener.cs

@@ -21,7 +21,7 @@ public void NotifyEvent(RiveEvent evt)
 
         var properties = evt.Properties
             .ToDictionary<KeyValuePair<string, Object>, string, object>(k => k.Key, k => k.Value);
-        var args = new EventReceivedArgs(evt.Name, type, properties);
+        var args = new StateMachineEventReceivedArgs(evt.Name, type, properties);
 
         virtualView.EventReceivedManager.HandleEvent(this, args, nameof(RivePlayer.EventReceived));
         virtualView.EventReceivedCommand?.Execute(args);

src/Rive.Maui/Platforms/iOS/CustomRiveView.cs

@@ -57,7 +57,13 @@ public void SetRiveResource(string? resourceName)
                 if (dynamicAsset == null)
                     return false;
 
-                var newData = GetNSDataForResource(dynamicAsset.Filename, dynamicAsset.Extension);
+                NSData? newData = null;
+                if (!string.IsNullOrWhiteSpace(dynamicAsset.Filename) && !string.IsNullOrWhiteSpace(dynamicAsset.FileExtension))
+                    newData = GetNSDataForResource(dynamicAsset.Filename, dynamicAsset.FileExtension);
+
+                if (dynamicAsset.FileBytes != null)
+                    newData = NSData.FromArray(dynamicAsset.FileBytes);
+
                 if (newData == null)
                     return false;
 
@@ -165,7 +171,7 @@ private void Tick()
                     {
                         var properties = evt.Properties
                             ?.ToDictionary<KeyValuePair<NSString, NSObject>, string, object>(k => k.Key, k => k.Value);
-                        var args = new EventReceivedArgs(evt.Name, (RivePlayerEvent)evt.Type, properties);
+                        var args = new StateMachineEventReceivedArgs(evt.Name, (RivePlayerEvent)evt.Type, properties);
                         control.EventReceivedManager.HandleEvent(this, args, nameof(RivePlayer.EventReceived));
                         control.EventReceivedCommand?.Execute(args);
                     }