From 69bccf469fb579977bfdd21ce43450ae1d9554fb Mon Sep 17 00:00:00 2001 From: David Perez Date: Tue, 21 Nov 2023 14:23:44 -0600 Subject: [PATCH] Add view item navigation (#269) --- .../x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt | 8 +------- .../bitwarden/ui/vault/feature/vault/VaultViewModel.kt | 7 ------- .../bitwarden/ui/vault/feature/vault/VaultScreenTest.kt | 4 ++-- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt index 0a93431711..7885e65a3f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt @@ -53,8 +53,6 @@ fun VaultScreen( when (event) { VaultEvent.NavigateToAddItemScreen -> onNavigateToVaultAddItemScreen() - is VaultEvent.NavigateToItemScreen -> onNavigateToVaultItemScreen(event.vaultItemId) - VaultEvent.NavigateToVaultSearchScreen -> { // TODO Create vault search screen and navigation implementation BIT-213 Toast @@ -62,11 +60,7 @@ fun VaultScreen( .show() } - is VaultEvent.NavigateToVaultItem -> { - Toast - .makeText(context, "Navigate to the item details screen", Toast.LENGTH_SHORT) - .show() - } + is VaultEvent.NavigateToVaultItem -> onNavigateToVaultItemScreen(event.itemId) VaultEvent.NavigateToCardGroup -> { Toast diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt index f2564985bc..3126ed679f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt @@ -406,13 +406,6 @@ sealed class VaultEvent { */ data object NavigateToAddItemScreen : VaultEvent() - /** - * Navigate to the Vault Item screen. - */ - data class NavigateToItemScreen( - val vaultItemId: String, - ) : VaultEvent() - /** * Navigate to the item details screen. */ diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt index 3219c1b747..0d24479d53 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt @@ -118,8 +118,8 @@ class VaultScreenTest : BaseComposeTest() { } @Test - fun `NavigateToItemScreen event should call onNavigateToVaultItemScreenCalled`() { - mutableEventFlow.tryEmit(VaultEvent.NavigateToItemScreen(vaultItemId = "id")) + fun `NavigateToVaultItem event should call onNavigateToVaultItemScreenCalled`() { + mutableEventFlow.tryEmit(VaultEvent.NavigateToVaultItem(itemId = "id")) assertTrue(onNavigateToVaultItemScreenCalled) }