Adding support for tags in ComposableAsset

player-ui · Dec 1, 2024 · de0e73c · de0e73c
1 parent f3f90bc
commit de0e73c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/android/player/src/main/java/com/intuit/playerui/android/AssetContext.kt b/android/player/src/main/java/com/intuit/playerui/android/AssetContext.kt
@@ -51,7 +51,7 @@ public fun AssetContext.withContext(context: Context): AssetContext = copy(conte
 public fun AssetContext.withStyles(@StyleRes vararg styles: Style?): AssetContext = withStyles(styles.filterNotNull())
 
 /** Create a new, styled [AssetContext] */
-public fun AssetContext.withStyles(@StyleRes styles: Styles): AssetContext = if (styles.isEmpty()) {
+public fun AssetContext.withStyles(@StyleRes styles: Styles?): AssetContext = if (styles.isNullOrEmpty()) {
     this
 } else {
     copy(

diff --git a/android/player/src/main/java/com/intuit/playerui/android/asset/RenderableAsset.kt b/android/player/src/main/java/com/intuit/playerui/android/asset/RenderableAsset.kt
@@ -208,7 +208,7 @@ public constructor(public val assetContext: AssetContext) : NodeWrapper {
         .render()
 
     /** Render a [View] with specific [styles] */
-    public fun RenderableAsset.render(@StyleRes styles: Styles, tag: String): View = assetContext
+    public fun RenderableAsset.render(@StyleRes styles: Styles?, tag: String): View = assetContext
         .withContext(this@RenderableAsset.requireContext())
         .withTag(tag)
         .withStyles(styles)

diff --git a/android/player/src/main/java/com/intuit/playerui/android/compose/ComposableAsset.kt b/android/player/src/main/java/com/intuit/playerui/android/compose/ComposableAsset.kt
@@ -69,16 +69,17 @@ fun RenderableAsset.compose(androidViewAttributes: AndroidViewAttributes? = null
 private fun RenderableAsset.composeAndroidView(androidViewAttributes: AndroidViewAttributes? = null) {
     val modifier = androidViewAttributes?.modifier ?: Modifier
     val styles = androidViewAttributes?.styles
+    val tag = androidViewAttributes?.tag
+
     AndroidView(factory = ::FrameLayout, modifier) {
         assetContext.withContext(it.context).build().run {
-            styles?.let { styles ->
-                render(styles)
-            } ?: render()
+            render(styles, tag ?: this@composeAndroidView.asset.id)
         } into it
     }
 }
 
 data class AndroidViewAttributes(
     val modifier: Modifier = Modifier,
     val styles: Styles? = null,
+    val tag: String? = null,
 )
diff --git a/...droid/src/main/java/com/intuit/playerui/android/reference/assets/collection/Collection.kt b/...droid/src/main/java/com/intuit/playerui/android/reference/assets/collection/Collection.kt
@@ -35,15 +35,17 @@ class Collection(assetContext: AssetContext) : ComposableAsset<Collection.Data>(
         Column(verticalArrangement = Arrangement.spacedBy(20.dp)) {
             CompositionLocalProvider(LocalTextStyle provides TextStyle(fontSize = 16.sp)) {
                 data.label?.compose(
-                    modifier = Modifier.padding(top = 10.dp).fillMaxWidth(),
                     androidViewAttributes = AndroidViewAttributes(
+                        modifier = Modifier.padding(top = 10.dp).fillMaxWidth(),
                         styles = listOf(R.style.Text_Label),
                     ),
                 )
             }
             Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) {
                 data.values.map {
-                    it.compose(modifier = Modifier.fillMaxWidth())
+                    it.compose(androidViewAttributes = AndroidViewAttributes(
+                        modifier = Modifier.fillMaxWidth()
+                    ))
                 }
             }
         }