@onekeyfe/react-native-native-list 6.7.0-alpha.397 → 6.7.0-alpha.399

package/android/src/main/java/com/onekey/nativelist/NativeListActivityRenderer.kt

@@ -54,6 +54,13 @@ internal class NativeListActivityRowView(context: ThemedReactContext, fonts: Nat
     details.onAction = { key, view, source, slot -> emitAction(key, view, source, slot) }
   }
 
+  /** Host clipping for the current bind; see [nativeListActivityHostClips]. */
+  private fun setHostClipping(clips: Boolean) {
+    content.clipChildren = clips
+    clipChildren = clips
+    clipToPadding = clips
+  }
+
   override fun defaultHeight(item: NativeListItem, layout: String) =
     if (item.json.has("amounts")) 0 else if ((item.json.optJSONArray("footerActions")?.length() ?: 0) > 0) 104 else 60
 
@@ -76,6 +83,10 @@ internal class NativeListActivityRowView(context: ThemedReactContext, fonts: Nat
       setPadding(hp, vp, hp, vp)
       visual.recycle()
       details.bind(item, theme, sourceScale)
+      // This view may be reused from a legacy row whose overhanging badge
+      // switched clipping off; a rich row has no badge on the host, so restore
+      // the defaults before returning.
+      setHostClipping(nativeListActivityHostClips(rich = true, leadingOverhangs = false))
       return
     }
     details.recycle()
@@ -157,6 +168,18 @@ internal class NativeListActivityRowView(context: ThemedReactContext, fonts: Nat
       sourceScale,
       data.optJSONObject("secondaryLeading"),
     )
+    // The token network badge hangs 4dp past the 40dp visual and Android clips a
+    // child to its own bounds while its parent clips children, so with the
+    // default clipping the history rows showed the badge cut flat (OK-66071).
+    // Stop clipping the content row and this row's padding exactly when the
+    // bound visual reports such a badge (SPEC "Leading badge overhang"), as the
+    // Identity renderer does.
+    setHostClipping(
+      nativeListActivityHostClips(
+        rich = false,
+        leadingOverhangs = !hideLeading && visual.requestsUnclippedHost,
+      )
+    )
     bind(
       title,
       data.optString("title"),

package/android/src/main/java/com/onekey/nativelist/NativeListIdentityRenderer.kt

@@ -31,6 +31,7 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
   private val titleLine = PackedTitleLineLayout(context)
   private val title = NativeListTextView(context)
   private val titleIcon = OneKeyIconView(context)
+  private var titleImage: NativeListImageSlot? = null
   private val subtitle = NativeListTextView(context)
   private val tertiary = NativeListTextView(context)
   private val badgeLine = NativeListTextView(context)
@@ -79,7 +80,7 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
       "single"
     else item.json.optString("groupPosition")
 
-  override val assetFields = listOf("leading")
+  override val assetFields = listOf("leading", "titleImage")
 
   override fun usesSourceScale(item: NativeListItem, provided: Boolean) =
     item.usesSelectorSourceScale || provided
@@ -262,6 +263,29 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
     leadingActionIcon.useSourceScale = sourceScale
     leadingActionIcon.setOnClickListener(null)
     bindIdentity(item, theme, item.json.optBoolean("selected"), checkboxState)
+    val titleImageDescriptor = item.json.optJSONObject("titleImage")
+    val titleImageSource = titleImageDescriptor?.optJSONObject("image")
+    if (titleImageSource != null && titleImageSource.optString("uri").isNotEmpty()) {
+      if (item.json.optString("presentation") == "walletSidebar") {
+        titleLine.packsChildrenAtStart = true
+        title.layoutParams = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)
+      }
+      val slot = titleImage ?: NativeListImageSlot(reactContext).also { titleImage = it }
+      // Reinsert after icons so newly added suffixes cannot precede the image.
+      titleLine.removeView(slot.view)
+      titleLine.addView(slot.view, titleLine.indexOfChild(titleIcon) + 1)
+      val size = stylePx(titleImageSource.optDouble("width"))
+      slot.view.layoutParams = LayoutParams(size, size).apply { marginStart = dp(4) }
+      slot.view.visibility = VISIBLE
+      slot.view.contentDescription = titleImageDescriptor.optString("accessibilityLabel").takeIf(String::isNotEmpty)
+      slot.view.importantForAccessibility = if (slot.view.contentDescription == null)
+        View.IMPORTANT_FOR_ACCESSIBILITY_NO else View.IMPORTANT_FOR_ACCESSIBILITY_YES
+      slot.bind(titleImageSource, "${item.key}:titleImage", placeholder = "#00000000", round = true)
+    } else {
+      titleImage?.recycle()
+      titleImage?.view?.visibility = GONE
+      titleImage?.view?.contentDescription = null
+    }
     TextViewCompat.setLineHeight(
       title,
       dp(if (item.json.optString("presentation") == "walletSidebar") 16 else 24),
@@ -449,7 +473,10 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
         val inner = (MeasureSpec.getSize(widthMeasureSpec) - paddingLeft - paddingRight)
           .coerceAtLeast(0)
         val leading = leadingFrame.layoutParams as LayoutParams
-        val icon = if (titleIcon.visibility == VISIBLE) dp(24) else 0
+        val imageWidth = titleImage?.view?.takeIf { it.visibility == VISIBLE }?.let {
+          it.layoutParams.width + dp(4)
+        } ?: 0
+        val icon = (if (titleIcon.visibility == VISIBLE) dp(24) else 0) + imageWidth
         (inner * ratio).roundToInt()
           .minus(leading.width + leading.marginEnd + icon)
           .coerceAtLeast(0)
@@ -555,6 +582,9 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
     longPressPoint = null
     longPressPointEpoch = -1L
     leadingFrame.recycle()
+    titleImage?.recycle()
+    titleImage?.view?.visibility = GONE
+    titleImage?.view?.contentDescription = null
     trailingColumn.reset()
     currentItem = null
   }
@@ -562,6 +592,7 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
   override fun disposeContent() {
     recycleContent()
     leadingFrame.dispose()
+    titleImage?.dispose()
   }
 
   private fun bindIdentity(
@@ -878,19 +909,16 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
       sourceScale,
       checkboxState,
       horizontal =
-        (0 until accessories.length())
-          .map { accessories.getJSONObject(it).optString("kind") }
-          .let { kinds ->
-            kinds.containsAll(listOf("value", "checkbox")) ||
-              kinds == listOf("valuePair", "menu") ||
-              kinds == listOf("valuePair", "chevron") ||
-              (kinds == listOf("icon", "chevron") &&
-                accessories.getJSONObject(0).optString("name") == "RefreshCcwOutline" &&
-                accessories.getJSONObject(0).optString("actionKey").isEmpty()) ||
-              (kinds == listOf("icon", "icon") &&
-                accessories.getJSONObject(0).optString("name") == "PencilOutline" &&
-                accessories.getJSONObject(1).optString("name") == "DragOutline")
-          },
+        nativeListIdentityTrailingIsHorizontal(
+          (0 until accessories.length()).map { index ->
+            val accessory = accessories.getJSONObject(index)
+            NativeListTrailingDescriptor(
+              kind = accessory.optString("kind"),
+              name = accessory.optString("name"),
+              actionKey = accessory.optString("actionKey"),
+            )
+          }
+        ),
     )
     trailingColumn.endInset?.let { setPadding(paddingLeft, paddingTop, it, paddingBottom) }
   }

package/android/src/main/java/com/onekey/nativelist/NativeListLeadingVisual.kt

@@ -23,6 +23,8 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
   private val icon = OneKeyIconView(context)
   private val unread = View(context)
   private val networkBackdrop = View(context)
+  // Ring under the secondary token of an Activity pair (SPEC "Activity leading pair").
+  private val pairBackdrop = View(context)
   private val corner = OneKeyIconView(context)
   private val cornerBackdrop = View(context)
   private val slots = mutableListOf<NativeListImageSlot>()
@@ -32,6 +34,10 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
   private var visual = JSONObject()
   private var style = JSONObject()
   private var sources = emptyList<Pair<JSONObject, String>>()
+  // Roles inside [sources]: the token `networkImage` badge and the Activity
+  // `secondaryLeading` token; null when absent.
+  private var networkIndex: Int? = null
+  private var pairIndex: Int? = null
   val fallbackTextView: TextView
     get() = fallback
 
@@ -90,7 +96,9 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
     }
 
   init {
-    listOf(fallback, icon, networkBackdrop, cornerBackdrop, corner, unread).forEach { addView(it) }
+    listOf(fallback, icon, pairBackdrop, networkBackdrop, cornerBackdrop, corner, unread).forEach {
+      addView(it)
+    }
     clipChildren = false
     clipToPadding = false
   }
@@ -119,6 +127,8 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
         "wallet" -> "avatar"
         else -> "generic"
       }
+    networkIndex = null
+    pairIndex = null
     sources =
       if (kind == "stackedImages")
         visual
@@ -132,7 +142,10 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
       else if (kind == "icon") emptyList()
       else visual.optJSONObject("image")?.let { listOf(it to variant) }.orEmpty()
     if (kind == "token" && sources.isNotEmpty())
-      visual.optJSONObject("networkImage")?.let { sources = sources + (it to "network") }
+      visual.optJSONObject("networkImage")?.let {
+        networkIndex = sources.size
+        sources = sources + (it to "network")
+      }
     secondaryVisual?.let { second ->
       val kind = second.optString("kind")
       val source =
@@ -141,7 +154,10 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
           "icon" -> null
           else -> second.optJSONObject("image")
         }
-      if (source != null)
+      if (source != null) {
+        // A second token forms a pair only next to a primary image; without one
+        // it simply takes the primary's place (OK-66071).
+        if (this.visual.optString("kind") == "token" && sources.isNotEmpty()) pairIndex = sources.size
         sources =
           sources +
             (source to
@@ -152,6 +168,7 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
                 "wallet" -> "avatar"
                 else -> "generic"
               })
+      }
     }
     while (slots.size < sources.size) {
       val slot = NativeListImageSlot(reactContext)
@@ -228,6 +245,7 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
         ) { loaded ->
           slot.view.visibility =
             if (!loaded && (index > 0 || sourceFallback)) INVISIBLE else VISIBLE
+          if (index == pairIndex) syncPairBackdrop()
           if (index == 0 && sourceFallback) {
             fallbackKey?.let {
               if (loaded) NativeListSourceFallbackState.forget(it)
@@ -242,9 +260,21 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
         }
       }
     }
-    networkBackdrop.visibility = if (kind == "token" && sources.size > 1) VISIBLE else GONE
+    networkBackdrop.visibility = if (networkIndex != null) VISIBLE else GONE
     networkBackdrop.background =
       fill(color(theme?.optString("rowBackground", "#FFFFFF") ?: "#FFFFFF"), dp(10).toFloat())
+    pairBackdrop.background =
+      fill(color(theme?.optString("rowBackground", "#FFFFFF") ?: "#FFFFFF"), 0f)
+    syncPairBackdrop()
+    // Stacking order by role: primary, pair ring, secondary token, badge
+    // backdrop, badge, corner icon. Slots are reused across binds with
+    // different roles, so the order is restored on every bind.
+    pairBackdrop.bringToFront()
+    pairIndex?.let { slots[it].view.bringToFront() }
+    networkBackdrop.bringToFront()
+    networkIndex?.let { slots[it].view.bringToFront() }
+    cornerBackdrop.bringToFront()
+    corner.bringToFront()
     val badge = visual.optJSONObject("cornerIcon")
     corner.visibility = if (badge == null) GONE else VISIBLE
     cornerBackdrop.visibility = corner.visibility
@@ -353,7 +383,7 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
         (fallbackGlyph.parent as? android.view.ViewGroup)?.removeView(fallbackGlyph)
         frame.addView(fallbackGlyph, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
       }
-      if (frame.parent == null) addView(frame)
+      if (frame.parent == null) addView(frame) else frame.bringToFront()
       overlays.add(frame to data)
     }
     previousOverlays.drop(descriptors.size).forEach { (frame, _) ->
@@ -426,28 +456,46 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
       iconSize,
       iconSize,
     )
-    val tokenPair = kind == "token" && sources.size > 1
+    val ring = dp(2)
     slots.take(sources.size).forEachIndexed { index, slot ->
-      val size =
-        if (tokenPair && index == 1) dp(16)
-        else if (sources.size == 1 || tokenPair) h else (h * 0.72f).roundToInt()
-      val x =
-        if (tokenPair && index == 1) w - size + dp(2)
-        else if (sources.size == 1 || tokenPair) 0
-        else (index * (w - size).toFloat() / maxOf(1, sources.size - 1)).roundToInt()
-      val y = if (tokenPair && index == 1) h - size + dp(2) else (h - size) / 2
-      val imageWidth = if (sources.size == 1 || tokenPair && index == 0) w else size
+      val frame =
+        nativeListLeadingSlotFrame(
+          index = index,
+          sourceCount = sources.size,
+          networkIndex = networkIndex,
+          pairIndex = pairIndex,
+          width = w,
+          height = h,
+          badgeSize = dp(16),
+          badgeOverhang = dp(2),
+          pairRing = ring,
+        )
       slot.view.measure(
-        MeasureSpec.makeMeasureSpec(imageWidth, MeasureSpec.EXACTLY),
-        MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(frame.width, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(frame.height, MeasureSpec.EXACTLY),
       )
       val inset = if (index == 0) bitmapBorderWidth else 0
-      place(slot.view, x + inset, y + inset, imageWidth - 2 * inset, size - 2 * inset)
+      place(
+        slot.view,
+        frame.x + inset,
+        frame.y + inset,
+        frame.width - 2 * inset,
+        frame.height - 2 * inset,
+      )
       val imageRadius =
         if (shape == "rounded" && !style.has("shape") && !style.has("cornerRadius"))
           dp(roundedImageRadius).toFloat()
         else radius
-      val r = if (index == 0 && (sources.size == 1 || tokenPair)) imageRadius else size / 2f
+      val fillsFrame = index == 0 && pairIndex == null && (sources.size == 1 || networkIndex != null)
+      val r =
+        when {
+          fillsFrame -> imageRadius
+          // Pair members keep the token shape at their own size (rounded NFTs
+          // use the box's 10dp rule scaled to the member).
+          pairIndex != null && index != networkIndex && shape == "rounded" ->
+            minOf(dp(roundedImageRadius).toFloat(), frame.height / 4f)
+          else -> frame.height / 2f
+        }
       slot.view.outlineProvider =
         object : ViewOutlineProvider() {
           override fun getOutline(view: View, outline: Outline) {
@@ -458,6 +506,14 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
         }
       slot.view.clipToOutline = true
     }
+    if (pairIndex != null) {
+      val member = nativeListLeadingPairMemberSize(h)
+      val box = member + 2 * ring
+      (pairBackdrop.background as? GradientDrawable)?.cornerRadius =
+        if (shape == "rounded") minOf(dp(roundedImageRadius).toFloat(), member / 4f) + ring
+        else box / 2f
+      place(pairBackdrop, w - box, h - box, box, box)
+    }
     place(networkBackdrop, w - dp(16), h - dp(16), dp(20), dp(20))
     place(cornerBackdrop, w - dp(16), h - dp(16), dp(20), dp(20))
     place(corner, w - dp(15), h - dp(15), dp(18), dp(18))
@@ -487,9 +543,22 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
     }
   }
 
+  /**
+   * The pair ring sits above the primary token, so it is shown only while the
+   * secondary token image is actually displayed: hidden while that image loads,
+   * after a failed load and once the slot is recycled, or it would cover the
+   * primary's lower-right corner with a blank row-background disc.
+   */
+  private fun syncPairBackdrop() {
+    val secondary = pairIndex?.let { slots.getOrNull(it) }
+    pairBackdrop.visibility =
+      if (secondary != null && secondary.view.visibility == VISIBLE) VISIBLE else GONE
+  }
+
   fun recycle() {
     slots.forEach { it.recycle() }
     overlaySlots.forEach { it.recycle() }
+    pairBackdrop.visibility = GONE
   }
 
   fun dispose() {

package/android/src/main/java/com/onekey/nativelist/NativeListModels.kt

@@ -4,6 +4,7 @@ import org.json.JSONArray
 import org.json.JSONObject
 import java.nio.ByteBuffer
 import java.security.MessageDigest
+import kotlin.math.roundToInt
 import java.util.Locale
 
 internal data class NativeSelectionTarget(val scope: String, val key: String?)
@@ -48,6 +49,96 @@ internal fun nativeListLeadingVisualOverhangsFrame(
   overlayCount: Int,
 ): Boolean = kind == "token" && sourceCount > 1 || hasCornerIcon || overlayCount > 0
 
+/**
+ * Whether an Activity row host clips its children and padding for this bind.
+ * One row view serves both the legacy row and the rich (`amounts`) row and is
+ * reused across binds, so clipping is derived from the bound item alone and
+ * applied on every bind: only a legacy row whose leading visual lays a badge
+ * past its frame ([nativeListLeadingVisualOverhangsFrame], OK-66071) opts out;
+ * a rich row keeps Android's default clipping even when the view it reuses
+ * last showed such a badge.
+ */
+internal fun nativeListActivityHostClips(rich: Boolean, leadingOverhangs: Boolean): Boolean =
+  rich || !leadingOverhangs
+
+internal data class NativeListSlotFrame(val x: Int, val y: Int, val width: Int, val height: Int)
+
+/** Side of one member of an Activity token pair inside a [frame]-unit box (24 in 40). */
+internal fun nativeListLeadingPairMemberSize(frame: Int): Int = (frame * 0.6f).roundToInt()
+
+/**
+ * Frame of image source [index] of a leading visual inside its [width]×[height]
+ * box (SPEC "Activity leading pair", OK-66071). [networkIndex] is the token
+ * `networkImage` badge and [pairIndex] the Activity `secondaryLeading` token;
+ * either is null when absent. A pair draws the primary at the top-left and the
+ * secondary at the bottom-right, both [nativeListLeadingPairMemberSize] wide and
+ * the secondary inset by its [pairRing]; the badge keeps its corner geometry
+ * above them. A lone token, or a token with only a badge, fills the box. Any
+ * other multi-source visual (stackedImages) steps 0.72-sized images diagonally.
+ */
+internal fun nativeListLeadingSlotFrame(
+  index: Int,
+  sourceCount: Int,
+  networkIndex: Int?,
+  pairIndex: Int?,
+  width: Int,
+  height: Int,
+  badgeSize: Int,
+  badgeOverhang: Int,
+  pairRing: Int,
+): NativeListSlotFrame {
+  if (index == networkIndex)
+    return NativeListSlotFrame(
+      width - badgeSize + badgeOverhang,
+      height - badgeSize + badgeOverhang,
+      badgeSize,
+      badgeSize,
+    )
+  if (pairIndex != null) {
+    val member = nativeListLeadingPairMemberSize(height)
+    return if (index == pairIndex)
+      NativeListSlotFrame(width - member - pairRing, height - member - pairRing, member, member)
+    else NativeListSlotFrame(0, 0, member, member)
+  }
+  if (sourceCount == 1 || networkIndex != null) return NativeListSlotFrame(0, 0, width, height)
+  val side = (height * 0.72f).roundToInt()
+  val x = (index * (width - side).toFloat() / maxOf(1, sourceCount - 1)).roundToInt()
+  return NativeListSlotFrame(x, (height - side) / 2, side, side)
+}
+
+internal data class NativeListTrailingDescriptor(
+  val kind: String,
+  val name: String = "",
+  val actionKey: String = "",
+)
+
+/**
+ * Identity trailing accessories stack vertically unless they form one of the
+ * pairs every platform lays out side by side. The `valuePair` + `DotVerSolid`
+ * menu icon pair (the Swap token selector's balance and row menu) matches
+ * iOS `configureTrailingStack`; stacking it put the menu under the balance and
+ * clipped both inside the fixed row height on Android only.
+ */
+internal fun nativeListIdentityTrailingIsHorizontal(
+  accessories: List<NativeListTrailingDescriptor>,
+): Boolean {
+  val kinds = accessories.map { it.kind }
+  if (kinds.containsAll(listOf("value", "checkbox"))) return true
+  if (accessories.size != 2) return false
+  val (first, second) = accessories
+  return kinds == listOf("valuePair", "menu") ||
+    kinds == listOf("valuePair", "chevron") ||
+    (kinds == listOf("valuePair", "icon") &&
+      second.name == "DotVerSolid" &&
+      second.actionKey == "menu") ||
+    (kinds == listOf("icon", "chevron") &&
+      first.name == "RefreshCcwOutline" &&
+      first.actionKey.isEmpty()) ||
+    (kinds == listOf("icon", "icon") &&
+      first.name == "PencilOutline" &&
+      second.name == "DragOutline")
+}
+
 internal fun resolveNativeListSelectorBackgroundColor(
   rowType: String,
   styleBackgroundColor: String?,
@@ -287,7 +378,9 @@ internal fun mergeRow(original: JSONObject, changes: JSONObject): JSONObject {
   val keys = changes.keys()
   while (keys.hasNext()) {
     val key = keys.next()
-    if (key != "key" && key != "type") result.put(key, changes.get(key))
+    if (key != "key" && key != "type") {
+      if (changes.isNull(key)) result.remove(key) else result.put(key, changes.get(key))
+    }
   }
   return result
 }

package/android/src/main/java/com/onekey/nativelist/NativeListPrimitives.kt

@@ -287,6 +287,12 @@ internal class OneKeyIconView(context: android.content.Context) : View(context)
     // use EVEN_ODD. Other existing icons retain their prior rendering behavior.
     private val actionIconFillTypes =
       mapOf(
+        // Asset-list icons the app passes by name (OK-66072 audit): absent entries drew nothing.
+        "DotVerSolid" to listOf(Path.FillType.WINDING),
+        "Document2Outline" to listOf(Path.FillType.WINDING, Path.FillType.EVEN_ODD),
+        "WalletOutline" to listOf(Path.FillType.WINDING, Path.FillType.EVEN_ODD),
+        "PlusLargeOutline" to listOf(Path.FillType.WINDING),
+        "TicketOutline" to listOf(Path.FillType.WINDING, Path.FillType.EVEN_ODD),
         "GlobusOutline" to listOf(Path.FillType.EVEN_ODD),
         "GasSolid" to listOf(Path.FillType.EVEN_ODD),
         "RefreshCcwOutline" to listOf(Path.FillType.WINDING),
@@ -333,6 +339,29 @@ internal class OneKeyIconView(context: android.content.Context) : View(context)
     // Exact 24x24 paths from app-monorepo packages/components Icon sources.
     private val iconPaths =
       mapOf(
+        "DotVerSolid" to
+          listOf(
+            "M14 18v4h-4v-4zm0-4h-4v-4h4zm0-8h-4V2h4z"
+          ),
+        "Document2Outline" to
+          listOf(
+            "M12 16H8v-2h4zm4-4H8v-2h8zm0-4H8V6h8z",
+            "M20 22H4V2h16zM6 20h12V4H6z"
+          ),
+        "WalletOutline" to
+          listOf(
+            "M15.5 13.25a1.25 1.25 0 1 1 0 2.5 1.25 1.25 0 0 1 0-2.5",
+            "M17 8h4v13H7a4 4 0 0 1-4-4V6.5A3.5 3.5 0 0 1 6.5 3H17zM5 17a2 2 0 0 0 2 2h12v-9H6.5c-.537 0-1.045-.12-1.5-.337zM6.5 5a1.5 1.5 0 1 0 0 3H15V5z"
+          ),
+        "PlusLargeOutline" to
+          listOf(
+            "M13 11h8v2h-8v8h-2v-8H3v-2h8V3h2z"
+          ),
+        "TicketOutline" to
+          listOf(
+            "M16 17.01h-2V15h2zm0-4h-2V11h2zm0-4h-2V7h2z",
+            "m22 9.927-.629.252c-1.661.665-1.661 2.977 0 3.642l.629.252V20H2v-5.927l.629-.252c1.661-.665 1.661-2.977 0-3.642L2 9.927V4h20zM4 8.636c2.5 1.52 2.499 5.207 0 6.727V18h16v-2.637c-2.499-1.52-2.5-5.208 0-6.727V6H4z"
+          ),
         "RefreshCcwOutline" to
           listOf(
             "M5 12a7 7 0 0 0 7 7 7.15 7.15 0 0 0 4.955-2h-2.943v-2h6v6h-2v-2.257A9.148 9.148 0 0 1 12 21a9 9 0 0 1-9-9v-1h2v1Zm1-6.754A9.148 9.148 0 0 1 12 3a9 9 0 0 1 9 9v1h-2v-1a7 7 0 0 0-7-7 7.15 7.15 0 0 0-4.955 2H10v2H4V3h2v2.246Z"

package/android/src/test/java/com/margelo/nitro/nativelist/NativeListActivityHostClipPolicyTest.kt

@@ -0,0 +1,29 @@
+package com.margelo.nitro.nativelist
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class NativeListActivityHostClipPolicyTest {
+  // One Activity row view serves legacy and rich rows and is reused across
+  // binds. A legacy row with an overhanging network badge switches the host's
+  // clipping off (OK-66071); the next bind must derive clipping afresh, so a
+  // rich row reusing that view clips again instead of drawing its details over
+  // a neighbouring row (PR #185 review).
+  @Test
+  fun rebindSequenceDerivesClippingFromEachBoundItem() {
+    data class Bind(val name: String, val rich: Boolean, val leadingOverhangs: Boolean, val clips: Boolean)
+
+    val binds = listOf(
+      Bind("legacy row, plain token", rich = false, leadingOverhangs = false, clips = true),
+      Bind("legacy row, network badge", rich = false, leadingOverhangs = true, clips = false),
+      Bind("rich row reusing the badge row's view", rich = true, leadingOverhangs = false, clips = true),
+      Bind("legacy row, badge again", rich = false, leadingOverhangs = true, clips = false),
+      Bind("legacy row, hidden leading", rich = false, leadingOverhangs = false, clips = true),
+    )
+
+    assertEquals(
+      binds.map(Bind::clips),
+      binds.map { nativeListActivityHostClips(rich = it.rich, leadingOverhangs = it.leadingOverhangs) },
+    )
+  }
+}

package/android/src/test/java/com/margelo/nitro/nativelist/NativeListIdentityTrailingAxisTest.kt

@@ -0,0 +1,36 @@
+package com.margelo.nitro.nativelist
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class NativeListIdentityTrailingAxisTest {
+  // Identity trailing accessories stack vertically except for the pairs iOS
+  // lays out side by side. The Swap token selector's `valuePair` + DotVerSolid
+  // menu icon was missing from the Android list, so the balance was pushed
+  // above the menu and clipped inside the 60dp row.
+  @Test
+  fun matchesTheSideBySidePairsOfIos() {
+    fun d(kind: String, name: String = "", actionKey: String = "") =
+      NativeListTrailingDescriptor(kind, name, actionKey)
+
+    val cases: List<Pair<List<NativeListTrailingDescriptor>, Boolean>> = listOf(
+      listOf(d("valuePair")) to false,
+      listOf(d("valuePair"), d("menu", actionKey = "menu")) to true,
+      listOf(d("valuePair"), d("icon", "DotVerSolid", "menu")) to true,
+      listOf(d("valuePair"), d("icon", "DotVerSolid")) to false,
+      listOf(d("valuePair"), d("icon", "InfoCircleOutline", "menu")) to false,
+      listOf(d("icon", "DotVerSolid", "menu"), d("valuePair")) to false,
+      listOf(d("valuePair"), d("chevron")) to true,
+      listOf(d("icon", "RefreshCcwOutline"), d("chevron")) to true,
+      listOf(d("icon", "RefreshCcwOutline", "refresh"), d("chevron")) to false,
+      listOf(d("icon", "PencilOutline", "edit"), d("icon", "DragOutline")) to true,
+      listOf(d("value"), d("checkbox")) to true,
+      listOf(d("valuePair"), d("icon", "DotVerSolid", "menu"), d("chevron")) to false,
+    )
+
+    assertEquals(
+      cases.map { it.second },
+      cases.map { nativeListIdentityTrailingIsHorizontal(it.first) },
+    )
+  }
+}

package/android/src/test/java/com/margelo/nitro/nativelist/NativeListLeadingSlotFrameTest.kt

@@ -0,0 +1,68 @@
+package com.margelo.nitro.nativelist
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class NativeListLeadingSlotFrameTest {
+  // 40dp box, 16dp badge hanging 2dp past the frame, 2dp pair ring.
+  private fun frame(index: Int, count: Int, network: Int? = null, pair: Int? = null) =
+    nativeListLeadingSlotFrame(
+      index = index,
+      sourceCount = count,
+      networkIndex = network,
+      pairIndex = pair,
+      width = 40,
+      height = 40,
+      badgeSize = 16,
+      badgeOverhang = 2,
+      pairRing = 2,
+    )
+
+  private val full = NativeListSlotFrame(0, 0, 40, 40)
+  private val badge = NativeListSlotFrame(26, 26, 16, 16)
+  private val primary = NativeListSlotFrame(0, 0, 24, 24)
+  private val secondary = NativeListSlotFrame(14, 14, 24, 24)
+
+  @Test
+  fun loneTokenFillsTheBox() {
+    assertEquals(full, frame(0, 1))
+  }
+
+  @Test
+  fun tokenWithNetworkBadgeKeepsTheCornerBadge() {
+    assertEquals(listOf(full, badge), listOf(frame(0, 2, network = 1), frame(1, 2, network = 1)))
+  }
+
+  // OK-66071: the history swap rows bind [send, network, receive]. Android laid
+  // the receive token over the whole box, hiding the send token and the network
+  // badge; iOS drew it in the badge's corner slot over the badge.
+  @Test
+  fun activityPairStepsTheSecondaryToTheBottomRightUnderTheBadge() {
+    assertEquals(
+      listOf(primary, badge, secondary),
+      (0 until 3).map { frame(it, 3, network = 1, pair = 2) },
+    )
+  }
+
+  @Test
+  fun activityPairWithoutNetworkBadge() {
+    assertEquals(listOf(primary, secondary), listOf(frame(0, 2, pair = 1), frame(1, 2, pair = 1)))
+  }
+
+  @Test
+  fun pairMemberIsSixTenthsOfTheBox() {
+    assertEquals(listOf(24, 19, 29), listOf(40, 32, 48).map(::nativeListLeadingPairMemberSize))
+  }
+
+  @Test
+  fun stackedImagesStepDiagonally() {
+    assertEquals(
+      listOf(
+        NativeListSlotFrame(0, 5, 29, 29),
+        NativeListSlotFrame(6, 5, 29, 29),
+        NativeListSlotFrame(11, 5, 29, 29),
+      ),
+      (0 until 3).map { frame(it, 3) },
+    )
+  }
+}

package/docs/ROW_TEMPLATES.md

@@ -59,6 +59,10 @@ separately from source implementation in STYLE_SPEC §9.
   a 4-point gap. It has no click action; an optional Web `hoverActionKey`
   emits an icon-anchored tooltip request on hover or touch. A trailing `button` is the fixed small
   secondary text action and uses the normal accessory event slot.
+- **Title image:** optional `titleImage` renders a circular image after the title
+  icons and before suffixes/badges. Its `ImageSource` dimensions must be square,
+  1...40 logical units. Optional Web `hoverActionKey` uses the existing anchored
+  help event; native keeps the image decorative for touch. See SPEC.md.
 - **Second Web help icon:** `secondaryTitleIcon` uses the same descriptor after
   `titleIcon`; each glyph has its own hover/touch anchor. Native ignores it.
 - **Decorative refresh:** a trailing `RefreshCcwOutline` without `actionKey`