@craft-native/android 0.0.205 → 0.0.206

package/package.json

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

package/templates/CraftNativeRefreshableFlatList.kt.template

@@ -1,6 +1,7 @@
 package {{PACKAGE_NAME}}
 
 import android.content.Context
+import org.json.JSONObject
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 
 /** Swipe-to-refresh host for a native FlatList. */
@@ -21,6 +22,12 @@ internal class CraftNativeRefreshableFlatList(context: Context) : SwipeRefreshLa
         if (handler == null) isRefreshing = false
     }
 
+    fun setRefreshAppearance(props: JSONObject, fallback: Int) {
+        val tint = props.optString("tintColor").takeIf { it.isNotBlank() }
+        val resolved = tint?.let { runCatching { craftNativeColor(it) }.getOrNull() } ?: fallback
+        setColorSchemeColors(resolved)
+    }
+
     override fun onDetachedFromWindow() {
         refreshHandler = null
         isRefreshing = false

package/templates/MainActivityNative.kt.template

@@ -149,8 +149,9 @@ private fun craftNativeOptionalString(value: Any?): String? = value
     ?.takeIf { it.isNotBlank() }
 
 private fun craftNativePickerValue(value: Any?): String? = when (value) {
+    is String -> value.takeIf { it.isNotEmpty() }
     is Number -> value.toDouble().takeIf { it.isFinite() }?.toString()
-    else -> craftNativeOptionalString(value)
+    else -> null
 }
 
 private fun craftNativeEventName(events: JSONObject, vararg names: String): String =
@@ -352,6 +353,14 @@ private class CraftNativeSvgView(context: Context) : View(context) {
         val vectorEffect: String? = null,
         val dominantBaseline: String? = null,
     ) {
+        private fun svgTypeface(weight: String?, inherited: Typeface): Typeface = when (weight?.lowercase()) {
+            "500" -> Typeface.create("sans-serif-medium", Typeface.NORMAL)
+            "600" -> Typeface.create("sans-serif", Typeface.BOLD)
+            "bold", "700", "800", "900" -> Typeface.DEFAULT_BOLD
+            "normal", "100", "200", "300", "400" -> Typeface.DEFAULT
+            else -> inherited
+        }
+
         fun merge(node: JSONObject): SvgPaint {
             val props = node.optJSONObject("props") ?: JSONObject()
             val style = node.optJSONObject("style") ?: JSONObject()
@@ -387,7 +396,7 @@ private class CraftNativeSvgView(context: Context) : View(context) {
                 strokeDashoffset = number("strokeDashoffset") ?: strokeDashoffset,
                 strokeMiterlimit = number("strokeMiterlimit")?.takeIf { it > 0 } ?: strokeMiterlimit,
                 fillRule = value("fillRule") ?: fillRule,
-                typeface = if (weight in setOf("bold", "700")) Typeface.DEFAULT_BOLD else typeface,
+                typeface = svgTypeface(weight, typeface),
                 strokeLinecap = value("strokeLinecap") ?: strokeLinecap,
                 strokeLinejoin = value("strokeLinejoin") ?: strokeLinejoin,
                 strokeDasharray = dashes(raw("strokeDasharray")) ?: strokeDasharray,
@@ -2209,13 +2218,13 @@ private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(conte
         }
     }
 
-    fun setRefreshAppearance(props: JSONObject, density: Float) {
+    fun setRefreshAppearance(props: JSONObject, density: Float, fallback: Int) {
         val tint = craftNativeOptionalString(props.opt("tintColor"))
-        if (tint != null) setColorSchemeColors(craftNativeColor(tint))
-        else setColorSchemeColors(Color.WHITE)
+        setColorSchemeColors(tint?.let { runCatching { craftNativeColor(it) }.getOrNull() } ?: fallback)
         val background = craftNativeOptionalString(props.opt("progressBackgroundColor"))
-        if (background != null) setProgressBackgroundColorSchemeColor(craftNativeColor(background))
-        else setProgressBackgroundColorSchemeColor(Color.TRANSPARENT)
+        setProgressBackgroundColorSchemeColor(
+            background?.let { runCatching { craftNativeColor(it) }.getOrNull() } ?: Color.TRANSPARENT,
+        )
         val offset = props.optDouble("progressViewOffset", Double.NaN)
         val requested = if (offset.isFinite()) (offset * density).roundToInt() else null
         if (configuredProgressOffset != requested) {
@@ -2862,7 +2871,8 @@ private class CraftNativeDatePickerView(context: Context) : FrameLayout(context)
         if (text.isBlank() || text == JSONObject.NULL.toString()) return null
         val formats = listOf(
             "HH:mm", "HH:mm:ss", "yyyy-MM-dd", "yyyy-MM-dd'T'HH:mm",
-            "yyyy-MM-dd'T'HH:mm:ss", "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", "yyyy-MM-dd'T'HH:mm:ssX",
+            "yyyy-MM-dd'T'HH:mm:ss", "yyyy-MM-dd'T'HH:mm:ss.SSS",
+            "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", "yyyy-MM-dd'T'HH:mm:ssX",
         )
         formats.firstNotNullOfOrNull { format ->
             runCatching {
@@ -4485,6 +4495,13 @@ class MainActivity : AppCompatActivity() {
         screen.view.setBackgroundColor(configured ?: ContextCompat.getColor(this, R.color.background))
     }
 
+    /** Refresh controls use a contrasting system tint when no color is authored. */
+    private fun refreshTintFallback(screen: Screen): Int {
+        val background = (screen.view.background as? ColorDrawable)?.color
+            ?: ContextCompat.getColor(this, R.color.background)
+        return if (Color.luminance(background) < 0.5f) Color.WHITE else Color.BLACK
+    }
+
     /** The bridge's capability names: Craft's core set and this host's services. */
     private fun capabilityNames(): JSONArray = capabilities.names().apply {
         services.names().forEach { name -> put(name) }
@@ -4961,7 +4978,9 @@ class MainActivity : AppCompatActivity() {
                 val title = craftNativeOptionalString(props.opt("title")) ?: childText(children)
                 isAllCaps = false
                 configureText(this, title, style)
-                craftNativeOptionalString(props.opt("color"))?.let { setTextColor(color(it, defaultTextColor)) }
+                val buttonColor = craftNativeOptionalString(props.opt("color"))
+                    ?: craftNativeOptionalString(style.opt("color"))
+                setTextColor(buttonColor?.let { color(it, defaultTextColor) } ?: defaultTextColor)
                 isEnabled = !props.optBoolean("disabled", false)
                 val handler = craftNativeEventName(events, "onPress", "onClick")
                 if (handler.isNotBlank()) screen.handlers[this] = handler else screen.handlers.remove(this)
@@ -4973,11 +4992,11 @@ class MainActivity : AppCompatActivity() {
             "Checkbox" -> (previous as? CheckBox ?: CheckBox(this)).apply {
                 text = craftNativeOptionalString(props.opt("label")) ?: childText(children)
                 configureText(this, text.toString(), style)
-                val requested = props.opt("checked") ?: props.opt("value")
-                val checked = when (requested) {
-                    is Boolean -> requested
-                    is Number -> requested.toDouble() != 0.0
-                    is String -> requested.equals("true", ignoreCase = true) || requested == "1"
+                val checkboxChecked = props.opt("checked")
+                val checkboxValue = props.opt("value")
+                val checked = when {
+                    checkboxChecked is Boolean -> checkboxChecked
+                    checkboxValue is Boolean -> checkboxValue
                     else -> false
                 }
                 setOnCheckedChangeListener(null)
@@ -4985,11 +5004,14 @@ class MainActivity : AppCompatActivity() {
                 // an indeterminate control must announce "mixed" and its next
                 // user toggle should transition to checked, not unchecked.
                 isChecked = checked
-                isActivated = props.optBoolean("indeterminate", false)
+                val indeterminate = (props.opt("indeterminate") as? Boolean) == true
+                isActivated = indeterminate
                 isEnabled = !props.optBoolean("disabled", false)
                 val checkboxColor = craftNativeOptionalString(props.opt("color"))
                     ?: craftNativeOptionalString(style.opt("color"))
-                buttonTintList = checkboxColor?.let { ColorStateList.valueOf(color(it, defaultTextColor)) }
+                buttonTintList = checkboxColor
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    ?.let { ColorStateList.valueOf(it) }
                 val handler = craftNativeEventName(events, "onValueChange", "onChange")
                 if (handler.isNotBlank()) screen.handlers[this] = handler else screen.handlers.remove(this)
                 setOnCheckedChangeListener { _, value ->
@@ -5016,11 +5038,12 @@ class MainActivity : AppCompatActivity() {
                 hint = craftNativeOptionalString(props.opt("placeholder")).orEmpty()
                 setHintTextColor(
                     craftNativeOptionalString(props.opt("placeholderTextColor"))
-                        ?.let { ColorStateList.valueOf(color(it, Color.GRAY)) }
+                        ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                        ?.let { ColorStateList.valueOf(it) }
                         ?: defaultHintColors,
                 )
                 highlightColor = craftNativeOptionalString(props.opt("selectionColor"))
-                    ?.let { color(it, defaultHighlightColor) }
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
                     ?: defaultHighlightColor
                 val maxLength = props.optInt("maxLength", 0)
                 val currentLength = (filters.firstOrNull { it is InputFilter.LengthFilter } as? InputFilter.LengthFilter)?.max ?: 0
@@ -5254,24 +5277,29 @@ class MainActivity : AppCompatActivity() {
                 val requestedValue = props.opt("value")
                 val requestedChecked = props.opt("checked")
                 isChecked = when {
-                    requestedValue != null && requestedValue != JSONObject.NULL -> props.optBoolean("value")
-                    requestedChecked == null || requestedChecked == JSONObject.NULL -> false
+                    requestedValue != null && requestedValue != JSONObject.NULL -> requestedValue as? Boolean ?: false
                     requestedChecked is Boolean -> requestedChecked
-                    requestedChecked is Number -> requestedChecked.toDouble() != 0.0
-                    requestedChecked is String -> requestedChecked.isBlank() || requestedChecked.equals("true", ignoreCase = true)
-                    else -> props.optBoolean("checked", false)
+                    else -> false
                 }
                 isEnabled = !props.optBoolean("disabled", false)
                 props.optJSONObject("trackColor")?.let { track ->
-                    val falseColor = color(track.optString("false"), Color.GRAY)
-                    val trueColor = color(track.optString("true"), falseColor)
-                    trackTintList = ColorStateList(
-                        arrayOf(intArrayOf(android.R.attr.state_checked), intArrayOf()),
-                        intArrayOf(trueColor, falseColor),
-                    )
+                    val falseRaw = craftNativeOptionalString(track.opt("false"))
+                    val trueRaw = craftNativeOptionalString(track.opt("true"))
+                    val falseColor = falseRaw?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    val trueColor = trueRaw?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    trackTintList = if ((falseRaw != null && falseColor == null) || (trueRaw != null && trueColor == null)) {
+                        null
+                    } else {
+                        val resolvedFalse = falseColor ?: Color.GRAY
+                        ColorStateList(
+                            arrayOf(intArrayOf(android.R.attr.state_checked), intArrayOf()),
+                            intArrayOf(trueColor ?: resolvedFalse, resolvedFalse),
+                        )
+                    }
                 } ?: run { trackTintList = null }
                 craftNativeOptionalString(props.opt("thumbColor"))
-                    ?.let { thumbTintList = ColorStateList.valueOf(color(it, Color.WHITE)) }
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    ?.let { thumbTintList = ColorStateList.valueOf(it) }
                     ?: run { thumbTintList = null }
                 val handler = craftNativeEventName(events, "onValueChange", "onChange")
                 if (handler.isNotBlank()) screen.handlers[this] = handler else screen.handlers.remove(this)
@@ -5308,15 +5336,15 @@ class MainActivity : AppCompatActivity() {
                     (((value - minimum) / (maximum - minimum)) * max).roundToInt().coerceIn(0, max)
                 }
                 if (step != null) screen.sliderSteps[this] = step else screen.sliderSteps.remove(this)
-                craftNativeOptionalString(props.opt("minimumTrackTintColor"))
-                    ?.let { ColorStateList.valueOf(color(it, Color.WHITE)) }
-                    ?: run { progressTintList = null }
-                craftNativeOptionalString(props.opt("maximumTrackTintColor"))
-                    ?.let { ColorStateList.valueOf(color(it, Color.GRAY)) }
-                    ?: run { progressBackgroundTintList = null }
-                craftNativeOptionalString(props.opt("thumbTintColor"))
-                    ?.let { ColorStateList.valueOf(color(it, Color.WHITE)) }
-                    ?: run { thumbTintList = null }
+                progressTintList = craftNativeOptionalString(props.opt("minimumTrackTintColor"))
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    ?.let { ColorStateList.valueOf(it) }
+                progressBackgroundTintList = craftNativeOptionalString(props.opt("maximumTrackTintColor"))
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    ?.let { ColorStateList.valueOf(it) }
+                thumbTintList = craftNativeOptionalString(props.opt("thumbTintColor"))
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    ?.let { ColorStateList.valueOf(it) }
                 isEnabled = !props.optBoolean("disabled", false)
                 val handler = craftNativeEventName(events, "onValueChange", "onChange")
                 if (handler.isNotBlank()) screen.handlers[this] = handler else screen.handlers.remove(this)
@@ -5354,9 +5382,9 @@ class MainActivity : AppCompatActivity() {
                 val animating = props.optBoolean("animating", true)
                 isIndeterminate = animating
                 visibility = if (!animating && props.optBoolean("hidesWhenStopped", true)) View.GONE else View.VISIBLE
-                craftNativeOptionalString(props.opt("color"))
-                    ?.let { ColorStateList.valueOf(color(it, Color.WHITE)) }
-                    ?: run { indeterminateTintList = null }
+                indeterminateTintList = craftNativeOptionalString(props.opt("color"))
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    ?.let { ColorStateList.valueOf(it) }
             }
             "Icon" -> (previous as? CraftNativeIconView ?: CraftNativeIconView(this)).apply {
                 configureIcon(this, props, style)
@@ -5386,9 +5414,9 @@ class MainActivity : AppCompatActivity() {
                     "center" -> ImageView.ScaleType.CENTER
                     else -> ImageView.ScaleType.CENTER_INSIDE
                 }
-                craftNativeOptionalString(style.opt("tintColor"))
-                    ?.let { image.setColorFilter(color(it, Color.TRANSPARENT)) }
-                    ?: image.clearColorFilter()
+                val tint = craftNativeOptionalString(style.opt("tintColor"))
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                if (tint == null) image.clearColorFilter() else image.setColorFilter(tint)
                 val onLoadStart = craftNativeEventName(events, "onLoadStart")
                 if (onLoadStart.isNotBlank()) screen.imageLoadStartHandlers[image] = onLoadStart else screen.imageLoadStartHandlers.remove(image)
                 val onLoad = craftNativeEventName(events, "onLoad")
@@ -5458,7 +5486,7 @@ class MainActivity : AppCompatActivity() {
                     { send(screen, "EVENT", JSONObject().put("handlerName", handler).put("nativeEvent", JSONObject())) }
                 }
                 setRefreshHandler(refreshHandler, refreshProps.optBoolean("refreshing", props.optBoolean("refreshing", false)))
-                setRefreshAppearance(refreshProps, resources.displayMetrics.density)
+                setRefreshAppearance(refreshProps, resources.displayMetrics.density, refreshTintFallback(screen))
                 val onScroll = craftNativeEventName(events, "onScroll")
                 if (onScroll.isNotBlank()) screen.scrollHandlers[this] = onScroll else screen.scrollHandlers.remove(this)
                 val onBegin = craftNativeEventName(events, "onScrollBeginDrag")
@@ -5528,9 +5556,15 @@ class MainActivity : AppCompatActivity() {
             }
             "FlatList" -> (previous as? CraftNativeRefreshableFlatList ?: CraftNativeRefreshableFlatList(this)).apply {
                 val nativeList = list
-                configureRefresh(craftNativeEventName(events, "onRefresh").takeIf { it.isNotBlank() }?.let { handler ->
+                val propRefresh = props.optJSONObject("refreshControl") ?: JSONObject()
+                val propRefreshEvents = propRefresh.optJSONObject("events") ?: JSONObject()
+                val refreshHandlerName = craftNativeEventName(propRefreshEvents, "onRefresh")
+                    .takeIf { it.isNotBlank() }
+                    ?: craftNativeEventName(events, "onRefresh").takeIf { it.isNotBlank() }
+                configureRefresh(refreshHandlerName?.let { handler ->
                     { send(screen, "EVENT", JSONObject().put("handlerName", handler).put("nativeEvent", JSONObject())) }
-                }, props.optBoolean("refreshing", false))
+                }, propRefresh.optBoolean("refreshing", props.optBoolean("refreshing", false)))
+                setRefreshAppearance(propRefresh, refreshTintFallback(screen))
                 nativeList.setKeyboardShouldPersistTaps(props.optString("keyboardShouldPersistTaps", "never"))
                 nativeList.setContentContainerStyle(props.optJSONObject("contentContainerStyle"), resources.displayMetrics.density)
                 nativeList.setKeyboardDismissMode(props.optString("keyboardDismissMode")) {
@@ -5800,8 +5834,7 @@ class MainActivity : AppCompatActivity() {
                 is JSONObject -> makeView(screen, child, "$path.$index", next, previousControls)
                 is String -> TextView(this).apply {
                     includeFontPadding = false
-                    text = child
-                    setTextColor(defaultTextColor)
+                    configureText(this, child, craftNativeTypography(style))
                 }
                 else -> null
             }
@@ -6046,10 +6079,13 @@ class MainActivity : AppCompatActivity() {
         }
         if (view is ImageView) {
             val tint = style.opt("tintColor") as? String
-            if (tint.isNullOrBlank() || tint == "null" || tint == "undefined") {
+            val resolvedTint = tint
+                ?.takeUnless { it.isBlank() || it == "null" || it == "undefined" }
+                ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+            if (resolvedTint == null) {
                 view.clearColorFilter()
             } else {
-                view.setColorFilter(color(tint, Color.TRANSPARENT))
+                view.setColorFilter(resolvedTint)
             }
         }
     }
@@ -6120,6 +6156,22 @@ class MainActivity : AppCompatActivity() {
         configureTextStyle(view, style)
     }
 
+    /**
+     * Raw strings inside a native container are implicit Text nodes. Keep
+     * their typography, but not the parent's padding or layout, just like
+     * the iOS reconciler does for the same child shape.
+     */
+    private fun craftNativeTypography(style: JSONObject): JSONObject = JSONObject().also { typography ->
+        listOf(
+            "color", "letterSpacing", "lineHeight", "fontSize", "fontFamily",
+            "fontWeight", "fontStyle", "textAlign", "textTransform",
+            "textDecorationLine", "textDecorationStyle", "textDecorationColor",
+            "textShadowColor", "textShadowRadius", "textShadowOffset",
+        ).forEach { key ->
+            if (style.has(key) && !style.isNull(key)) typography.put(key, style.opt(key))
+        }
+    }
+
     private fun configureIcon(view: CraftNativeIconView, props: JSONObject, style: JSONObject) {
         val symbol = craftNativeOptionalString(props.opt("symbol"))
             ?: craftNativeOptionalString(props.opt("name")).orEmpty()
@@ -6466,7 +6518,7 @@ class MainActivity : AppCompatActivity() {
         }
         ViewCompat.setStateDescription(
             view,
-            if (type == "Checkbox" && props.optBoolean("indeterminate", false)) "mixed" else null,
+            if (type == "Checkbox" && (props.opt("indeterminate") as? Boolean) == true) "mixed" else null,
         )
         ViewCompat.setAccessibilityDelegate(view, object : AccessibilityDelegateCompat() {
             override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfoCompat) {