From 0f97f1e37bc1ce46efc25a0a6cf5f2070ea4c051 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 22 Dec 2021 09:53:34 -0600
Subject: [PATCH] Update Google Maps

---
 app/build.gradle.kts                          |  2 +-
 .../org/tasks/location/GoogleMapFragment.kt   | 21 ++++++++++---------
 deps_googleplay.txt                           |  6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index fc87a6cfa..5c8d4cc2d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -240,7 +240,7 @@ dependencies {
     }
     googleplayImplementation("com.google.firebase:firebase-config-ktx:${Versions.remote_config}")
     googleplayImplementation("com.google.android.gms:play-services-location:19.0.0")
-    googleplayImplementation("com.google.android.gms:play-services-maps:17.0.1")
+    googleplayImplementation("com.google.android.gms:play-services-maps:18.0.1")
     googleplayImplementation("com.android.billingclient:billing-ktx:3.0.3")
 
     androidTestImplementation("com.google.dagger:hilt-android-testing:${Versions.hilt}")
diff --git a/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.kt b/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.kt
index 3f5655a76..d2159a262 100644
--- a/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.kt
+++ b/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.kt
@@ -58,16 +58,12 @@ class GoogleMapFragment @Inject constructor(
         if (map == null) {
             return
         }
-        for (marker in markers) {
-            marker.remove()
-        }
-        markers.clear()
-        for (place in places) {
-            val marker = map!!.addMarker(
-                    MarkerOptions().position(LatLng(place.latitude, place.longitude)))
-            marker.tag = place
-            markers.add(marker)
-        }
+        markers
+            .onEach { it.remove() }
+            .clear()
+        places
+            .mapNotNull { map?.addMarker(it) }
+            .let { markers.addAll(it) }
     }
 
     override fun disableGestures() {
@@ -104,5 +100,10 @@ class GoogleMapFragment @Inject constructor(
 
     companion object {
         private const val FRAG_TAG_MAP = "frag_tag_map"
+
+        private fun GoogleMap.addMarker(place: Place) =
+            addMarker(MarkerOptions().position(LatLng(place.latitude, place.longitude)))?.apply {
+                tag = place
+            }
     }
 }
\ No newline at end of file
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 4f2c331e6..abf54c75b 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -220,10 +220,10 @@
 +|    +--- com.google.android.gms:play-services-places-placereport:17.0.0
 +|    |    \--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
 +|    \--- com.google.android.gms:play-services-tasks:18.0.0 (*)
-++--- com.google.android.gms:play-services-maps:17.0.1
+++--- com.google.android.gms:play-services-maps:18.0.1
 +|    +--- androidx.fragment:fragment:1.0.0 -> 1.3.6 (*)
-+|    +--- com.google.android.gms:play-services-base:17.0.0 -> 18.0.0 (*)
-+|    \--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
++|    +--- com.google.android.gms:play-services-base:18.0.0 (*)
++|    \--- com.google.android.gms:play-services-basement:18.0.0 (*)
 ++--- com.android.billingclient:billing-ktx:3.0.3
 +|    +--- com.android.billingclient:billing:3.0.3
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.5.31 (*)