From 7e344fb7002b9e143f39a6dfeb40a550c9081a18 Mon Sep 17 00:00:00 2001 From: David Perez Date: Tue, 12 Mar 2024 15:53:54 -0500 Subject: [PATCH] BIT-1971: Add remaining appbar and fab test tags (#1128) --- .../ui/platform/components/appbar/BitwardenTopAppBar.kt | 1 + .../settings/autofill/blockautofill/BlockAutoFillScreen.kt | 3 +++ .../ui/platform/feature/settings/folders/FoldersScreen.kt | 6 +++++- .../com/x8bit/bitwarden/ui/tools/feature/send/SendScreen.kt | 3 +++ .../bitwarden/ui/vault/feature/item/VaultItemScreen.kt | 4 +++- .../ui/vault/feature/itemlisting/VaultItemListingScreen.kt | 3 +++ .../x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt | 3 +++ 7 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/BitwardenTopAppBar.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/BitwardenTopAppBar.kt index a7cbc209e2..9eaedcced9 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/BitwardenTopAppBar.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/BitwardenTopAppBar.kt @@ -105,6 +105,7 @@ fun BitwardenTopAppBar( maxLines = 1, softWrap = false, overflow = TextOverflow.Ellipsis, + modifier = Modifier.semantics { testTag = "PageTitleLabel" }, ) }, modifier = modifier.semantics { testTag = "HeaderBarComponent" }, diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreen.kt index 948782b1b0..760f571ef9 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreen.kt @@ -36,6 +36,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll 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.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -136,6 +138,7 @@ fun BlockAutoFillScreen( onClick = remember(viewModel) { { viewModel.trySendAction(BlockAutoFillAction.AddUriClick) } }, + modifier = Modifier.semantics { testTag = "AddItemButton" }, ) { Icon( painter = painterResource(id = R.drawable.ic_plus), 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 d5486b45ea..b0a30ac1aa 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 @@ -28,6 +28,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.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -90,7 +92,9 @@ fun FoldersScreen( onClick = remember(viewModel) { { viewModel.trySendAction(FoldersAction.AddFolderButtonClick) } }, - modifier = Modifier.navigationBarsPadding(), + modifier = Modifier + .semantics { testTag = "AddItemButton" } + .navigationBarsPadding(), ) { Icon( painter = painterResource(id = R.drawable.ic_plus), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendScreen.kt index 3720f70cf5..5fc36cd1e1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendScreen.kt @@ -23,6 +23,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 @@ -159,6 +161,7 @@ fun SendScreen( onClick = remember(viewModel) { { viewModel.trySendAction(SendAction.AddSendClick) } }, + modifier = Modifier.semantics { testTag = "AddItemButton" }, ) { Icon( painter = painterResource(id = R.drawable.ic_plus), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt index f8f4ff23cc..8611d1e7db 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt @@ -254,7 +254,9 @@ fun VaultItemScreen( onClick = remember(viewModel) { { viewModel.trySendAction(VaultItemAction.Common.EditClick) } }, - modifier = Modifier.padding(bottom = 16.dp), + modifier = Modifier + .semantics { testTag = "EditItemButton" } + .padding(bottom = 16.dp), ) { Icon( painter = painterResource(id = R.drawable.ic_edit), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt index d105889e49..e905b78e4a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt @@ -24,6 +24,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 com.x8bit.bitwarden.R @@ -227,6 +229,7 @@ private fun VaultItemListingScaffold( FloatingActionButton( containerColor = MaterialTheme.colorScheme.primaryContainer, onClick = vaultItemListingHandlers.addVaultItemClick, + modifier = Modifier.semantics { testTag = "AddItemButton" }, ) { Icon( painter = painterResource(id = R.drawable.ic_plus), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt index eb716ef908..caecfd42f5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt @@ -30,6 +30,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.compose.ui.unit.dp import androidx.core.net.toUri import androidx.hilt.navigation.compose.hiltViewModel @@ -252,6 +254,7 @@ private fun VaultScreenScaffold( FloatingActionButton( containerColor = MaterialTheme.colorScheme.primaryContainer, onClick = vaultHandlers.addItemClickAction, + modifier = Modifier.semantics { testTag = "AddItemButton" }, ) { Icon( painter = painterResource(id = R.drawable.ic_plus),