Use a latch for zoom animation

android · Feb 23, 2022 · e24c8f7 · e24c8f7
1 parent 8483100
commit e24c8f7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/Crane/app/src/androidTest/java/androidx/compose/samples/crane/details/CityMapViewTests.kt b/Crane/app/src/androidTest/java/androidx/compose/samples/crane/details/CityMapViewTests.kt
@@ -59,6 +59,7 @@ class CityMapViewTests {
     val composeTestRule = createAndroidComposeRule<MainActivity>()
 
     private lateinit var mapState: CameraPositionState
+    private lateinit var zoomLatch: CountDownLatch
 
     @Before
     fun setUp() {
@@ -67,6 +68,7 @@ class CityMapViewTests {
         cityDetails = destinationsRepository.getDestination(MADRID.name)!!
 
         val countDownLatch = CountDownLatch(1)
+        zoomLatch = CountDownLatch(1)
 
         composeTestRule.setContent {
             CraneTheme {
@@ -77,7 +79,8 @@ class CityMapViewTests {
                         onMapLoadedWithCameraState = { cameraPositionState ->
                             mapState = cameraPositionState
                             countDownLatch.countDown()
-                        }
+                        },
+                        onZoomChanged = { zoomLatch.countDown() }
                     )
                 }
             }
@@ -105,7 +108,7 @@ class CityMapViewTests {
             .performClick()
 
         // Wait for the animation to happen
-        composeTestRule.waitForIdle()
+        assertTrue("Zoom timed out", zoomLatch.await(30, TimeUnit.SECONDS))
 
         assertTrue(zoomBefore < mapState.position.zoom)
     }
@@ -118,7 +121,7 @@ class CityMapViewTests {
             .performClick()
 
         // Wait for the animation to happen
-        composeTestRule.waitForIdle()
+        assertTrue("Zoom timed out", zoomLatch.await(30, TimeUnit.SECONDS))
 
         assertTrue(zoomBefore > mapState.position.zoom)
     }

diff --git a/Crane/app/src/main/java/androidx/compose/samples/crane/details/DetailsActivity.kt b/Crane/app/src/main/java/androidx/compose/samples/crane/details/DetailsActivity.kt
@@ -183,6 +183,7 @@ fun CityMapView(
     latitude: String,
     longitude: String,
     onMapLoadedWithCameraState: ((CameraPositionState) -> Unit)? = null, // Exposed for use in tests
+    onZoomChanged: (() -> Unit)? = null
 ) {
     val cityLocation = remember(latitude, longitude) {
         LatLng(latitude.toDouble(), longitude.toDouble())
@@ -199,7 +200,8 @@ fun CityMapView(
         cameraPositionState = cameraPositionState,
         onMapLoaded = {
             onMapLoadedWithCameraState?.invoke(cameraPositionState)
-        }
+        },
+        onZoomChanged = onZoomChanged
     ) {
         Marker(position = cityLocation)
     }
@@ -213,6 +215,7 @@ fun CityMapView(
 fun MapViewContainer(
     cameraPositionState: CameraPositionState,
     onMapLoaded: () -> Unit = {},
+    onZoomChanged: (() -> Unit)? = null,
     content: (@Composable () -> Unit)? = null
 ) {
     val mapProperties = remember {
@@ -230,8 +233,18 @@ fun MapViewContainer(
     val animationScope = rememberCoroutineScope()
     Column {
         ZoomControls(
-            onZoomIn = { animationScope.launch { cameraPositionState.animate(CameraUpdateFactory.zoomIn()) } },
-            onZoomOut = { animationScope.launch { cameraPositionState.animate(CameraUpdateFactory.zoomOut()) } }
+            onZoomIn = {
+                animationScope.launch {
+                    cameraPositionState.animate(CameraUpdateFactory.zoomIn())
+                    onZoomChanged?.invoke()
+                }
+            },
+            onZoomOut = {
+                animationScope.launch {
+                    cameraPositionState.animate(CameraUpdateFactory.zoomOut())
+                    onZoomChanged?.invoke()
+                }
+            }
         )
 
         GoogleMap(