craft-native 0.0.174 → 0.0.175

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

@@ -1,9 +1,11 @@
 package {{PACKAGE_NAME}}
 
 import android.animation.ValueAnimator
+import android.Manifest
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
+import android.content.pm.PackageManager
 import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.database.ContentObserver
@@ -517,9 +519,11 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
             "terrain" -> GoogleMap.MAP_TYPE_TERRAIN
             else -> GoogleMap.MAP_TYPE_NORMAL
         }
+        val showUserLocation = pendingProps.optBoolean("showsUserLocation", false) && hasLocationPermission()
+        runCatching { map.isMyLocationEnabled = showUserLocation }
         val nextMarkers = mutableMapOf<String, Pair<LatLng, String?>>()
         val nextHandlers = mutableMapOf<String, String>()
-        val nextPolylines = mutableMapOf<String, Pair<List<LatLng>, Int>>()
+        val nextPolylines = mutableMapOf<String, Triple<List<LatLng>, Int, Float>>()
         for (index in 0 until pendingChildren.length()) {
             val child = pendingChildren.optJSONObject(index) ?: continue
             val type = child.optString("type").lowercase()
@@ -536,7 +540,10 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
                         .takeIf { it.isNotBlank() }?.let { nextHandlers[id] = it }
                 }
             } else if (type == "mappolyline" || type == "polyline") {
-                if (points.size > 1) nextPolylines[id] = points to color(props.optString("strokeColor"))
+                if (points.size > 1) {
+                    val width = props.optDouble("strokeWidth", 3.0).toFloat().takeIf { it.isFinite() && it > 0 } ?: 3f
+                    nextPolylines[id] = Triple(points, color(props.optString("strokeColor")), width)
+                }
             }
         }
         markers.keys.filter { nextMarkers[it] == null }.forEach { markers.remove(it)?.remove() }
@@ -554,7 +561,7 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         polylines.values.forEach { it.remove() }
         polylines.clear()
         for ((id, value) in nextPolylines) {
-            polylines[id] = map.addPolyline(PolylineOptions().addAll(value.first).color(value.second).width(3f))
+            polylines[id] = map.addPolyline(PolylineOptions().addAll(value.first).color(value.second).width(value.third))
         }
         if (pendingProps.optBoolean("fitToBounds", false)) fitToBounds()
         region(pendingProps.optJSONObject("region") ?: pendingProps.optJSONObject("initialRegion"))?.let { bounds ->
@@ -578,14 +585,20 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
+        mapView.onStart()
         mapView.onResume()
     }
 
     override fun onDetachedFromWindow() {
         mapView.onPause()
+        mapView.onStop()
         super.onDetachedFromWindow()
     }
 
+    private fun hasLocationPermission(): Boolean =
+        ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED ||
+            ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED
+
     private fun coordinates(geometry: JSONArray?): List<LatLng> {
         if (geometry == null) return emptyList()
         return (0 until geometry.length() - 1 step 2).mapNotNull { index ->

package/dist/cli.js

@@ -3303,7 +3303,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.174";
+var version = "0.0.175";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -310,7 +310,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.174";
+var version = "0.0.175";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -58,7 +58,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.174";
+var version = "0.0.175";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/templates/CraftNativeScreen.swift

@@ -431,6 +431,7 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
     private var annotationsByID: [String: MKPointAnnotation] = [:]
     private var overlaysByID: [String: MKPolyline] = [:]
     private var overlayColors: [ObjectIdentifier: UIColor] = [:]
+    private var overlayWidths: [ObjectIdentifier: CGFloat] = [:]
     private(set) var markerHandlers: [String: String] = [:]
     var onMarkerTap: ((String) -> Void)?
 
@@ -453,6 +454,10 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
         isZoomEnabled = props["zoomEnabled"] as? Bool ?? true
         isRotateEnabled = props["rotateEnabled"] as? Bool ?? false
         mapType = Self.mapType(props["mapType"] as? String)
+        // Showing the user dot must not trigger a permission prompt from a
+        // renderer pass. The app's existing location capability owns that
+        // prompt; a map only opts in after authorization is already granted.
+        showsUserLocation = props["showsUserLocation"] as? Bool == true && Self.locationPermissionGranted()
 
         var nextMarkers: [String: (coordinate: CLLocationCoordinate2D, title: String?)] = [:]
         var nextHandlers: [String: String] = [:]
@@ -497,10 +502,12 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
         removeOverlays(Array(overlaysByID.values))
         overlaysByID.removeAll(keepingCapacity: true)
         overlayColors.removeAll(keepingCapacity: true)
+        overlayWidths.removeAll(keepingCapacity: true)
         for (id, value) in nextPolylines {
             let overlay = MKPolyline(coordinates: value.coordinates, count: value.coordinates.count)
             overlaysByID[id] = overlay
             overlayColors[ObjectIdentifier(overlay)] = value.color
+            overlayWidths[ObjectIdentifier(overlay)] = value.width
             addOverlay(overlay)
         }
 
@@ -542,7 +549,7 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
     func mapView(_ mapView: MKMapView, rendererFor overlay: MKOverlay) -> MKOverlayRenderer {
         let renderer = MKPolylineRenderer(overlay: overlay)
         renderer.strokeColor = overlayColors[ObjectIdentifier(overlay)] ?? .systemBlue
-        renderer.lineWidth = 3
+        renderer.lineWidth = overlayWidths[ObjectIdentifier(overlay)] ?? 3
         return renderer
     }
 
@@ -585,6 +592,16 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
         default: return .standard
         }
     }
+
+    private static func locationPermissionGranted() -> Bool {
+        let status: CLAuthorizationStatus
+        if #available(iOS 14.0, *) {
+            status = CLLocationManager().authorizationStatus
+        } else {
+            status = CLLocationManager.authorizationStatus()
+        }
+        return status == .authorizedAlways || status == .authorizedWhenInUse
+    }
 }
 
 /// A WebView-free host for the first stx native vertical slice. The bundled

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.174",
+  "version": "0.0.175",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",