From 1e325f68ff12b3b1ea0e973bef3c47b43045ec97 Mon Sep 17 00:00:00 2001 From: Simon Hocevar Date: Sun, 20 Feb 2022 09:49:09 +0100 Subject: [PATCH 1/2] Fixed Collection contains no element matching the predicate. --- .../com/google/maps/android/compose/MapApplier.kt | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt b/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt index cacc5c49..0b96b774 100644 --- a/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt +++ b/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt @@ -15,14 +15,9 @@ package com.google.maps.android.compose import androidx.compose.runtime.AbstractApplier -import androidx.compose.ui.platform.ComposeView import com.google.android.gms.maps.GoogleMap import com.google.android.gms.maps.MapView -import com.google.android.gms.maps.model.Circle -import com.google.android.gms.maps.model.GroundOverlay -import com.google.android.gms.maps.model.Marker -import com.google.android.gms.maps.model.Polygon -import com.google.android.gms.maps.model.Polyline +import com.google.android.gms.maps.model.* internal interface MapNode { fun onAttached() {} @@ -139,16 +134,16 @@ internal class MapApplier( } private fun MutableList.nodeForCircle(circle: Circle): CircleNode? = - first { it is CircleNode && it.circle == circle } as? CircleNode + firstOrNull { it is CircleNode && it.circle == circle } as? CircleNode private fun MutableList.nodeForMarker(marker: Marker): MarkerNode? = - first { it is MarkerNode && it.marker == marker } as? MarkerNode + firstOrNull { it is MarkerNode && it.marker == marker } as? MarkerNode private fun MutableList.nodeForPolygon(polygon: Polygon): PolygonNode? = - first { it is PolygonNode && it.polygon == polygon } as? PolygonNode + firstOrNull { it is PolygonNode && it.polygon == polygon } as? PolygonNode private fun MutableList.nodeForPolyline(polyline: Polyline): PolylineNode? = - first { it is PolylineNode && it.polyline == polyline } as? PolylineNode + firstOrNull { it is PolylineNode && it.polyline == polyline } as? PolylineNode private fun MutableList.nodeForGroundOverlay( groundOverlay: GroundOverlay From db0c0d7ca2e94846db994b401232f23cb5a17a72 Mon Sep 17 00:00:00 2001 From: Simon Hocevar Date: Fri, 11 Mar 2022 06:50:14 +0100 Subject: [PATCH 2/2] first or null overlay node; no wildcard imports --- .../java/com/google/maps/android/compose/MapApplier.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt b/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt index 0b96b774..3144268e 100644 --- a/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt +++ b/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt @@ -17,7 +17,11 @@ package com.google.maps.android.compose import androidx.compose.runtime.AbstractApplier import com.google.android.gms.maps.GoogleMap import com.google.android.gms.maps.MapView -import com.google.android.gms.maps.model.* +import com.google.android.gms.maps.model.Circle +import com.google.android.gms.maps.model.GroundOverlay +import com.google.android.gms.maps.model.Marker +import com.google.android.gms.maps.model.Polygon +import com.google.android.gms.maps.model.Polyline internal interface MapNode { fun onAttached() {} @@ -148,4 +152,4 @@ private fun MutableList.nodeForPolyline(polyline: Polyline): PolylineNo private fun MutableList.nodeForGroundOverlay( groundOverlay: GroundOverlay ): GroundOverlayNode? = - first { it is GroundOverlayNode && it.groundOverlay == groundOverlay } as? GroundOverlayNode + firstOrNull { it is GroundOverlayNode && it.groundOverlay == groundOverlay } as? GroundOverlayNode