From ed2d6ca585668e4ee3ebf18df612fca611056eb8 Mon Sep 17 00:00:00 2001 From: David Perez Date: Fri, 27 Jun 2025 14:06:31 -0500 Subject: [PATCH] Move item listing models to common location for reuse with search (#5438) --- .../feature/itemlisting/ItemListingScreen.kt | 4 +- .../itemlisting/ItemListingViewModel.kt | 8 +-- .../model/SharedCodesDisplayState.kt | 2 +- .../model/VerificationCodeDisplayItem.kt | 2 +- .../feature/search/ItemSearchContent.kt | 2 +- .../feature/search/ItemSearchViewModel.kt | 62 +++++-------------- .../SharedVerificationCodesStateExtensions.kt | 6 +- .../util/VerificationCodeItemExtensions.kt | 4 +- .../itemlisting/ItemListingScreenTest.kt | 4 +- .../itemlisting/ItemListingViewModelTest.kt | 8 +-- .../feature/search/ItemSearchViewModelTest.kt | 27 +++++--- .../util/SharedVerificationCodesStateTest.kt | 6 +- .../VerificationCodeItemExtensionsTest.kt | 4 +- 13 files changed, 60 insertions(+), 79 deletions(-) rename authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/{itemlisting => }/model/SharedCodesDisplayState.kt (92%) rename authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/{itemlisting => }/model/VerificationCodeDisplayItem.kt (90%) rename authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/{itemlisting => }/util/SharedVerificationCodesStateExtensions.kt (85%) rename authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/{itemlisting => }/util/VerificationCodeItemExtensions.kt (91%) rename authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/{itemlisting => }/util/SharedVerificationCodesStateTest.kt (93%) rename authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/{itemlisting => }/util/VerificationCodeItemExtensionsTest.kt (97%) diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt index bac9bbc6f5..37110fa128 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt @@ -55,9 +55,9 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.bitwarden.authenticator.R import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.ItemListingExpandableFabAction -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.SharedCodesDisplayState import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VaultDropdownMenuAction -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VerificationCodeDisplayItem +import com.bitwarden.authenticator.ui.authenticator.feature.model.SharedCodesDisplayState +import com.bitwarden.authenticator.ui.authenticator.feature.model.VerificationCodeDisplayItem import com.bitwarden.authenticator.ui.platform.components.appbar.AuthenticatorMediumTopAppBar import com.bitwarden.authenticator.ui.platform.components.appbar.AuthenticatorTopAppBar import com.bitwarden.authenticator.ui.platform.components.appbar.action.AuthenticatorSearchActionItem diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModel.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModel.kt index 46eca399f4..daad6c98a9 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModel.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModel.kt @@ -19,11 +19,11 @@ import com.bitwarden.authenticator.data.platform.manager.BitwardenEncodingManage import com.bitwarden.authenticator.data.platform.manager.clipboard.BitwardenClipboardManager import com.bitwarden.authenticator.data.platform.manager.imports.model.GoogleAuthenticatorProtos import com.bitwarden.authenticator.data.platform.repository.SettingsRepository -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.SharedCodesDisplayState import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VaultDropdownMenuAction -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VerificationCodeDisplayItem -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.util.toDisplayItem -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.util.toSharedCodesDisplayState +import com.bitwarden.authenticator.ui.authenticator.feature.model.SharedCodesDisplayState +import com.bitwarden.authenticator.ui.authenticator.feature.model.VerificationCodeDisplayItem +import com.bitwarden.authenticator.ui.authenticator.feature.util.toDisplayItem +import com.bitwarden.authenticator.ui.authenticator.feature.util.toSharedCodesDisplayState import com.bitwarden.authenticatorbridge.manager.AuthenticatorBridgeManager import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.ui.platform.base.BaseViewModel diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/model/SharedCodesDisplayState.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/model/SharedCodesDisplayState.kt similarity index 92% rename from authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/model/SharedCodesDisplayState.kt rename to authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/model/SharedCodesDisplayState.kt index 44952a26f4..491464386a 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/model/SharedCodesDisplayState.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/model/SharedCodesDisplayState.kt @@ -1,4 +1,4 @@ -package com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model +package com.bitwarden.authenticator.ui.authenticator.feature.model import android.os.Parcelable import com.bitwarden.ui.util.Text diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/model/VerificationCodeDisplayItem.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/model/VerificationCodeDisplayItem.kt similarity index 90% rename from authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/model/VerificationCodeDisplayItem.kt rename to authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/model/VerificationCodeDisplayItem.kt index aa9bba83f6..68e7693040 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/model/VerificationCodeDisplayItem.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/model/VerificationCodeDisplayItem.kt @@ -1,4 +1,4 @@ -package com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model +package com.bitwarden.authenticator.ui.authenticator.feature.model import android.os.Parcelable import com.bitwarden.authenticator.R diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchContent.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchContent.kt index 3e4fbebb97..5efbe008bf 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchContent.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchContent.kt @@ -21,7 +21,7 @@ fun ItemSearchContent( modifier: Modifier = Modifier, ) { LazyColumn(modifier = modifier) { - items(viewState.displayItems) { + items(viewState.itemList) { VaultVerificationCodeItem( modifier = Modifier .fillMaxWidth() diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModel.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModel.kt index ba83321732..a0ac58ca3f 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModel.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModel.kt @@ -9,11 +9,12 @@ import com.bitwarden.authenticator.data.authenticator.repository.AuthenticatorRe import com.bitwarden.authenticator.data.authenticator.repository.model.SharedVerificationCodesState import com.bitwarden.authenticator.data.authenticator.repository.util.itemsOrEmpty import com.bitwarden.authenticator.data.platform.manager.clipboard.BitwardenClipboardManager +import com.bitwarden.authenticator.ui.authenticator.feature.model.VerificationCodeDisplayItem +import com.bitwarden.authenticator.ui.authenticator.feature.util.toDisplayItem import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.SpecialCharWithPrecedenceComparator import com.bitwarden.ui.platform.base.BaseViewModel import com.bitwarden.ui.platform.base.util.removeDiacritics -import com.bitwarden.ui.platform.components.icon.model.IconData import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import dagger.hilt.android.lifecycle.HiltViewModel @@ -155,7 +156,15 @@ class ItemSearchViewModel @Inject constructor( isNotEmpty() -> { ItemSearchState.ViewState.Content( - displayItems = toDisplayItemList() + itemList = this + .map { + it.toDisplayItem( + alertThresholdSeconds = 7, + sharedVerificationCodesState = authenticatorRepository + .sharedCodesStateFlow + .value, + ) + } .sortAlphabetically(), ) } @@ -167,39 +176,13 @@ class ItemSearchViewModel @Inject constructor( } } - private fun List.toDisplayItemList(): List = - this.map { - it.toDisplayItem() - } - - private fun VerificationCodeItem.toDisplayItem(): ItemSearchState.DisplayItem = - ItemSearchState.DisplayItem( - id = id, - authCode = code, - title = issuer ?: label ?: "--", - subtitle = if (issuer != null) { - // Only show label if it is not being used as the primary title: - label - } else { - null - }, - periodSeconds = periodSeconds, - timeLeftSeconds = timeLeftSeconds, - alertThresholdSeconds = 7, - startIcon = IconData.Local(iconRes = R.drawable.ic_login_item), - ) - /** - * Sort a list of [ItemSearchState.DisplayItem] by their titles alphabetically giving digits and + * Sort a list of [VerificationCodeDisplayItem] by their titles alphabetically giving digits and * special characters higher precedence. */ - @Suppress("MaxLineLength") - private fun List.sortAlphabetically() = + private fun List.sortAlphabetically() = this.sortedWith { item1, item2 -> - SpecialCharWithPrecedenceComparator.compare( - item1.title.orEmpty(), - item2.title.orEmpty(), - ) + SpecialCharWithPrecedenceComparator.compare(item1.title, item2.title) } //endregion Utility Functions } @@ -222,7 +205,7 @@ data class ItemSearchState( */ @Parcelize data class Content( - val displayItems: List, + val itemList: List, ) : ViewState() /** @@ -231,21 +214,6 @@ data class ItemSearchState( @Parcelize data class Empty(val message: Text?) : ViewState() } - - /** - * An item to be displayed. - */ - @Parcelize - data class DisplayItem( - val id: String, - val authCode: String, - val title: String, - val subtitle: String? = null, - val periodSeconds: Int, - val timeLeftSeconds: Int, - val alertThresholdSeconds: Int, - val startIcon: IconData, - ) : Parcelable } /** diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/util/SharedVerificationCodesStateExtensions.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/util/SharedVerificationCodesStateExtensions.kt similarity index 85% rename from authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/util/SharedVerificationCodesStateExtensions.kt rename to authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/util/SharedVerificationCodesStateExtensions.kt index b1e8b6724a..551bd73e53 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/util/SharedVerificationCodesStateExtensions.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/util/SharedVerificationCodesStateExtensions.kt @@ -1,10 +1,10 @@ -package com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.util +package com.bitwarden.authenticator.ui.authenticator.feature.util import com.bitwarden.authenticator.R import com.bitwarden.authenticator.data.authenticator.repository.model.AuthenticatorItem import com.bitwarden.authenticator.data.authenticator.repository.model.SharedVerificationCodesState -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.SharedCodesDisplayState -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VerificationCodeDisplayItem +import com.bitwarden.authenticator.ui.authenticator.feature.model.SharedCodesDisplayState +import com.bitwarden.authenticator.ui.authenticator.feature.model.VerificationCodeDisplayItem import com.bitwarden.ui.util.asText /** diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/util/VerificationCodeItemExtensions.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/util/VerificationCodeItemExtensions.kt similarity index 91% rename from authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/util/VerificationCodeItemExtensions.kt rename to authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/util/VerificationCodeItemExtensions.kt index 159dc404c2..29e2841f78 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/util/VerificationCodeItemExtensions.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/util/VerificationCodeItemExtensions.kt @@ -1,9 +1,9 @@ -package com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.util +package com.bitwarden.authenticator.ui.authenticator.feature.util import com.bitwarden.authenticator.data.authenticator.manager.model.VerificationCodeItem import com.bitwarden.authenticator.data.authenticator.repository.model.AuthenticatorItem import com.bitwarden.authenticator.data.authenticator.repository.model.SharedVerificationCodesState -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VerificationCodeDisplayItem +import com.bitwarden.authenticator.ui.authenticator.feature.model.VerificationCodeDisplayItem /** * Converts [VerificationCodeItem] to a [VerificationCodeDisplayItem]. diff --git a/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreenTest.kt b/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreenTest.kt index 26a70bfb81..d6ab372180 100644 --- a/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreenTest.kt +++ b/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreenTest.kt @@ -9,9 +9,9 @@ import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performTouchInput import androidx.core.net.toUri -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.SharedCodesDisplayState import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VaultDropdownMenuAction -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VerificationCodeDisplayItem +import com.bitwarden.authenticator.ui.authenticator.feature.model.SharedCodesDisplayState +import com.bitwarden.authenticator.ui.authenticator.feature.model.VerificationCodeDisplayItem import com.bitwarden.authenticator.ui.platform.base.AuthenticatorComposeTest import com.bitwarden.authenticator.ui.platform.manager.intent.IntentManager import com.bitwarden.authenticator.ui.platform.manager.permissions.FakePermissionManager diff --git a/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModelTest.kt b/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModelTest.kt index 28c15ab64a..e744bf6604 100644 --- a/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModelTest.kt +++ b/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModelTest.kt @@ -10,11 +10,11 @@ import com.bitwarden.authenticator.data.authenticator.repository.model.SharedVer import com.bitwarden.authenticator.data.platform.manager.BitwardenEncodingManager import com.bitwarden.authenticator.data.platform.manager.clipboard.BitwardenClipboardManager import com.bitwarden.authenticator.data.platform.repository.SettingsRepository -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.SharedCodesDisplayState import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VaultDropdownMenuAction -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VerificationCodeDisplayItem -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.util.toDisplayItem -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.util.toSharedCodesDisplayState +import com.bitwarden.authenticator.ui.authenticator.feature.model.SharedCodesDisplayState +import com.bitwarden.authenticator.ui.authenticator.feature.model.VerificationCodeDisplayItem +import com.bitwarden.authenticator.ui.authenticator.feature.util.toDisplayItem +import com.bitwarden.authenticator.ui.authenticator.feature.util.toSharedCodesDisplayState import com.bitwarden.authenticatorbridge.manager.AuthenticatorBridgeManager import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.ui.platform.base.BaseViewModelTest diff --git a/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModelTest.kt b/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModelTest.kt index a537f391ec..f8997fc765 100644 --- a/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModelTest.kt +++ b/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/search/ItemSearchViewModelTest.kt @@ -9,6 +9,7 @@ import com.bitwarden.authenticator.data.authenticator.repository.model.Authentic import com.bitwarden.authenticator.data.authenticator.repository.model.SharedVerificationCodesState import com.bitwarden.authenticator.data.authenticator.repository.util.itemsOrEmpty import com.bitwarden.authenticator.data.platform.manager.clipboard.BitwardenClipboardManager +import com.bitwarden.authenticator.ui.authenticator.feature.model.VerificationCodeDisplayItem import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.ui.platform.base.BaseViewModelTest import com.bitwarden.ui.platform.components.icon.model.IconData @@ -66,7 +67,7 @@ class ItemSearchViewModelTest : BaseViewModelTest() { assertEquals( ItemSearchState.ViewState.Content( - displayItems = SHARED_AND_LOCAL_DISPLAY_ITEMS, + itemList = SHARED_AND_LOCAL_DISPLAY_ITEMS, ), viewModel.stateFlow.value.viewState, ) @@ -84,7 +85,7 @@ class ItemSearchViewModelTest : BaseViewModelTest() { assertEquals( ItemSearchState.ViewState.Content( - displayItems = listOf(SHARED_AND_LOCAL_DISPLAY_ITEMS[1]), + itemList = listOf(SHARED_AND_LOCAL_DISPLAY_ITEMS[1]), ), viewModel.stateFlow.value.viewState, ) @@ -116,7 +117,7 @@ private val LOCAL_ITEMS = listOf( private val SHARED_ITEMS = listOf( VerificationCodeItem( - "123456", + code = "123456", periodSeconds = 60, timeLeftSeconds = 30, issueTime = 1, @@ -133,24 +134,36 @@ private val SHARED_ITEMS = listOf( ) private val SHARED_AND_LOCAL_DISPLAY_ITEMS = listOf( - ItemSearchState.DisplayItem( + VerificationCodeDisplayItem( id = SHARED_ITEMS[0].id, authCode = SHARED_ITEMS[0].code, title = SHARED_ITEMS[0].issuer!!, periodSeconds = SHARED_ITEMS[0].periodSeconds, timeLeftSeconds = SHARED_ITEMS[0].timeLeftSeconds, alertThresholdSeconds = 7, - startIcon = IconData.Local(iconRes = R.drawable.ic_login_item), + startIcon = IconData.Local( + iconRes = R.drawable.ic_login_item, + testTag = "BitwardenIcon", + ), subtitle = SHARED_ITEMS[0].label, + favorite = false, + allowLongPressActions = false, + showMoveToBitwarden = false, ), - ItemSearchState.DisplayItem( + VerificationCodeDisplayItem( id = LOCAL_ITEMS[0].id, authCode = LOCAL_ITEMS[0].code, title = LOCAL_ITEMS[0].issuer!!, periodSeconds = LOCAL_ITEMS[0].periodSeconds, timeLeftSeconds = LOCAL_ITEMS[0].timeLeftSeconds, alertThresholdSeconds = 7, - startIcon = IconData.Local(iconRes = R.drawable.ic_login_item), + startIcon = IconData.Local( + iconRes = R.drawable.ic_login_item, + testTag = "BitwardenIcon", + ), subtitle = LOCAL_ITEMS[0].label, + favorite = false, + allowLongPressActions = true, + showMoveToBitwarden = true, ), ) diff --git a/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/util/SharedVerificationCodesStateTest.kt b/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/util/SharedVerificationCodesStateTest.kt similarity index 93% rename from authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/util/SharedVerificationCodesStateTest.kt rename to authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/util/SharedVerificationCodesStateTest.kt index f0ab4a744c..73ce0597c5 100644 --- a/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/util/SharedVerificationCodesStateTest.kt +++ b/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/util/SharedVerificationCodesStateTest.kt @@ -1,11 +1,11 @@ -package com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.util +package com.bitwarden.authenticator.ui.authenticator.feature.util import com.bitwarden.authenticator.R import com.bitwarden.authenticator.data.authenticator.manager.model.VerificationCodeItem import com.bitwarden.authenticator.data.authenticator.repository.model.AuthenticatorItem import com.bitwarden.authenticator.data.authenticator.repository.model.SharedVerificationCodesState -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.SharedCodesDisplayState -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VerificationCodeDisplayItem +import com.bitwarden.authenticator.ui.authenticator.feature.model.SharedCodesDisplayState +import com.bitwarden.authenticator.ui.authenticator.feature.model.VerificationCodeDisplayItem import com.bitwarden.ui.util.asText import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/util/VerificationCodeItemExtensionsTest.kt b/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/util/VerificationCodeItemExtensionsTest.kt similarity index 97% rename from authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/util/VerificationCodeItemExtensionsTest.kt rename to authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/util/VerificationCodeItemExtensionsTest.kt index 0341cdf629..01bae300aa 100644 --- a/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/util/VerificationCodeItemExtensionsTest.kt +++ b/authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/util/VerificationCodeItemExtensionsTest.kt @@ -1,9 +1,9 @@ -package com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.util +package com.bitwarden.authenticator.ui.authenticator.feature.util import com.bitwarden.authenticator.data.authenticator.manager.util.createMockVerificationCodeItem import com.bitwarden.authenticator.data.authenticator.repository.model.AuthenticatorItem import com.bitwarden.authenticator.data.authenticator.repository.model.SharedVerificationCodesState -import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VerificationCodeDisplayItem +import com.bitwarden.authenticator.ui.authenticator.feature.model.VerificationCodeDisplayItem import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test