@onekeyfe/react-native-native-list 6.7.0-alpha.409 → 6.7.0-alpha.412

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

@@ -122,6 +122,9 @@ internal class NativeListAccessoryStack(context: android.content.Context, val fo
     checkboxState: (NativeListItem, NativeSelectionTarget?, String) -> String,
     horizontal: Boolean = false,
   ) {
+    val iconUpdate = NativeListIconUpdate(this)
+    try {
+
     selectorUsesSourceScale = sourceScale
     reset()
     tag = item
@@ -179,6 +182,8 @@ internal class NativeListAccessoryStack(context: android.content.Context, val fo
     }
     visibility =
       if ((0 until childCount).any { getChildAt(it).visibility != GONE }) VISIBLE else GONE
+
+    } finally { iconUpdate.finish() }
   }
 
   fun updateSelection(

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

@@ -0,0 +1,47 @@
+// Generated by scripts/generate-icons.mjs. Coverage and legacy names only; hosts provide SVG resources.
+package com.margelo.nitro.nativelist
+
+internal data class NativeListIconMetadata(val name: String, val width: Float, val height: Float)
+internal val nativeListGeneratedIcons: Map<String, NativeListIconMetadata> = mapOf(
+  "AccountErrorCustom" to NativeListIconMetadata("AccountErrorCustom", 18f, 18f),
+  "AllNetworksSolid" to NativeListIconMetadata("AllNetworksSolid", 24f, 24f),
+  "AppleBrand" to NativeListIconMetadata("AppleBrand", 16f, 20f),
+  "ArrowBottomOutline" to NativeListIconMetadata("ArrowBottomOutline", 24f, 24f),
+  "ArrowTopOutline" to NativeListIconMetadata("ArrowTopOutline", 24f, 24f),
+  "BadgeVerifiedSolid" to NativeListIconMetadata("BadgeRecognizedSolid", 24f, 24f),
+  "BotIllus" to NativeListIconMetadata("BotIllus", 24f, 24f),
+  "ChartTrendingUpOutline" to NativeListIconMetadata("ChartTrendingUpOutline", 24f, 24f),
+  "ChevronBottomOutline" to NativeListIconMetadata("ChevronBottomOutline", 24f, 24f),
+  "ChevronGrabberVerOutline" to NativeListIconMetadata("ChevronGrabberVerOutline", 24f, 24f),
+  "ChevronRightSmallOutline" to NativeListIconMetadata("ChevronRightSmallOutline", 24f, 24f),
+  "ChevronTopOutline" to NativeListIconMetadata("ChevronTopOutline", 24f, 24f),
+  "Circle" to NativeListIconMetadata("Circle", 24f, 24f),
+  "CrossedSmallSolid" to NativeListIconMetadata("CrossedSmallSolid", 24f, 24f),
+  "CryptoCoinOutline" to NativeListIconMetadata("CryptoCoinOutline", 24f, 24f),
+  "Document2Outline" to NativeListIconMetadata("Document2Outline", 24f, 24f),
+  "DotHorOutline" to NativeListIconMetadata("DotHorOutline", 24f, 24f),
+  "DotVerSolid" to NativeListIconMetadata("DotVerSolid", 24f, 24f),
+  "DragOutline" to NativeListIconMetadata("DragOutline", 24f, 24f),
+  "ErrorSolid" to NativeListIconMetadata("ErrorSolid", 24f, 24f),
+  "GasSolid" to NativeListIconMetadata("GasSolid", 24f, 24f),
+  "GlobusOutline" to NativeListIconMetadata("GlobusOutline", 24f, 24f),
+  "GoogleIllus" to NativeListIconMetadata("GoogleIllus", 24f, 24f),
+  "ImageSquareWavesOutline" to NativeListIconMetadata("ImageSquareWavesOutline", 24f, 24f),
+  "InfoCircleOutline" to NativeListIconMetadata("InfoCircleOutline", 24f, 24f),
+  "LockSolid" to NativeListIconMetadata("LockSolid", 24f, 24f),
+  "MinusCircleOutline" to NativeListIconMetadata("MinusCircleOutline", 24f, 24f),
+  "MinusCircleSolid" to NativeListIconMetadata("MinusCircleSolid", 24f, 24f),
+  "PencilOutline" to NativeListIconMetadata("PencilOutline", 24f, 24f),
+  "PlusCircleOutline" to NativeListIconMetadata("PlusCircleOutline", 24f, 24f),
+  "PlusLargeOutline" to NativeListIconMetadata("PlusLargeOutline", 24f, 24f),
+  "PlusSmallOutline" to NativeListIconMetadata("PlusSmallOutline", 24f, 24f),
+  "QuestionmarkSolid" to NativeListIconMetadata("QuestionmarkSolid", 24f, 24f),
+  "RefreshCcwOutline" to NativeListIconMetadata("RefreshCcwOutline", 24f, 24f),
+  "ShieldExclamationOutline" to NativeListIconMetadata("ShieldExclamationOutline", 24f, 24f),
+  "SpeakerPromoteOutline" to NativeListIconMetadata("SpeakerPromoteOutline", 24f, 24f),
+  "StarOutline" to NativeListIconMetadata("StarOutline", 24f, 24f),
+  "StarSolid" to NativeListIconMetadata("StarSolid", 24f, 24f),
+  "SwapHorOutline" to NativeListIconMetadata("SwapHorOutline", 24f, 24f),
+  "TicketOutline" to NativeListIconMetadata("TicketOutline", 24f, 24f),
+  "WalletOutline" to NativeListIconMetadata("WalletOutline", 24f, 24f),
+)

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

@@ -112,6 +112,9 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
     sourceScale: Boolean,
     secondaryVisual: JSONObject? = null,
   ) {
+    val iconUpdate = NativeListIconUpdate(this)
+    try {
+
     fallback.typeface = fonts.bold(context)
     this.visual = visual
     this.style = style
@@ -394,6 +397,8 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
     overlaySlots.drop(descriptors.size).forEach { it.recycle() }
     unread.bringToFront()
     requestLayout()
+
+    } finally { iconUpdate.finish() }
   }
 
   override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {

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

@@ -3,12 +3,10 @@ package com.margelo.nitro.nativelist
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
-import android.graphics.Path
 import android.graphics.Typeface
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.core.graphics.PathParser
 import com.facebook.react.common.assets.ReactFontManager
 import kotlin.math.roundToInt
 
@@ -183,357 +181,138 @@ internal class SelectorSubtitleLayout(context: android.content.Context) : Linear
   }
 }
 
-internal class OneKeyIconView(context: android.content.Context) : View(context) {
+internal open class OneKeyIconView(context: android.content.Context) : View(context) {
   var useSourceScale = false
+    set(value) { if (field == value) return; field = value; refresh() }
   var iconName: String = ""
-    set(value) {
-      field = value
-      invalidate()
-    }
-
+    set(value) { if (field == value) return; field = value; refresh() }
   var tintColor: Int = Color.rgb(100, 100, 100)
-    set(value) {
-      field = value
-      invalidate()
-    }
-
+    set(value) { if (field == value) return; field = value; refresh() }
   var glyphSizeDp: Int? = null
-    set(value) {
-      field = value
-      invalidate()
-    }
+    set(value) { if (field == value) return; field = value; refresh() }
+  private val owner = Any()
+  private var generation = 0L
+  private var identity: String? = null
+  private var bitmap: android.graphics.Bitmap? = null
+  private var displayed: com.margelo.nitro.onekeyimage.OneKeyNamedSVG.RenderResult? = null
+  private var displayedGeometry: String? = null
+  private val fill = Paint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG)
+  private var updateDepth = 0
+  private var initialized = true
+  private var attached = false
 
-  private val fill = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL }
+  internal fun beginIconUpdate() { updateDepth++ }
+  internal fun endIconUpdate() { updateDepth--; if (updateDepth == 0) refresh() }
 
-  override fun onDraw(canvas: Canvas) {
-    super.onDraw(canvas)
-    val pathData = iconPaths[iconName] ?: return
-    val drawSize =
-      minOf(
-        minOf(width, height).toFloat(),
-        glyphSizeDp?.let {
-          if (useSourceScale) (it * resources.displayMetrics.density).roundToInt().toFloat()
-          else NativeListScale.dp(resources, it).toFloat()
-        } ?: Float.MAX_VALUE,
-      )
-    // OneKey patch: custom account-error artwork uses an 18-point viewBox.
-    // val scale = drawSize / 24f
-    val scale = drawSize / (selectorIconViewBoxes[iconName] ?: 24f)
-    fill.color = tintColor
-    canvas.save()
-    canvas.translate((width - drawSize) / 2f, (height - drawSize) / 2f)
-    canvas.scale(scale, scale)
-    val sourceFillTypes = actionIconFillTypes[iconName]
-    pathData.forEachIndexed { index, data ->
-      PathParser.createPathFromPathData(data)?.let { path ->
-        path.fillType = sourceFillTypes?.getOrNull(index) ?: Path.FillType.EVEN_ODD
-        // OneKey patch: provider illustration colors are part of their source asset.
-        fill.color = selectorIconColors[iconName]?.getOrNull(index) ?: tintColor
-        canvas.drawPath(path, fill)
+  protected open fun metadata(): NativeListIconMetadata? {
+    nativeListGeneratedIcons[iconName]?.let { return it }
+    if (iconName.isEmpty()) return null
+    val meta = com.margelo.nitro.onekeyimage.OneKeyNamedSVG.iconMetadata(context.applicationContext.assets, iconName) ?: return null
+    return NativeListIconMetadata(iconName, meta.width, meta.height)
+  }
+  protected open fun glyphRect(icon: NativeListIconMetadata): android.graphics.RectF {
+    val size = minOf(minOf(width,height).toFloat(), glyphSizeDp?.let {
+      if (useSourceScale) (it * resources.displayMetrics.density).roundToInt().toFloat()
+      else NativeListScale.dp(resources,it).toFloat()
+    } ?: Float.MAX_VALUE)
+    val left = (width-size)/2f
+    val top = (height-size)/2f
+    return android.graphics.RectF(left,top,left+size,top+size*icon.height/icon.width)
+  }
+
+  protected fun refresh(force: Boolean = false) {
+    if (updateDepth > 0) return
+    val icon = metadata()
+    val rect = icon?.let { glyphRect(it) }
+    val next = "$iconName|$tintColor|$rect|${resources.displayMetrics.density}|$attached|$isShown"
+    if (!force && next == identity) return
+    identity = next; generation++
+    val revision = generation
+    com.margelo.nitro.onekeyimage.OneKeyNamedSVG.cancel(owner)
+    fun clear() { bitmap = null; displayed = null; displayedGeometry = null; fill.colorFilter = null; invalidate() }
+    if (!attached || !isShown || icon == null || rect == null || rect.isEmpty || icon.name == "Circle") { clear(); return }
+    val w = kotlin.math.ceil(rect.width()).toInt()
+    val h = kotlin.math.ceil(rect.height()).toInt()
+    if (w !in 1..4096 || h !in 1..4096 || w.toLong() * h > 4194304) { clear(); return }
+    val color = "rgba(${Color.red(tintColor)},${Color.green(tintColor)},${Color.blue(tintColor)},${Color.alpha(tintColor)/255.0})"
+    val geometry = "${icon.name}|$rect|${resources.displayMetrics.density}"
+    val ready = displayed
+    if (displayedGeometry == geometry && ready != null && bitmap != null) {
+      if (ready.canTint(color)) {
+        fill.colorFilter = ready.tintColor(color)?.let { android.graphics.PorterDuffColorFilter(it, android.graphics.PorterDuff.Mode.SRC_IN) }
+        invalidate(); return
+      }
+    } else clear()
+    val weakView = java.lang.ref.WeakReference(this)
+    com.margelo.nitro.onekeyimage.OneKeyNamedSVG.requestRender(owner, context.applicationContext.assets,
+      icon.name,color,w,h,resources.displayMetrics.density) { result ->
+      val view = weakView.get()
+      if (view != null && view.generation == revision && view.attached && view.isShown) {
+        view.displayed = result
+        view.displayedGeometry = if (result != null) geometry else null
+        view.bitmap = result?.bitmap
+        view.fill.colorFilter = result?.tintColor(color)?.let { android.graphics.PorterDuffColorFilter(it, android.graphics.PorterDuff.Mode.SRC_IN) }
+        view.invalidate()
       }
     }
-    canvas.restore()
   }
 
-  companion object {
-    // OneKey patch: preserve provider colors and non-24 viewBoxes.
-    private val selectorIconColors: Map<String, List<Int?>> =
-      mapOf(
-        "GlobusOutline" to listOf(null),
-        "GasSolid" to listOf(null),
-        "RefreshCcwOutline" to listOf(null),
-        "CryptoCoinOutline" to listOf(null, null),
-        "LockSolid" to listOf(null),
-        "GoogleIllus" to
-          listOf(
-            parseNativeListColor("#4285F4"),
-            parseNativeListColor("#34A853"),
-            parseNativeListColor("#FBBC05"),
-            parseNativeListColor("#EA4335"),
-          ),
-        "AppleBrand" to listOf(null),
-        "BotIllus" to
-          listOf(
-            parseNativeListColor("#8897A5"),
-            parseNativeListColor("#3FA9F5"),
-            parseNativeListColor("#8897A5"),
-            parseNativeListColor("#8897A5"),
-            parseNativeListColor("#10243E"),
-            parseNativeListColor("#10243E"),
-            parseNativeListColor("#10243E"),
-          ),
-        "AllNetworksSolid" to listOf(null, null),
-        "CrossedSmallSolid" to listOf(null),
-        "AccountErrorCustom" to listOf(Color.argb(0x72, 0, 0, 0), Color.argb(0x72, 0, 0, 0)),
-        "Circle" to listOf(null),
-      )
-    private val selectorIconViewBoxes =
-      mapOf(
-        "GlobusOutline" to 24f,
-        "GasSolid" to 24f,
-        "RefreshCcwOutline" to 24f,
-        "CryptoCoinOutline" to 24f,
-        "LockSolid" to 24f,
-        "GoogleIllus" to 24f,
-        "AppleBrand" to 16f,
-        "BotIllus" to 24f,
-        "AllNetworksSolid" to 24f,
-        "CrossedSmallSolid" to 24f,
-        "AccountErrorCustom" to 18f,
-        "Circle" to 24f,
-      )
-    // Keep the SVG fill-rule used by each Action-row source path. React Native
-    // SVG defaults to nonzero (WINDING); only paths declaring fillRule="evenodd"
-    // 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),
-        "CryptoCoinOutline" to listOf(Path.FillType.WINDING, Path.FillType.EVEN_ODD),
-        "LockSolid" to listOf(Path.FillType.EVEN_ODD),
-        "GoogleIllus" to
-          listOf(
-            Path.FillType.WINDING,
-            Path.FillType.WINDING,
-            Path.FillType.WINDING,
-            Path.FillType.WINDING,
-          ),
-        "AppleBrand" to listOf(Path.FillType.WINDING),
-        "BotIllus" to
-          listOf(
-            Path.FillType.WINDING,
-            Path.FillType.WINDING,
-            Path.FillType.WINDING,
-            Path.FillType.WINDING,
-            Path.FillType.WINDING,
-            Path.FillType.WINDING,
-            Path.FillType.WINDING,
-          ),
-        "AllNetworksSolid" to listOf(Path.FillType.WINDING, Path.FillType.EVEN_ODD),
-        "CrossedSmallSolid" to listOf(Path.FillType.WINDING),
-        "AccountErrorCustom" to listOf(Path.FillType.WINDING, Path.FillType.EVEN_ODD),
-        "Circle" to listOf(Path.FillType.WINDING),
-        "BadgeVerifiedSolid" to listOf(Path.FillType.EVEN_ODD),
-        "ChevronRightSmallOutline" to listOf(Path.FillType.WINDING),
-        "MinusCircleOutline" to listOf(Path.FillType.WINDING, Path.FillType.EVEN_ODD),
-        "PlusCircleOutline" to listOf(Path.FillType.WINDING, Path.FillType.EVEN_ODD),
-        "PlusSmallOutline" to listOf(Path.FillType.WINDING),
-        "DotHorOutline" to listOf(Path.FillType.WINDING),
-        "MinusCircleSolid" to listOf(Path.FillType.EVEN_ODD),
-        "PencilOutline" to listOf(Path.FillType.EVEN_ODD),
-        "DragOutline" to listOf(Path.FillType.WINDING),
-        "StarSolid" to listOf(Path.FillType.WINDING),
-        "ChevronGrabberVerOutline" to listOf(Path.FillType.WINDING),
-        "ChevronBottomOutline" to listOf(Path.FillType.WINDING),
-        "ChevronTopOutline" to listOf(Path.FillType.WINDING),
-        "ImageSquareWavesOutline" to listOf(Path.FillType.WINDING, Path.FillType.EVEN_ODD),
-      )
-
-    // 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"
-          ),
-        "GasSolid" to
-          listOf(
-            "M15 9h4v7h1V8.414L17.586 6 19 4.586l3 3V18h-5v-7h-2v8h1v2H2v-2h1V3h12zM6 9v2h6V9z"
-          ),
-        "CryptoCoinOutline" to
-          listOf(
-            "M11 16.387a4.5 4.5 0 0 1 0-8.775V6h2v1.613a4.5 4.5 0 0 1 2.856 2.067l-1.712 1.032a2.5 2.5 0 1 0 0 2.576l1.712 1.032A4.5 4.5 0 0 1 13 16.386V18h-2z",
-            "M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10m-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0",
-          ),
-        // OneKey patch: official selector SVG path geometry.
-        "GlobusOutline" to
-          listOf(
-            "M12 2c5.185 0 9.448 3.947 9.95 9H22v2h-.05c-.502 5.053-4.765 9-9.95 9s-9.448-3.947-9.95-9H2v-2h.05C2.552 5.947 6.815 2 12 2M9.523 13c.09 1.982.438 3.726.934 5.002.29.746.612 1.282.917 1.614.304.331.517.384.626.384s.322-.053.626-.384c.305-.332.627-.868.917-1.614.496-1.276.845-3.02.934-5.002zm-5.459 0a8 8 0 0 0 4.8 6.36 10 10 0 0 1-.271-.633C7.994 17.187 7.61 15.189 7.52 13zm12.416 0c-.09 2.189-.474 4.187-1.073 5.727a10 10 0 0 1-.271.633 8 8 0 0 0 4.8-6.36zM8.863 4.639A8 8 0 0 0 4.064 11h3.457c.09-2.189.473-4.187 1.072-5.727q.127-.327.27-.634M12 4c-.109 0-.322.053-.626.384-.305.332-.627.868-.917 1.614-.496 1.276-.844 3.02-.934 5.002h4.954c-.09-1.982-.438-3.726-.934-5.002-.29-.746-.612-1.282-.917-1.614C12.322 4.053 12.109 4 12 4m3.136.639q.144.307.271.634c.599 1.54.982 3.538 1.073 5.727h3.456a8 8 0 0 0-4.8-6.361"
-          ),
-        "LockSolid" to
-          listOf(
-            "M12 2a5 5 0 0 1 5 5v2h3v13H4V9h3V7a5 5 0 0 1 5-5m-1 11v5h2v-5zm1-9a3 3 0 0 0-3 3v2h6V7a3 3 0 0 0-3-3"
-          ),
-        "GoogleIllus" to
-          listOf(
-            "M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09",
-            "M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23",
-            "M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22z",
-            "M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53",
-          ),
-        "AppleBrand" to
-          listOf(
-            "M11.67.834c.117 1.074-.315 2.153-.955 2.928-.64.773-1.692 1.378-2.718 1.298-.14-1.054.38-2.151.971-2.836C9.63 1.45 10.746.872 11.67.834M14.994 7.093c-.176.108-1.992 1.224-1.972 3.482.025 2.769 2.428 3.693 2.46 3.705l-.004.015a10.1 10.1 0 0 1-1.264 2.593c-.764 1.116-1.556 2.229-2.806 2.254-.598.011-1-.162-1.416-.343-.437-.19-.891-.386-1.609-.386-.751 0-1.226.203-1.683.398-.397.169-.78.333-1.32.354-1.208.047-2.124-1.207-2.895-2.32C.909 14.57-.294 10.414 1.322 7.612c.803-1.395 2.237-2.275 3.794-2.298.671-.014 1.32.244 1.89.47.434.172.821.326 1.135.326.282 0 .659-.149 1.099-.323.692-.273 1.539-.607 2.41-.518.599.026 2.276.24 3.354 1.818z"
-          ),
-        "BotIllus" to
-          listOf(
-            "M11 2a1 1 0 1 1 2 0v1.8l1.6 1.6a1 1 0 1 1-1.4 1.4L12 5.6l-1.2 1.2a1 1 0 0 1-1.4-1.4L11 3.8z",
-            "M8.0 6.0h8.0a5.0 5.0 0 0 1 5.0 5.0v4.0a5.0 5.0 0 0 1 -5.0 5.0h-8.0a5.0 5.0 0 0 1 -5.0 -5.0v-4.0a5.0 5.0 0 0 1 5.0 -5.0z",
-            "M3.0 10.0h0.0a1.5 1.5 0 0 1 1.5 1.5v3.0a1.5 1.5 0 0 1 -1.5 1.5h0.0a1.5 1.5 0 0 1 -1.5 -1.5v-3.0a1.5 1.5 0 0 1 1.5 -1.5z",
-            "M21.0 10.0h0.0a1.5 1.5 0 0 1 1.5 1.5v3.0a1.5 1.5 0 0 1 -1.5 1.5h0.0a1.5 1.5 0 0 1 -1.5 -1.5v-3.0a1.5 1.5 0 0 1 1.5 -1.5z",
-            "M7.5 12.0a1.5 1.5 0 1 0 3.0 0a1.5 1.5 0 1 0 -3.0 0",
-            "M13.5 12.0a1.5 1.5 0 1 0 3.0 0a1.5 1.5 0 1 0 -3.0 0",
-            "M8.5 15.4c.9.8 2.08 1.2 3.5 1.2s2.6-.4 3.5-1.2c.24-.2.6-.18.8.06.2.23.17.6-.06.8-1.14.98-2.58 1.46-4.24 1.46s-3.1-.48-4.24-1.46a.58.58 0 0 1-.06-.8c.2-.24.56-.26.8-.06",
-          ),
-        "AllNetworksSolid" to
-          listOf(
-            "M15.333 13.998a1.335 1.335 0 1 1 0 2.67 1.335 1.335 0 0 1 0-2.67",
-            "M12 0c6.627 0 12 5.373 12 12s-5.373 12-12 12S0 18.627 0 12 5.373 0 12 0M8 12.668A2 2 0 0 0 6 14.666V16c0 1.103.895 1.997 1.998 1.998h1.334A2 2 0 0 0 11.33 16v-1.334a2 2 0 0 0-1.998-1.998zm7.333 0a2.665 2.665 0 1 0 0 5.33 2.665 2.665 0 0 0 0-5.33M7.999 6.001A2 2 0 0 0 6.001 8v1.334c0 1.103.895 1.998 1.998 1.998h1.334a2 2 0 0 0 1.998-1.998V7.999a2 2 0 0 0-1.998-1.998zm6.667 0A2 2 0 0 0 12.668 8v1.334c0 1.103.895 1.998 1.998 1.998H16a2 2 0 0 0 1.998-1.998V7.999A2 2 0 0 0 16 6.001z",
-          ),
-        "CrossedSmallSolid" to
-          listOf(
-            "M17.87 8.25 14.12 12l3.75 3.75-2.12 2.121-3.75-3.75-3.75 3.75-2.121-2.121L9.879 12l-3.75-3.75 2.12-2.121L12 9.879l3.75-3.75 2.122 2.121Z"
-          ),
-        "AccountErrorCustom" to
-          listOf(
-            "M12.5 12.75a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5",
-            "M0 3.5A3.5 3.5 0 0 1 3.5 0h8.088A2.41 2.41 0 0 1 14 2.412V5h1a3 3 0 0 1 3 3v7a3 3 0 0 1-3 3H4a4 4 0 0 1-4-4zm2 3.163V14a2 2 0 0 0 2 2h11a1 1 0 0 0 1-1V8a1 1 0 0 0-1-1H3.5c-.537 0-1.045-.12-1.5-.337M2 3.5A1.5 1.5 0 0 0 3.5 5H12V2.412A.41.41 0 0 0 11.588 2H3.5A1.5 1.5 0 0 0 2 3.5",
-          ),
-        "Circle" to listOf("M0 12a12 12 0 1 0 24 0a12 12 0 1 0 -24 0"),
-        "BadgeVerifiedSolid" to
-          listOf(
-            "M9.483 11.458v3.5h-1v-3.5z M10.467 2.698a2.03 2.03 0 0 1 3.065 0l1.358 1.564a.03.03 0 0 0 .028.01l2.046-.325a2.03 2.03 0 0 1 2.347 1.971l.037 2.07q0 .016.014.026l1.776 1.066a2.03 2.03 0 0 1 .532 3.019l-1.304 1.609a.03.03 0 0 0-.005.03l.675 1.956a2.03 2.03 0 0 1-1.533 2.656l-2.033.394a.03.03 0 0 0-.023.019l-.741 1.933a2.03 2.03 0 0 1-2.88 1.05l-1.811-1.006a.03.03 0 0 0-.03 0l-1.811 1.005a2.03 2.03 0 0 1-2.88-1.049l-.742-1.933a.03.03 0 0 0-.023-.019l-2.033-.394a2.03 2.03 0 0 1-1.532-2.656l.675-1.957a.03.03 0 0 0-.005-.029l-1.304-1.61a2.03 2.03 0 0 1 .532-3.018l1.776-1.066a.03.03 0 0 0 .014-.026l.035-2.07a2.03 2.03 0 0 1 2.349-1.97l2.045.324a.03.03 0 0 0 .028-.01zm1.516 3.76a.5.5 0 0 0-.447.276l-1.861 3.724H8.483a1 1 0 0 0-1 1v3.5a1 1 0 0 0 1 1h6.692a2 2 0 0 0 1.981-1.73l.341-2.5a2 2 0 0 0-1.982-2.27h-1.939l.197-1.269a1.5 1.5 0 0 0-1.481-1.731z"
-          ),
-        "ArrowBottomOutline" to
-          listOf("m13 17.586 5-5L19.414 14 12 21.414 4.586 14 6 12.586l5 5V3h2z"),
-        "ArrowTopOutline" to
-          listOf("M19.414 10 18 11.414l-5-5V21h-2V6.414l-5 5L4.586 10 12 2.586z"),
-        "ChartTrendingUpOutline" to
-          listOf("M22 13h-2V9.414l-7 7-4-4-6 6L1.586 17 9 9.586l4 4L18.586 8H15V6h7z"),
-        "SwapHorOutline" to
-          listOf(
-            "M21 16H6.914l2.293 2.293-1.414 1.414L2.086 14H21zm.914-6H3V8h14.086l-2.293-2.293 1.414-1.414z"
-          ),
-        "ShieldExclamationOutline" to
-          listOf(
-            "M12 12.25a1.25 1.25 0 1 1 0 2.5 1.25 1.25 0 0 1 0-2.5m0-4.75a1 1 0 0 1 1 1v2a1 1 0 0 1-2 0v-2a1 1 0 0 1 1-1",
-            "M11.352 2.223c.42-.145.876-.145 1.296 0l6.98 2.4a1.995 1.995 0 0 1 1.347 1.886v5.432c0 2.799-1.146 4.817-2.805 6.387-1.61 1.525-3.735 2.652-5.696 3.71a1 1 0 0 1-.947 0c-1.961-1.058-4.086-2.185-5.697-3.71-1.659-1.57-2.805-3.588-2.805-6.386V6.508c0-.852.542-1.61 1.347-1.887l6.98-2.4ZM5.02 6.509v5.432c0 2.16.848 3.676 2.18 4.938 1.272 1.204 2.957 2.149 4.799 3.145 1.842-.996 3.527-1.94 4.799-3.145 1.332-1.262 2.181-2.778 2.181-4.938V6.51L12 4.109z",
-          ),
-        "InfoCircleOutline" to
-          listOf(
-            "M13 17h-2v-5h-1v-2h3zm0-8h-2V7h2z",
-            "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2m0 2a8 8 0 1 0 0 16 8 8 0 0 0 0-16",
-          ),
-        "SpeakerPromoteOutline" to
-          listOf(
-            "M21.996 11a4 4 0 0 1-3 3.874v5.495l-5.361-1.711A3.998 3.998 0 0 1 5.996 17v-.779l-4-1.276v-7.89l17-5.424v5.495c1.725.444 3 2.01 3 3.874m-2 0c0-.74-.402-1.385-1-1.731v3.46c.597-.345 1-.989 1-1.729M7.998 7.24v7.521l8.998 2.871V4.368l-8.998 2.87ZM3.996 8.516v4.967l2.002.638V7.877zm4 8.484a2 2 0 0 0 3.706 1.041L7.996 16.86z"
-          ),
-        "PlusCircleOutline" to
-          listOf(
-            "M13 11h4v2h-4v4h-2v-4l-4 .001v-2L11 11V7h2z",
-            "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2m0 2a8 8 0 1 0 0 16 8 8 0 0 0 0-16",
-          ),
-        "PlusSmallOutline" to listOf("M13 11h5v2h-5v5h-2v-5H6v-2h5V6h2z"),
-        "DotHorOutline" to listOf("M6 14H2v-4h4zm8 0h-4v-4h4zm8 0h-4v-4h4z"),
-        "MinusCircleOutline" to
-          listOf(
-            "M17 13H7v-2h10z",
-            "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2m0 2a8 8 0 1 0 0 16 8 8 0 0 0 0-16",
-          ),
-        "MinusCircleSolid" to
-          listOf(
-            "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2M7 13h10v-2H7z"
-          ),
-        "ErrorSolid" to listOf("M23.256 20H.742L12 1.041zM11 15v2h2v-2zm0-6v5h2V9z"),
-        "QuestionmarkSolid" to
-          listOf(
-            "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2m-1 15h2v-2h-2zM9 7v3h2V9h2v1l-2 1.5V14h2v-1.5l2-1.5V7z"
-          ),
-        "PencilOutline" to
-          listOf(
-            "M22.414 7.5 7.914 22H2v-5.914l14.5-14.5zM4 16.914V20h3.086l9.5-9.5L13.5 7.414zM14.914 6 18 9.086 19.586 7.5 16.5 4.414z"
-          ),
-        "ChevronRightSmallOutline" to listOf("M15.414 12 10 17.414 8.586 16l4-4-4-4L10 6.586z"),
-        "DragOutline" to
-          listOf("M11 21H7v-4h4zm6 0h-4v-4h4zm-6-7H7v-4h4zm6 0h-4v-4h4zm-6-7H7V3h4zm6 0h-4V3h4z"),
-        "StarOutline" to
-          listOf(
-            "m15.455 7.243 7.729 1.123-5.592 5.45 1.32 7.698L12 17.879l-6.911 3.635 1.32-7.698-5.592-5.45 7.728-1.123L12 .24zM9.872 9.071l-4.759.69 3.444 3.358-.814 4.738L12 15.62l.465.245 3.791 1.993-.813-4.739 3.443-3.357-4.758-.69L12 4.758z"
-          ),
-        "StarSolid" to
-          listOf(
-            "m15.405 7.313 7.84 1.034-5.735 5.443 1.44 7.774L12 17.793l-6.948 3.771 1.44-7.774L.756 8.347l7.839-1.034L12 .178z"
-          ),
-        "ChevronGrabberVerOutline" to
-          listOf(
-            "M17.414 15 12 20.414 6.586 15 8 13.586l4 4 4-4zm0-6L16 10.414l-4-4-4 4L6.586 9 12 3.586z"
-          ),
-        "ChevronBottomOutline" to
-          listOf("M20.707 9.707 12 18.414 3.293 9.707l1.414-1.414L12 15.586l7.293-7.293z"),
-        "ChevronTopOutline" to
-          listOf("m20.707 14.293-1.414 1.414L12 8.414l-7.293 7.293-1.414-1.414L12 5.586z"),
-        "ImageSquareWavesOutline" to
-          listOf(
-            "M14.25 7a2 2 0 1 1 0 4 2 2 0 0 1 0-4",
-            "M21 21H3V3h18zM5 16.414V19h12.586L14 15.414l-2 2-4-4zm0-2.828 3-3 4 4 2-2 5 5V5H5z",
-          ),
-      )
+  override fun onDraw(canvas: Canvas) {
+    super.onDraw(canvas)
+    val icon = metadata() ?: return
+    val rect = glyphRect(icon)
+    if (icon.name == "Circle") { fill.colorFilter = null; fill.color = tintColor; canvas.drawOval(rect,fill); return }
+    fill.alpha = 255
+    bitmap?.let { canvas.drawBitmap(it,null,rect,fill) }
   }
+  override fun onAttachedToWindow() { super.onAttachedToWindow(); attached = true; refresh() }
+  override fun onDetachedFromWindow() {
+    attached = false
+    super.onDetachedFromWindow()
+    refresh()
+  }
+  override fun onVisibilityChanged(changedView: View, visibility: Int) {
+    super.onVisibilityChanged(changedView, visibility)
+    if (initialized) refresh()
+  }
+  override fun onSizeChanged(w: Int,h: Int,oldw: Int,oldh: Int) { super.onSizeChanged(w,h,oldw,oldh); refresh() }
+  override fun onConfigurationChanged(config: android.content.res.Configuration) { super.onConfigurationChanged(config); refresh(true) }
 }
 
-internal class OneKeyCheckboxView(context: android.content.Context) : View(context) {
+internal class OneKeyCheckboxView(context: android.content.Context) : OneKeyIconView(context) {
   var usesSelectorGeometry = false
-  private val glyphPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL }
-  private var state = "unchecked"
-
-  fun setState(value: String, color: Int) {
-    state = value
-    glyphPaint.color = color
-    invalidate()
+    set(value) { if (field == value) return; field = value; refresh() }
+  fun setState(value: String,color: Int) {
+    tintColor = color
+    iconName = when(value) {
+      "checked" -> "CheckboxCheckedCustom"
+      "indeterminate" -> "CheckboxIndeterminateCustom"
+      else -> ""
+    }
   }
+  override fun metadata(): NativeListIconMetadata? = when(iconName) {
+    "CheckboxCheckedCustom", "CheckboxIndeterminateCustom" -> NativeListIconMetadata(iconName,16f,16f)
+    else -> null
+  }
+  override fun glyphRect(icon: NativeListIconMetadata): android.graphics.RectF {
+    val size = if (usesSelectorGeometry) (16 * resources.displayMetrics.density).roundToInt().toFloat() else minOf(width,height)*0.8f
+    val border = (2 * resources.displayMetrics.density).roundToInt().toFloat()
+    val left = if(usesSelectorGeometry) border else (width-size)/2f
+    val top = if(usesSelectorGeometry) border else (height-size)/2f
+    return android.graphics.RectF(left,top,left+size,top+size)
+  }
+}
 
-  override fun onDraw(canvas: Canvas) {
-    super.onDraw(canvas)
-    val pathData =
-      when (state) {
-        "checked" ->
-          "M12.204 5.043a1 1 0 0 1 0 1.414l-4.5 4.5a1 1 0 0 1-1.414 0l-2-2a1 1 0 1 1 1.414-1.414l1.293 1.293 3.793-3.793a1 1 0 0 1 1.414 0"
-        "indeterminate" -> "M4 8a1 1 0 0 1 1-1h6a1 1 0 0 1 0 2H5a1 1 0 0 1-1-1"
-        else -> return
-      }
-    // OneKey patch: the source icon is a 16dp child after the 2dp border, not 80% of a rounded
-    // frame.
-    val drawSize =
-      if (usesSelectorGeometry) (16 * resources.displayMetrics.density).roundToInt().toFloat()
-      else minOf(width, height) * 0.8f
-    val borderOffset = (2 * resources.displayMetrics.density).roundToInt().toFloat()
-    canvas.save()
-    canvas.translate(
-      if (usesSelectorGeometry) borderOffset else (width - drawSize) / 2f,
-      if (usesSelectorGeometry) borderOffset else (height - drawSize) / 2f,
-    )
-    canvas.scale(drawSize / 16f, drawSize / 16f)
-    PathParser.createPathFromPathData(pathData)?.let { canvas.drawPath(it, glyphPaint) }
-    canvas.restore()
+/** Captures existing glyph slots only; nested synchronous binds share their final identity. */
+internal class NativeListIconUpdate(root: View) {
+  private val icons = mutableListOf<OneKeyIconView>()
+  init {
+    fun collect(view: View) {
+      if (view is OneKeyIconView) icons.add(view)
+      if (view is android.view.ViewGroup) for (index in 0 until view.childCount) collect(view.getChildAt(index))
+    }
+    collect(root)
+    icons.forEach { it.beginIconUpdate() }
   }
+  fun finish() { icons.forEach { it.endIconUpdate() } }
 }

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

@@ -186,6 +186,9 @@ internal abstract class NativeListRendererRowView(protected val reactContext: Th
     checkboxState: (NativeListItem, NativeSelectionTarget?, String) -> String,
     useSourceScale: Boolean,
   ) {
+    val iconUpdate = NativeListIconUpdate(this)
+    try {
+
     val update = update(current, item)
     val signature =
       nativeListCanonical(
@@ -246,6 +249,8 @@ internal abstract class NativeListRendererRowView(protected val reactContext: Th
     bindSelectionContent(item, checkboxState)
     appearance()
     requestLayout()
+
+    } finally { iconUpdate.finish() }
   }
 
   override fun bindSelection(