@onekeyfe/react-native-native-list 6.7.0-alpha.378 → 6.7.0-alpha.382

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

@@ -1,7 +1,9 @@
 package com.margelo.nitro.nativelist
 
 import android.graphics.Color
+import android.graphics.Canvas
 import android.graphics.Outline
+import android.graphics.Paint
 import android.graphics.drawable.GradientDrawable
 import android.view.Gravity
 import android.view.View
@@ -211,6 +213,7 @@ internal class NativeListMessageRowView(context: ThemedReactContext, fonts: Nati
   NativeListRendererRowView(context, fonts) {
   override val assetFields = listOf("leading", "thumbnail")
   private val views = NativeListMessageRenderer.Views(context, fonts)
+  private val warningBorderPaint = Paint(Paint.ANTI_ALIAS_FLAG)
 
   override fun bindContent(
     item: NativeListItem,
@@ -229,5 +232,27 @@ internal class NativeListMessageRowView(context: ThemedReactContext, fonts: Nati
 
   override fun recycleContent() = views.recycle()
 
+  override fun appearance() {
+    super.appearance()
+    if (boundItem?.json?.optString("presentation") == "inlineWarning") {
+      foreground = null
+      clipToOutline = false
+      (background as? GradientDrawable)?.cornerRadius = 0f
+    }
+  }
+
+  override fun dispatchDraw(canvas: Canvas) {
+    super.dispatchDraw(canvas)
+    val item = boundItem ?: return
+    if (item.json.optString("presentation") != "inlineWarning") return
+    val container = item.json.optJSONObject("style")?.optJSONObject("container") ?: return
+    val borderWidth = container.optDouble("borderWidth", 0.0).toFloat()
+    if (borderWidth <= 0) return
+    val pixels = (borderWidth * resources.displayMetrics.density).coerceAtLeast(1f)
+    warningBorderPaint.color = parseNativeListColor(container.optString("borderColor", "#00000000"))
+    canvas.drawRect(0f, 0f, width.toFloat(), pixels, warningBorderPaint)
+    canvas.drawRect(0f, height - pixels, width.toFloat(), height.toFloat(), warningBorderPaint)
+  }
+
   override fun disposeContent() = views.dispose()
 }

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

@@ -13,7 +13,7 @@ internal fun isNativeListRowPressEnabled(
   variant: String,
   disabled: Boolean,
   pressDisabled: Boolean,
-): Boolean = !disabled && !pressDisabled && (type != "system" || variant == "retry")
+): Boolean = !disabled && !pressDisabled && type != "buttonGroup" && (type != "system" || variant == "retry")
 
 internal fun isNativeListWholeRowInteractive(
   type: String,
@@ -78,7 +78,7 @@ private fun updateLengthPrefixed(digest: MessageDigest, value: String) {
 }
 
 // Template type alone partitions reuse; data keys and styles never select a renderer.
-internal enum class NativeListRendererKey { MESSAGE, RAIL, MEDIA_TILE, ACTION, SYSTEM, ACTIVITY, DATA_ROW, METRIC_CARD, MARKET, IDENTITY, SECTION_HEADER, WALLET_GROUP }
+internal enum class NativeListRendererKey { MESSAGE, RAIL, MEDIA_TILE, ACTION, SYSTEM, ACTIVITY, DATA_ROW, METRIC_CARD, MARKET, IDENTITY, SECTION_HEADER, WALLET_GROUP, BUTTON_GROUP }
 
 internal data class NativeListItem(
   val key: String,
@@ -163,6 +163,8 @@ internal data class NativeListItem(
 
 internal data class NativeListConfig(
   val generation: Int,
+  val structuralTransition: StructuralTransition?,
+  val disclosure: Disclosure?,
   val layout: String,
   val orientation: String,
   val gridColumns: Int,
@@ -189,9 +191,36 @@ internal data class NativeListConfig(
   val fixedFooter: NativeListItem?,
   val items: List<NativeListItem>,
 ) {
+  internal data class StructuralTransition(
+    val id: String,
+    val durationMs: Long,
+    val anchorKey: String?,
+  )
+  internal data class Disclosure(
+    val expanded: Boolean,
+    val expandedTrailingInset: Double,
+  )
   companion object {
     fun parse(snapshotJson: String): NativeListConfig {
       val root = JSONObject(snapshotJson)
+      val transition = root.optJSONObject("structuralTransition")
+      val structuralTransition = transition?.optString("id")?.takeIf(String::isNotEmpty)?.let { id ->
+        StructuralTransition(
+          id = id,
+          durationMs = transition.optDouble("durationMs", 220.0).coerceIn(0.0, 2000.0).toLong(),
+          anchorKey = transition.optString("anchorKey").takeIf(String::isNotEmpty),
+        )
+      }
+      val disclosureJson = root.optJSONObject("disclosure")
+      require(!root.has("disclosure") || disclosureJson != null) { "Invalid disclosure" }
+      val disclosure = disclosureJson?.let { value ->
+        require(value.opt("expanded") is Boolean) { "Invalid disclosure.expanded" }
+        require(!value.has("expandedTrailingInset") ||
+          value.opt("expandedTrailingInset") is Number) { "Invalid disclosure.expandedTrailingInset" }
+        val inset = value.optDouble("expandedTrailingInset", 0.0)
+        require(inset.isFinite() && inset >= 0.0) { "Invalid disclosure.expandedTrailingInset" }
+        Disclosure(value.getBoolean("expanded"), inset)
+      }
       require(root.getInt("schemaVersion") == 1) { "Unsupported schemaVersion" }
       val layout = root.getJSONObject("layout")
       val selection = root.optJSONObject("selection")
@@ -214,6 +243,8 @@ internal data class NativeListConfig(
       val fixedFooter = root.optJSONObject("fixedFooter")?.let(NativeListItem::parse)
       return NativeListConfig(
         generation = root.getInt("generation"),
+        structuralTransition = structuralTransition,
+        disclosure = disclosure,
         layout = layout.getString("kind"),
         orientation = layout.optString("orientation", "vertical"),
         gridColumns = layout.optInt("gridColumns", 1).coerceIn(1, 7),

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

@@ -240,6 +240,9 @@ internal class OneKeyIconView(context: android.content.Context) : View(context)
     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(
@@ -267,6 +270,9 @@ internal class OneKeyIconView(context: android.content.Context) : View(context)
     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,
@@ -282,6 +288,9 @@ internal class OneKeyIconView(context: android.content.Context) : View(context)
     private val actionIconFillTypes =
       mapOf(
         "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(
@@ -324,6 +333,19 @@ internal class OneKeyIconView(context: android.content.Context) : View(context)
     // Exact 24x24 paths from app-monorepo packages/components Icon sources.
     private val iconPaths =
       mapOf(
+        "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(

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

@@ -17,6 +17,7 @@ internal object NativeListRendererRegistry {
       NativeListRendererKey.ACTIVITY to ::NativeListActivityRowView,
       NativeListRendererKey.SYSTEM to ::NativeListSystemRowView,
       NativeListRendererKey.ACTION to ::NativeListActionRowView,
+      NativeListRendererKey.BUTTON_GROUP to ::NativeListButtonGroupRowView,
     )
 
   private val keys =
@@ -33,6 +34,7 @@ internal object NativeListRendererRegistry {
       "activity" to NativeListRendererKey.ACTIVITY,
       "system" to NativeListRendererKey.SYSTEM,
       "action" to NativeListRendererKey.ACTION,
+      "buttonGroup" to NativeListRendererKey.BUTTON_GROUP,
     )
 
   fun key(type: String) = keys.getValue(type)

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

@@ -106,6 +106,8 @@ internal abstract class NativeListRendererRowView(protected val reactContext: Th
   protected open val pressedColorName = "rowPressedBackground"
   protected open val pressedColorFallback = "#00000017"
   private var current: NativeListItem? = null
+  protected val boundItem: NativeListItem?
+    get() = current
   private var theme: JSONObject? = null
   private var listLayout = "linear"
   private var itemIndex: Int? = null

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

@@ -52,7 +52,7 @@ internal data class NativeListResolvedText(
     view.letterSpacing = 0f
     view.gravity = gravity
     view.opticalOffsetY = offset
-    view.maxLines = lines
+    view.maxLines = if (lines == 0) Int.MAX_VALUE else lines
     view.setHorizontallyScrolling(lines == 1 && explicitTruncation)
     view.ellipsize = if (explicitTruncation && !clip) TextUtils.TruncateAt.END else null
     view.setLineSpacing(0f, 1f)
@@ -87,7 +87,8 @@ internal data class NativeListResolvedText(
       sourceScale: Boolean,
     ): NativeListResolvedText {
       val density = context.resources.displayMetrics.density
-      val maxLines = (style?.optInt("lines", lines) ?: lines).coerceIn(1, 3)
+      val requestedLines = style?.optInt("lines", lines) ?: lines
+      val maxLines = if (requestedLines == 0) 0 else requestedLines.coerceIn(1, 3)
       val truncation = style?.let { it.has("lines") || it.has("truncate") } == true
       val fontSize =
         if (style?.has("fontSize") == true) (style.optDouble("fontSize") * density).toFloat()

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

@@ -26,6 +26,7 @@ internal class NativeListSectionHeaderRowView(context: ThemedReactContext, fonts
   private val mainColumn = LinearLayout(context)
   private val titleLine = PackedTitleLineLayout(context)
   private val title = DottedUnderlineTextView(context)
+  private val leadingBadge = NativeListTextView(context)
   private val titleSpinner = ProgressBar(context, null, android.R.attr.progressBarStyleSmall).apply {
     isIndeterminate = true
     importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
@@ -165,6 +166,12 @@ internal class NativeListSectionHeaderRowView(context: ThemedReactContext, fonts
     currentTheme = theme
     currentLayout = layout
     removeAllViews()
+    if (trailingViews[0].parent === titleLine) {
+      titleLine.removeView(trailingViews[0])
+      trailingColumn.addView(trailingViews[0], 0)
+    }
+    titleLine.removeView(leadingBadge)
+    leadingBadge.text = ""
     titleLine.removeView(headerTitleIcon)
     trailingColumn.removeView(headerValueIcon)
     paintDefaults.forEach { (view, flags) -> view.paintFlags = flags }
@@ -188,6 +195,10 @@ internal class NativeListSectionHeaderRowView(context: ThemedReactContext, fonts
       view.ellipsize = null
       view.setHorizontallyScrolling(false)
       view.opticalOffsetY = 0f
+      view.helpBindingGeneration += 1
+      view.guardsHelpTouches = false
+      view.primaryHelpOnly = false
+      view.showsHelpUnderline = false
       view.gravity = Gravity.START
       view.letterSpacing = 0f
       view.fontFeatureSettings = "tnum"
@@ -291,6 +302,7 @@ internal class NativeListSectionHeaderRowView(context: ThemedReactContext, fonts
       }
     }
     applyTextStyle(item)
+    bindPositionHeaderFields(item, theme)
     titleSpinner.indeterminateTintList = ColorStateList.valueOf(title.currentTextColor)
     style
       .optJSONObject("container")
@@ -307,6 +319,57 @@ internal class NativeListSectionHeaderRowView(context: ThemedReactContext, fonts
     applySelectorTypography(item)
   }
 
+  private fun bindPositionHeaderFields(item: NativeListItem, theme: JSONObject?) {
+    val style = item.json.optJSONObject("style") ?: JSONObject()
+    item.json.optJSONObject("leadingBadge")?.let { badge ->
+      leadingBadge.text = badge.optString("text")
+      leadingBadge.textSize = sp(12f)
+      leadingBadge.typeface = fonts.medium(context)
+      leadingBadge.includeFontPadding = false
+      val tones = mapOf("info" to ("info" to "#0F69F6"), "success" to ("positive" to "#008F5A"), "warning" to ("caution" to "#A35E00"), "danger" to ("negative" to "#CE2C31"))
+      val tone = tones[badge.optString("tone")]
+      if (tone != null) {
+        val tint = color(theme, tone.first, tone.second)
+        leadingBadge.setTextColor(tint)
+        val fallback = (tint and 0x00FFFFFF) or (31 shl 24)
+        val fill = if (badge.optString("tone") == "success" && theme?.has("successBackground") == true)
+          safeColor(theme.optString("successBackground"), fallback) else fallback
+        leadingBadge.background = roundedFill(fill, 4f)
+      } else {
+        leadingBadge.setTextColor(color(theme, "secondaryText", "#0000009B"))
+        leadingBadge.background = roundedFill(color(theme, "strongBackground", "#0000000F"), 4f)
+      }
+      leadingBadge.setPadding(dp(8), dp(2), dp(8), dp(2))
+      TextViewCompat.setLineHeight(leadingBadge, dp(16))
+      titleLine.addView(leadingBadge, 0, LayoutParams(LayoutParams.WRAP_CONTENT, dp(20)).apply { marginEnd = dp(8) })
+    }
+    if (style.has("titleDecoration")) {
+      title.showsDottedUnderline = false
+      title.showsHelpUnderline = style.optString("titleDecoration") == "dashed"
+      title.setPadding(0, 0, 0, if (title.showsHelpUnderline) dp(3) else 0)
+    }
+    val value = trailingViews[0]
+    if (style.optString("valuePlacement") == "afterTitle") {
+      trailingColumn.removeView(value)
+      title.layoutParams = wrap()
+      titleLine.packsChildrenAtStart = false
+      titleLine.addView(value, wrap().apply { marginStart = dp(8) })
+    }
+    item.json.optJSONObject("valueHelp")?.let { help ->
+      value.guardsHelpTouches = true
+      value.setOnClickListener(null)
+      value.isClickable = false
+      value.showsHelpUnderline = help.optString("underline") == "dashed"
+      if (help.optString("presentation") == "popover") {
+        value.setOnClickListener {
+          currentItem?.takeUnless { it.json.optBoolean("disabled") }?.let {
+            emitAction(it, help.optString("actionKey"), null, value, "trailingAccessory", 0)
+          }
+        }
+      }
+    }
+  }
+
   private fun applyTextStyle(item: NativeListItem) {
     val style = item.json.optJSONObject("style") ?: return
     for ((slot, view) in
@@ -411,6 +474,12 @@ internal class NativeListSectionHeaderRowView(context: ThemedReactContext, fonts
   override fun recycleContent() {
     checkboxControl.reset()
     currentItem = null
+    title.setOnClickListener(null)
+    title.isClickable = false
+    trailingViews[0].helpBindingGeneration += 1
+    trailingViews[0].setOnClickListener(null)
+    trailingViews[0].isClickable = false
+    trailingViews[0].showsHelpUnderline = false
     titleSpinner.visibility = GONE
   }
 

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

@@ -1,9 +1,62 @@
 package com.margelo.nitro.nativelist
 
 import android.graphics.Canvas
+import android.graphics.DashPathEffect
+import android.graphics.Paint
+import android.graphics.RectF
+import android.view.MotionEvent
 import android.widget.TextView
 
 internal open class NativeListTextView(context: android.content.Context) : TextView(context) {
+  var helpBindingGeneration = 0
+  var guardsHelpTouches = false
+  private var helpDownGeneration = -1
+  var primaryHelpOnly = false
+  var showsHelpUnderline = false
+    set(value) { field = value; invalidate() }
+  private val helpPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+    style = Paint.Style.STROKE
+    strokeWidth = resources.displayMetrics.density
+    pathEffect = DashPathEffect(floatArrayOf(3 * strokeWidth, 2 * strokeWidth), 0f)
+  }
+
+  val helpAnchorBounds: RectF?
+    get() {
+      if (!primaryHelpOnly) return null
+      val textLayout = layout ?: return null
+      if (textLayout.lineCount == 0) return null
+      return RectF(
+        totalPaddingLeft + textLayout.getLineLeft(0),
+        (totalPaddingTop + textLayout.getLineTop(0)).toFloat() + opticalOffsetY,
+        totalPaddingLeft + textLayout.getLineRight(0),
+        (totalPaddingTop + textLayout.getLineBottom(0)).toFloat() + opticalOffsetY,
+      )
+    }
+
+  override fun onTouchEvent(event: MotionEvent): Boolean {
+    if (primaryHelpOnly && event.actionMasked == MotionEvent.ACTION_DOWN &&
+      helpAnchorBounds?.contains(event.x, event.y) != true) return false
+    if (guardsHelpTouches) {
+      if (event.actionMasked == MotionEvent.ACTION_DOWN) helpDownGeneration = helpBindingGeneration
+      if (event.actionMasked == MotionEvent.ACTION_UP && helpDownGeneration != helpBindingGeneration) {
+        isPressed = false
+        return true
+      }
+    }
+    return super.onTouchEvent(event)
+  }
+
+  private fun drawHelpUnderline(canvas: Canvas) {
+    if (!showsHelpUnderline) return
+    val textLayout = layout ?: return
+    if (textLayout.lineCount == 0) return
+    helpPaint.color = currentTextColor
+    val left = totalPaddingLeft + textLayout.getLineLeft(0)
+    val right = totalPaddingLeft + textLayout.getLineRight(0)
+    val bottom = totalPaddingTop + textLayout.getLineBottom(0) - resources.displayMetrics.density
+    canvas.drawLine(left, bottom, right, bottom, helpPaint)
+  }
+
   var rowHorizontallyScrolling = false
     private set
 
@@ -16,10 +69,11 @@ internal open class NativeListTextView(context: android.content.Context) : TextV
     set(value) { field = value; invalidate() }
 
   override fun onDraw(canvas: Canvas) {
-    if (opticalOffsetY == 0f) { super.onDraw(canvas); return }
+    if (opticalOffsetY == 0f) { super.onDraw(canvas); drawHelpUnderline(canvas); return }
     val checkpoint = canvas.save()
     canvas.translate(0f, opticalOffsetY)
     super.onDraw(canvas)
+    drawHelpUnderline(canvas)
     canvas.restoreToCount(checkpoint)
   }
 }