craft-native 0.0.247 → 0.0.249

package/dist/android/src/index.d.ts

@@ -70,6 +70,8 @@ export interface CraftAndroidConfig {
      */
     enableHeartRate?: boolean;
     enableHealthConnect?: boolean;
+    /** Google Wallet save-link handoff for native screens. */
+    enableWallet?: boolean;
     /**
      * The Health Connect data the app reads and writes, by the shared type
      * names (`steps`, `sleep`, `workouts`...). The manifest declares only

package/dist/android/src/index.js

@@ -18,6 +18,8 @@ import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.LatLngBounds
 import com.google.android.gms.maps.model.Marker
 import com.google.android.gms.maps.model.MarkerOptions
+import com.google.android.gms.maps.model.Polygon
+import com.google.android.gms.maps.model.PolygonOptions
 import com.google.android.gms.maps.model.Polyline
 import com.google.android.gms.maps.model.PolylineOptions`,
       dependency: "com.google.android.gms:play-services-maps:18.2.0"
@@ -37,6 +39,7 @@ import org.maplibre.android.maps.OnMapReadyCallback
 import org.maplibre.android.maps.Style
 import org.maplibre.android.style.expressions.Expression
 import org.maplibre.android.style.layers.CircleLayer
+import org.maplibre.android.style.layers.FillLayer
 import org.maplibre.android.style.layers.LineLayer
 import org.maplibre.android.style.layers.SymbolLayer
 import org.maplibre.android.style.layers.PropertyFactory.*
@@ -500,6 +503,7 @@ var DEFAULT_CONFIG = {
   enableBluetooth: false,
   enableHeartRate: false,
   enableHealthConnect: false,
+  enableWallet: false,
   enableKeepAwake: false,
   enableDeepLinks: false,
   urlSchemes: [],
@@ -1382,23 +1386,23 @@ async function run(options) {
   }
 }
 export {
-  syncNativeFonts,
-  syncAndroidWebAssets,
-  runKotlinFixture,
-  run,
-  resolveRuntimeDir,
-  renderAndroidPermissions,
-  renderAndroidDeepLinks,
-  open,
-  nativeRouteRuntime,
-  nativeRouteBundles,
-  nativeMessages,
-  nativeMapProviders,
-  installRuntime,
-  init,
-  healthConnectPermissions,
-  createAndroidEmulator,
-  build,
+  ANDROID_MIN_SDK,
   HEALTH_CONNECT_PERMISSIONS,
-  ANDROID_MIN_SDK
+  build,
+  createAndroidEmulator,
+  healthConnectPermissions,
+  init,
+  installRuntime,
+  nativeMapProviders,
+  nativeMessages,
+  nativeRouteBundles,
+  nativeRouteRuntime,
+  open,
+  renderAndroidDeepLinks,
+  renderAndroidPermissions,
+  resolveRuntimeDir,
+  run,
+  runKotlinFixture,
+  syncAndroidWebAssets,
+  syncNativeFonts
 };

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

@@ -360,6 +360,12 @@ object CraftNative {
         nodeData: FloatArray,
         treeMeta: FloatArray,
     ): FloatArray?
+    private external fun nativeLayoutTreeV5(
+        width: Float,
+        height: Float,
+        nodeData: FloatArray,
+        treeMeta: FloatArray,
+    ): FloatArray?
     private external fun nativeClipboardRead(activity: Activity): String?
     private external fun nativeClipboardWrite(activity: Activity, text: String): Boolean
     private external fun nativeOpenUrl(activity: Activity, url: String): Boolean
@@ -660,6 +666,17 @@ object CraftNative {
         }
     }
 
+    /** Resolve a tree with shared auto rows and explicit equal grid rows. */
+    fun layoutTreeV5(width: Float, height: Float, nodeData: FloatArray, treeMeta: FloatArray): FloatArray? {
+        if (!isAvailable || nodeData.isEmpty() || treeMeta.isEmpty()) return null
+        return try {
+            nativeLayoutTreeV5(width, height, nodeData, treeMeta)
+                ?.takeIf { it.size >= treeMeta.size / 2 * 4 && it.all { value -> value.isFinite() } }
+        } catch (e: UnsatisfiedLinkError) {
+            null
+        }
+    }
+
     /**
      * The clipboard's text, or null to use the Kotlin implementation.
      *

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

@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
 import org.json.JSONObject
 import kotlin.math.ceil
+import kotlin.math.max
 
 internal typealias CraftNativeRenderItem = (node: JSONObject, identity: String, previous: View?) -> View
 
@@ -96,6 +97,7 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
 
     private var renderItem: CraftNativeRenderItem? = null
     private var recycleItem: ((String) -> Unit)? = null
+    private var removeItem: ((String) -> Unit)? = null
     private var endReached: (() -> Unit)? = null
     private var threshold = 0.1
     private var endReachedSignature: String? = null
@@ -120,6 +122,49 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
     var onMomentumScrollBegin: (() -> Unit)? = null
     var onMomentumScrollEnd: (() -> Unit)? = null
     var onLayoutChanged: (() -> Unit)? = null
+    var onContentSizeChanged: (() -> Unit)? = null
+    private var lastIntrinsicHeight = Int.MIN_VALUE
+    private var lastReportedContentHeight = Int.MIN_VALUE
+
+    private val scrollListener = object : OnScrollListener() {
+        private var dragging = false
+        private var momentum = false
+
+        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+            onScrollEvent?.invoke()
+            onLayoutChanged?.invoke()
+            evaluateEndReached()
+        }
+
+        override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+            when (newState) {
+                RecyclerView.SCROLL_STATE_DRAGGING -> if (!dragging) {
+                    dragging = true
+                    onScrollBeginDrag?.invoke()
+                }
+                RecyclerView.SCROLL_STATE_SETTLING -> {
+                    if (dragging) {
+                        dragging = false
+                        onScrollEndDrag?.invoke()
+                    }
+                    if (!momentum) {
+                        momentum = true
+                        onMomentumScrollBegin?.invoke()
+                    }
+                }
+                RecyclerView.SCROLL_STATE_IDLE -> {
+                    if (dragging) {
+                        dragging = false
+                        onScrollEndDrag?.invoke()
+                    }
+                    if (momentum) {
+                        momentum = false
+                        onMomentumScrollEnd?.invoke()
+                    }
+                }
+            }
+        }
+    }
 
     private fun holderLayoutParams() = LayoutParams(
         if (horizontal) LayoutParams.WRAP_CONTENT else LayoutParams.MATCH_PARENT,
@@ -132,7 +177,11 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
     }
 
     fun setScrollEnabled(enabled: Boolean) {
+        if (scrollEnabled == enabled) return
         scrollEnabled = enabled
+        lastIntrinsicHeight = Int.MIN_VALUE
+        lastReportedContentHeight = Int.MIN_VALUE
+        requestLayout()
     }
 
     val isScrollEnabledForTest: Boolean
@@ -151,6 +200,26 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
     val isScrollTargetPendingForTest: Boolean
         get() = pendingScrollTarget != null
 
+    /** Stable identities currently mounted, in their adapter order. */
+    val visibleItemIdentities: List<String>
+        get() = (0 until childCount)
+            .mapNotNull { index ->
+                val child = getChildAt(index)
+                val position = getChildAdapterPosition(child)
+                val order = if (position == RecyclerView.NO_POSITION) {
+                    // ListAdapter can briefly report NO_POSITION while an
+                    // async diff is dispatching. Keep the mounted holder in
+                    // the snapshot instead of making the entire list appear
+                    // empty to host-side reconciliation tests.
+                    Int.MAX_VALUE - childCount + index
+                } else {
+                    position
+                }
+                (getChildViewHolder(child) as? Holder)?.identity?.let { order to it }
+            }
+            .sortedBy { it.first }
+            .map { it.second }
+
     override fun onInterceptTouchEvent(event: android.view.MotionEvent): Boolean {
         if (!scrollEnabled) return false
         return super.onInterceptTouchEvent(event)
@@ -161,6 +230,29 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
         return super.onTouchEvent(event)
     }
 
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        val heightMode = MeasureSpec.getMode(heightMeasureSpec)
+        if (!scrollEnabled && !horizontal && heightMode != MeasureSpec.EXACTLY) {
+            // A non-scrolling FlatList is content-sized on iOS. Let the
+            // RecyclerView measure its full adapter range instead of keeping
+            // the viewport height, which otherwise clips the list when it is
+            // nested in an outer native ScrollView.
+            super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED))
+            val contentHeight = max(measuredHeight, computeVerticalScrollRange())
+            val resolvedHeight = resolveSize(contentHeight, heightMeasureSpec)
+            val contentChanged = resolvedHeight != lastIntrinsicHeight
+            lastIntrinsicHeight = resolvedHeight
+            setMeasuredDimension(
+                resolveSize(measuredWidth, widthMeasureSpec),
+                resolvedHeight,
+            )
+            if (contentChanged) reportContentSizeChanged()
+            return
+        }
+        lastIntrinsicHeight = Int.MIN_VALUE
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+    }
+
     fun setBounceOptions(enabled: Boolean, vertical: Boolean, horizontal: Boolean) {
         bounces = enabled
         alwaysBounceVertical = vertical
@@ -182,51 +274,21 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
         super.onLayout(changed, left, top, right, bottom)
         scrollToPendingTarget(0)
+        if (!scrollEnabled && !horizontal) reportContentSizeChanged()
         onLayoutChanged?.invoke()
     }
 
+    private fun reportContentSizeChanged() {
+        val height = measuredHeight
+        if (height <= 0 || height == lastReportedContentHeight) return
+        lastReportedContentHeight = height
+        post { onContentSizeChanged?.invoke() }
+    }
+
     init {
         adapter = listAdapter
         itemAnimator = null
-        addOnScrollListener(object : OnScrollListener() {
-            private var dragging = false
-            private var momentum = false
-
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                onScrollEvent?.invoke()
-                onLayoutChanged?.invoke()
-                evaluateEndReached()
-            }
-
-            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-                when (newState) {
-                    RecyclerView.SCROLL_STATE_DRAGGING -> if (!dragging) {
-                        dragging = true
-                        onScrollBeginDrag?.invoke()
-                    }
-                    RecyclerView.SCROLL_STATE_SETTLING -> {
-                        if (dragging) {
-                            dragging = false
-                            onScrollEndDrag?.invoke()
-                        }
-                        if (!momentum) {
-                            momentum = true
-                            onMomentumScrollBegin?.invoke()
-                        }
-                    }
-                    RecyclerView.SCROLL_STATE_IDLE -> {
-                        if (dragging) {
-                            dragging = false
-                            onScrollEndDrag?.invoke()
-                        }
-                        if (momentum) {
-                            momentum = false
-                            onMomentumScrollEnd?.invoke()
-                        }
-                    }
-                }
-            }
-        })
+        addOnScrollListener(scrollListener)
     }
 
     fun setKeyboardDismissMode(mode: String, dismissKeyboard: () -> Unit) {
@@ -291,10 +353,12 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
         endReachedThreshold: Double,
         renderItem: CraftNativeRenderItem,
         recycleItem: (String) -> Unit,
+        removeItem: (String) -> Unit,
         endReached: (() -> Unit)?,
     ) {
         this.renderItem = renderItem
         this.recycleItem = recycleItem
+        this.removeItem = removeItem
         this.endReached = endReached
         threshold = endReachedThreshold.takeIf { it.isFinite() }?.coerceAtLeast(0.0) ?: 0.1
 
@@ -321,7 +385,7 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
 
         val oldIds = listAdapter.currentList.mapTo(mutableSetOf()) { it.identity }
         val nextIds = next.mapTo(mutableSetOf()) { it.identity }
-        (oldIds - nextIds).forEach(recycleItem)
+        (oldIds - nextIds).forEach(removeItem)
         val dataItems = next.filterNot { it.chrome }
         val contentSignature = dataItems.joinToString("") {
             "${it.identity.length}:${it.identity}${it.signature.length}:${it.signature}"
@@ -386,6 +450,7 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
         }
         renderItem = null
         recycleItem = null
+        removeItem = null
         endReached = null
         setPagingEnabled(false)
         scrollTargetKey = null
@@ -397,6 +462,16 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
         onMomentumScrollBegin = null
         onMomentumScrollEnd = null
         onLayoutChanged = null
+        onContentSizeChanged = null
+        lastIntrinsicHeight = Int.MIN_VALUE
+        lastReportedContentHeight = Int.MIN_VALUE
+    }
+
+    /** Releases callbacks owned by a permanently removed native list node. */
+    fun resetForTeardown() {
+        discardAll()
+        removeOnScrollListener(scrollListener)
+        setOnTouchListener(null)
     }
 
     fun refreshThemeDefaults() {

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

@@ -1,5 +1,6 @@
 /** The Android host for the small, host-neutral native trail map contract. */
 private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMapReadyCallback {
+    private data class PolygonValue(val points: List<LatLng>, val fillColor: Int, val strokeColor: Int, val strokeWidth: Float)
     private val mapView = MapView(context)
     private val scaleView = LinearLayout(context).apply {
         orientation = LinearLayout.VERTICAL
@@ -17,6 +18,7 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
     private var pendingChildren = JSONArray()
     private val markers = mutableMapOf<String, Marker>()
     private val polylines = mutableMapOf<String, Polyline>()
+    private val polygons = mutableMapOf<String, Polygon>()
     private val markerHandlers = mutableMapOf<String, String>()
     private var onMarkerTap: ((String) -> Unit)? = null
     var onMapPress: ((LatLng) -> Unit)? = null
@@ -40,10 +42,23 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         })
         scaleView.visibility = View.GONE
         addView(tileAttribution, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, Gravity.BOTTOM or Gravity.END).apply { rightMargin = (8 * resources.displayMetrics.density).roundToInt(); bottomMargin = (8 * resources.displayMetrics.density).roundToInt() })
+        refreshThemeDefaults()
         mapView.onCreate(null)
         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)
+        scaleView.background = GradientDrawable().apply { setColor(surface); cornerRadius = 4f }
+        scaleLabel.setTextColor(foreground)
+        scaleLine.setBackgroundColor(foreground)
+        tileAttribution.setTextColor(foreground)
+        tileAttribution.setBackgroundColor(surface)
+        applyPending(refreshCamera = false)
+    }
+
     override fun onMapReady(map: GoogleMap) {
         if (destroyed) return
         googleMap = map
@@ -85,7 +100,7 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
 
     fun markerHandler(id: String): String? = markerHandlers[id]
 
-    private fun applyPending() {
+    private fun applyPending(refreshCamera: Boolean = true) {
         val map = googleMap ?: return
         applyMapPadding()
         map.uiSettings.isCompassEnabled = craftNativeBoolean(pendingProps.opt("showsCompass"))
@@ -109,6 +124,31 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         val nextPinColors = mutableMapOf<String, Int>()
         val nextHandlers = mutableMapOf<String, String>()
         val nextPolylines = mutableMapOf<String, Triple<List<LatLng>, Int, Float>>()
+        val nextPolygons = mutableMapOf<String, PolygonValue>()
+        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
+            nextMarkers[id] = point to (overlay.opt("title") as? String)
+            (overlay.opt("pinColor") as? String)?.let { nextPinColors[id] = color(it) }
+            (overlay.opt("bearing") as? Number)?.toDouble()?.takeIf { it.isFinite() }?.let { nextBearings[id] = (it % 360).toFloat() }
+        }
+        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 authoredWidth = when (val rawWidth = overlay.opt("strokeWidth")) {
+                null, JSONObject.NULL -> 3.0
+                is Number -> rawWidth.toDouble()
+                else -> 3.0
+            }
+            val width = (authoredWidth * resources.displayMetrics.density).toFloat()
+            if (!authoredWidth.isFinite() || !width.isFinite() || width <= 0f) continue
+            nextPolylines[id] = Triple(points, color(craftNativeOptionalString(overlay.opt("strokeColor")).orEmpty()), width)
+        }
         for (index in 0 until pendingChildren.length()) {
             val child = pendingChildren.optJSONObject(index) ?: continue
             val type = child.optString("type").lowercase()
@@ -121,7 +161,7 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
             if (type == "mapmarker" || type == "marker") {
                 points.firstOrNull()?.let { point ->
                     nextMarkers[id] = point to (props.opt("title") as? String)
-                    (props.opt("pinColor") as? String)?.let { value -> runCatching { craftNativeColor(value) }.getOrNull()?.let { nextPinColors[id] = it } }
+                    (props.opt("pinColor") as? String)?.let { value -> nextPinColors[id] = color(value) }
                     (props.opt("bearing") as? Number)?.toDouble()?.takeIf { it.isFinite() }?.let { nextBearings[id] = (it % 360).toFloat() }
                     listOf(events.opt("onPress"), events.opt("onMarkerPress"))
                         .firstNotNullOfOrNull(::craftNativeOptionalString)
@@ -147,6 +187,18 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
                     if (!authoredWidth.isFinite() || !width.isFinite() || width <= 0f) continue
                     nextPolylines[id] = Triple(points, color(craftNativeOptionalString(props.opt("strokeColor")).orEmpty()), width)
                 }
+            } else if (type == "mappolygon" || type == "polygon") {
+                if (points.size > 2) {
+                    val rawWidth = props.opt("strokeWidth")
+                    val authoredWidth = when (rawWidth) {
+                        null, JSONObject.NULL -> 2.0
+                        is Number -> rawWidth.toDouble()
+                        else -> 2.0
+                    }
+                    val width = (authoredWidth * resources.displayMetrics.density).toFloat()
+                    if (!authoredWidth.isFinite() || !width.isFinite() || width <= 0f) continue
+                    nextPolygons[id] = PolygonValue(points, color(craftNativeOptionalString(props.opt("fillColor")).orEmpty(), Color.argb(72, 33, 150, 83)), color(craftNativeOptionalString(props.opt("strokeColor")).orEmpty()), width)
+                }
             }
         }
         markerBearings = nextBearings
@@ -181,6 +233,22 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
                 map.addPolyline(PolylineOptions().addAll(value.first).color(value.second).width(value.third))?.let { polylines[id] = it }
             }
         }
+        polygons.keys.filter { nextPolygons[it] == null }.forEach { id -> polygons.remove(id)?.remove() }
+        for ((id, value) in nextPolygons) {
+            val polygon = polygons[id]
+            if (polygon != null) {
+                polygon.points = value.points
+                polygon.fillColor = value.fillColor
+                polygon.strokeColor = value.strokeColor
+                polygon.strokeWidth = value.strokeWidth
+            } else {
+                map.addPolygon(PolygonOptions().addAll(value.points).fillColor(value.fillColor).strokeColor(value.strokeColor).strokeWidth(value.strokeWidth))?.let { polygons[id] = it }
+            }
+        }
+        if (!refreshCamera) {
+            updateScale()
+            return
+        }
         val explicitRegion = region(pendingProps.optJSONObject("region"))
         val initialRegion = region(pendingProps.optJSONObject("initialRegion"))
         if (explicitRegion != null) {
@@ -196,7 +264,7 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
                 initialCameraKey = key
             }
         } else if (craftNativeBoolean(pendingProps.opt("fitToBounds"))) {
-            val key = "fit:${overlayKey(nextMarkers, nextPolylines)}:${pendingProps.optJSONObject("edgePadding")}"
+            val key = "fit:${overlayKey(nextMarkers, nextPolylines, nextPolygons)}:${pendingProps.optJSONObject("edgePadding")}"
             if (initialCameraKey != key) {
                 if (fitToBounds()) initialCameraKey = key
             }
@@ -323,6 +391,7 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
     private fun overlayKey(
         markers: Map<String, Pair<LatLng, String?>>,
         polylines: Map<String, Triple<List<LatLng>, Int, Float>>,
+        polygons: Map<String, PolygonValue>,
     ): String {
         val markerKey = markers.toSortedMap().entries.joinToString("|") { (id, value) ->
             "$id:${value.first.latitude},${value.first.longitude}"
@@ -330,7 +399,10 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         val polylineKey = polylines.toSortedMap().entries.joinToString("|") { (id, value) ->
             "$id:" + value.first.joinToString(";") { point -> "${point.latitude},${point.longitude}" }
         }
-        return "m[$markerKey]p[$polylineKey]"
+        val polygonKey = polygons.toSortedMap().entries.joinToString("|") { (id, value) ->
+            "$id:" + value.points.joinToString(";") { point -> "${point.latitude},${point.longitude}" }
+        }
+        return "m[$markerKey]p[$polylineKey]g[$polygonKey]"
     }
 
     private fun fitToBounds(): Boolean {
@@ -340,6 +412,8 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         var count = 0
         markers.values.forEach { builder.include(it.position); count++ }
         polylines.values.flatMap { it.points }.forEach { builder.include(it); count++ }
+        polygons.values.flatMap { it.points }.forEach { builder.include(it); count++ }
+        polygons.values.flatMap { it.points }.forEach { builder.include(it); count++ }
         if (count == 0) return false
         post {
             if (width > 0 && height > 0) {
@@ -388,6 +462,8 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         markers.clear()
         polylines.values.forEach { it.remove() }
         polylines.clear()
+        polygons.values.forEach { it.remove() }
+        polygons.clear()
         mapView.onDestroy()
         googleMap = null
     }
@@ -435,6 +511,17 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
     private fun finiteNumber(value: Any?): Double? =
         (value as? Number)?.toDouble()?.takeIf { it.isFinite() }
 
-    private fun color(value: String): Int = runCatching { craftNativeColor(value) }.getOrDefault(Color.BLUE)
+    private fun color(value: String): Int {
+        return color(value, Color.BLUE)
+    }
+
+    private fun color(value: String, fallback: Int): Int {
+        val dark = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+        return when (value.trim().lowercase()) {
+            "label" -> if (dark) Color.WHITE else Color.BLACK
+            "secondarylabel", "secondary-label" -> if (dark) Color.LTGRAY else Color.DKGRAY
+            else -> runCatching { craftNativeColor(value) }.getOrDefault(fallback)
+        }
+    }
 }