Merge branch 'main' into feat/add-map-view-factory

dkhawk · web-flow · commit 8605030f9b5a · 2025-08-29T09:51:58.000-06:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -42,7 +42,7 @@ jobs:
         distribution: 'temurin'
 
     - name: Build modules
-      run: ./gradlew build jacocoTestReport --stacktrace
+      run: ./gradlew build jacocoTestReport -x :maps-app:generateDebugScreenshotTestConfig -x :maps-app:testDebugScreenshotTest -x :maps-app:generateReleaseScreenshotTestConfig -x :maps-app:testReleaseScreenshotTest --stacktrace
 
     - name: Run Screenshot Tests
       run: ./gradlew validateDebugScreenshotTest
@@ -51,5 +51,5 @@ jobs:
       uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: my-artifact
+        name: screenshot-report
         path: maps-app/build/reports
diff --git a/README.md b/README.md
@@ -157,6 +157,26 @@ Box(Modifier.fillMaxSize()) {
 }
 ```
 
+Remember that the map must load before any camera state can be set. If you are using a LaunchedEffect, you must wait until the map has been loaded:
+
+```kotlin
+@Composable
+fun MapScreen() {
+var mapLoaded by remember { mutableStateOf(false) }
+
+    GoogleMap(
+        modifier = Modifier.fillMaxSize(),
+        onMapLoaded = { mapLoaded = true }
+    )
+
+    if (mapLoaded) {
+        LaunchedEffect(Unit) {
+            // here the camera operations
+        }
+    }
+}
+```
+
 </details>
 
 <details>
@@ -477,6 +497,13 @@ Box(Modifier.fillMaxSize()) {
 
 The colors of the text, line, and shadow are also all configurable (e.g., based on `isSystemInDarkTheme()` on a dark map). Similarly, the `DisappearingScaleBar` animations can be configured.
 
+## Internal usage attribution ID
+
+This library calls the MapsApiSettings.addInternalUsageAttributionId method, which helps Google
+understand which libraries and samples are helpful to developers and is optional. Instructions for
+opting out of the identifier are provided in
+[reference documentation](maps-compose/src/main/java/com/google/maps/android/compose/internal/MapsApiAttribution.kt).
+
 ## Contributing
 
 Contributions are welcome and encouraged! If you'd like to contribute, send us a [pull request] and refer to our [code of conduct] and [contributing guide].
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,23 +1,23 @@
 [versions]
 activitycompose = "1.10.1"
-agp = "8.10.1"
-androidCore = "1.6.1"
-androidx-core = "1.16.0"
-androidxtest = "1.6.2"
-compose-bom = "2025.04.00"
+agp = "8.12.1"
+androidCore = "1.7.0"
+androidx-core = "1.17.0"
+androidxtest = "1.7.0"
+compose-bom = "2025.08.01"
 dokka = "2.0.0"
-espresso = "3.6.1"
+espresso = "3.7.0"
 gradleMavenPublishPlugin = "0.34.0"
 jacoco-plugin = "0.2.1"
 junit = "4.13.2"
-junitktx = "1.2.1"
-kotlin = "2.2.0"
+junitktx = "1.3.0"
+kotlin = "2.2.10"
 kotlinxCoroutines = "1.10.2"
-leakcanaryAndroid = "2.12"
+leakcanaryAndroid = "2.14"
 mapsecrets = "2.0.1"
 mapsktx = "5.2.0"
-org-jacoco-core = "0.8.12"
-screenshot = "0.0.1-alpha10"
+org-jacoco-core = "0.8.13"
+screenshot = "0.0.1-alpha11"
 constraintlayout = "2.2.1"
 material = "1.12.0"
 
@@ -52,6 +52,7 @@ org-jacoco-core = { module = "org.jacoco:org.jacoco.core", version.ref = "org-ja
 test-junit = { module = "junit:junit", version.ref = "junit" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+screenshot-validation-api = { group = "com.android.tools.screenshot", name = "screenshot-validation-api", version.ref = "screenshot" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/maps-app/build.gradle.kts b/maps-app/build.gradle.kts
@@ -23,11 +23,11 @@ android {
     }
 
     namespace = "com.google.maps.android.compose"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -67,6 +67,7 @@ dependencies {
     implementation(libs.androidx.compose.ui.preview.tooling)
     implementation(libs.androidx.constraintlayout)
     implementation(libs.material)
+    implementation(libs.screenshot.validation.api)
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.leakcanary.android)
 
diff --git a/maps-app/src/debug/screenshotTest/reference/com/google/maps/android/compose/ScaleBarTest/PreviewDisappearingScaleBar_0.png b/maps-app/src/debug/screenshotTest/reference/com/google/maps/android/compose/ScaleBarTest/PreviewDisappearingScaleBar_0.png
diff --git a/maps-app/src/debug/screenshotTest/reference/com/google/maps/android/compose/ScaleBarTest/PreviewScaleBar_0.png b/maps-app/src/debug/screenshotTest/reference/com/google/maps/android/compose/ScaleBarTest/PreviewScaleBar_0.png
diff --git a/maps-app/src/main/java/com/google/maps/android/compose/BasicMapActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/BasicMapActivity.kt
@@ -58,8 +58,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.android.tools.screenshot.PreviewTest
 import com.google.android.gms.maps.CameraUpdateFactory
 import com.google.android.gms.maps.model.BitmapDescriptorFactory
 import com.google.android.gms.maps.model.CameraPosition
@@ -433,7 +433,7 @@ private fun DebugView(
 }
 
 
-@Preview
+@PreviewTest
 @Composable
 fun GoogleMapViewPreview() {
     MapsComposeSampleTheme {
diff --git a/maps-app/src/main/java/com/google/maps/android/compose/LocationTrackingActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/LocationTrackingActivity.kt
@@ -93,14 +93,16 @@ class LocationTrackingActivity : ComponentActivity() {
             // Collect location updates
             val locationState = locationFlow.collectAsState(initial = newLocation())
 
-            // Update blue dot and camera when the location changes
-            LaunchedEffect(locationState.value) {
-                Log.d(TAG, "Updating blue dot on map...")
-                locationSource.onLocationChanged(locationState.value)
-
-                Log.d(TAG, "Updating camera position...")
-                val cameraPosition = CameraPosition.fromLatLngZoom(LatLng(locationState.value.latitude, locationState.value.longitude), zoom)
-                cameraPositionState.animate(CameraUpdateFactory.newCameraPosition(cameraPosition), 1_000)
+            if (isMapLoaded) {
+                // Update blue dot and camera when the location changes
+                LaunchedEffect(locationState.value) {
+                    Log.d(TAG, "Updating blue dot on map...")
+                    locationSource.onLocationChanged(locationState.value)
+
+                    Log.d(TAG, "Updating camera position...")
+                    val cameraPosition = CameraPosition.fromLatLngZoom(LatLng(locationState.value.latitude, locationState.value.longitude), zoom)
+                    cameraPositionState.animate(CameraUpdateFactory.newCameraPosition(cameraPosition), 1_000)
+                }
             }
 
             // Detect when the map starts moving and print the reason
diff --git a/maps-app/src/main/java/com/google/maps/android/compose/ScaleBarActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/ScaleBarActivity.kt
@@ -38,8 +38,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.android.tools.screenshot.PreviewTest
 import com.google.android.gms.maps.model.CameraPosition
 import com.google.android.gms.maps.model.LatLng
 import com.google.maps.android.compose.theme.MapsComposeSampleTheme
@@ -133,7 +133,7 @@ class ScaleBarActivity : ComponentActivity() {
     }
 }
 
-@Preview
+@PreviewTest
 @Composable
 fun PreviewScaleBar() {
     val cameraPositionState = remember {
diff --git a/maps-app/src/screenshotTest/AndroidManifest.xml b/maps-app/src/screenshotTest/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.google.maps.android.compose" />
diff --git a/maps-app/src/screenshotTest/java/com/google/maps/android/compose/ScaleBarTest.kt b/maps-app/src/screenshotTest/java/com/google/maps/android/compose/ScaleBarTest.kt
@@ -6,6 +6,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.android.tools.screenshot.PreviewTest
 import com.google.android.gms.maps.model.CameraPosition
 import com.google.android.gms.maps.model.LatLng
 import com.google.maps.android.compose.theme.MapsComposeSampleTheme
@@ -14,7 +15,8 @@ import com.google.maps.android.compose.widgets.ScaleBar
 
 
 class ScaleBarTest() {
-    @Preview
+    @PreviewTest
+    @Preview(showBackground = true)
     @Composable
     fun PreviewScaleBar() {
         val cameraPositionState = remember {
@@ -36,7 +38,8 @@ class ScaleBarTest() {
         }
     }
 
-    @Preview
+    @PreviewTest
+    @Preview(showBackground = true)
     @Composable
     fun PreviewDisappearingScaleBar() {
         val cameraPositionState = remember {
diff --git a/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTest/PreviewDisappearingScaleBar_748aa731_0.png b/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTest/PreviewDisappearingScaleBar_748aa731_0.png
diff --git a/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTest/PreviewScaleBar_748aa731_0.png b/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTest/PreviewScaleBar_748aa731_0.png
diff --git a/maps-compose-utils/build.gradle.kts b/maps-compose-utils/build.gradle.kts
@@ -10,7 +10,7 @@ android {
     }
 
     namespace = "com.google.maps.android.compose.utils"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 21
diff --git a/maps-compose-widgets/build.gradle.kts b/maps-compose-widgets/build.gradle.kts
@@ -10,7 +10,7 @@ android {
     }
 
     namespace = "com.google.maps.android.compose.widgets"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 21
diff --git a/maps-compose/build.gradle.kts b/maps-compose/build.gradle.kts
@@ -12,7 +12,7 @@ android {
     }
 
     namespace = "com.google.maps.android.compose"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 21
diff --git a/maps-compose/src/main/java/com/google/maps/android/compose/CameraPositionState.kt b/maps-compose/src/main/java/com/google/maps/android/compose/CameraPositionState.kt
@@ -43,7 +43,8 @@ import kotlin.coroutines.resumeWithException
 /**
  * Create and [rememberSaveable] a [CameraPositionState] using [CameraPositionState.Saver].
  * [init] will be called when the [CameraPositionState] is first created to configure its
- * initial state.
+ * initial state. Remember that the camera state can be applied when the map has been
+ * loaded.
  */
 @Composable
 public inline fun rememberCameraPositionState(
diff --git a/maps-compose/src/main/java/com/google/maps/android/compose/GoogleMap.kt b/maps-compose/src/main/java/com/google/maps/android/compose/GoogleMap.kt
@@ -54,9 +54,11 @@ import com.google.maps.android.compose.internal.MapsApiAttribution
 import com.google.maps.android.ktx.awaitMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.awaitCancellation
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 /**
  * A compose container for a [MapView].
@@ -235,7 +237,10 @@ private fun CoroutineScope.launchSubcomposition(
     content: @Composable @GoogleMapComposable () -> Unit,
 ): Job {
     // Use [CoroutineStart.UNDISPATCHED] to kick off GoogleMap loading immediately
-    return launch(start = CoroutineStart.UNDISPATCHED) {
+    return launch(
+        context = Dispatchers.Main,
+        start = CoroutineStart.UNDISPATCHED
+    ) {
         val map = mapView.awaitMap()
         val composition = Composition(
             applier = MapApplier(map, mapView, mapClickListeners),
diff --git a/maps-compose/src/main/java/com/google/maps/android/compose/internal/MapsApiAttribution.kt b/maps-compose/src/main/java/com/google/maps/android/compose/internal/MapsApiAttribution.kt
@@ -6,9 +6,8 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
 import com.google.android.gms.maps.MapsApiSettings
 import com.google.maps.android.compose.meta.AttributionId
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.util.concurrent.atomic.AtomicBoolean
 
 /**
@@ -21,16 +20,30 @@ internal object MapsApiAttribution {
     private val _isInitialized = mutableStateOf(false)
     val isInitialized: State<Boolean> = _isInitialized
 
+    /**
+     * The value of the attribution ID.  Set this to the empty string to opt out of attribution.
+     *
+     * This must be set before calling the GoogleMap composable.
+     */
+    var attributionId: String = AttributionId.VALUE
+
     /**
      * Adds the attribution ID to the Maps API settings. This is done on a background thread
      * using [Dispatchers.IO]. The attribution ID is only added once.
      *
+     * Adds a usage attribution ID to the initializer, which helps Google understand which libraries
+     * and samples are helpful to developers, such as usage of this library.
+     * To opt out of sending the usage attribution ID, it is safe to delete this function call
+     * or replace the value with an empty string.
+     *
+     * See https://developers.google.com/android/reference/com/google/android/gms/maps/MapsApiSettings#addInternalUsageAttributionId(android.content.Context,%20java.lang.String)
+     *
      * @param context The context to use to add the attribution ID.
      */
-    fun addAttributionId(context: Context) {
+    suspend fun addAttributionId(context: Context) {
         if (hasBeenCalled.compareAndSet(false, true)) {
-            CoroutineScope(Dispatchers.IO).launch {
-                MapsApiSettings.addInternalUsageAttributionId(context, AttributionId.VALUE)
+            withContext(Dispatchers.IO) {
+                MapsApiSettings.addInternalUsageAttributionId(context, attributionId)
                 _isInitialized.value = true
             }
         }
