Skip to content

Commit c145451

Browse files
david-livefrontdavid-livefront
authored
PM-21879: Move SpanStyleUtil and StringResExtensions to UI module (#5238)
1 parent d1a8cbf commit c145451

File tree

63 files changed

+125
-131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+125
-131
lines changed

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ import androidx.hilt.navigation.compose.hiltViewModel
3232
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3333
import com.bitwarden.ui.platform.base.util.EventsEffect
3434
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
35+
import com.bitwarden.ui.platform.base.util.toAnnotatedString
3536
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
3637
import com.bitwarden.ui.platform.theme.BitwardenTheme
3738
import com.x8bit.bitwarden.R
3839
import com.x8bit.bitwarden.ui.auth.feature.checkemail.handlers.rememberCheckEmailHandler
39-
import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
4040
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
4141
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton
4242
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenOutlinedButton

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
3535
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3636
import com.bitwarden.ui.platform.base.util.EventsEffect
3737
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
38+
import com.bitwarden.ui.platform.base.util.toAnnotatedString
3839
import com.bitwarden.ui.platform.components.model.CardStyle
3940
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
4041
import com.bitwarden.ui.platform.theme.BitwardenTheme
@@ -54,7 +55,6 @@ import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.Sub
5455
import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.TermsClick
5556
import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountEvent.NavigateToPrivacyPolicy
5657
import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountEvent.NavigateToTerms
57-
import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
5858
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
5959
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenTextButton
6060
import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenBasicDialog

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordguidance/MasterPasswordGuidanceScreen.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import com.bitwarden.ui.platform.base.util.toAnnotatedString
2828
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
2929
import com.bitwarden.ui.platform.theme.BitwardenTheme
3030
import com.x8bit.bitwarden.R
31-
import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
3231
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
3332
import com.x8bit.bitwarden.ui.platform.components.card.BitwardenActionCard
3433
import com.x8bit.bitwarden.ui.platform.components.card.BitwardenContentCard

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
4444
import com.bitwarden.data.repository.model.Environment
4545
import com.bitwarden.ui.platform.base.util.EventsEffect
4646
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
47+
import com.bitwarden.ui.platform.base.util.toAnnotatedString
4748
import com.bitwarden.ui.platform.components.model.CardStyle
4849
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
4950
import com.bitwarden.ui.platform.theme.BitwardenTheme
@@ -53,7 +54,6 @@ import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationEv
5354
import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationEvent.NavigateToTerms
5455
import com.x8bit.bitwarden.ui.auth.feature.startregistration.handlers.StartRegistrationHandler
5556
import com.x8bit.bitwarden.ui.auth.feature.startregistration.handlers.rememberStartRegistrationHandler
56-
import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
5757
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
5858
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton
5959
import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenBasicDialog

‎app/src/main/java/com/x8bit/bitwarden/ui/platform/components/text/BitwardenHyperTextLink.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import androidx.compose.ui.semantics.customActions
1010
import androidx.compose.ui.semantics.semantics
1111
import androidx.compose.ui.text.TextStyle
1212
import androidx.compose.ui.text.style.TextAlign
13+
import com.bitwarden.ui.platform.base.util.spanStyleOf
14+
import com.bitwarden.ui.platform.base.util.toAnnotatedString
1315
import com.bitwarden.ui.platform.theme.BitwardenTheme
14-
import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
15-
import com.x8bit.bitwarden.ui.platform.util.spanStyleOf
1616

1717
/**
1818
* Uses an annotated string resource to create a string with clickable text.

‎app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,12 @@ import androidx.hilt.navigation.compose.hiltViewModel
3939
import androidx.lifecycle.compose.collectAsStateWithLifecycle
4040
import com.bitwarden.annotation.OmitFromCoverage
4141
import com.bitwarden.ui.platform.base.util.EventsEffect
42+
import com.bitwarden.ui.platform.base.util.bitwardenBoldSpanStyle
4243
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
4344
import com.bitwarden.ui.platform.base.util.toAnnotatedString
4445
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
4546
import com.bitwarden.ui.platform.theme.BitwardenTheme
4647
import com.x8bit.bitwarden.R
47-
import com.x8bit.bitwarden.ui.platform.base.util.bitwardenBoldSpanStyle
48-
import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
4948
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
5049
import com.x8bit.bitwarden.ui.platform.components.appbar.NavigationIcon
5150
import com.x8bit.bitwarden.ui.platform.components.bottomsheet.BitwardenModalBottomSheet

‎app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
2323
import com.bitwarden.ui.platform.base.util.toAnnotatedString
2424
import com.bitwarden.ui.platform.theme.BitwardenTheme
2525
import com.x8bit.bitwarden.R
26-
import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
2726
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton
2827
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenOutlinedButton
2928
import com.x8bit.bitwarden.ui.platform.components.card.BitwardenContentCard

‎app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/QrCodeScanScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ import androidx.core.content.ContextCompat
5252
import androidx.hilt.navigation.compose.hiltViewModel
5353
import androidx.lifecycle.compose.LocalLifecycleOwner
5454
import com.bitwarden.ui.platform.base.util.EventsEffect
55+
import com.bitwarden.ui.platform.base.util.toAnnotatedString
5556
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
5657
import com.bitwarden.ui.platform.model.WindowSize
5758
import com.bitwarden.ui.platform.theme.BitwardenTheme
5859
import com.bitwarden.ui.platform.theme.LocalBitwardenColorScheme
5960
import com.bitwarden.ui.platform.theme.color.darkBitwardenColorScheme
6061
import com.bitwarden.ui.platform.util.rememberWindowSize
6162
import com.x8bit.bitwarden.R
62-
import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
6363
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
6464
import com.x8bit.bitwarden.ui.platform.components.scaffold.BitwardenScaffold
6565
import com.x8bit.bitwarden.ui.vault.feature.qrcodescan.util.QrCodeAnalyzer

‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import androidx.compose.ui.test.onNodeWithText
1010
import androidx.compose.ui.test.performClick
1111
import androidx.compose.ui.test.performScrollTo
1212
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
13+
import com.bitwarden.ui.util.assertNoDialogExists
1314
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
1415
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
15-
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
1616
import io.mockk.every
1717
import io.mockk.mockk
1818
import io.mockk.verify

‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import androidx.compose.ui.test.performScrollTo
1616
import androidx.compose.ui.test.performTextInput
1717
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
1818
import com.bitwarden.ui.util.asText
19+
import com.bitwarden.ui.util.assertNoDialogExists
1920
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
2021
import com.x8bit.bitwarden.ui.platform.components.toggle.UnlockWithPinState
2122
import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricSupportStatus
2223
import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricsManager
23-
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
2424
import io.mockk.every
2525
import io.mockk.just
2626
import io.mockk.mockk

‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import androidx.compose.ui.test.performTextInput
1818
import androidx.core.net.toUri
1919
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
2020
import com.bitwarden.ui.util.asText
21+
import com.bitwarden.ui.util.performCustomAccessibilityAction
2122
import com.x8bit.bitwarden.ui.auth.feature.completeregistration.PasswordStrengthState
2223
import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.AcceptPoliciesToggle
2324
import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.CheckDataBreachesToggle
@@ -29,7 +30,6 @@ import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.Pas
2930
import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.SubmitClick
3031
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
3132
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
32-
import com.x8bit.bitwarden.ui.util.performCustomAccessibilityAction
3333
import io.mockk.every
3434
import io.mockk.just
3535
import io.mockk.mockk

‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import androidx.compose.ui.test.performClick
1414
import androidx.compose.ui.test.performTextInput
1515
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
1616
import com.bitwarden.ui.util.asText
17+
import com.bitwarden.ui.util.assertNoDialogExists
1718
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
1819
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
19-
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
2020
import io.mockk.every
2121
import io.mockk.just
2222
import io.mockk.mockk

‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import androidx.compose.ui.test.performTextInput
1919
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
2020
import com.bitwarden.data.repository.model.Environment
2121
import com.bitwarden.ui.util.asText
22+
import com.bitwarden.ui.util.assertNoDialogExists
2223
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
2324
import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary
2425
import com.x8bit.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed
2526
import com.x8bit.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed
26-
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
2727
import com.x8bit.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed
2828
import com.x8bit.bitwarden.ui.util.assertSwitcherIsDisplayed
2929
import com.x8bit.bitwarden.ui.util.assertSwitcherIsNotDisplayed

‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import androidx.compose.ui.test.performClick
1515
import androidx.compose.ui.test.performScrollTo
1616
import androidx.compose.ui.test.performTextInput
1717
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
18+
import com.bitwarden.ui.util.assertNoDialogExists
1819
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
1920
import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary
2021
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
2122
import com.x8bit.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed
2223
import com.x8bit.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed
23-
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
2424
import com.x8bit.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed
2525
import com.x8bit.bitwarden.ui.util.assertSwitcherIsDisplayed
2626
import com.x8bit.bitwarden.ui.util.assertSwitcherIsNotDisplayed

‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceScreenTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import androidx.compose.ui.test.performClick
1212
import androidx.compose.ui.test.performScrollTo
1313
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
1414
import com.bitwarden.ui.util.asText
15+
import com.bitwarden.ui.util.assertNoDialogExists
16+
import com.bitwarden.ui.util.isProgressBar
1517
import com.x8bit.bitwarden.R
1618
import com.x8bit.bitwarden.ui.auth.feature.loginwithdevice.model.LoginWithDeviceType
1719
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
1820
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
19-
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
20-
import com.x8bit.bitwarden.ui.util.isProgressBar
2121
import io.mockk.every
2222
import io.mockk.just
2323
import io.mockk.mockk

‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordhint/MasterPasswordHintScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import androidx.compose.ui.test.performClick
66
import androidx.compose.ui.test.performTextReplacement
77
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
88
import com.bitwarden.ui.util.asText
9+
import com.bitwarden.ui.util.assertNoDialogExists
910
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
10-
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
1111
import io.mockk.every
1212
import io.mockk.mockk
1313
import io.mockk.verify

‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import androidx.compose.ui.test.performClick
1414
import androidx.compose.ui.test.performScrollTo
1515
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
1616
import com.bitwarden.ui.util.asText
17+
import com.bitwarden.ui.util.assertNoDialogExists
1718
import com.x8bit.bitwarden.R
1819
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
19-
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
2020
import io.mockk.every
2121
import io.mockk.just
2222
import io.mockk.mockk

‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/resetPassword/ResetPasswordScreenTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import androidx.compose.ui.test.performClick
1313
import androidx.compose.ui.test.performTextInput
1414
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
1515
import com.bitwarden.ui.util.asText
16+
import com.bitwarden.ui.util.assertNoDialogExists
17+
import com.bitwarden.ui.util.performCustomAccessibilityAction
1618
import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetReason
1719
import com.x8bit.bitwarden.ui.auth.feature.completeregistration.PasswordStrengthState
1820
import com.x8bit.bitwarden.ui.auth.feature.resetpassword.ResetPasswordAction
@@ -21,8 +23,6 @@ import com.x8bit.bitwarden.ui.auth.feature.resetpassword.ResetPasswordScreen
2123
import com.x8bit.bitwarden.ui.auth.feature.resetpassword.ResetPasswordState
2224
import com.x8bit.bitwarden.ui.auth.feature.resetpassword.ResetPasswordViewModel
2325
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
24-
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
25-
import com.x8bit.bitwarden.ui.util.performCustomAccessibilityAction
2626
import io.mockk.every
2727
import io.mockk.mockk
2828
import io.mockk.verify

‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/setpassword/SetPasswordScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import androidx.compose.ui.test.performClick
1111
import androidx.compose.ui.test.performTextInput
1212
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
1313
import com.bitwarden.ui.util.asText
14+
import com.bitwarden.ui.util.assertNoDialogExists
1415
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
15-
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
1616
import io.mockk.every
1717
import io.mockk.mockk
1818
import io.mockk.verify

‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import androidx.core.net.toUri
1515
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
1616
import com.bitwarden.data.repository.model.Environment
1717
import com.bitwarden.ui.util.asText
18+
import com.bitwarden.ui.util.performCustomAccessibilityAction
1819
import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationAction.CloseClick
1920
import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationAction.EmailInputChange
2021
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
2122
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
22-
import com.x8bit.bitwarden.ui.util.performCustomAccessibilityAction
2323
import io.mockk.every
2424
import io.mockk.just
2525
import io.mockk.mockk

‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/trusteddevice/TrustedDeviceScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import androidx.compose.ui.test.performClick
1212
import androidx.compose.ui.test.performScrollTo
1313
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
1414
import com.bitwarden.ui.util.asText
15+
import com.bitwarden.ui.util.assertNoDialogExists
1516
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
16-
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
1717
import io.mockk.every
1818
import io.mockk.mockk
1919
import io.mockk.verify

‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import androidx.compose.ui.test.performTextInput
2020
import androidx.compose.ui.test.requestFocus
2121
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
2222
import com.bitwarden.ui.util.asText
23+
import com.bitwarden.ui.util.assertNoDialogExists
2324
import com.x8bit.bitwarden.R
2425
import com.x8bit.bitwarden.data.auth.repository.model.VaultUnlockType
2526
import com.x8bit.bitwarden.data.util.advanceTimeByAndRunCurrent
@@ -31,7 +32,6 @@ import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary
3132
import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricsManager
3233
import com.x8bit.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed
3334
import com.x8bit.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed
34-
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
3535
import com.x8bit.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed
3636
import com.x8bit.bitwarden.ui.util.assertSwitcherIsDisplayed
3737
import com.x8bit.bitwarden.ui.util.assertSwitcherIsNotDisplayed

‎app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchScreenTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ import androidx.core.net.toUri
2020
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
2121
import com.bitwarden.send.SendType
2222
import com.bitwarden.ui.util.asText
23+
import com.bitwarden.ui.util.assertMasterPasswordDialogDisplayed
24+
import com.bitwarden.ui.util.assertNoDialogExists
25+
import com.bitwarden.ui.util.isProgressBar
2326
import com.bitwarden.vault.CipherType
2427
import com.x8bit.bitwarden.data.platform.manager.util.AppResumeStateManager
2528
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
@@ -31,9 +34,6 @@ import com.x8bit.bitwarden.ui.tools.feature.send.addedit.AddEditSendRoute
3134
import com.x8bit.bitwarden.ui.tools.feature.send.addedit.ModeType
3235
import com.x8bit.bitwarden.ui.tools.feature.send.model.SendItemType
3336
import com.x8bit.bitwarden.ui.tools.feature.send.viewsend.ViewSendRoute
34-
import com.x8bit.bitwarden.ui.util.assertMasterPasswordDialogDisplayed
35-
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
36-
import com.x8bit.bitwarden.ui.util.isProgressBar
3737
import com.x8bit.bitwarden.ui.vault.feature.addedit.VaultAddEditArgs
3838
import com.x8bit.bitwarden.ui.vault.feature.item.VaultItemArgs
3939
import com.x8bit.bitwarden.ui.vault.feature.itemlisting.model.ListingItemOverflowAction

‎app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensionsTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.x8bit.bitwarden.ui.platform.feature.search.util
22

33
import android.net.Uri
44
import com.bitwarden.send.SendView
5+
import com.bitwarden.ui.util.asText
56
import com.bitwarden.vault.CipherRepromptType
67
import com.bitwarden.vault.CipherType
78
import com.bitwarden.vault.CipherView
@@ -11,7 +12,6 @@ import com.x8bit.bitwarden.R
1112
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView
1213
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSdkFido2CredentialList
1314
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView
14-
import com.bitwarden.ui.util.asText
1515
import com.x8bit.bitwarden.ui.platform.feature.search.SearchState
1616
import com.x8bit.bitwarden.ui.platform.feature.search.SearchTypeData
1717
import com.x8bit.bitwarden.ui.platform.feature.search.model.AutofillSelectionOption

‎app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ import androidx.compose.ui.test.performTextInput
2121
import androidx.core.net.toUri
2222
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
2323
import com.bitwarden.ui.util.asText
24+
import com.bitwarden.ui.util.assertNoDialogExists
2425
import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeout
2526
import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction
2627
import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest
2728
import com.x8bit.bitwarden.ui.platform.components.toggle.UnlockWithPinState
2829
import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricSupportStatus
2930
import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricsManager
3031
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
31-
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
3232
import io.mockk.coEvery
3333
import io.mockk.every
3434
import io.mockk.just

0 commit comments

Comments
 (0)