diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt index 9b35e6874..7ab34151d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt @@ -32,7 +32,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext @@ -42,7 +41,6 @@ import androidx.compose.ui.semantics.CustomAccessibilityAction import androidx.compose.ui.semantics.customActions import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag -import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.semantics.toggleableState import androidx.compose.ui.state.ToggleableState import androidx.compose.ui.text.buildAnnotatedString @@ -85,7 +83,7 @@ import com.x8bit.bitwarden.ui.platform.theme.clickableSpanStyle /** * Top level composable for the create account screen. */ -@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class) +@OptIn(ExperimentalMaterial3Api::class) @Suppress("LongMethod") @Composable fun CreateAccountScreen( @@ -193,7 +191,6 @@ fun CreateAccountScreen( ) { innerPadding -> Column( modifier = Modifier - .semantics { testTagsAsResourceId = true } .padding(innerPadding) .imePadding() .fillMaxSize() diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt index bed82d0e9..6ceb48d68 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt @@ -18,13 +18,10 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi 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.testTagsAsResourceId import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -135,7 +132,6 @@ fun EnterpriseSignOnScreen( } } -@OptIn(ExperimentalComposeUiApi::class) @Composable private fun EnterpriseSignOnScreenContent( state: EnterpriseSignOnState, @@ -145,7 +141,6 @@ private fun EnterpriseSignOnScreenContent( Column( horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier - .semantics { testTagsAsResourceId = true } .imePadding() .verticalScroll(rememberScrollState()) .fillMaxWidth(), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreen.kt index fd4cf3005..9bc527893 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreen.kt @@ -17,7 +17,6 @@ import androidx.compose.material3.rememberTopAppBarState import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.remember -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext @@ -25,7 +24,6 @@ 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.semantics.testTagsAsResourceId import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -45,7 +43,7 @@ import com.x8bit.bitwarden.ui.platform.components.BitwardenTopAppBar * Displays the about self-hosted/custom environment screen. */ @Suppress("LongMethod") -@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class) +@OptIn(ExperimentalMaterial3Api::class) @Composable fun EnvironmentScreen( onNavigateBack: () -> Unit, @@ -103,7 +101,6 @@ fun EnvironmentScreen( ) { innerPadding -> Column( Modifier - .semantics { testTagsAsResourceId = true } .padding(innerPadding) .fillMaxSize() .imePadding() diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt index 600446ffe..65961bcdd 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt @@ -30,7 +30,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.input.nestedscroll.nestedScroll @@ -38,7 +37,6 @@ 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.semantics.testTagsAsResourceId import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @@ -204,7 +202,6 @@ fun LandingScreen( } @Suppress("LongMethod") -@OptIn(ExperimentalComposeUiApi::class) @Composable private fun LandingScreenContent( state: LandingState, @@ -219,7 +216,6 @@ private fun LandingScreenContent( Column( horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier - .semantics { testTagsAsResourceId = true } .imePadding() .verticalScroll(rememberScrollState()), ) { diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt index e65016e44..604504828 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt @@ -24,7 +24,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext @@ -32,7 +31,6 @@ 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.semantics.testTagsAsResourceId import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -191,7 +189,6 @@ fun LoginScreen( } @Suppress("LongMethod", "LongParameterList") -@OptIn(ExperimentalComposeUiApi::class) @Composable private fun LoginScreenContent( state: LoginState, @@ -207,7 +204,6 @@ private fun LoginScreenContent( Column( horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier - .semantics { testTagsAsResourceId = true } .imePadding() .verticalScroll(rememberScrollState()), ) { diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceScreen.kt index 4d3c955bf..3b5bc9fd5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceScreen.kt @@ -23,7 +23,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext @@ -31,7 +30,6 @@ 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.semantics.testTagsAsResourceId import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -131,7 +129,6 @@ fun LoginWithDeviceScreen( } @Suppress("LongMethod") -@OptIn(ExperimentalComposeUiApi::class) @Composable private fun LoginWithDeviceScreenContent( state: LoginWithDeviceState.ViewState.Content, @@ -142,7 +139,6 @@ private fun LoginWithDeviceScreenContent( Column( horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier - .semantics { testTagsAsResourceId = true } .imePadding() .verticalScroll(rememberScrollState()), ) { diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/resetpassword/ResetPasswordScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/resetpassword/ResetPasswordScreen.kt index ae5c81afe..b2adaaed7 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/resetpassword/ResetPasswordScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/resetpassword/ResetPasswordScreen.kt @@ -19,13 +19,11 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll 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.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -144,7 +142,6 @@ fun ResetPasswordScreen( } } -@OptIn(ExperimentalComposeUiApi::class) @Composable @Suppress("LongMethod") private fun ResetPasswordScreeContent( @@ -158,7 +155,6 @@ private fun ResetPasswordScreeContent( Column( horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier - .semantics { testTagsAsResourceId = true } .imePadding() .verticalScroll(rememberScrollState()), ) { diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt index ac65c7f66..47f2092ce 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt @@ -19,14 +19,11 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier 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.testTagsAsResourceId import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @@ -166,7 +163,6 @@ fun TwoFactorLoginScreen( } } -@OptIn(ExperimentalComposeUiApi::class) @Composable @Suppress("LongMethod") private fun TwoFactorLoginScreenContent( @@ -180,7 +176,6 @@ private fun TwoFactorLoginScreenContent( Column( horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier - .semantics { testTagsAsResourceId = true } .imePadding() .verticalScroll(rememberScrollState()), ) { diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreen.kt index 6d5cb69ec..20ac15bab 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreen.kt @@ -22,14 +22,12 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext 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.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -64,7 +62,7 @@ import kotlinx.collections.immutable.toImmutableList /** * The top level composable for the Vault Unlock screen. */ -@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class) +@OptIn(ExperimentalMaterial3Api::class) @Suppress("LongMethod") @Composable fun VaultUnlockScreen( @@ -133,7 +131,6 @@ fun VaultUnlockScreen( BitwardenScaffold( modifier = Modifier .fillMaxSize() - .semantics { testTagsAsResourceId = true } .nestedScroll(scrollBehavior.nestedScrollConnection), topBar = { BitwardenTopAppBar( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenAccountSwitcher.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenAccountSwitcher.kt index acfa32f3b..254e71bc1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenAccountSwitcher.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenAccountSwitcher.kt @@ -34,14 +34,12 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag -import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.unit.dp import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.platform.base.util.lowercaseWithCurrentLocal @@ -88,7 +86,7 @@ private const val MAXIMUM_ACCOUNT_LIMIT = 5 * @param topAppBarScrollBehavior Used to derive the background color of the content and keep it in * sync with the associated app bar. */ -@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class) +@OptIn(ExperimentalMaterial3Api::class) @Suppress("LongMethod") @Composable fun BitwardenAccountSwitcher( @@ -141,7 +139,7 @@ fun BitwardenAccountSwitcher( } } - Box(modifier = modifier.semantics { testTagsAsResourceId = true }) { + Box(modifier = modifier) { BitwardenAnimatedScrim( isVisible = isVisible, onClick = onDismissRequest, diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenScaffold.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenScaffold.kt index 2f80bcad9..3a6dea9a9 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenScaffold.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenScaffold.kt @@ -16,15 +16,18 @@ import androidx.compose.material3.pulltorefresh.PullToRefreshContainer import androidx.compose.material3.pulltorefresh.PullToRefreshState import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment +import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.semantics.testTagsAsResourceId /** * Direct passthrough to [Scaffold] but contains a few specific override values. Everything is * still overridable if necessary. */ -@OptIn(ExperimentalMaterial3Api::class) +@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class) @Composable fun BitwardenScaffold( modifier: Modifier = Modifier, @@ -43,6 +46,7 @@ fun BitwardenScaffold( ) { Scaffold( modifier = Modifier + .semantics { testTagsAsResourceId = true } .run { pullToRefreshState?.let { nestedScroll(it.nestedScrollConnection) } ?: this } .then(modifier), topBar = topBar, 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 31930c02f..47a2e021c 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 @@ -12,7 +12,6 @@ import androidx.compose.material3.rememberTopAppBarState import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.remember -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext @@ -20,7 +19,6 @@ 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.semantics.testTagsAsResourceId import androidx.compose.ui.unit.dp import androidx.core.net.toUri import androidx.hilt.navigation.compose.hiltViewModel @@ -47,7 +45,7 @@ import kotlinx.collections.immutable.toImmutableList * The search UI for vault items or send items. */ @Suppress("LongMethod") -@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class) +@OptIn(ExperimentalMaterial3Api::class) @Composable fun SearchScreen( onNavigateBack: () -> Unit, @@ -100,7 +98,6 @@ fun SearchScreen( ) }, modifier = Modifier - .semantics { testTagsAsResourceId = true } .nestedScroll(scrollBehavior.nestedScrollConnection), ) { innerPadding -> Column( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalScreen.kt index 5b673c020..aa3e05895 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalScreen.kt @@ -20,7 +20,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.remember -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext @@ -28,7 +27,6 @@ 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.semantics.testTagsAsResourceId import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -145,7 +143,6 @@ fun LoginApprovalScreen( } } -@OptIn(ExperimentalComposeUiApi::class) @Suppress("LongMethod") @Composable private fun LoginApprovalContent( @@ -156,7 +153,6 @@ private fun LoginApprovalContent( ) { Column( modifier = modifier - .semantics { testTagsAsResourceId = true } .verticalScroll(state = rememberScrollState()), ) { Spacer(modifier = Modifier.height(8.dp)) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt index 0f5cee2db..29dc61a9e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt @@ -32,7 +32,6 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.layout.onGloballyPositioned @@ -42,7 +41,6 @@ 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.semantics.testTagsAsResourceId import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp @@ -289,7 +287,6 @@ private fun ModalAppBar( //region ScrollContent and Static Items -@OptIn(ExperimentalComposeUiApi::class) @Suppress("LongMethod") @Composable private fun ScrollContent( @@ -310,7 +307,6 @@ private fun ScrollContent( ) { Column( modifier = modifier - .semantics { testTagsAsResourceId = true } .fillMaxHeight() .verticalScroll(rememberScrollState()), ) { 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 22e20c84c..a9cc91444 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 @@ -23,7 +23,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext @@ -31,7 +30,6 @@ 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.semantics.testTagsAsResourceId import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -47,7 +45,7 @@ import kotlinx.collections.immutable.persistentListOf * Displays the password history screen */ @Suppress("LongMethod") -@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class) +@OptIn(ExperimentalMaterial3Api::class) @Composable fun PasswordHistoryScreen( onNavigateBack: () -> Unit, @@ -70,7 +68,6 @@ fun PasswordHistoryScreen( BitwardenScaffold( modifier = Modifier .fillMaxSize() - .semantics { testTagsAsResourceId = true } .nestedScroll(scrollBehavior.nestedScrollConnection), topBar = { BitwardenTopAppBar( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendEmpty.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendEmpty.kt index b0a99c893..03b6755cf 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendEmpty.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendEmpty.kt @@ -13,12 +13,10 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier 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.text.style.TextAlign import androidx.compose.ui.unit.dp import com.x8bit.bitwarden.R @@ -27,7 +25,6 @@ import com.x8bit.bitwarden.ui.platform.components.BitwardenPolicyWarningText /** * Content for the empty state of the [SendScreen]. */ -@OptIn(ExperimentalComposeUiApi::class) @Composable fun SendEmpty( policyDisablesSend: Boolean, @@ -37,7 +34,7 @@ fun SendEmpty( Column( verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, - modifier = modifier.semantics { testTagsAsResourceId = true }, + modifier = modifier, ) { if (policyDisablesSend) { BitwardenPolicyWarningText( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt index 13e25f29b..26beb9de4 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt @@ -27,14 +27,12 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clipToBounds 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.semantics.testTagsAsResourceId import androidx.compose.ui.unit.dp import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.platform.components.BitwardenFilledTonalButton @@ -54,7 +52,6 @@ import com.x8bit.bitwarden.ui.tools.feature.send.addsend.handlers.AddSendHandler /** * Content view for the [AddSendScreen]. */ -@OptIn(ExperimentalComposeUiApi::class) @Suppress("LongMethod") @Composable fun AddSendContent( @@ -73,7 +70,6 @@ fun AddSendContent( Column( modifier = modifier - .semantics { testTagsAsResourceId = true } .verticalScroll(rememberScrollState()), ) { if (policyDisablesSend) { diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditItemContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditItemContent.kt index cedb7a435..38fa52789 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditItemContent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditItemContent.kt @@ -8,11 +8,8 @@ import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.runtime.Composable -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.unit.dp import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.platform.components.BitwardenListHeaderText @@ -28,7 +25,6 @@ import kotlinx.collections.immutable.toImmutableList /** * The top level content UI state for the [VaultAddEditScreen]. */ -@OptIn(ExperimentalComposeUiApi::class) @Composable @Suppress("LongMethod") fun VaultAddEditContent( @@ -55,10 +51,7 @@ fun VaultAddEditContent( }, ) - LazyColumn( - modifier = modifier - .semantics { testTagsAsResourceId = true }, - ) { + LazyColumn(modifier = modifier) { item { if (state.isIndividualVaultDisabled && isAddItemMode) { BitwardenPolicyWarningText( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsContent.kt index 453a826b7..4cffbddbf 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsContent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsContent.kt @@ -21,13 +21,11 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier 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.semantics.testTagsAsResourceId import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp @@ -41,7 +39,6 @@ import com.x8bit.bitwarden.ui.vault.feature.attachments.handlers.AttachmentsHand /** * The top level content UI state for the [AttachmentsScreen] when viewing a content. */ -@OptIn(ExperimentalComposeUiApi::class) @Suppress("LongMethod") @Composable fun AttachmentsContent( @@ -49,10 +46,7 @@ fun AttachmentsContent( attachmentsHandlers: AttachmentsHandlers, modifier: Modifier = Modifier, ) { - LazyColumn( - modifier = modifier - .semantics { testTagsAsResourceId = true }, - ) { + LazyColumn(modifier = modifier) { if (viewState.attachments.isEmpty()) { item { Spacer(modifier = Modifier.height(8.dp))