ToastMessage adjustments (#89)

* make ToastMessage take stringResource value instead of string. remove use of description to avoid conflict with accessibility reader

3 files changed, 15 insertions, 15 deletions

diff --git a/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/PreviewViewModel.kt b/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/PreviewViewModel.kt
index a41dc4a..7066977 100644
--- a/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/PreviewViewModel.kt
+++ b/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/PreviewViewModel.kt
@@ -38,8 +38,8 @@ import kotlinx.coroutines.launch
 private const val TAG = "PreviewViewModel"
 
 // toast test descriptions
-const val IMAGE_CAPTURE_SUCCESS_TOAST_DESC = "ImageCaptureSuccessToast"
-const val IMAGE_CAPTURE_FAIL_TOAST_DESC = "ImageCaptureFailureToast"
+const val IMAGE_CAPTURE_SUCCESS_TOAST_TAG = "ImageCaptureSuccessToast"
+const val IMAGE_CAPTURE_FAIL_TOAST_TAG = "ImageCaptureFailureToast"
 
 /**
  * [ViewModel] for [PreviewScreen].
@@ -201,8 +201,8 @@ class PreviewViewModel @Inject constructor(
                 _previewUiState.emit(
                     previewUiState.value.copy(
                         toastMessageToShow = ToastMessage(
-                            message = R.string.toast_image_capture_success.toString(),
-                            testDesc = IMAGE_CAPTURE_SUCCESS_TOAST_DESC
+                            stringResource = R.string.toast_image_capture_success,
+                            testTag = IMAGE_CAPTURE_SUCCESS_TOAST_TAG
                         )
                     )
                 )
@@ -212,8 +212,8 @@ class PreviewViewModel @Inject constructor(
                 _previewUiState.emit(
                     previewUiState.value.copy(
                         toastMessageToShow = ToastMessage(
-                            message = R.string.toast_capture_failure.toString(),
-                            testDesc = IMAGE_CAPTURE_FAIL_TOAST_DESC
+                            stringResource = R.string.toast_capture_failure,
+                            testTag = IMAGE_CAPTURE_FAIL_TOAST_TAG
                         )
                     )
                 )
diff --git a/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt b/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt
index d92acb6..f863c1b 100644
--- a/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt
+++ b/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt
@@ -54,7 +54,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.contentDescription
-import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.google.jetpackcamera.feature.preview.R
@@ -76,9 +75,12 @@ fun ShowToast(modifier: Modifier = Modifier, toastMessage: ToastMessage, onToast
     Box(
         modifier
             .testTag(toastMessage.testTag)
-            .semantics { contentDescription = toastMessage.testDesc }
     ) {
-        Toast.makeText(LocalContext.current, toastMessage.message, toastMessage.toastLength).show()
+        Toast.makeText(
+            LocalContext.current,
+            stringResource(id = toastMessage.stringResource),
+            toastMessage.toastLength
+        ).show()
         onToastShown()
     }
 }
diff --git a/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/ToastMessage.kt b/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/ToastMessage.kt
index bc418d2..f86a8dd 100644
--- a/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/ToastMessage.kt
+++ b/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/ui/ToastMessage.kt
@@ -20,17 +20,15 @@ import android.widget.Toast
 /**
  * Helper class containing information used to create a [Toast].
  *
- * @param message the text to be displayed.
+ * @param stringResource the resource ID of to be displayed.
  * @param isLongToast determines if the display time is [Toast.LENGTH_LONG] or [Toast.LENGTH_SHORT].
- * @param testDesc the *unique* description to identify a specific toast message.
- * @property testTag the identifiable resource ID of a Toast on screen.
+ * @property testTag the identifiable resource ID of a [ShowToast] on screen.
  */
 class ToastMessage(
-    val message: String,
+    val stringResource: Int,
     isLongToast: Boolean = false,
-    val testDesc: String = "Toast Message"
+    val testTag: String = ""
 ) {
-    val testTag: String = "Toast Message"
     val toastLength: Int = when (isLongToast) {
         true -> Toast.LENGTH_LONG
         false -> Toast.LENGTH_SHORT