Decouple ui:controller:impl and ui:uistateadapter:capture from ui:components:capture

app/build.gradle.kts

@@ -133,6 +133,7 @@ dependencies {
     androidTestImplementation(libs.camera.lifecycle) // to reset CameraX between tests
     androidTestImplementation(libs.truth)
     androidTestImplementation(libs.testParameterInjector)
+    androidTestImplementation(project(":ui:uistate"))
     androidTestImplementation(project(":ui:components:capture"))
     androidTestImplementation(project(":ui:debug"))
     androidTestUtil(libs.androidx.orchestrator)
@@ -169,6 +170,7 @@ dependencies {
     coreLibraryDesugaring(libs.desugar.jdk.libs)
 
     // capture components
+    implementation(project(":ui:uistate"))
     implementation(project(":ui:components:capture"))
     implementation(project(":ui:debug"))
 

app/src/androidTest/java/com/google/jetpackcamera/ConcurrentCameraTest.kt

@@ -47,7 +47,7 @@ import com.google.jetpackcamera.ui.components.capture.QUICK_SETTINGS_HDR_BUTTON
 import com.google.jetpackcamera.ui.components.capture.QUICK_SETTINGS_RATIO_1_1_BUTTON
 import com.google.jetpackcamera.ui.components.capture.QUICK_SETTINGS_RATIO_BUTTON
 import com.google.jetpackcamera.ui.components.capture.R as CaptureR
-import com.google.jetpackcamera.ui.components.capture.VIDEO_CAPTURE_SUCCESS_TAG
+import com.google.jetpackcamera.ui.uistateadapter.capture.R as StateR
 import com.google.jetpackcamera.utils.TEST_REQUIRED_PERMISSIONS
 import com.google.jetpackcamera.utils.VIDEO_CAPTURE_TIMEOUT_MILLIS
 import com.google.jetpackcamera.utils.getResString
@@ -59,7 +59,7 @@ import com.google.jetpackcamera.utils.setConcurrentCameraModeInSettings
 import com.google.jetpackcamera.utils.stateDescriptionMatches
 import com.google.jetpackcamera.utils.visitSettingsScreen
 import com.google.jetpackcamera.utils.waitForCaptureButton
-import com.google.jetpackcamera.utils.waitForNodeWithTag
+import com.google.jetpackcamera.utils.waitForNodeWithText
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -170,8 +170,7 @@ class ConcurrentCameraTest {
                     .assert(
                         stateDescriptionMatches(
                             getResString(
-                                CaptureR.string
-                                    .quick_settings_description_capture_mode_video_only
+                                CaptureR.string.quick_settings_description_capture_mode_video_only
                             )
                         )
                     )
@@ -228,7 +227,10 @@ class ConcurrentCameraTest {
 
             longClickForVideoRecordingCheckingElapsedTime()
 
-            waitForNodeWithTag(VIDEO_CAPTURE_SUCCESS_TAG, VIDEO_CAPTURE_TIMEOUT_MILLIS)
+            waitForNodeWithText(
+                StateR.string.toast_video_capture_success,
+                VIDEO_CAPTURE_TIMEOUT_MILLIS
+            )
         }
     }
 

app/src/androidTest/java/com/google/jetpackcamera/FlashDeviceTest.kt

@@ -31,9 +31,8 @@ import com.google.jetpackcamera.model.FlashMode
 import com.google.jetpackcamera.model.LensFacing
 import com.google.jetpackcamera.ui.components.capture.CAPTURE_BUTTON
 import com.google.jetpackcamera.ui.components.capture.FLIP_CAMERA_BUTTON
-import com.google.jetpackcamera.ui.components.capture.IMAGE_CAPTURE_SUCCESS_TAG
 import com.google.jetpackcamera.ui.components.capture.SCREEN_FLASH_OVERLAY
-import com.google.jetpackcamera.ui.components.capture.VIDEO_CAPTURE_SUCCESS_TAG
+import com.google.jetpackcamera.ui.uistateadapter.capture.R as StateR
 import com.google.jetpackcamera.utils.IMAGE_CAPTURE_TIMEOUT_MILLIS
 import com.google.jetpackcamera.utils.SCREEN_FLASH_OVERLAY_TIMEOUT_MILLIS
 import com.google.jetpackcamera.utils.TEST_REQUIRED_PERMISSIONS
@@ -46,6 +45,7 @@ import com.google.jetpackcamera.utils.runMainActivityScenarioTest
 import com.google.jetpackcamera.utils.setFlashMode
 import com.google.jetpackcamera.utils.waitForCaptureButton
 import com.google.jetpackcamera.utils.waitForNodeWithTag
+import com.google.jetpackcamera.utils.waitForNodeWithText
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -131,7 +131,10 @@ internal class FlashDeviceTest {
             .assertExists()
             .performClick()
 
-        composeTestRule.waitForNodeWithTag(IMAGE_CAPTURE_SUCCESS_TAG, IMAGE_CAPTURE_TIMEOUT_MILLIS)
+        composeTestRule.waitForNodeWithText(
+            StateR.string.toast_image_capture_success,
+            IMAGE_CAPTURE_TIMEOUT_MILLIS
+        )
     }
 
     @Test
@@ -163,8 +166,8 @@ internal class FlashDeviceTest {
                 SCREEN_FLASH_OVERLAY_TIMEOUT_MILLIS
             )
 
-            composeTestRule.waitForNodeWithTag(
-                IMAGE_CAPTURE_SUCCESS_TAG,
+            composeTestRule.waitForNodeWithText(
+                StateR.string.toast_image_capture_success,
                 IMAGE_CAPTURE_TIMEOUT_MILLIS
             )
         }
@@ -195,8 +198,8 @@ internal class FlashDeviceTest {
             composeTestRule.setFlashMode(FlashMode.ON)
 
             composeTestRule.longClickForVideoRecordingCheckingElapsedTime()
-            composeTestRule.waitForNodeWithTag(
-                VIDEO_CAPTURE_SUCCESS_TAG,
+            composeTestRule.waitForNodeWithText(
+                StateR.string.toast_video_capture_success,
                 VIDEO_CAPTURE_TIMEOUT_MILLIS
             )
         }

app/src/androidTest/java/com/google/jetpackcamera/ImageCaptureDeviceTest.kt

@@ -19,6 +19,8 @@ import android.app.Activity
 import android.net.Uri
 import android.provider.MediaStore
 import android.view.KeyEvent
+import androidx.annotation.StringRes
+import androidx.compose.ui.test.ComposeTimeoutException
 import androidx.compose.ui.test.hasContentDescription
 import androidx.compose.ui.test.isDisplayed
 import androidx.compose.ui.test.isNotDisplayed
@@ -31,9 +33,7 @@ import androidx.test.uiautomator.UiDevice
 import com.google.common.truth.Truth
 import com.google.jetpackcamera.feature.postcapture.ui.VIEWER_POST_CAPTURE_IMAGE
 import com.google.jetpackcamera.ui.components.capture.CAPTURE_BUTTON
-import com.google.jetpackcamera.ui.components.capture.IMAGE_CAPTURE_FAILURE_TAG
-import com.google.jetpackcamera.ui.components.capture.IMAGE_CAPTURE_SUCCESS_TAG
-import com.google.jetpackcamera.ui.components.capture.VIDEO_CAPTURE_EXTERNAL_UNSUPPORTED_TAG
+import com.google.jetpackcamera.ui.uistateadapter.capture.R as StateR
 import com.google.jetpackcamera.utils.CacheParam
 import com.google.jetpackcamera.utils.FILE_PREFIX
 import com.google.jetpackcamera.utils.IMAGE_CAPTURE_TIMEOUT_MILLIS
@@ -46,16 +46,17 @@ import com.google.jetpackcamera.utils.VIDEO_PREFIX
 import com.google.jetpackcamera.utils.deleteFilesInDirAfterTimestamp
 import com.google.jetpackcamera.utils.doesFileExist
 import com.google.jetpackcamera.utils.doesMediaExist
-import com.google.jetpackcamera.utils.ensureTagNotAppears
 import com.google.jetpackcamera.utils.expectedNumFiles
 import com.google.jetpackcamera.utils.getMultipleImageCaptureIntent
 import com.google.jetpackcamera.utils.getSingleImageCaptureIntent
 import com.google.jetpackcamera.utils.getTestUri
 import com.google.jetpackcamera.utils.longClickForVideoRecording
+import com.google.jetpackcamera.utils.onNodeWithText
 import com.google.jetpackcamera.utils.runMainActivityMediaStoreAutoDeleteScenarioTest
 import com.google.jetpackcamera.utils.runMainActivityScenarioTestForResult
 import com.google.jetpackcamera.utils.waitForCaptureButton
 import com.google.jetpackcamera.utils.waitForNodeWithTag
+import com.google.jetpackcamera.utils.waitForNodeWithText
 import com.google.testing.junit.testparameterinjector.TestParameter
 import com.google.testing.junit.testparameterinjector.TestParameterInjector
 import org.junit.Rule
@@ -168,8 +169,8 @@ internal class ImageCaptureDeviceTest {
                     .assertExists()
                     .performClick()
 
-                composeTestRule.waitForNodeWithTag(
-                    IMAGE_CAPTURE_FAILURE_TAG,
+                composeTestRule.waitForNodeWithText(
+                    StateR.string.toast_capture_failure,
                     IMAGE_CAPTURE_TIMEOUT_MILLIS
                 )
                 uiDevice.pressBack()
@@ -193,8 +194,8 @@ internal class ImageCaptureDeviceTest {
 
                 composeTestRule.longClickForVideoRecording()
 
-                composeTestRule.ensureTagNotAppears(
-                    VIDEO_CAPTURE_EXTERNAL_UNSUPPORTED_TAG,
+                ensureTextNotAppears(
+                    StateR.string.toast_video_capture_external_unsupported,
                     VIDEO_CAPTURE_TIMEOUT_MILLIS
                 )
 
@@ -225,7 +226,7 @@ internal class ImageCaptureDeviceTest {
                 repeat(2) {
                     clickCaptureAndWaitUntilMessageDisappears(
                         IMAGE_CAPTURE_TIMEOUT_MILLIS,
-                        IMAGE_CAPTURE_SUCCESS_TAG
+                        StateR.string.toast_image_capture_success
                     )
                 }
                 clickCapture()
@@ -253,7 +254,7 @@ internal class ImageCaptureDeviceTest {
                 repeat(2) {
                     clickCaptureAndWaitUntilMessageDisappears(
                         IMAGE_CAPTURE_TIMEOUT_MILLIS,
-                        IMAGE_CAPTURE_SUCCESS_TAG
+                        StateR.string.toast_image_capture_success
                     )
                 }
                 uiDevice.pressBack()
@@ -298,7 +299,7 @@ internal class ImageCaptureDeviceTest {
                 composeTestRule.waitForCaptureButton()
                 clickCaptureAndWaitUntilMessageDisappears(
                     IMAGE_CAPTURE_TIMEOUT_MILLIS,
-                    IMAGE_CAPTURE_FAILURE_TAG
+                    StateR.string.toast_capture_failure
                 )
                 clickCapture()
             }
@@ -309,10 +310,13 @@ internal class ImageCaptureDeviceTest {
         deleteFilesInDirAfterTimestamp(PICTURES_DIR_PATH, instrumentation, timeStamp)
     }
 
-    private fun clickCaptureAndWaitUntilMessageDisappears(msgTimeOut: Long, msgTag: String) {
+    private fun clickCaptureAndWaitUntilMessageDisappears(
+        msgTimeOut: Long,
+        @StringRes msgResId: Int
+    ) {
         clickCapture()
         composeTestRule.waitUntil(timeoutMillis = msgTimeOut) {
-            composeTestRule.onNodeWithTag(testTag = msgTag, useUnmergedTree = true).isDisplayed()
+            composeTestRule.onNodeWithText(msgResId).isDisplayed()
         }
         val dismissButtonMatcher =
             hasContentDescription(value = "dismiss", substring = true, ignoreCase = true)
@@ -322,8 +326,20 @@ internal class ImageCaptureDeviceTest {
         composeTestRule.onNode(dismissButtonMatcher, useUnmergedTree = true)
             .performClick()
         composeTestRule.waitUntil(timeoutMillis = MESSAGE_DISAPPEAR_TIMEOUT_MILLIS) {
-            val node = composeTestRule.onNodeWithTag(testTag = msgTag, useUnmergedTree = true)
-            node.isNotDisplayed()
+            composeTestRule.onNodeWithText(msgResId).isNotDisplayed()
+        }
+    }
+
+    private fun ensureTextNotAppears(@StringRes textResId: Int, timeoutMillis: Long) {
+        try {
+            composeTestRule.waitUntil(timeoutMillis = timeoutMillis) {
+                composeTestRule.onNodeWithText(textResId).isDisplayed()
+            }
+            throw AssertionError(
+                "${com.google.jetpackcamera.utils.getResString(textResId)} should not be present"
+            )
+        } catch (e: ComposeTimeoutException) {
+            /* Do nothing. we want to time out here. */
         }
     }
 
@@ -336,8 +352,8 @@ internal class ImageCaptureDeviceTest {
     private fun verifyImageCaptureSuccess() {
         when (cacheParam) {
             CacheParam.NO_CACHE -> {
-                composeTestRule.waitForNodeWithTag(
-                    IMAGE_CAPTURE_SUCCESS_TAG,
+                composeTestRule.waitForNodeWithText(
+                    StateR.string.toast_image_capture_success,
                     IMAGE_CAPTURE_TIMEOUT_MILLIS
                 )
             }

app/src/androidTest/java/com/google/jetpackcamera/PermissionsTest.kt

@@ -30,9 +30,8 @@ import com.google.jetpackcamera.permissions.ui.RECORD_AUDIO_PERMISSION_BUTTON
 import com.google.jetpackcamera.permissions.ui.REQUEST_PERMISSION_BUTTON
 import com.google.jetpackcamera.permissions.ui.WRITE_EXTERNAL_STORAGE_PERMISSION_BUTTON
 import com.google.jetpackcamera.ui.components.capture.CAPTURE_BUTTON
-import com.google.jetpackcamera.ui.components.capture.IMAGE_CAPTURE_FAILURE_TAG
-import com.google.jetpackcamera.ui.components.capture.IMAGE_CAPTURE_SUCCESS_TAG
 import com.google.jetpackcamera.ui.components.capture.IMAGE_WELL_TAG
+import com.google.jetpackcamera.ui.uistateadapter.capture.R as StateR
 import com.google.jetpackcamera.utils.APP_REQUIRED_PERMISSIONS
 import com.google.jetpackcamera.utils.APP_START_TIMEOUT_MILLIS
 import com.google.jetpackcamera.utils.IMAGE_CAPTURE_TIMEOUT_MILLIS
@@ -261,8 +260,8 @@ class PermissionsTest {
             composeTestRule.onNodeWithTag(CAPTURE_BUTTON)
                 .assertExists()
                 .performClick()
-            composeTestRule.waitForNodeWithTag(
-                IMAGE_CAPTURE_SUCCESS_TAG,
+            composeTestRule.waitForNodeWithText(
+                StateR.string.toast_image_capture_success,
                 timeoutMillis = IMAGE_CAPTURE_TIMEOUT_MILLIS
             )
         }
@@ -299,8 +298,8 @@ class PermissionsTest {
             // check for image capture failure
             composeTestRule.onNodeWithTag(CAPTURE_BUTTON).assertExists().performClick()
 
-            composeTestRule.waitForNodeWithTag(
-                IMAGE_CAPTURE_FAILURE_TAG,
+            composeTestRule.waitForNodeWithText(
+                StateR.string.toast_capture_failure,
                 timeoutMillis = IMAGE_CAPTURE_TIMEOUT_MILLIS
             )
             // imageWell shouldn't appear

app/src/androidTest/java/com/google/jetpackcamera/PostCaptureTest.kt

@@ -23,17 +23,15 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import com.google.common.truth.Truth.assertThat
+import com.google.jetpackcamera.feature.postcapture.R as PostCaptureR
 import com.google.jetpackcamera.feature.postcapture.ui.BUTTON_POST_CAPTURE_DELETE
 import com.google.jetpackcamera.feature.postcapture.ui.BUTTON_POST_CAPTURE_EXIT
 import com.google.jetpackcamera.feature.postcapture.ui.BUTTON_POST_CAPTURE_SAVE
-import com.google.jetpackcamera.feature.postcapture.ui.SNACKBAR_POST_CAPTURE_IMAGE_SAVE_SUCCESS
-import com.google.jetpackcamera.feature.postcapture.ui.SNACKBAR_POST_CAPTURE_VIDEO_SAVE_SUCCESS
 import com.google.jetpackcamera.feature.postcapture.ui.VIEWER_POST_CAPTURE_IMAGE
 import com.google.jetpackcamera.feature.postcapture.ui.VIEWER_POST_CAPTURE_VIDEO
 import com.google.jetpackcamera.ui.components.capture.CAPTURE_BUTTON
-import com.google.jetpackcamera.ui.components.capture.IMAGE_CAPTURE_SUCCESS_TAG
 import com.google.jetpackcamera.ui.components.capture.IMAGE_WELL_TAG
-import com.google.jetpackcamera.ui.components.capture.VIDEO_CAPTURE_SUCCESS_TAG
+import com.google.jetpackcamera.ui.uistateadapter.capture.R as StateR
 import com.google.jetpackcamera.utils.IMAGE_CAPTURE_TIMEOUT_MILLIS
 import com.google.jetpackcamera.utils.IMAGE_WELL_LOAD_TIMEOUT_MILLIS
 import com.google.jetpackcamera.utils.JCA_MEDIA_DIR_PATH
@@ -50,6 +48,7 @@ import com.google.jetpackcamera.utils.runMainActivityScenarioTest
 import com.google.jetpackcamera.utils.wait
 import com.google.jetpackcamera.utils.waitForCaptureButton
 import com.google.jetpackcamera.utils.waitForNodeWithTag
+import com.google.jetpackcamera.utils.waitForNodeWithText
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -166,8 +165,8 @@ class PostCaptureTest {
             composeTestRule.onNodeWithTag(BUTTON_POST_CAPTURE_SAVE).performClick()
 
             // Wait for image save success message
-            composeTestRule.waitForNodeWithTag(
-                SNACKBAR_POST_CAPTURE_IMAGE_SAVE_SUCCESS,
+            composeTestRule.waitForNodeWithText(
+                PostCaptureR.string.snackbar_save_image_success,
                 SAVE_MEDIA_TIMEOUT_MILLIS
             )
             assertThat(newImageMediaExists()).isTrue()
@@ -194,8 +193,8 @@ class PostCaptureTest {
             composeTestRule.onNodeWithTag(BUTTON_POST_CAPTURE_SAVE).performClick()
 
             // Wait for video save success message
-            composeTestRule.waitForNodeWithTag(
-                SNACKBAR_POST_CAPTURE_VIDEO_SAVE_SUCCESS,
+            composeTestRule.waitForNodeWithText(
+                PostCaptureR.string.snackbar_save_video_success,
                 SAVE_MEDIA_TIMEOUT_MILLIS
             )
 
@@ -210,7 +209,10 @@ class PostCaptureTest {
         composeTestRule.waitForCaptureButton()
         assertThat(newImageMediaExists()).isFalse()
         composeTestRule.onNodeWithTag(CAPTURE_BUTTON).assertExists().performClick()
-        composeTestRule.waitForNodeWithTag(IMAGE_CAPTURE_SUCCESS_TAG, IMAGE_CAPTURE_TIMEOUT_MILLIS)
+        composeTestRule.waitForNodeWithText(
+            StateR.string.toast_image_capture_success,
+            IMAGE_CAPTURE_TIMEOUT_MILLIS
+        )
         assertThat(newImageMediaExists()).isTrue()
         // enter postcapture via imagewell and delete recent capture
         enterImageWellAndDelete(VIEWER_POST_CAPTURE_IMAGE)
@@ -227,7 +229,10 @@ class PostCaptureTest {
         assertThat(newVideoMediaExists()).isFalse()
         composeTestRule.longClickForVideoRecordingCheckingElapsedTime()
 
-        composeTestRule.waitForNodeWithTag(VIDEO_CAPTURE_SUCCESS_TAG, VIDEO_CAPTURE_TIMEOUT_MILLIS)
+        composeTestRule.waitForNodeWithText(
+            StateR.string.toast_video_capture_success,
+            VIDEO_CAPTURE_TIMEOUT_MILLIS
+        )
         assertThat(newVideoMediaExists()).isTrue()
         // enter postcapture via imagewell and delete recent capture
         enterImageWellAndDelete(VIEWER_POST_CAPTURE_VIDEO)
@@ -242,14 +247,17 @@ class PostCaptureTest {
         composeTestRule.waitForCaptureButton()
         assertThat(newImageMediaExists()).isFalse()
         composeTestRule.onNodeWithTag(CAPTURE_BUTTON).assertExists().performClick()
-        composeTestRule.waitForNodeWithTag(IMAGE_CAPTURE_SUCCESS_TAG, IMAGE_CAPTURE_TIMEOUT_MILLIS)
+        composeTestRule.waitForNodeWithText(
+            StateR.string.toast_image_capture_success,
+            IMAGE_CAPTURE_TIMEOUT_MILLIS
+        )
         assertThat(newImageMediaExists()).isTrue()
         // enter postcapture via imagewell and save recent capture
         val newTimestamp = System.currentTimeMillis()
 
         enterImageWellAndSave(VIEWER_POST_CAPTURE_IMAGE)
-        composeTestRule.waitForNodeWithTag(
-            SNACKBAR_POST_CAPTURE_IMAGE_SAVE_SUCCESS,
+        composeTestRule.waitForNodeWithText(
+            PostCaptureR.string.snackbar_save_image_success,
             SAVE_MEDIA_TIMEOUT_MILLIS
         )
         composeTestRule.waitUntil(timeoutMillis = SAVE_MEDIA_TIMEOUT_MILLIS) {
@@ -264,13 +272,16 @@ class PostCaptureTest {
         assertThat(newVideoMediaExists()).isFalse()
         composeTestRule.longClickForVideoRecordingCheckingElapsedTime()
 
-        composeTestRule.waitForNodeWithTag(VIDEO_CAPTURE_SUCCESS_TAG, VIDEO_CAPTURE_TIMEOUT_MILLIS)
+        composeTestRule.waitForNodeWithText(
+            StateR.string.toast_video_capture_success,
+            VIDEO_CAPTURE_TIMEOUT_MILLIS
+        )
         assertThat(newVideoMediaExists()).isTrue()
         // enter postcapture via imagewell and save recent capture
         val newTimestamp = System.currentTimeMillis()
         enterImageWellAndSave(VIEWER_POST_CAPTURE_VIDEO)
-        composeTestRule.waitForNodeWithTag(
-            SNACKBAR_POST_CAPTURE_VIDEO_SAVE_SUCCESS,
+        composeTestRule.waitForNodeWithText(
+            PostCaptureR.string.snackbar_save_video_success,
             SAVE_MEDIA_TIMEOUT_MILLIS
         )
         composeTestRule.waitUntil(timeoutMillis = VIDEO_CAPTURE_TIMEOUT_MILLIS) {