From 3f19401c6dfe760caeb438586655bce58fd681a4 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Tue, 12 Mar 2024 17:01:32 -0500
Subject: [PATCH] BIT-1992: Add test tags to the folders UI (#1130)

---
 .../ui/platform/feature/settings/folders/FoldersScreen.kt      | 3 +++
 .../bitwarden/ui/tools/feature/send/addsend/AddSendScreen.kt   | 3 +++
 .../bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt   | 3 +++
 .../ui/vault/feature/attachments/AttachmentsScreen.kt          | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersScreen.kt
index b0a30ac1a..ae45d3da9 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersScreen.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersScreen.kt
@@ -154,6 +154,7 @@ private fun FoldersContent(
                 textAlign = TextAlign.Center,
                 style = MaterialTheme.typography.bodyMedium,
                 color = MaterialTheme.colorScheme.onSurface,
+                modifier = Modifier.semantics { testTag = "NoFoldersLabel" },
             )
         }
     } else {
@@ -163,6 +164,7 @@ private fun FoldersContent(
             items(foldersList) {
                 Row(
                     modifier = Modifier
+                        .semantics { testTag = "FolderCell" }
                         .clickable(
                             interactionSource = remember { MutableInteractionSource() },
                             indication = rememberRipple(color = MaterialTheme.colorScheme.primary),
@@ -176,6 +178,7 @@ private fun FoldersContent(
                 ) {
                     Text(
                         modifier = Modifier
+                            .semantics { testTag = "FolderName" }
                             .padding(start = 16.dp)
                             .weight(1f),
                         text = it.name,
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreen.kt
index b3ed6e84e..9f8b8a0cc 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreen.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreen.kt
@@ -19,6 +19,8 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.x8bit.bitwarden.R
@@ -144,6 +146,7 @@ fun AddSendScreen(
                         onClick = remember(viewModel) {
                             { viewModel.trySendAction(AddSendAction.SaveClick) }
                         },
+                        modifier = Modifier.semantics { testTag = "SaveButton" },
                     )
                     if (!state.isAddMode) {
                         BitwardenOverflowActionItem(
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt
index 1f752f741..efe3fb82b 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt
@@ -18,6 +18,8 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
 import androidx.core.net.toUri
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -180,6 +182,7 @@ fun VaultAddEditScreen(
                         onClick = remember(viewModel) {
                             { viewModel.trySendAction(VaultAddEditAction.Common.SaveClick) }
                         },
+                        modifier = Modifier.semantics { testTag = "SaveButton" },
                     )
                     BitwardenOverflowActionItem(
                         menuItemDataList = persistentListOfNotNull(
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsScreen.kt
index 593149429..2c3910e6e 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsScreen.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsScreen.kt
@@ -14,6 +14,8 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.x8bit.bitwarden.R
@@ -92,6 +94,7 @@ fun AttachmentsScreen(
                     BitwardenTextButton(
                         label = stringResource(id = R.string.save),
                         onClick = attachmentsHandlers.onSaveClick,
+                        modifier = Modifier.semantics { testTag = "SaveButton" },
                     )
                 },
             )