Merge branch 'main' of https://github.com/googlemaps-samples/codelab-maps-platform-101-compose

Author: dkhawk

solution/app/build.gradle.kts

@@ -65,40 +65,40 @@ kapt {
 
 dependencies {
 
-    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.core:core-ktx:1.13.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
-    implementation("androidx.activity:activity-compose:1.8.2")
-    implementation(platform("androidx.compose:compose-bom:2024.03.00"))
+    implementation("androidx.activity:activity-compose:1.9.0")
+    implementation(platform("androidx.compose:compose-bom:2024.04.01"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
 
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.robolectric:robolectric:4.11.1")
+    testImplementation("org.robolectric:robolectric:4.12.1")
     testImplementation("androidx.test:core:1.5.0")
     testImplementation("com.google.truth:truth:1.4.2")
 
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    androidTestImplementation(platform("androidx.compose:compose-bom:2024.03.00"))
+    androidTestImplementation(platform("androidx.compose:compose-bom:2024.04.01"))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
 
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
 
     // Hilt
-    val hiltVersion = "2.51"
+    val hiltVersion = "2.51.1"
     implementation("com.google.dagger:hilt-android:$hiltVersion")
     kapt("com.google.dagger:hilt-android-compiler:$hiltVersion")
     implementation(kotlin("reflect"))
 
     // Google Maps Compose library
-    implementation("com.google.maps.android:maps-compose:4.3.3")
+    implementation("com.google.maps.android:maps-compose:4.4.0")
     // Google Maps Compose utility library
-    implementation("com.google.maps.android:maps-compose-utils:4.3.3")
+    implementation("com.google.maps.android:maps-compose-utils:4.4.0")
     // Google Maps Compose widgets library
-    implementation("com.google.maps.android:maps-compose-widgets:4.3.3")
+    implementation("com.google.maps.android:maps-compose-widgets:4.4.0")
 }
 
 secrets {

solution/app/src/main/java/com/example/mountainmarkers/MountainMap.kt

@@ -38,7 +38,6 @@ import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.LatLngBounds
 import com.google.android.gms.maps.model.MapStyleOptions
 import com.google.maps.android.compose.CameraPositionState
-import com.google.maps.android.compose.Circle
 import com.google.maps.android.compose.GoogleMap
 import com.google.maps.android.compose.GoogleMapComposable
 import com.google.maps.android.compose.MapEffect
@@ -115,19 +114,19 @@ fun MountainMap(
             when (selectedMarkerType) {
                 MarkerType.Basic -> {
                     BasicMarkersMapContent(
-                        mountainsScreenViewState = viewState,
+                        mountains = viewState.mountains,
                     )
                 }
 
                 MarkerType.Advanced -> {
                     AdvancedMarkersMapContent(
-                        mountainsScreenViewState = viewState,
+                        mountains = viewState.mountains,
                     )
                 }
 
                 MarkerType.Clustered -> {
                     ClusteringMarkersMapContent(
-                        mountainsScreenViewState = viewState,
+                        mountains = viewState.mountains,
                         onClusterClick = { cluster ->
                             val newZoom = cameraPositionState.position.zoom + 1
                             scope.launch {

solution/app/src/main/java/com/example/mountainmarkers/presentation/AdvancedMarkersMapContent.kt

@@ -19,6 +19,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import com.example.mountainmarkers.R
+import com.example.mountainmarkers.data.local.Mountain
 import com.example.mountainmarkers.data.local.is14er
 import com.example.mountainmarkers.data.utils.toElevationString
 import com.example.mountainmarkers.presentation.MountainsScreenViewState.MountainList
@@ -37,7 +38,7 @@ import com.google.maps.android.compose.rememberMarkerState
 @Composable
 @GoogleMapComposable
 fun AdvancedMarkersMapContent(
-    mountainsScreenViewState: MountainList,
+    mountains: List<Mountain>,
     onMountainClick: (Marker) -> Boolean = { false },
 ) {
     val mountainIcon = vectorToBitmap(
@@ -70,7 +71,7 @@ fun AdvancedMarkersMapContent(
         build()
     }
 
-    mountainsScreenViewState.mountains.forEach { mountain ->
+    mountains.forEach { mountain ->
         val pin = if (mountain.is14er()) fourteenerPin else mountainPin
         AdvancedMarker(
             state = rememberMarkerState(position = mountain.location),

solution/app/src/main/java/com/example/mountainmarkers/presentation/BasicMarkersMapContent.kt

@@ -20,6 +20,7 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import com.example.mountainmarkers.R
+import com.example.mountainmarkers.data.local.Mountain
 import com.example.mountainmarkers.data.local.is14er
 import com.example.mountainmarkers.presentation.utils.BitmapParameters
 import com.example.mountainmarkers.data.utils.toElevationString
@@ -36,7 +37,7 @@ import com.google.maps.android.compose.rememberMarkerState
 @Composable
 @GoogleMapComposable
 fun BasicMarkersMapContent(
-    mountainsScreenViewState: MountainList,
+    mountains: List<Mountain>,
     onMountainClick: (Marker) -> Boolean = { false }
 ) {
     // Create mountainIcon and fourteenerIcon
@@ -58,7 +59,7 @@ fun BasicMarkersMapContent(
         )
     )
 
-    mountainsScreenViewState.mountains.forEach { mountain ->
+    mountains.forEach { mountain ->
         val icon = if (mountain.is14er()) fourteenerIcon else mountainIcon
         Marker(
             state = rememberMarkerState(position = mountain.location),

solution/app/src/main/java/com/example/mountainmarkers/presentation/ClusteringMarkersMapContent.kt

@@ -41,7 +41,7 @@ import com.google.maps.android.compose.GoogleMapComposable
 import com.google.maps.android.compose.MapsComposeExperimentalApi
 import com.google.maps.android.compose.clustering.Clustering
 
-class IconColor(val iconColor: Color, val backgroundColor: Color, val borderColor: Color)
+data class IconColor(val iconColor: Color, val backgroundColor: Color, val borderColor: Color)
 
 data class MountainClusterItem(
     val mountain: Mountain,
@@ -60,7 +60,7 @@ data class MountainClusterItem(
 @Composable
 @GoogleMapComposable
 fun ClusteringMarkersMapContent(
-    mountainsScreenViewState: MountainList,
+    mountains: List<Mountain>,
     onClusterClick: (Cluster<out ClusterItem>) -> Boolean = { false },
     onMountainClick: (ClusterItem) -> Boolean = { false },
 ) {
@@ -81,9 +81,9 @@ fun ClusteringMarkersMapContent(
         borderColor = MaterialTheme.colorScheme.secondary
     )
 
-    val mountainClusterItems by remember(mountainsScreenViewState.mountains) {
+    val mountainClusterItems by remember(mountains) {
         mutableStateOf(
-            mountainsScreenViewState.mountains.map { mountain ->
+            mountains.map { mountain ->
                 MountainClusterItem(
                     mountain = mountain,
                     snippetString = unitsConverter.toElevationString(resources, mountain.elevation)

starter/app/src/main/java/com/example/mountainmarkers/MainActivity.kt

@@ -25,7 +25,7 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
@@ -69,7 +69,7 @@ class MainActivity : ComponentActivity() {
                     dynamicColor = false
                 ) {
                     // Remember the type of marker we want to show
-                    var selectedMarkerType by remember {
+                    var selectedMarkerType by rememberSaveable {
                         mutableStateOf(MarkerType.Basic)
                     }
 

starter/app/src/main/java/com/example/mountainmarkers/presentation/AdvancedMarkersMapContent.kt

@@ -15,6 +15,7 @@
 package com.example.mountainmarkers.presentation
 
 import androidx.compose.runtime.Composable
+import com.example.mountainmarkers.data.local.Mountain
 import com.example.mountainmarkers.presentation.MountainsScreenViewState.MountainList
 import com.google.android.gms.maps.model.Marker
 
@@ -23,7 +24,7 @@ import com.google.android.gms.maps.model.Marker
  */
 @Composable
 fun AdvancedMarkersMapContent(
-    mountainsScreenViewState: MountainList,
+    mountains: List<Mountain>,
     onMountainClick: (Marker) -> Boolean = { false },
 ) {
 }

starter/app/src/main/java/com/example/mountainmarkers/presentation/BasicMarkersMapContent.kt

@@ -15,6 +15,7 @@
 package com.example.mountainmarkers.presentation
 
 import androidx.compose.runtime.Composable
+import com.example.mountainmarkers.data.local.Mountain
 import com.example.mountainmarkers.presentation.MountainsScreenViewState.MountainList
 import com.google.android.gms.maps.model.Marker
 
@@ -23,7 +24,7 @@ import com.google.android.gms.maps.model.Marker
  */
 @Composable
 fun BasicMarkersMapContent(
-    mountainsScreenViewState: MountainList,
+    mountains: List<Mountain>,
     onMountainClick: (Marker) -> Boolean = { false }
 ) {
 }

starter/app/src/main/java/com/example/mountainmarkers/presentation/ClusteringMarkersMapContent.kt

@@ -15,6 +15,7 @@
 package com.example.mountainmarkers.presentation
 
 import androidx.compose.runtime.Composable
+import com.example.mountainmarkers.data.local.Mountain
 import com.example.mountainmarkers.presentation.MountainsScreenViewState.MountainList
 import com.google.maps.android.clustering.Cluster
 import com.google.maps.android.clustering.ClusterItem
@@ -24,7 +25,7 @@ import com.google.maps.android.clustering.ClusterItem
  */
 @Composable
 fun ClusteringMarkersMapContent(
-    mountainsScreenViewState: MountainList,
+    mountains: List<Mountain>,
     onClusterClick: (Cluster<out ClusterItem>) -> Boolean = { false },
     onMountainClick: (ClusterItem) -> Boolean = { false },
 ) {