@craft-native/android 0.0.189 → 0.0.191

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/android",
-  "version": "0.0.189",
+  "version": "0.0.191",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/android#readme",
   "repository": {
     "type": "git",

package/templates/CraftNativeShell.kt.template

@@ -576,6 +576,9 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     private val buttons = LinearLayout(context)
     private val tabBar = LinearLayout(context)
     private val tabViews = mutableListOf<Pair<TextView, TextView>>()
+    private val tabIconText = mutableMapOf<String, String>()
+    private val tabImageURLs = mutableMapOf<String, String>()
+    private val tabImages = mutableMapOf<String, android.graphics.drawable.Drawable>()
     private val density = resources.displayMetrics.density
     private var selectedTab = 0
     private var swipeTracking = false
@@ -703,6 +706,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
 
     /** Draws `options` (a screen's `setOptions`) for a screen `depth` deep in its stack. */
     fun apply(options: JSONObject, depth: Int, fallbackTitle: String?) {
+        options.optJSONObject("tabItem")?.let(::updateTab)
         val hidden = options.optBoolean("hidden", false)
         val large = options.optBoolean("largeTitle", false) && depth == 0
         val title = options.optString("title").takeIf { options.has("title") } ?: fallbackTitle.orEmpty()
@@ -728,6 +732,42 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         refreshColors()
     }
 
+    private fun updateTab(item: JSONObject) {
+        val id = item.optString("id")
+        val index = tabs.indexOfFirst { it.id == id }
+        if (index < 0) return
+        val cell = tabBar.getChildAt(index)
+        if (item.has("accessibilityLabel")) cell.contentDescription = item.optString("accessibilityLabel").takeUnless { item.isNull("accessibilityLabel") || it.isBlank() } ?: tabs[index].title
+        if (item.has("iconText")) {
+            tabIconText.remove(id)
+            item.optString("iconText").takeUnless { item.isNull("iconText") || it.isBlank() }?.let { tabIconText[id] = it.take(8) }
+        }
+        if (item.has("image")) {
+            val address = item.optString("image").takeIf { !item.isNull("image") && it.startsWith("https://") }
+            if (address != tabImageURLs[id]) {
+                tabImages.remove(id)
+                tabImageURLs.remove(id)
+                if (address != null) {
+                    tabImageURLs[id] = address
+                    Thread {
+                        val image = runCatching {
+                            val connection = java.net.URL(address).openConnection().apply { connectTimeout = 5000; readTimeout = 5000 }
+                            val bitmap = connection.getInputStream().use { android.graphics.BitmapFactory.decodeStream(it) } ?: return@runCatching null
+                            androidx.core.graphics.drawable.RoundedBitmapDrawableFactory.create(resources, android.graphics.Bitmap.createScaledBitmap(bitmap, dp(27), dp(27), true)).apply { isCircular = true }
+                        }.getOrNull()
+                        post {
+                            if (tabImageURLs[id] == address && image != null) {
+                                tabImages[id] = image
+                                refreshColors()
+                            }
+                        }
+                    }.start()
+                }
+            }
+        }
+        refreshColors()
+    }
+
     /** Light or dark changed: the bars follow the screen's background. */
     fun refreshColors() {
         val background = ContextCompat.getColor(context, R.color.background)
@@ -749,11 +789,12 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         )).apply { setLayerInset(1, 0, maxOf(1, (density / 2).toInt()), 0, 0) }
         tabViews.forEachIndexed { index, (icon, label) ->
             val color = if (index == selectedTab) accent else muted
-            icon.setTextColor(color)
+            val number = tabIconText[tabs[index].id]
+            icon.setTextColor(if (number != null) Color.parseColor("#FF2D55") else color)
             label.setTextColor(color)
-            val vector = CraftNativeIcons.drawable(context, null, tabs[index].symbol, color)
+            val vector = tabImages[tabs[index].id] ?: if (number == null) CraftNativeIcons.drawable(context, null, tabs[index].symbol, color) else null
             icon.foreground = vector
-            if (vector != null) icon.text = ""
+            icon.text = if (vector != null) "" else number ?: CraftNativeSymbols.glyph(tabs[index].symbol)
         }
         for (index in 0 until buttons.childCount) (buttons.getChildAt(index) as? TextView)?.setTextColor(accent)
     }

package/templates/MainActivityNative.kt.template

@@ -2653,6 +2653,37 @@ private class CraftNativeDatePickerView(context: Context) : FrameLayout(context)
     }
 }
 
+/** A field's pending native edits and the props acknowledged by the screen. */
+internal class CraftNativeInputEcho {
+    private val pending = ArrayDeque<String>()
+    private var rendered: String? = null
+    private var initialized = false
+
+    fun record(value: String) {
+        pending.addLast(value)
+        while (pending.size > 64) pending.removeFirst()
+    }
+
+    fun accept(value: String?, nativeValue: String): Boolean {
+        if (value == null) {
+            initialized = false
+            rendered = null
+            pending.clear()
+            return false
+        }
+        // A retained field can render the same prop more than once, after
+        // its echo was consumed. That repeated prop must not overwrite a
+        // keystroke that has not made the native/JS round trip yet.
+        val changed = !initialized || rendered != value
+        initialized = true
+        rendered = value
+        if (!changed) return false
+        val index = pending.indexOf(value)
+        if (index >= 0) repeat(index + 1) { pending.removeFirst() }
+        return nativeValue != value && index < 0
+    }
+}
+
 /**
  * A native screen's `<Video>`: the platform's VideoView.
  *
@@ -3261,7 +3292,7 @@ class MainActivity : AppCompatActivity() {
          * the screen answer with a value the field has already moved past;
          * that echo is not written back over what was typed since.
          */
-        val inputEchoes = mutableMapOf<EditText, ArrayDeque<String>>()
+        val inputEchoes = mutableMapOf<EditText, CraftNativeInputEcho>()
         val controls = mutableMapOf<String, View>()
         // Protocol ids identify mutation targets; authored keys identify the
         // retained view. Keep both mappings so a targeted update can recover
@@ -4601,10 +4632,8 @@ class MainActivity : AppCompatActivity() {
                 val autofillHint = autofillHintFor(props)
                 if (autofillHint == null) setAutofillHints(*emptyArray()) else setAutofillHints(autofillHint)
                 val controlledValue = props.opt("value")?.takeUnless { it == JSONObject.NULL }?.toString()
-                val echoes = screen.inputEchoes[this]
-                val echoIndex = if (controlledValue == null || echoes == null) -1 else echoes.indexOf(controlledValue)
-                if (echoIndex >= 0) repeat(echoIndex + 1) { echoes!!.removeFirst() }
-                if (controlledValue != null && text.toString() != controlledValue && echoIndex < 0) {
+                val echoes = screen.inputEchoes.getOrPut(this) { CraftNativeInputEcho() }
+                if (echoes.accept(controlledValue, text.toString()) && controlledValue != null) {
                     screen.suppressedTextChanges.add(this)
                     setTextPreservingSelection(this, controlledValue)
                 }
@@ -4662,9 +4691,7 @@ class MainActivity : AppCompatActivity() {
                         (screen.inputIdentities[this@apply] ?: identity).let { screen.drafts[it] = updated }
                         if (screen.suppressedTextChanges.remove(this@apply)) return
                         val current = screen.handlers[this@apply] ?: return
-                        val echoes = screen.inputEchoes.getOrPut(this@apply) { ArrayDeque() }
-                        echoes.addLast(updated)
-                        while (echoes.size > 64) echoes.removeFirst()
+                        screen.inputEchoes.getOrPut(this@apply) { CraftNativeInputEcho() }.record(updated)
                         send(screen, "EVENT", JSONObject()
                             .put("handlerName", current)
                             .put("nativeEvent", JSONObject().put("text", updated)))
@@ -5430,6 +5457,11 @@ class MainActivity : AppCompatActivity() {
         view.elevation = dp(craftNativeNonNegativeDouble(style, "elevation", 0.0)).toFloat()
         view.z = craftNativeFiniteFloat(style, "zIndex", 0f)
         val background = style.has("backgroundColor") && !style.isNull("backgroundColor")
+        // VideoView's Surface is behind this window. An opaque View
+        // background paints over the decoded picture (only rounded corners
+        // showed it). Keep the outline/borders, with a transparent fill.
+        val backgroundColor = if (view is CraftNativeVideoView) Color.TRANSPARENT
+            else color(style.optString("backgroundColor"), Color.TRANSPARENT)
         val border = craftNativeNonNegativeDouble(style, "borderWidth", 0.0)
         val radius = craftNativeNonNegativeDouble(style, "borderRadius", 0.0)
         val sideBorderKeys = listOf("borderTopWidth", "borderRightWidth", "borderBottomWidth", "borderLeftWidth")
@@ -5452,14 +5484,14 @@ class MainActivity : AppCompatActivity() {
         if (background || border > 0 || radius > 0 || hasSideBorders) {
             if (hasSideBorders) {
                 view.background = CraftNativeSideBorderDrawable(
-                    color(style.optString("backgroundColor"), Color.TRANSPARENT),
+                    backgroundColor,
                     cornerRadii,
                     sideWidths,
                     sideColors,
                 )
             } else {
                 view.background = GradientDrawable().apply {
-                    setColor(color(style.optString("backgroundColor"), Color.TRANSPARENT))
+                    setColor(backgroundColor)
                     if (hasCornerRadii) setCornerRadii(cornerRadii) else cornerRadius = dp(radius).toFloat()
                     if (border > 0) {
                         val borderColor = color(style.optString("borderColor"), Color.TRANSPARENT)