@craft-native/android 0.0.174 → 0.0.175

package/package.json

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

package/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 ->