fix: minor enhancements for DraggableMarkersCollectionWithPolygonActivity (#674)

bubenheimer · dkhawk · web-flow · commit af9b873b3c03 · 2025-01-29T15:49:32.000-07:00
Co-authored-by: Uli Bubenheimer &lt;bubenheimer@users.noreply.github.com&gt;
Co-authored-by: Dale Hawkins &lt;107309+dkhawk@users.noreply.github.com&gt;
diff --git a/app/src/main/java/com/google/maps/android/compose/markerexamples/draggablemarkerscollectionwithpolygon/DraggableMarkersCollectionWithPolygonActivity.kt b/app/src/main/java/com/google/maps/android/compose/markerexamples/draggablemarkerscollectionwithpolygon/DraggableMarkersCollectionWithPolygonActivity.kt
@@ -25,10 +25,10 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.key
-import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshots.SnapshotStateMap
+import androidx.compose.runtime.toMutableStateMap
 import androidx.compose.ui.Modifier
 import com.google.android.gms.maps.model.LatLng
 import com.google.maps.android.compose.GoogleMap
@@ -64,11 +64,10 @@ private class DraggableMarkersModel(dataModel: Map<LocationKey, LocationData>) {
     // This initializes MarkerState from our model once (model is initial source of truth)
     // and never updates it from the model afterwards.
     // See SyncingDraggableMarkerWithDataModelActivity for rationale.
-    private val markerDataMap: SnapshotStateMap<LocationKey, MarkerState> = mutableStateMapOf(
-        *dataModel.entries.map { (locationKey, locationData) ->
+    private val markerDataMap: SnapshotStateMap<LocationKey, MarkerState> =
+        dataModel.entries.map { (locationKey, locationData) ->
             locationKey to MarkerState(locationData.position)
-        }.toTypedArray()
-    )
+        }.toMutableStateMap()
 
     /** Add new marker location to model */
     fun addLocation(locationData: LocationData) {
@@ -165,20 +164,18 @@ private fun GoogleMapWithLocations(
  * A draggable GoogleMap Marker representing a location on the map
  */
 @Composable
-private fun LocationMarker(
+private inline fun LocationMarker(
     markerState: MarkerState,
-    onClick: () -> Unit
-) {
-    Marker(
-        state = markerState,
-        draggable = true,
-        onClick = {
-            onClick()
-
-            true
-        }
-    )
-}
+    crossinline onClick: () -> Unit
+) = Marker(
+    state = markerState,
+    draggable = true,
+    onClick = {
+        onClick()
+
+        true
+    }
+)
 
 /**
  * A Polygon. Helps isolate recompositions while a Marker is being dragged.
