diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt index 9cd0d63725..f7e9127fa3 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt @@ -38,6 +38,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.base.util.standardHorizontalMargin +import com.bitwarden.ui.platform.components.account.BitwardenAccountSwitcher +import com.bitwarden.ui.platform.components.account.BitwardenPlaceholderAccountActionItem import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar import com.bitwarden.ui.platform.components.button.BitwardenFilledButton import com.bitwarden.ui.platform.components.button.BitwardenTextButton @@ -53,8 +55,6 @@ import com.bitwarden.ui.platform.components.util.rememberVectorPainter import com.bitwarden.ui.platform.resource.BitwardenDrawable import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.platform.theme.BitwardenTheme -import com.x8bit.bitwarden.ui.platform.components.account.BitwardenAccountSwitcher -import com.x8bit.bitwarden.ui.platform.components.account.BitwardenPlaceholderAccountActionItem import com.x8bit.bitwarden.ui.platform.components.dropdown.EnvironmentSelector import kotlinx.collections.immutable.toImmutableList diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt index e7bae48e39..9331fa7b54 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt @@ -7,6 +7,7 @@ import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.platform.base.BackgroundEvent import com.bitwarden.ui.platform.base.BaseViewModel import com.bitwarden.ui.platform.base.util.isValidEmail +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.components.snackbar.BitwardenSnackbarData import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.util.Text @@ -16,7 +17,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.LogoutReason import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.vault.repository.VaultRepository -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelay import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelayManager import com.x8bit.bitwarden.ui.vault.feature.vault.util.toAccountSummaries diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt index a621a3e429..5965e834b5 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt @@ -32,6 +32,8 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.base.util.standardHorizontalMargin +import com.bitwarden.ui.platform.components.account.BitwardenAccountSwitcher +import com.bitwarden.ui.platform.components.account.BitwardenPlaceholderAccountActionItem import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar import com.bitwarden.ui.platform.components.appbar.action.BitwardenOverflowActionItem import com.bitwarden.ui.platform.components.appbar.model.OverflowMenuItemData @@ -48,8 +50,6 @@ import com.bitwarden.ui.platform.resource.BitwardenDrawable import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.platform.theme.BitwardenTheme import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.ui.platform.components.account.BitwardenAccountSwitcher -import com.x8bit.bitwarden.ui.platform.components.account.BitwardenPlaceholderAccountActionItem import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModel.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModel.kt index fb43c54d00..160e9a2640 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModel.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModel.kt @@ -7,6 +7,7 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import com.bitwarden.data.repository.util.baseWebVaultUrlOrDefault import com.bitwarden.ui.platform.base.BaseViewModel +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -17,7 +18,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.LogoutReason import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.util.toUriOrNull import com.x8bit.bitwarden.data.vault.repository.VaultRepository -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.vault.feature.vault.util.toAccountSummaries import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.update diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreen.kt index f8feade14c..d0d3168f44 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreen.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreen.kt @@ -36,6 +36,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.base.util.cardStyle import com.bitwarden.ui.platform.base.util.standardHorizontalMargin +import com.bitwarden.ui.platform.components.account.BitwardenAccountActionItem +import com.bitwarden.ui.platform.components.account.BitwardenAccountSwitcher +import com.bitwarden.ui.platform.components.account.dialog.BitwardenLogoutConfirmationDialog import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar import com.bitwarden.ui.platform.components.appbar.action.BitwardenOverflowActionItem import com.bitwarden.ui.platform.components.appbar.model.OverflowMenuItemData @@ -57,9 +60,6 @@ import com.x8bit.bitwarden.ui.auth.feature.vaultunlock.util.unlockScreenTitle import com.x8bit.bitwarden.ui.credentials.manager.CredentialProviderCompletionManager import com.x8bit.bitwarden.ui.credentials.manager.model.AssertFido2CredentialResult import com.x8bit.bitwarden.ui.credentials.manager.model.GetCredentialsResult -import com.x8bit.bitwarden.ui.platform.components.account.BitwardenAccountActionItem -import com.x8bit.bitwarden.ui.platform.components.account.BitwardenAccountSwitcher -import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenLogoutConfirmationDialog import com.x8bit.bitwarden.ui.platform.composition.LocalBiometricsManager import com.x8bit.bitwarden.ui.platform.composition.LocalCredentialProviderCompletionManager import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricsManager diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt index f0f4af298f..defa78ec50 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt @@ -7,6 +7,8 @@ import androidx.lifecycle.viewModelScope import com.bitwarden.ui.platform.base.BackgroundEvent import com.bitwarden.ui.platform.base.BaseViewModel import com.bitwarden.ui.platform.base.util.hexToColor +import com.bitwarden.ui.platform.components.account.model.AccountSummary +import com.bitwarden.ui.platform.components.account.util.initials import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -31,8 +33,6 @@ import com.x8bit.bitwarden.data.vault.repository.model.VaultUnlockResult import com.x8bit.bitwarden.ui.auth.feature.vaultunlock.model.UnlockType import com.x8bit.bitwarden.ui.auth.feature.vaultunlock.util.emptyInputDialogMessage import com.x8bit.bitwarden.ui.auth.feature.vaultunlock.util.unlockScreenErrorMessage -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary -import com.x8bit.bitwarden.ui.vault.feature.vault.util.initials import com.x8bit.bitwarden.ui.vault.feature.vault.util.toAccountSummaries import com.x8bit.bitwarden.ui.vault.feature.vault.util.toActiveAccountSummary import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt index 6176d85ef4..4ae216183a 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt @@ -35,6 +35,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.base.util.standardHorizontalMargin +import com.bitwarden.ui.platform.components.account.dialog.BitwardenLogoutConfirmationDialog import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar import com.bitwarden.ui.platform.components.badge.NotificationBadge import com.bitwarden.ui.platform.components.button.BitwardenTextButton @@ -59,7 +60,6 @@ import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeout import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction -import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenLogoutConfirmationDialog import com.x8bit.bitwarden.ui.platform.components.dropdown.BitwardenMultiSelectButton import com.x8bit.bitwarden.ui.platform.components.row.BitwardenExternalLinkRow import com.x8bit.bitwarden.ui.platform.components.row.BitwardenTextRow diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt index c5e9fc7f10..8147c6e9d2 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt @@ -19,6 +19,9 @@ import androidx.core.net.toUri import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.bitwarden.ui.platform.base.util.EventsEffect +import com.bitwarden.ui.platform.components.account.BitwardenAccountActionItem +import com.bitwarden.ui.platform.components.account.BitwardenAccountSwitcher +import com.bitwarden.ui.platform.components.account.util.initials import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar import com.bitwarden.ui.platform.components.appbar.NavigationIcon import com.bitwarden.ui.platform.components.appbar.action.BitwardenOverflowActionItem @@ -44,8 +47,6 @@ import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.credentials.manager.CredentialProviderCompletionManager -import com.x8bit.bitwarden.ui.platform.components.account.BitwardenAccountActionItem -import com.x8bit.bitwarden.ui.platform.components.account.BitwardenAccountSwitcher import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenMasterPasswordDialog import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenOverwritePasskeyConfirmationDialog import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenPinDialog @@ -65,7 +66,6 @@ import com.x8bit.bitwarden.ui.vault.feature.addedit.VaultAddEditArgs import com.x8bit.bitwarden.ui.vault.feature.item.VaultItemArgs import com.x8bit.bitwarden.ui.vault.feature.itemlisting.handlers.VaultItemListingHandlers import com.x8bit.bitwarden.ui.vault.feature.itemlisting.handlers.VaultItemListingUserVerificationHandlers -import com.x8bit.bitwarden.ui.vault.feature.vault.util.initials import com.x8bit.bitwarden.ui.vault.model.VaultAddEditType import com.x8bit.bitwarden.ui.vault.model.VaultItemListingType import kotlinx.collections.immutable.persistentListOf diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt index 09af276de2..4e0ab32b04 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt @@ -21,6 +21,7 @@ import com.bitwarden.ui.platform.base.BackgroundEvent import com.bitwarden.ui.platform.base.BaseViewModel import com.bitwarden.ui.platform.base.util.toAndroidAppUriString import com.bitwarden.ui.platform.base.util.toHostOrPathOrNull +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.components.icon.model.IconData import com.bitwarden.ui.platform.components.snackbar.BitwardenSnackbarData import com.bitwarden.ui.platform.resource.BitwardenString @@ -79,7 +80,6 @@ import com.x8bit.bitwarden.ui.credentials.manager.model.AssertFido2CredentialRes import com.x8bit.bitwarden.ui.credentials.manager.model.GetCredentialsResult import com.x8bit.bitwarden.ui.credentials.manager.model.GetPasswordCredentialResult import com.x8bit.bitwarden.ui.credentials.manager.model.RegisterFido2CredentialResult -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.platform.feature.search.SearchTypeData import com.x8bit.bitwarden.ui.platform.feature.search.model.SearchType import com.x8bit.bitwarden.ui.platform.feature.search.util.filterAndOrganize diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/handlers/VaultItemListingHandlers.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/handlers/VaultItemListingHandlers.kt index 5256dfe121..cda27901c5 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/handlers/VaultItemListingHandlers.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/handlers/VaultItemListingHandlers.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.ui.vault.feature.itemlisting.handlers -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.x8bit.bitwarden.ui.vault.feature.itemlisting.MasterPasswordRepromptData import com.x8bit.bitwarden.ui.vault.feature.itemlisting.VaultItemListingState import com.x8bit.bitwarden.ui.vault.feature.itemlisting.VaultItemListingViewModel diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt index 26e9931016..4f7fd12ede 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt @@ -29,6 +29,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.base.util.LifecycleEventEffect import com.bitwarden.ui.platform.base.util.standardHorizontalMargin +import com.bitwarden.ui.platform.components.account.BitwardenAccountActionItem +import com.bitwarden.ui.platform.components.account.BitwardenAccountSwitcher import com.bitwarden.ui.platform.components.animation.AnimateNullableContentVisibility import com.bitwarden.ui.platform.components.appbar.BitwardenMediumTopAppBar import com.bitwarden.ui.platform.components.appbar.action.BitwardenOverflowActionItem @@ -55,8 +57,6 @@ import com.bitwarden.ui.platform.composition.LocalIntentManager import com.bitwarden.ui.platform.manager.IntentManager import com.bitwarden.ui.platform.resource.BitwardenDrawable import com.bitwarden.ui.platform.resource.BitwardenString -import com.x8bit.bitwarden.ui.platform.components.account.BitwardenAccountActionItem -import com.x8bit.bitwarden.ui.platform.components.account.BitwardenAccountSwitcher import com.x8bit.bitwarden.ui.platform.composition.LocalAppReviewManager import com.x8bit.bitwarden.ui.platform.composition.LocalExitManager import com.x8bit.bitwarden.ui.platform.feature.search.model.SearchType diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt index bb6e3d4e96..f5f0d61bcf 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt @@ -11,6 +11,8 @@ import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.platform.base.BackgroundEvent import com.bitwarden.ui.platform.base.BaseViewModel import com.bitwarden.ui.platform.base.util.hexToColor +import com.bitwarden.ui.platform.components.account.model.AccountSummary +import com.bitwarden.ui.platform.components.account.util.initials import com.bitwarden.ui.platform.components.icon.model.IconData import com.bitwarden.ui.platform.components.snackbar.BitwardenSnackbarData import com.bitwarden.ui.platform.resource.BitwardenDrawable @@ -41,7 +43,6 @@ import com.x8bit.bitwarden.data.vault.manager.model.GetCipherResult import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.GenerateTotpResult import com.x8bit.bitwarden.data.vault.repository.model.VaultData -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelay import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelayManager import com.x8bit.bitwarden.ui.vault.components.model.CreateVaultItemType @@ -49,7 +50,6 @@ import com.x8bit.bitwarden.ui.vault.components.util.toVaultItemCipherTypeOrNull import com.x8bit.bitwarden.ui.vault.feature.itemlisting.model.ListingItemOverflowAction import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterData import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType -import com.x8bit.bitwarden.ui.vault.feature.vault.util.initials import com.x8bit.bitwarden.ui.vault.feature.vault.util.toAccountSummaries import com.x8bit.bitwarden.ui.vault.feature.vault.util.toActiveAccountSummary import com.x8bit.bitwarden.ui.vault.feature.vault.util.toAppBarTitle diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/handlers/VaultHandlers.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/handlers/VaultHandlers.kt index 282863c6e3..8230e4dc32 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/handlers/VaultHandlers.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/handlers/VaultHandlers.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.ui.vault.feature.vault.handlers -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.x8bit.bitwarden.ui.vault.components.model.CreateVaultItemType import com.x8bit.bitwarden.ui.vault.feature.itemlisting.model.ListingItemOverflowAction import com.x8bit.bitwarden.ui.vault.feature.vault.VaultAction diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensions.kt index 2b6efe837a..cdfbffe0d8 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensions.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.ui.vault.feature.vault.util +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.x8bit.bitwarden.data.auth.repository.model.UserState -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterData import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt index d77cff8c39..e2085d8b47 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt @@ -18,23 +18,23 @@ import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performTextInput import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.data.repository.model.Environment +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.components.snackbar.BitwardenSnackbarData import com.bitwarden.ui.util.asText +import com.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed +import com.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed import com.bitwarden.ui.util.assertNoDialogExists +import com.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed +import com.bitwarden.ui.util.assertSwitcherIsDisplayed +import com.bitwarden.ui.util.assertSwitcherIsNotDisplayed +import com.bitwarden.ui.util.performAccountClick +import com.bitwarden.ui.util.performAccountIconClick +import com.bitwarden.ui.util.performAccountLongClick +import com.bitwarden.ui.util.performLockAccountClick +import com.bitwarden.ui.util.performLogoutAccountClick +import com.bitwarden.ui.util.performRemoveAccountClick +import com.bitwarden.ui.util.performYesDialogButtonClick import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary -import com.x8bit.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertSwitcherIsDisplayed -import com.x8bit.bitwarden.ui.util.assertSwitcherIsNotDisplayed -import com.x8bit.bitwarden.ui.util.performAccountClick -import com.x8bit.bitwarden.ui.util.performAccountIconClick -import com.x8bit.bitwarden.ui.util.performAccountLongClick -import com.x8bit.bitwarden.ui.util.performLockAccountClick -import com.x8bit.bitwarden.ui.util.performLogoutAccountClick -import com.x8bit.bitwarden.ui.util.performRemoveAccountClick -import com.x8bit.bitwarden.ui.util.performYesDialogButtonClick import io.mockk.every import io.mockk.mockk import io.mockk.verify diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModelTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModelTest.kt index 0526993848..ccb56816e2 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModelTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModelTest.kt @@ -5,6 +5,7 @@ import app.cash.turbine.test import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.platform.base.BaseViewModelTest +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.components.snackbar.BitwardenSnackbarData import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.util.asText @@ -16,7 +17,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.VaultUnlockType import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository import com.x8bit.bitwarden.data.vault.repository.VaultRepository -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelay import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelayManager import com.x8bit.bitwarden.ui.vault.feature.vault.util.toAccountSummaries diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreenTest.kt index f24c10e755..fab8a17c3d 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreenTest.kt @@ -14,23 +14,23 @@ import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performTextInput import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.manager.IntentManager +import com.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed +import com.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed import com.bitwarden.ui.util.assertNoDialogExists +import com.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed +import com.bitwarden.ui.util.assertSwitcherIsDisplayed +import com.bitwarden.ui.util.assertSwitcherIsNotDisplayed +import com.bitwarden.ui.util.performAccountClick +import com.bitwarden.ui.util.performAccountIconClick +import com.bitwarden.ui.util.performAccountLongClick +import com.bitwarden.ui.util.performAddAccountClick +import com.bitwarden.ui.util.performLockAccountClick +import com.bitwarden.ui.util.performLogoutAccountClick +import com.bitwarden.ui.util.performRemoveAccountClick +import com.bitwarden.ui.util.performYesDialogButtonClick import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary -import com.x8bit.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertSwitcherIsDisplayed -import com.x8bit.bitwarden.ui.util.assertSwitcherIsNotDisplayed -import com.x8bit.bitwarden.ui.util.performAccountClick -import com.x8bit.bitwarden.ui.util.performAccountIconClick -import com.x8bit.bitwarden.ui.util.performAccountLongClick -import com.x8bit.bitwarden.ui.util.performAddAccountClick -import com.x8bit.bitwarden.ui.util.performLockAccountClick -import com.x8bit.bitwarden.ui.util.performLogoutAccountClick -import com.x8bit.bitwarden.ui.util.performRemoveAccountClick -import com.x8bit.bitwarden.ui.util.performYesDialogButtonClick import io.mockk.every import io.mockk.just import io.mockk.mockk diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModelTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModelTest.kt index c99b5d5bfb..b6aa750b40 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModelTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModelTest.kt @@ -5,6 +5,7 @@ import app.cash.turbine.test import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.platform.base.BaseViewModelTest +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus @@ -16,7 +17,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository import com.x8bit.bitwarden.data.vault.repository.VaultRepository -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.vault.feature.vault.util.toAccountSummaries import io.mockk.coEvery import io.mockk.coVerify diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreenTest.kt index f55ad3b218..55975e89b0 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreenTest.kt @@ -19,30 +19,30 @@ import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performTextInput import androidx.compose.ui.test.requestFocus import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.util.asText +import com.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed +import com.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed import com.bitwarden.ui.util.assertNoDialogExists +import com.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed +import com.bitwarden.ui.util.assertSwitcherIsDisplayed +import com.bitwarden.ui.util.assertSwitcherIsNotDisplayed +import com.bitwarden.ui.util.performAccountClick +import com.bitwarden.ui.util.performAccountIconClick +import com.bitwarden.ui.util.performAccountLongClick +import com.bitwarden.ui.util.performAddAccountClick +import com.bitwarden.ui.util.performLockAccountClick +import com.bitwarden.ui.util.performLogoutAccountClick +import com.bitwarden.ui.util.performRemoveAccountClick +import com.bitwarden.ui.util.performYesDialogButtonClick import com.x8bit.bitwarden.data.auth.repository.model.VaultUnlockType import com.x8bit.bitwarden.data.util.advanceTimeByAndRunCurrent import com.x8bit.bitwarden.ui.credentials.manager.CredentialProviderCompletionManager import com.x8bit.bitwarden.ui.credentials.manager.model.AssertFido2CredentialResult import com.x8bit.bitwarden.ui.credentials.manager.model.GetCredentialsResult import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricsManager -import com.x8bit.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertSwitcherIsDisplayed -import com.x8bit.bitwarden.ui.util.assertSwitcherIsNotDisplayed -import com.x8bit.bitwarden.ui.util.performAccountClick -import com.x8bit.bitwarden.ui.util.performAccountIconClick -import com.x8bit.bitwarden.ui.util.performAccountLongClick -import com.x8bit.bitwarden.ui.util.performAddAccountClick -import com.x8bit.bitwarden.ui.util.performLockAccountClick -import com.x8bit.bitwarden.ui.util.performLogoutAccountClick -import com.x8bit.bitwarden.ui.util.performRemoveAccountClick -import com.x8bit.bitwarden.ui.util.performYesDialogButtonClick import io.mockk.every import io.mockk.just import io.mockk.mockk diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModelTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModelTest.kt index c0868a1cee..beb1aeddc5 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModelTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModelTest.kt @@ -5,6 +5,7 @@ import app.cash.turbine.test import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.platform.base.BaseViewModelTest +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus @@ -26,7 +27,6 @@ import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.VaultUnlockResult import com.x8bit.bitwarden.ui.auth.feature.vaultunlock.model.UnlockType import com.x8bit.bitwarden.ui.auth.feature.vaultunlock.util.unlockScreenInputLabel -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.vault.feature.vault.util.toAccountSummary import io.mockk.coEvery import io.mockk.coVerify diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt index 8eef9101bb..5b037cae0f 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt @@ -21,16 +21,29 @@ import com.bitwarden.data.repository.util.baseIconUrl import com.bitwarden.data.repository.util.baseWebSendUrl import com.bitwarden.send.SendType import com.bitwarden.ui.platform.base.util.toHostOrPathOrNull +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.components.icon.model.IconData import com.bitwarden.ui.platform.components.snackbar.BitwardenSnackbarData import com.bitwarden.ui.platform.manager.IntentManager import com.bitwarden.ui.platform.resource.BitwardenDrawable import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.util.asText +import com.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed +import com.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed import com.bitwarden.ui.util.assertMasterPasswordDialogDisplayed import com.bitwarden.ui.util.assertNoDialogExists +import com.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed +import com.bitwarden.ui.util.assertSwitcherIsDisplayed +import com.bitwarden.ui.util.assertSwitcherIsNotDisplayed import com.bitwarden.ui.util.isProgressBar import com.bitwarden.ui.util.onNodeWithTextAfterScroll +import com.bitwarden.ui.util.performAccountClick +import com.bitwarden.ui.util.performAccountIconClick +import com.bitwarden.ui.util.performAccountLongClick +import com.bitwarden.ui.util.performLockAccountClick +import com.bitwarden.ui.util.performLogoutAccountClick +import com.bitwarden.ui.util.performRemoveAccountClick +import com.bitwarden.ui.util.performYesDialogButtonClick import com.bitwarden.vault.CipherType import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView @@ -41,7 +54,6 @@ import com.x8bit.bitwarden.ui.credentials.manager.model.GetCredentialsResult import com.x8bit.bitwarden.ui.credentials.manager.model.GetPasswordCredentialResult import com.x8bit.bitwarden.ui.credentials.manager.model.RegisterFido2CredentialResult import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.platform.feature.search.model.SearchType import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricsManager import com.x8bit.bitwarden.ui.platform.manager.exit.ExitManager @@ -49,18 +61,6 @@ import com.x8bit.bitwarden.ui.tools.feature.send.addedit.AddEditSendRoute import com.x8bit.bitwarden.ui.tools.feature.send.addedit.ModeType import com.x8bit.bitwarden.ui.tools.feature.send.model.SendItemType import com.x8bit.bitwarden.ui.tools.feature.send.viewsend.ViewSendRoute -import com.x8bit.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertSwitcherIsDisplayed -import com.x8bit.bitwarden.ui.util.assertSwitcherIsNotDisplayed -import com.x8bit.bitwarden.ui.util.performAccountClick -import com.x8bit.bitwarden.ui.util.performAccountIconClick -import com.x8bit.bitwarden.ui.util.performAccountLongClick -import com.x8bit.bitwarden.ui.util.performLockAccountClick -import com.x8bit.bitwarden.ui.util.performLogoutAccountClick -import com.x8bit.bitwarden.ui.util.performRemoveAccountClick -import com.x8bit.bitwarden.ui.util.performYesDialogButtonClick import com.x8bit.bitwarden.ui.vault.components.model.CreateVaultItemType import com.x8bit.bitwarden.ui.vault.feature.addedit.VaultAddEditArgs import com.x8bit.bitwarden.ui.vault.feature.item.VaultItemArgs diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt index acbc7548cd..0547f37135 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt @@ -29,6 +29,7 @@ import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.send.SendType import com.bitwarden.ui.platform.base.BaseViewModelTest +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.components.icon.model.IconData import com.bitwarden.ui.platform.components.snackbar.BitwardenSnackbarData import com.bitwarden.ui.platform.resource.BitwardenDrawable @@ -101,7 +102,6 @@ import com.x8bit.bitwarden.ui.credentials.manager.model.AssertFido2CredentialRes import com.x8bit.bitwarden.ui.credentials.manager.model.GetCredentialsResult import com.x8bit.bitwarden.ui.credentials.manager.model.GetPasswordCredentialResult import com.x8bit.bitwarden.ui.credentials.manager.model.RegisterFido2CredentialResult -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.platform.feature.search.model.SearchType import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelayManager import com.x8bit.bitwarden.ui.tools.feature.send.model.SendItemType diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt index 823f57ee3c..9502b51d3a 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt @@ -25,32 +25,32 @@ import androidx.core.net.toUri import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.data.repository.model.Environment import com.bitwarden.data.repository.util.baseIconUrl +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.components.snackbar.BitwardenSnackbarData import com.bitwarden.ui.platform.manager.IntentManager import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.util.asText +import com.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed +import com.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed import com.bitwarden.ui.util.assertNoDialogExists +import com.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed import com.bitwarden.ui.util.assertScrollableNodeDoesNotExist +import com.bitwarden.ui.util.assertSwitcherIsDisplayed +import com.bitwarden.ui.util.assertSwitcherIsNotDisplayed import com.bitwarden.ui.util.onNodeWithTextAfterScroll +import com.bitwarden.ui.util.performAccountClick +import com.bitwarden.ui.util.performAccountIconClick +import com.bitwarden.ui.util.performAccountLongClick +import com.bitwarden.ui.util.performAddAccountClick +import com.bitwarden.ui.util.performLockAccountClick +import com.bitwarden.ui.util.performLogoutAccountClick +import com.bitwarden.ui.util.performRemoveAccountClick +import com.bitwarden.ui.util.performYesDialogButtonClick import com.bitwarden.vault.CipherType import com.x8bit.bitwarden.data.util.advanceTimeByAndRunCurrent import com.x8bit.bitwarden.ui.platform.base.BitwardenComposeTest -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.platform.manager.exit.ExitManager import com.x8bit.bitwarden.ui.platform.manager.review.AppReviewManager -import com.x8bit.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed -import com.x8bit.bitwarden.ui.util.assertSwitcherIsDisplayed -import com.x8bit.bitwarden.ui.util.assertSwitcherIsNotDisplayed -import com.x8bit.bitwarden.ui.util.performAccountClick -import com.x8bit.bitwarden.ui.util.performAccountIconClick -import com.x8bit.bitwarden.ui.util.performAccountLongClick -import com.x8bit.bitwarden.ui.util.performAddAccountClick -import com.x8bit.bitwarden.ui.util.performLockAccountClick -import com.x8bit.bitwarden.ui.util.performLogoutAccountClick -import com.x8bit.bitwarden.ui.util.performRemoveAccountClick -import com.x8bit.bitwarden.ui.util.performYesDialogButtonClick import com.x8bit.bitwarden.ui.vault.components.model.CreateVaultItemType import com.x8bit.bitwarden.ui.vault.feature.addedit.VaultAddEditArgs import com.x8bit.bitwarden.ui.vault.feature.item.VaultItemArgs diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt index 05580a4aa9..c655aba84e 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt @@ -10,6 +10,7 @@ import com.bitwarden.network.model.OrganizationType import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.ui.platform.base.BaseViewModelTest +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.components.snackbar.BitwardenSnackbarData import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.util.Text @@ -50,7 +51,6 @@ import com.x8bit.bitwarden.data.vault.manager.model.GetCipherResult import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.GenerateTotpResult import com.x8bit.bitwarden.data.vault.repository.model.VaultData -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelay import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelayManager import com.x8bit.bitwarden.ui.vault.components.model.CreateVaultItemType diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/AccountSummaryExtensionsTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/AccountSummaryExtensionsTest.kt index ee2dc81e17..d4af5ae49a 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/AccountSummaryExtensionsTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/AccountSummaryExtensionsTest.kt @@ -1,8 +1,12 @@ package com.x8bit.bitwarden.ui.vault.feature.vault.util +import com.bitwarden.ui.platform.components.account.model.AccountSummary +import com.bitwarden.ui.platform.components.account.util.iconRes +import com.bitwarden.ui.platform.components.account.util.iconTestTag +import com.bitwarden.ui.platform.components.account.util.initials +import com.bitwarden.ui.platform.components.account.util.supportingTextResOrNull import com.bitwarden.ui.platform.resource.BitwardenDrawable import com.bitwarden.ui.platform.resource.BitwardenString -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import io.mockk.every import io.mockk.mockk import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensionsTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensionsTest.kt index 513493b622..51c3f172f3 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensionsTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensionsTest.kt @@ -3,11 +3,11 @@ package com.x8bit.bitwarden.ui.vault.feature.vault.util import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import com.bitwarden.data.repository.model.Environment import com.bitwarden.network.model.OrganizationType +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.model.Organization import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterData import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/account/BitwardenAccountActionItem.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/BitwardenAccountActionItem.kt similarity index 94% rename from app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/account/BitwardenAccountActionItem.kt rename to ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/BitwardenAccountActionItem.kt index 4dfc8faeef..13a016704f 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/account/BitwardenAccountActionItem.kt +++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/BitwardenAccountActionItem.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.platform.components.account +package com.bitwarden.ui.platform.components.account import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -14,6 +14,7 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.bitwarden.ui.R import com.bitwarden.ui.platform.base.util.toSafeOverlayColor import com.bitwarden.ui.platform.base.util.toUnscaledTextUnit import com.bitwarden.ui.platform.components.button.color.bitwardenStandardIconButtonColors @@ -54,7 +55,7 @@ fun BitwardenAccountActionItem( style = TextStyle( fontSize = 11.dp.toUnscaledTextUnit(), lineHeight = 13.dp.toUnscaledTextUnit(), - fontFamily = FontFamily(Font(com.bitwarden.ui.R.font.dm_sans_bold)), + fontFamily = FontFamily(Font(R.font.dm_sans_bold)), fontWeight = FontWeight.W600, ), color = color.toSafeOverlayColor(), diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/account/BitwardenAccountSwitcher.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/BitwardenAccountSwitcher.kt similarity index 96% rename from app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/account/BitwardenAccountSwitcher.kt rename to ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/BitwardenAccountSwitcher.kt index f1391aaa19..9e5bb88102 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/account/BitwardenAccountSwitcher.kt +++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/BitwardenAccountSwitcher.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.platform.components.account +package com.bitwarden.ui.platform.components.account import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.ExperimentalAnimationApi @@ -52,6 +52,13 @@ import com.bitwarden.ui.platform.base.util.lowercaseWithCurrentLocal import com.bitwarden.ui.platform.base.util.scrolledContainerBackground import com.bitwarden.ui.platform.base.util.toSafeOverlayColor import com.bitwarden.ui.platform.base.util.toUnscaledTextUnit +import com.bitwarden.ui.platform.components.account.dialog.BitwardenLogoutConfirmationDialog +import com.bitwarden.ui.platform.components.account.dialog.BitwardenRemovalConfirmationDialog +import com.bitwarden.ui.platform.components.account.model.AccountSummary +import com.bitwarden.ui.platform.components.account.util.iconRes +import com.bitwarden.ui.platform.components.account.util.iconTestTag +import com.bitwarden.ui.platform.components.account.util.initials +import com.bitwarden.ui.platform.components.account.util.supportingTextResOrNull import com.bitwarden.ui.platform.components.dialog.BitwardenSelectionDialog import com.bitwarden.ui.platform.components.dialog.row.BitwardenBasicDialogRow import com.bitwarden.ui.platform.components.divider.BitwardenHorizontalDivider @@ -60,13 +67,6 @@ import com.bitwarden.ui.platform.components.util.rememberVectorPainter import com.bitwarden.ui.platform.resource.BitwardenDrawable import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.platform.theme.BitwardenTheme -import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenLogoutConfirmationDialog -import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenRemovalConfirmationDialog -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary -import com.x8bit.bitwarden.ui.vault.feature.vault.util.iconRes -import com.x8bit.bitwarden.ui.vault.feature.vault.util.iconTestTag -import com.x8bit.bitwarden.ui.vault.feature.vault.util.initials -import com.x8bit.bitwarden.ui.vault.feature.vault.util.supportingTextResOrNull import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/account/BitwardenPlaceholderAccountItem.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/BitwardenPlaceholderAccountItem.kt similarity index 97% rename from app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/account/BitwardenPlaceholderAccountItem.kt rename to ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/BitwardenPlaceholderAccountItem.kt index 2d8703937d..bfc9be780e 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/account/BitwardenPlaceholderAccountItem.kt +++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/BitwardenPlaceholderAccountItem.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.platform.components.account +package com.bitwarden.ui.platform.components.account import androidx.compose.material3.Icon import androidx.compose.material3.IconButton diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenLogoutConfirmationDialog.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/dialog/BitwardenLogoutConfirmationDialog.kt similarity index 91% rename from app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenLogoutConfirmationDialog.kt rename to ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/dialog/BitwardenLogoutConfirmationDialog.kt index 15b495d5dc..8cc61bf069 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenLogoutConfirmationDialog.kt +++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/dialog/BitwardenLogoutConfirmationDialog.kt @@ -1,10 +1,10 @@ -package com.x8bit.bitwarden.ui.platform.components.dialog +package com.bitwarden.ui.platform.components.account.dialog import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.components.dialog.BitwardenTwoButtonDialog import com.bitwarden.ui.platform.resource.BitwardenString -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary /** * A reusable dialog for confirming whether or not the user wants to log out. diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenRemovalConfirmationDialog.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/dialog/BitwardenRemovalConfirmationDialog.kt similarity index 92% rename from app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenRemovalConfirmationDialog.kt rename to ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/dialog/BitwardenRemovalConfirmationDialog.kt index 914721f093..c20af3c045 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenRemovalConfirmationDialog.kt +++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/dialog/BitwardenRemovalConfirmationDialog.kt @@ -1,10 +1,10 @@ -package com.x8bit.bitwarden.ui.platform.components.dialog +package com.bitwarden.ui.platform.components.account.dialog import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.components.dialog.BitwardenTwoButtonDialog import com.bitwarden.ui.platform.resource.BitwardenString -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary /** * A reusable dialog for confirming whether or not the user wants to remove their account. diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/model/AccountSummary.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/model/AccountSummary.kt similarity index 97% rename from app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/model/AccountSummary.kt rename to ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/model/AccountSummary.kt index f48cb91d91..f9de8c6003 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/model/AccountSummary.kt +++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/model/AccountSummary.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.platform.components.model +package com.bitwarden.ui.platform.components.account.model import android.os.Parcelable import androidx.compose.ui.graphics.Color diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/AccountSummaryExtensions.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/util/AccountSummaryExtensions.kt similarity index 94% rename from app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/AccountSummaryExtensions.kt rename to ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/util/AccountSummaryExtensions.kt index 07f1731be1..85f19b97b9 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/AccountSummaryExtensions.kt +++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/account/util/AccountSummaryExtensions.kt @@ -1,10 +1,10 @@ -package com.x8bit.bitwarden.ui.vault.feature.vault.util +package com.bitwarden.ui.platform.components.account.util import androidx.annotation.DrawableRes import androidx.annotation.StringRes +import com.bitwarden.ui.platform.components.account.model.AccountSummary import com.bitwarden.ui.platform.resource.BitwardenDrawable import com.bitwarden.ui.platform.resource.BitwardenString -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import java.util.Locale /** diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/util/BitwardenAccountSwitcherTestHelpers.kt b/ui/src/testFixtures/kotlin/com/bitwarden/ui/util/BitwardenAccountSwitcherTestHelpers.kt similarity index 98% rename from app/src/test/kotlin/com/x8bit/bitwarden/ui/util/BitwardenAccountSwitcherTestHelpers.kt rename to ui/src/testFixtures/kotlin/com/bitwarden/ui/util/BitwardenAccountSwitcherTestHelpers.kt index dc52e9bd04..bc20fb1d74 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/util/BitwardenAccountSwitcherTestHelpers.kt +++ b/ui/src/testFixtures/kotlin/com/bitwarden/ui/util/BitwardenAccountSwitcherTestHelpers.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.util +package com.bitwarden.ui.util import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.filterToOne @@ -12,7 +12,7 @@ import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTouchInput -import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary +import com.bitwarden.ui.platform.components.account.model.AccountSummary private const val ACCOUNT = "Account" private const val ADD_ACCOUNT = "Add account"