diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/BitwardenSearchTopAppBar.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/BitwardenSearchTopAppBar.kt index 6e0049490..34ea1eab0 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/BitwardenSearchTopAppBar.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/BitwardenSearchTopAppBar.kt @@ -84,6 +84,7 @@ fun BitwardenSearchTopAppBar( keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), modifier = Modifier .tabNavigation() + .testTag("SearchFieldEntry") .focusRequester(focusRequester) .fillMaxWidth(), ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/action/BitwardenOverflowActionItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/action/BitwardenOverflowActionItem.kt index 67a2a6a43..606a781b6 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/action/BitwardenOverflowActionItem.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/action/BitwardenOverflowActionItem.kt @@ -17,7 +17,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.semantics.testTag import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.DpOffset @@ -65,6 +64,7 @@ fun BitwardenOverflowActionItem( containerColor = BitwardenTheme.colorScheme.background.primary, modifier = Modifier .semantics { testTagsAsResourceId = true } + .testTag("FloatingOptionsContent") .widthIn( min = 112.dp, max = 280.dp, @@ -72,16 +72,13 @@ fun BitwardenOverflowActionItem( content = { menuItemDataList.forEach { dropdownMenuItemData -> DropdownMenuItem( - modifier = Modifier.semantics { - dropdownMenuItemData.testTag?.let { - testTag = it - } - }, + modifier = Modifier.testTag("FloatingOptionsItem"), colors = bitwardenMenuItemColors(), text = { Text( text = dropdownMenuItemData.text, style = BitwardenTheme.typography.bodyLarge, + modifier = Modifier.testTag("FloatingOptionsItemName"), ) }, onClick = { @@ -115,10 +112,8 @@ private fun BitwardenOverflowActionItem_preview() { * * @param text The text displayed for the item in the menu. * @param onClick A callback for when the menu item is clicked. - * @param testTag Optional test tag for the menu item. */ data class OverflowMenuItemData( val text: String, val onClick: () -> Unit, - val testTag: String? = null, ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/row/BitwardenSelectionRow.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/row/BitwardenSelectionRow.kt index 238eb53c2..5d3e5bfdc 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/row/BitwardenSelectionRow.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/row/BitwardenSelectionRow.kt @@ -11,6 +11,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.testTag import androidx.compose.ui.semantics.selected import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.dp @@ -35,6 +36,7 @@ fun BitwardenSelectionRow( Row( modifier = modifier .fillMaxWidth() + .testTag("AlertRadioButtonOption") .clickable( interactionSource = remember { MutableInteractionSource() }, indication = ripple( @@ -56,6 +58,7 @@ fun BitwardenSelectionRow( text = text(), color = BitwardenTheme.colorScheme.text.primary, style = BitwardenTheme.typography.bodyLarge, + modifier = Modifier.testTag("AlertRadioButtonOptionName"), ) } } diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/listitem/BitwardenListItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/listitem/BitwardenListItem.kt index 841c790e5..6597d10a2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/listitem/BitwardenListItem.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/listitem/BitwardenListItem.kt @@ -22,6 +22,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag @@ -167,7 +168,7 @@ fun BitwardenListItem( selectionItems = { selectionDataList.forEach { itemData -> BitwardenBasicDialogRow( - modifier = Modifier.semantics { itemData.testTag?.let { testTag = it } }, + modifier = Modifier.testTag("AlertSelectionOption"), text = itemData.text, onClick = { shouldShowDialog = false diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchScreen.kt index 97bf9584c..42bffa0d7 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchScreen.kt @@ -15,7 +15,6 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.core.net.toUri @@ -90,7 +89,6 @@ fun SearchScreen( navigationIconContentDescription = stringResource(id = R.string.back), onNavigationIconClick = searchHandlers.onBackClick, ), - modifier = Modifier.testTag(tag = "SearchFieldEntry"), ) }, modifier = Modifier diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryScreen.kt index 3abaa3723..9bb0b84fe 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryScreen.kt @@ -82,7 +82,6 @@ fun PasswordHistoryScreen( BitwardenOverflowActionItem( menuItemDataList = persistentListOf( OverflowMenuItemData( - testTag = "ClearPasswordList", text = stringResource(id = R.string.clear), onClick = remember(viewModel) { { diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendListItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendListItem.kt index c5080adb2..4d8856dc3 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendListItem.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendListItem.kt @@ -78,7 +78,6 @@ fun SendListItem( SelectionItemData( text = stringResource(id = R.string.copy_link), onClick = onCopyClick, - testTag = "Copy", ), SelectionItemData( text = stringResource(id = R.string.share_link), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt index d40429e9b..54f2859db 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt @@ -57,7 +57,7 @@ fun VaultContent( showDivider = true, modifier = Modifier .fillMaxWidth() - .testTag("FolderFilter") + .testTag("VerificationCodesFilter") .padding(16.dp), ) }