craft-native 0.0.247 → 0.0.249

package/dist/android/templates/CraftNativeMapLibre.kt.template

@@ -57,11 +57,24 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
             rightMargin = (8 * resources.displayMetrics.density).roundToInt()
             bottomMargin = (8 * resources.displayMetrics.density).roundToInt()
         })
+        refreshThemeDefaults()
         mapView.onCreate(null)
         mapView.addOnDidFinishLoadingMapListener { if (!destroyed && initialCameraKey == null) applyPending() }
         mapView.getMapAsync(this)
     }
 
+    fun refreshThemeDefaults() {
+        val dark = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+        val foreground = if (dark) Color.rgb(245, 245, 245) else Color.rgb(37, 51, 33)
+        val surface = if (dark) Color.argb(230, 38, 38, 38) else Color.argb(230, 255, 255, 255)
+        attribution.setTextColor(foreground)
+        attribution.setBackgroundColor(surface)
+        scale.setBackgroundColor(surface)
+        scaleLabel.setTextColor(foreground)
+        scaleLine.setBackgroundColor(foreground)
+        readyStyle?.let { updateOverlays(it) }
+    }
+
     override fun onMapReady(nativeMap: MapLibreMap) {
         if (destroyed) return
         map = nativeMap
@@ -109,6 +122,14 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
     fun markerHandler(id: String): String? = markerHandlers[id]
 
     private fun applyPending() {
+        // MapLibre may deliver style and render callbacks from its worker
+        // thread. All map, style, and GeoJSON source mutations must happen on
+        // Android's UI thread, so marshal the whole reconciliation before
+        // touching the native map object.
+        if (Looper.myLooper() != Looper.getMainLooper()) {
+            post { applyPending() }
+            return
+        }
         val nativeMap = map ?: return
         if (destroyed) return
         nativeMap.uiSettings.isCompassEnabled = craftNativeBoolean(pendingProps.opt("showsCompass"))
@@ -200,6 +221,12 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
         style.addLayer(LineLayer("craft-map-routes", "craft-map-overlays")
             .withFilter(Expression.eq(Expression.get("kind"), "line"))
             .withProperties(lineColor(Expression.toColor(Expression.get("color"))), lineWidth(Expression.get("width")), lineCap("round"), lineJoin("round")))
+        style.addLayer(FillLayer("craft-map-polygons", "craft-map-overlays")
+            .withFilter(Expression.eq(Expression.get("kind"), "polygon"))
+            .withProperties(fillColor(Expression.toColor(Expression.get("fillColor")))))
+        style.addLayer(LineLayer("craft-map-polygon-strokes", "craft-map-overlays")
+            .withFilter(Expression.eq(Expression.get("kind"), "polygon"))
+            .withProperties(lineColor(Expression.toColor(Expression.get("strokeColor"))), lineWidth(Expression.get("strokeWidth")), lineCap("round"), lineJoin("round")))
         style.addLayer(CircleLayer("craft-map-markers", "craft-map-overlays")
             .withFilter(Expression.eq(Expression.get("kind"), "marker"))
             .withProperties(circleColor(Expression.toColor(Expression.get("color"))), circleRadius(7f), circleStrokeColor(Color.WHITE), circleStrokeWidth(2f)))
@@ -212,6 +239,42 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
         val features = JSONArray()
         val pointsForFit = mutableListOf<LatLng>()
         markerHandlers.clear()
+        val dataMarkers = pendingProps.optJSONArray("markers")
+        for (index in 0 until (dataMarkers?.length() ?: 0)) {
+            val overlay = dataMarkers?.optJSONObject(index) ?: continue
+            val id = craftNativeOptionalString(overlay.opt("id")) ?: continue
+            val point = coordinates(overlay.optJSONArray("geometry")).firstOrNull() ?: continue
+            val bearing = finiteNumber(overlay.opt("bearing"))
+            val properties = JSONObject()
+                .put("craftOverlayId", id)
+                .put("kind", if (bearing == null) "marker" else "direction")
+                .put("craftMarkerId", id)
+                .put("bearing", (bearing ?: 0.0) % 360)
+                .put("color", cssColor(overlay.opt("pinColor"), Color.rgb(36, 114, 75)))
+            val geometry = JSONObject().put("type", "Point").put("coordinates", JSONArray().put(point.longitude).put(point.latitude))
+            features.put(JSONObject().put("type", "Feature").put("properties", properties).put("geometry", geometry))
+            pointsForFit.add(point)
+        }
+        val dataPolylines = pendingProps.optJSONArray("polylines")
+        for (index in 0 until (dataPolylines?.length() ?: 0)) {
+            val overlay = dataPolylines?.optJSONObject(index) ?: continue
+            val id = craftNativeOptionalString(overlay.opt("id")) ?: continue
+            val points = coordinates(overlay.optJSONArray("geometry"))
+            if (points.size <= 1) continue
+            val rawWidth = overlay.opt("strokeWidth")
+            val logicalWidth = if (rawWidth == null || rawWidth == JSONObject.NULL) 3.0 else finiteNumber(rawWidth) ?: continue
+            val width = (logicalWidth * resources.displayMetrics.density).takeIf { it.isFinite() && it > 0 } ?: continue
+            val properties = JSONObject()
+                .put("craftOverlayId", id)
+                .put("kind", "line")
+                .put("color", cssColor(overlay.opt("strokeColor"), Color.BLUE))
+                .put("width", width)
+            val geometry = JSONObject().put("type", "LineString").put("coordinates", JSONArray().apply {
+                points.forEach { put(JSONArray().put(it.longitude).put(it.latitude)) }
+            })
+            features.put(JSONObject().put("type", "Feature").put("properties", properties).put("geometry", geometry))
+            pointsForFit.addAll(points)
+        }
         for (index in 0 until pendingChildren.length()) {
             val child = pendingChildren.optJSONObject(index) ?: continue
             val type = child.optString("type").lowercase()
@@ -231,11 +294,25 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
                 pointsForFit.add(point)
             } else if ((type == "mappolyline" || type == "polyline") && points.size > 1) {
                 val authoredWidth = props.opt("strokeWidth")
-                val width = if (authoredWidth == null || authoredWidth == JSONObject.NULL) 3.0 else finiteNumber(authoredWidth) ?: continue
-                if (width <= 0 || !width.toFloat().isFinite()) continue
+                val logicalWidth = if (authoredWidth == null || authoredWidth == JSONObject.NULL) 3.0 else finiteNumber(authoredWidth) ?: continue
+                // The shared contract is expressed in logical points. MapLibre's
+                // style line-width is in physical pixels, just like the Google
+                // Maps polyline width, so convert only at this host boundary.
+                val width = (logicalWidth * resources.displayMetrics.density)
+                    .takeIf { it.isFinite() && it > 0 } ?: continue
                 properties.put("kind", "line").put("color", cssColor(props.opt("strokeColor"), Color.BLUE)).put("width", width)
                 geometry.put("type", "LineString").put("coordinates", JSONArray().apply { points.forEach { put(JSONArray().put(it.longitude).put(it.latitude)) } })
                 pointsForFit.addAll(points)
+            } else if ((type == "mappolygon" || type == "polygon") && points.size > 2) {
+                val rawWidth = props.opt("strokeWidth")
+                val logicalWidth = if (rawWidth == null || rawWidth == JSONObject.NULL) 2.0 else finiteNumber(rawWidth) ?: continue
+                val width = (logicalWidth * resources.displayMetrics.density).takeIf { it.isFinite() && it > 0 } ?: continue
+                val fill = cssColor(props.opt("fillColor"), Color.argb(72, 33, 150, 83))
+                val stroke = cssColor(props.opt("strokeColor"), Color.rgb(33, 150, 83))
+                properties.put("kind", "polygon").put("fillColor", fill).put("strokeColor", stroke).put("strokeWidth", width)
+                val ring = points + points.first()
+                geometry.put("type", "Polygon").put("coordinates", JSONArray().put(JSONArray().apply { ring.forEach { put(JSONArray().put(it.longitude).put(it.latitude)) } }))
+                pointsForFit.addAll(points)
             } else continue
             features.put(JSONObject().put("type", "Feature").put("properties", properties).put("geometry", geometry))
         }
@@ -244,10 +321,20 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
     }
 
     private fun cssColor(value: Any?, fallback: Int): String {
-        val color = (value as? String)?.let { runCatching { craftNativeColor(it) }.getOrNull() } ?: fallback
+        val color = (value as? String)?.let { mapColor(it, fallback) } ?: fallback
         return "rgba(${Color.red(color)},${Color.green(color)},${Color.blue(color)},${Color.alpha(color) / 255.0})"
     }
 
+    private fun mapColor(raw: String, fallback: Int): Int {
+        val value = raw.trim().lowercase()
+        val dark = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+        return when (value) {
+            "label" -> if (dark) Color.WHITE else Color.BLACK
+            "secondarylabel", "secondary-label" -> if (dark) Color.LTGRAY else Color.DKGRAY
+            else -> runCatching { craftNativeColor(raw) }.getOrDefault(fallback)
+        }
+    }
+
     private fun directionBitmap(): Bitmap {
         val size = (26 * resources.displayMetrics.density).roundToInt().coerceAtLeast(24)
         val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)

package/dist/android/templates/CraftNativeMutation.kt.template

@@ -111,6 +111,14 @@ class CraftNativeMutationDocument {
                         moveChild(operation, candidateNodes)
                         operation.optString("parentId").takeIf { it !in affectedNodeIds }?.let { affectedNodeIds.add(it) }
                     }
+                    "reparentChild" -> {
+                        val previousParent = reparentChild(operation, candidateNodes)
+                        operation.optString("parentId").takeIf { it !in affectedNodeIds }?.let { affectedNodeIds.add(it) }
+                        previousParent.takeIf { it !in affectedNodeIds }?.let { affectedNodeIds.add(it) }
+                        // A child crossing parents needs the committed tree to
+                        // be reconciled so the host can move its existing view.
+                        requiresFullRender = true
+                    }
                     "removeNode" -> {
                         val parent = candidateNodes[operation.optString("id")]?.parent
                         if (parent == null) requiresFullRender = true
@@ -152,6 +160,9 @@ class CraftNativeMutationDocument {
 
     fun node(id: String): JSONObject? = materialize(id, nodes)
 
+    /** Reserve surviving protocol nodes before reusing an authored keyed slot. */
+    fun containsNode(id: String): Boolean = nodes.containsKey(id)
+
     /** The committed parent used to redraw a child that has no native view. */
     fun parentId(id: String): String? = nodes[id]?.parent
 
@@ -225,6 +236,27 @@ class CraftNativeMutationDocument {
         parent.children.add(insertionIndex(operation, parent.children.size), childId)
     }
 
+    private fun reparentChild(operation: JSONObject, nodes: MutableMap<String, Node>): String {
+        val parentId = requiredId(operation, "parentId", "reparentChild")
+        val childId = requiredId(operation, "childId", "reparentChild")
+        val parent = nodes[parentId] ?: fail("UNKNOWN_PARENT", "node $parentId does not exist")
+        val child = nodes[childId] ?: fail("UNKNOWN_NODE", "node $childId does not exist")
+        val previousParentId = child.parent
+            ?: fail("NOT_ATTACHED", "node $childId is not attached to a parent")
+        val previousParent = nodes[previousParentId]
+            ?: fail("INVALID_TREE", "node $childId has a missing parent")
+        if (!acceptsChildren(parent.type)) fail("INVALID_PARENT", "node $parentId cannot contain child nodes")
+        if (parentId == childId || parentId in descendants(childId, nodes)) {
+            fail("CYCLE", "reparenting node $childId would create a cycle")
+        }
+        if (parentId == previousParentId) fail("SAME_PARENT", "node $childId is already a child of $parentId")
+        val index = insertionIndex(operation, parent.children.size)
+        previousParent.children.remove(childId)
+        parent.children.add(index, childId)
+        child.parent = parentId
+        return previousParentId
+    }
+
     private fun removeNode(
         operation: JSONObject,
         nodes: MutableMap<String, Node>,

package/dist/android/templates/CraftNativeRefreshableFlatList.kt.template

@@ -22,6 +22,12 @@ internal class CraftNativeRefreshableFlatList(context: Context) : SwipeRefreshLa
         if (handler == null) isRefreshing = false
     }
 
+    fun resetForTeardown() {
+        refreshHandler = null
+        isRefreshing = false
+        isEnabled = false
+    }
+
     fun setRefreshAppearance(props: JSONObject, fallback: Int) {
         val tint = props.optString("tintColor").takeIf { it.isNotBlank() }
         val resolved = tint?.let { runCatching { craftNativeColor(it) }.getOrNull() } ?: fallback
@@ -29,8 +35,7 @@ internal class CraftNativeRefreshableFlatList(context: Context) : SwipeRefreshLa
     }
 
     override fun onDetachedFromWindow() {
-        refreshHandler = null
-        isRefreshing = false
+        resetForTeardown()
         super.onDetachedFromWindow()
     }
 }

package/dist/android/templates/CraftNativeServices.kt.template

@@ -113,6 +113,7 @@ internal class CraftNativeServices(
             // `health.grantedTypes()` and `health.openSettings()`.
             add("healthAvailability")
         }
+        if (config.optBoolean("enableWallet")) add("wallet")
         if (config.optBoolean("enableKeepAwake")) add("keepAwake")
         if (config.optBoolean("enableGeolocation") || config.optBoolean("enableBackgroundLocation")) {
             add("geolocation")
@@ -130,6 +131,7 @@ internal class CraftNativeServices(
     fun handles(module: String): Boolean = module in setOf(
         "Dialog", "Browser", "Linking", "Share", "Push", "Health", "KeepAwake", "Brightness", "StatusBar", "Speech", "Background",
         "Location", "Media", "CrashReporter", "HeartRate",
+        "Wallet",
     )
 
     fun perform(module: String, method: String, args: JSONArray, completion: (CraftNativeCapabilityResult) -> Unit) {
@@ -144,6 +146,7 @@ internal class CraftNativeServices(
                 "Share" -> share(args.optJSONObject(0) ?: JSONObject(), done)
                 "Push" -> push(method, done)
                 "Health" -> health?.perform(method, args, done) ?: done(failure("CAPABILITY_DISABLED", "Health Connect is not enabled for this app"))
+                "Wallet" -> wallet(method, args, done)
                 "KeepAwake" -> keepAwake(args.optBoolean(0, true), done)
                 "Brightness" -> brightness(method, args, done)
                 "StatusBar" -> statusBar(args.optString(0, "default"), done)
@@ -176,6 +179,28 @@ internal class CraftNativeServices(
         }
     }
 
+    private fun wallet(method: String, args: JSONArray, done: (CraftNativeCapabilityResult) -> Unit) {
+        if (!config.optBoolean("enableWallet")) return done(failure("CAPABILITY_DISABLED", "Wallet is disabled"))
+        when (method) {
+            "isAvailable" -> done(success(runCatching {
+                context.packageManager.getLaunchIntentForPackage("com.google.android.apps.walletnfcrel") != null
+            }.getOrDefault(false)))
+            "add" -> {
+                val source = args.optJSONObject(0) ?: return done(failure("INVALID_ARGUMENT", "Wallet.add needs a source object"))
+                val address = source.optString("url").trim()
+                if (!address.startsWith("https://")) return done(failure("INVALID_ARGUMENT", "Android Wallet.add needs an HTTPS save URL"))
+                val host = activity() ?: return done(failure("NEEDS_ACTIVITY", "No screen is showing to open Wallet"))
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse(address))
+                if (intent.resolveActivity(host.packageManager) == null) return done(failure("UNAVAILABLE", "Google Wallet cannot open this save URL"))
+                runCatching { host.startActivity(intent) }
+                    .onSuccess { done(success(true)) }
+                    .onFailure { done(failure("PRESENTATION_FAILED", it.message ?: "Google Wallet could not open")) }
+            }
+            "has" -> done(failure("UNSUPPORTED", "Google Wallet pass lookup is not available through the save-link API"))
+            else -> done(failure("UNKNOWN_ACTION", "Unsupported Wallet method"))
+        }
+    }
+
     // MARK: Dialogs
 
     private fun dialog(method: String, options: JSONObject, done: (CraftNativeCapabilityResult) -> Unit) {

package/dist/android/templates/CraftNativeShell.kt.template

@@ -447,6 +447,24 @@ internal object CraftNativePrelude {
         // address the host through `window.craft`. Keep native screens
         // compatible without pretending a document exists.
         if (typeof globalThis.window === 'undefined') globalThis.window = globalThis;
+        // JavaScriptSandbox intentionally has no browser URL/encoding
+        // globals. Install named failures instead of letting a shared module
+        // die with an unhelpful `URLSearchParams is not defined` halfway
+        // through its load path. The full browser implementations belong to
+        // the shared STX runtime; these diagnostics keep the native boundary
+        // explicit until that runtime is present.
+        (function() {
+          function unavailable(name, hint) {
+            var failure = function() {
+              throw new ReferenceError(name + ' is not available on a native screen — ' + hint);
+            };
+            failure.prototype.constructor = failure;
+            return failure;
+          }
+          if (typeof globalThis.URL === 'undefined') globalThis.URL = unavailable('URL', 'use an absolute URL or build the path with encodeURIComponent');
+          if (typeof globalThis.URLSearchParams === 'undefined') globalThis.URLSearchParams = unavailable('URLSearchParams', 'build query strings with encodeURIComponent');
+          if (typeof globalThis.TextEncoder === 'undefined') globalThis.TextEncoder = unavailable('TextEncoder', 'use a native-supported encoding helper');
+        })();
         (function() {
           var forward = null;
           var listeners = [];
@@ -671,9 +689,11 @@ internal object CraftNativePrelude {
           // Older native bundles call the page-shaped `craft.dialog` API
           // directly. Keep that API on the capability bridge so JavaScript
           // Core/JavaScriptSandbox screens never fall back to a DOM sheet.
-          if (Array.isArray(__stxNativeBridge.capabilities) && __stxNativeBridge.capabilities.indexOf('dialog') >= 0 && !craft.dialog) {
-            var nextDialogRequest = 0;
-            function dialogRequest(method, args) {
+          // Native capability ownership wins over any browser-shaped dialog
+          // object the bundle installed before the bridge ran. Otherwise an
+          // action sheet silently falls back to the DOM renderer.
+          var nextDialogRequest = 0;
+          function dialogRequest(method, args) {
               return new Promise(function(resolve, reject) {
                 var id = 'craft-dialog-' + (++nextDialogRequest);
                 var remove = __stxNativeBridge.addMessageListener(function(raw) {
@@ -702,13 +722,19 @@ internal object CraftNativePrelude {
                   },
                 }));
               });
+          }
+          function installNativeDialog() {
+            var craft = globalThis.craft = globalThis.craft || {};
+            if (Array.isArray(__stxNativeBridge.capabilities) && __stxNativeBridge.capabilities.indexOf('dialog') >= 0) {
+              craft.dialog = {
+                alert: function(options) { return dialogRequest('alert', [options || {}]).then(function() {}); },
+                confirm: function(options) { return dialogRequest('confirm', [options || {}]).then(Boolean); },
+                actionSheet: function(options) { return dialogRequest('actionSheet', [options || {}]).then(function(id) { return typeof id === 'string' ? id : null; }); },
+              };
             }
-            craft.dialog = {
-              alert: function(options) { return dialogRequest('alert', [options || {}]).then(function() {}); },
-              confirm: function(options) { return dialogRequest('confirm', [options || {}]).then(Boolean); },
-              actionSheet: function(options) { return dialogRequest('actionSheet', [options || {}]).then(function(id) { return typeof id === 'string' ? id : null; }); },
-            };
           }
+          globalThis.__craftInstallNativeDialog = installNativeDialog;
+          installNativeDialog();
         })();
     """.trimIndent()
 }
@@ -740,6 +766,8 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     private val tabIconTints = mutableMapOf<String, Int>()
     private val tabIconPulses = mutableSetOf<String>()
     private val selectedSymbols = mutableMapOf<String, String>()
+    /** The page's own symbol for a tab while it says so, in place of the configured one. */
+    private val tabSymbols = mutableMapOf<String, String>()
     private val selectedIconTints = mutableMapOf<String, Int>()
     private val selectedIconPulses = mutableMapOf<String, Boolean>()
     private val tabImageURLs = mutableMapOf<String, String>()
@@ -974,6 +1002,10 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         if (item.has("iconPulse")) {
             if (item.optBoolean("iconPulse", false)) tabIconPulses.add(id) else tabIconPulses.remove(id)
         }
+        if (item.has("symbol")) {
+            tabSymbols.remove(id)
+            item.optString("symbol").trim().takeUnless { item.isNull("symbol") || it.isBlank() }?.let { tabSymbols[id] = it }
+        }
         if (item.has("selectedSymbol")) {
             selectedSymbols.remove(id)
             item.optString("selectedSymbol").trim().takeUnless { item.isNull("selectedSymbol") || it.isBlank() }?.let { selectedSymbols[id] = it }
@@ -1016,7 +1048,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         val tab = tabs[index]
         val selected = index == selectedTab
         return CraftTabIconAppearance(
-            if (selected) selectedSymbols[tab.id] ?: tab.symbol else tab.symbol,
+            if (selected) selectedSymbols[tab.id] ?: tabSymbols[tab.id] ?: tab.symbol else tabSymbols[tab.id] ?: tab.symbol,
             if (selected) selectedIconTints[tab.id] ?: tabIconTints[tab.id] else tabIconTints[tab.id],
             (if (selected) selectedIconPulses[tab.id] ?: tabIconPulses.contains(tab.id) else tabIconPulses.contains(tab.id)) && motionAllowed,
         )