Asset types in Kotlin

- As discussed, expose a way to determine the AssetType in Kotlin
- Cleans up a couple of things highlighted by @dragostis previously

Diffs=
69396dd2b Asset types for Images and Fonts in Kotlin (#7039)

Co-authored-by: Umberto Sonnino <[email protected]>

Author: umberto-sonnino

Diff for: .rive_head

@@ -1 +1 @@
-2828b7b013811f1f4b0b0e2ee0f6d9b23c73878b
+69396dd2bb3931cefee324201db34a366e3baefa

Diff for: app/src/main/java/app/rive/runtime/example/AssetLoaderFragment.kt

@@ -15,7 +15,11 @@ import app.rive.runtime.kotlin.RiveAnimationView
 import app.rive.runtime.kotlin.core.BytesRequest
 import app.rive.runtime.kotlin.core.FileAsset
 import app.rive.runtime.kotlin.core.FileAssetLoader
+import app.rive.runtime.kotlin.core.FontAsset
+import app.rive.runtime.kotlin.core.ImageAsset
 import app.rive.runtime.kotlin.core.Loop
+import app.rive.runtime.kotlin.core.RiveFont
+import app.rive.runtime.kotlin.core.RiveRenderImage
 import com.android.volley.RequestQueue
 import com.android.volley.toolbox.Volley
 import kotlin.random.Random
@@ -33,6 +37,21 @@ private fun makeContainer(context: Context): FrameLayout {
     }
 }
 
+private fun makeButton(
+    context: Context,
+    label: String,
+    clickListener: View.OnClickListener
+): Button {
+    return Button(context).apply {
+        layoutParams = ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.WRAP_CONTENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT,
+        )
+        text = label
+        setOnClickListener(clickListener)
+    }
+}
+
 class AssetLoaderFragment : Fragment() {
     private var _binding: FragmentAssetLoaderBinding? = null
     private val binding get() = _binding!!
@@ -76,36 +95,28 @@ class AssetButtonFragment : Fragment() {
 
     private val loremImage = "https://picsum.photos"
     private lateinit var queue: RequestQueue
-    private lateinit var assetStore: AssetStore
-    private val minSize = 150
-    private val maxSize = 500
+    private lateinit var assetStore: ImageAssetStore
+    private val minSize = 750
+    private val maxSize = 1000
     private val maxId = 1084
-    private var lastAssetChanged = 0
 
-    private fun makeButton(context: Context): Button {
-        return Button(context).apply {
-            layoutParams = ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT,
+    private fun randomImageButton(context: Context): Button {
+        return makeButton(context, "Change Image") {
+            val randomWidth = Random.nextInt(minSize, maxSize)
+            val randomHeight = Random.nextInt(minSize, maxSize)
+            val imgId = Random.nextInt(maxId)
+            val url = "$loremImage/id/$imgId/$randomWidth/$randomHeight"
+            val request = BytesRequest(
+                url,
+                { bytes ->
+                    assetStore.nextAsset.image = RiveRenderImage.make(bytes)
+                },
+                {
+                    Log.e("Request", "onAssetLoaded: failed to load $url.")
+                    it.printStackTrace()
+                }
             )
-            text = "Change Image"
-            setOnClickListener {
-                val randomAsset =
-                    assetStore.assetList[lastAssetChanged++ % assetStore.assetList.size]
-                val randomWidth = Random.nextInt(minSize, maxSize)
-                val randomHeight = Random.nextInt(minSize, maxSize)
-                val imgId = Random.nextInt(maxId)
-                val url = "$loremImage/id/$imgId/$randomWidth/$randomHeight"
-                val request = BytesRequest(
-                    url,
-                    { bytes -> randomAsset.decode(bytes) },
-                    {
-                        Log.e("Request", "onAssetLoaded: failed to load $url.")
-                        it.printStackTrace()
-                    }
-                )
-                queue.add(request)
-            }
+            queue.add(request)
         }
     }
 
@@ -119,39 +130,73 @@ class AssetButtonFragment : Fragment() {
         val ctx = view.context
         queue = Volley.newRequestQueue(ctx)
 
-        assetStore = AssetStore()
+        assetStore = ImageAssetStore()
         val riveView = RiveAnimationView.Builder(ctx)
             .setAssetLoader(assetStore)
-            .setResource(R.raw.walle)
+            .setResource(R.raw.asset_load_check)
             .build()
 
         makeContainer(ctx).let {
             it.addView(riveView)
             binding.fragmentButtonContainer.addView(it)
         }
 
-        makeButton(ctx).let {
+        randomImageButton(ctx).let {
             binding.fragmentButtonContainer.addView(it)
         }
 
 
         return view
     }
 
-    private class AssetStore : FileAssetLoader() {
-        val assetList = mutableListOf<FileAsset>()
+    private class ImageAssetStore : FileAssetLoader() {
+        private var lastAssetChanged = 0
+        val assetList = mutableListOf<ImageAsset>()
+
+        val nextAsset: ImageAsset
+            get() = assetList[lastAssetChanged++ % assetList.size]
+
         override fun loadContents(asset: FileAsset, inBandBytes: ByteArray): Boolean {
-            return assetList.add(asset)
+            if (asset is ImageAsset) {
+                return assetList.add(asset)
+            }
+            return false
         }
     }
 }
 
 class FontAssetFragment : Fragment() {
     private var _binding: FragmentAssetButtonBinding? = null
+    private lateinit var queue: RequestQueue
     private val binding get() = _binding!!
 
     private lateinit var fontDecoder: RandomFontDecoder
 
+    private val fontUrls = listOf(
+        "https://cdn.rive.app/runtime/flutter/IndieFlower-Regular.ttf",
+        "https://cdn.rive.app/runtime/flutter/comic-neue.ttf",
+        "https://cdn.rive.app/runtime/flutter/inter.ttf",
+        "https://cdn.rive.app/runtime/flutter/inter-tight.ttf",
+        "https://cdn.rive.app/runtime/flutter/josefin-sans.ttf",
+        "https://cdn.rive.app/runtime/flutter/send-flowers.ttf",
+    )
+
+
+    private fun randomFontButton(context: Context): Button {
+        return makeButton(context, "Change Font") {
+            val url = fontUrls.random()
+            val request = BytesRequest(
+                url,
+                { bytes -> fontDecoder.fontAsset.font = RiveFont.make(bytes) },
+                {
+                    Log.e("Request", "onAssetLoaded: failed to load $url.")
+                    it.printStackTrace()
+                }
+            )
+            queue.add(request)
+        }
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -160,6 +205,7 @@ class FontAssetFragment : Fragment() {
         _binding = FragmentAssetButtonBinding.inflate(inflater, container, false)
         val view = binding.root
         val ctx = view.context
+        queue = Volley.newRequestQueue(ctx)
 
         fontDecoder = RandomFontDecoder(ctx)
         val riveView = RiveAnimationView.Builder(ctx)
@@ -173,20 +219,26 @@ class FontAssetFragment : Fragment() {
             it.addView(riveView)
             binding.fragmentButtonContainer.addView(it)
         }
+        randomFontButton(ctx).let {
+            binding.fragmentButtonContainer.addView(it)
+        }
 
         return view
     }
 
     private class RandomFontDecoder(private val context: Context) : FileAssetLoader() {
-        lateinit var fontAsset: FileAsset
+        lateinit var fontAsset: FontAsset
         override fun loadContents(asset: FileAsset, inBandBytes: ByteArray): Boolean {
-            // Store a reference to the asset.
-            fontAsset = asset
-
-            // Load the original font
-            context.resources.openRawResource(R.raw.roboto).use {
-                return asset.decode(it.readBytes())
+            if (asset is FontAsset) {
+                // Store a reference to the asset.
+                fontAsset = asset
+
+                // Load the original font
+                context.resources.openRawResource(R.raw.roboto).use {
+                    return asset.decode(it.readBytes())
+                }
             }
+            return false
         }
     }
 }

Diff for: app/src/main/res/layout/fragment_asset_button.xml

@@ -4,7 +4,6 @@
     android:id="@+id/fragmentButtonContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#57A5E0"
     android:gravity="center"
     android:orientation="vertical"
     android:padding="16dp"

Diff for: app/src/main/res/layout/fragment_asset_loader.xml

@@ -5,7 +5,6 @@
     android:id="@+id/fragmentLoaderContainer"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="#57A5E0"
     android:gravity="center"
     android:orientation="vertical"
     android:padding="16dp"

Diff for: app/src/main/res/raw/asset_load_check.riv

@@ -11,7 +11,7 @@ ext {
 }
 buildscript {
     ext {
-        gradle_version = '8.3.1'
+        gradle_version = '8.3.2'
         kotlin_version = '1.9.22'
         dokkaVersion = "1.4.30"
         compose_version = '1.6.2'

Diff for: build.gradle

@@ -16,6 +16,6 @@ org.gradle.jvmargs=-Xmx2048m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official

Diff for: gradle.properties

@@ -9,7 +9,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -38,7 +38,7 @@ android {
         dokkaSourceSets {
             named("main") {
                 noAndroidSdkLink.set(false)
-                outputDirectory.set(buildDir.resolve("dokka"))
+                outputDirectory.set(layout.buildDirectory.resolve("dokka"))
                 reportUndocumented.set(true)
             }
         }
@@ -64,6 +64,7 @@ dependencies {
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.9.22"
 }
 
 // Commenting this out, this only really helps when you're doing local dev, but it means our git actions need abd!