From 6fbf109df5f99ff4e31dd04ff19213908628169f Mon Sep 17 00:00:00 2001 From: Ramsey Smith <142836716+ramsey-livefront@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:54:37 -0700 Subject: [PATCH] Corrected directories within vault package (#287) --- .../feature/vaultunlocked/VaultUnlockedNavigation.kt | 8 ++++---- .../feature/{vault => additem}/VaultAddItemNavigation.kt | 2 +- .../feature/{vault => additem}/VaultAddItemScreen.kt | 2 +- .../feature/{vault => additem}/VaultAddItemViewModel.kt | 8 ++++---- .../{vault => additem}/VaultAddLoginItemTypeHandlers.kt | 2 +- .../vault/feature/{vault => }/item/VaultItemNavigation.kt | 2 +- .../ui/vault/feature/{vault => }/item/VaultItemScreen.kt | 2 +- .../vault/feature/{vault => }/item/VaultItemViewModel.kt | 2 +- .../feature/{vault => additem}/VaultAddItemScreenTest.kt | 2 +- .../{vault => additem}/VaultAddItemViewModelTest.kt | 2 +- .../vault/feature/{vault => }/item/VaultItemScreenTest.kt | 2 +- .../feature/{vault => }/item/VaultItemViewModelTest.kt | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) rename app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/{vault => additem}/VaultAddItemNavigation.kt (94%) rename app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/{vault => additem}/VaultAddItemScreen.kt (99%) rename app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/{vault => additem}/VaultAddItemViewModel.kt (98%) rename app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/{vault => additem}/VaultAddLoginItemTypeHandlers.kt (99%) rename app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/{vault => }/item/VaultItemNavigation.kt (96%) rename app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/{vault => }/item/VaultItemScreen.kt (97%) rename app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/{vault => }/item/VaultItemViewModel.kt (96%) rename app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/{vault => additem}/VaultAddItemScreenTest.kt (99%) rename app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/{vault => additem}/VaultAddItemViewModelTest.kt (99%) rename app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/{vault => }/item/VaultItemScreenTest.kt (96%) rename app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/{vault => }/item/VaultItemViewModelTest.kt (96%) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt index 142f428b26..75e337f9aa 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt @@ -10,10 +10,10 @@ import com.x8bit.bitwarden.ui.platform.feature.vaultunlockednavbar.VAULT_UNLOCKE import com.x8bit.bitwarden.ui.platform.feature.vaultunlockednavbar.vaultUnlockedNavBarDestination import com.x8bit.bitwarden.ui.tools.feature.send.navigateToNewSend import com.x8bit.bitwarden.ui.tools.feature.send.newSendDestination -import com.x8bit.bitwarden.ui.vault.feature.vault.item.navigateToVaultItem -import com.x8bit.bitwarden.ui.vault.feature.vault.item.vaultItemDestination -import com.x8bit.bitwarden.ui.vault.feature.vault.navigateToVaultAddItem -import com.x8bit.bitwarden.ui.vault.feature.vault.vaultAddItemDestination +import com.x8bit.bitwarden.ui.vault.feature.item.navigateToVaultItem +import com.x8bit.bitwarden.ui.vault.feature.item.vaultItemDestination +import com.x8bit.bitwarden.ui.vault.feature.additem.navigateToVaultAddItem +import com.x8bit.bitwarden.ui.vault.feature.additem.vaultAddItemDestination const val VAULT_UNLOCKED_GRAPH_ROUTE: String = "vault_unlocked_graph" diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemNavigation.kt similarity index 94% rename from app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemNavigation.kt rename to app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemNavigation.kt index 4e88945420..08580f8158 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemNavigation.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.vault.feature.vault +package com.x8bit.bitwarden.ui.vault.feature.additem import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemScreen.kt similarity index 99% rename from app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemScreen.kt rename to app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemScreen.kt index 8c97531741..1a95f9e2bb 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemScreen.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.vault.feature.vault +package com.x8bit.bitwarden.ui.vault.feature.additem import android.widget.Toast import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemViewModel.kt similarity index 98% rename from app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemViewModel.kt rename to app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemViewModel.kt index 82edace6a5..5dbe9bd055 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemViewModel.kt @@ -1,13 +1,13 @@ -package com.x8bit.bitwarden.ui.vault.feature.vault +package com.x8bit.bitwarden.ui.vault.feature.additem import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.platform.base.BaseViewModel -import com.x8bit.bitwarden.ui.vault.feature.vault.VaultAddItemState.ItemType.Card.displayStringResId -import com.x8bit.bitwarden.ui.vault.feature.vault.VaultAddItemState.ItemType.Identity.displayStringResId -import com.x8bit.bitwarden.ui.vault.feature.vault.VaultAddItemState.ItemType.SecureNotes.displayStringResId +import com.x8bit.bitwarden.ui.vault.feature.additem.VaultAddItemState.ItemType.Card.displayStringResId +import com.x8bit.bitwarden.ui.vault.feature.additem.VaultAddItemState.ItemType.Identity.displayStringResId +import com.x8bit.bitwarden.ui.vault.feature.additem.VaultAddItemState.ItemType.SecureNotes.displayStringResId import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddLoginItemTypeHandlers.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddLoginItemTypeHandlers.kt similarity index 99% rename from app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddLoginItemTypeHandlers.kt rename to app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddLoginItemTypeHandlers.kt index 241f9997d2..f4ac1325f7 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddLoginItemTypeHandlers.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddLoginItemTypeHandlers.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.vault.feature.vault +package com.x8bit.bitwarden.ui.vault.feature.additem /** * A collection of handler functions specifically tailored for managing actions diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemNavigation.kt similarity index 96% rename from app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemNavigation.kt rename to app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemNavigation.kt index 57ef1c67a2..68de4ab486 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemNavigation.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.vault.feature.vault.item +package com.x8bit.bitwarden.ui.vault.feature.item import androidx.lifecycle.SavedStateHandle import androidx.navigation.NavController diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt similarity index 97% rename from app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemScreen.kt rename to app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt index 2e080cb99f..d1c47abad2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.vault.feature.vault.item +package com.x8bit.bitwarden.ui.vault.feature.item import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt similarity index 96% rename from app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemViewModel.kt rename to app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt index 3daa60e85d..ce7253035e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.vault.feature.vault.item +package com.x8bit.bitwarden.ui.vault.feature.item import android.os.Parcelable import androidx.lifecycle.SavedStateHandle diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemScreenTest.kt similarity index 99% rename from app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemScreenTest.kt rename to app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemScreenTest.kt index 91e6b55637..4a0d72e8cd 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemScreenTest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.vault.feature.vault +package com.x8bit.bitwarden.ui.vault.feature.additem import androidx.compose.ui.geometry.Offset import androidx.compose.ui.test.assertIsDisplayed diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemViewModelTest.kt similarity index 99% rename from app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemViewModelTest.kt rename to app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemViewModelTest.kt index f2d110bd4e..363b2743ce 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemViewModelTest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.vault.feature.vault +package com.x8bit.bitwarden.ui.vault.feature.additem import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt similarity index 96% rename from app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemScreenTest.kt rename to app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt index 9fb5d327f7..b82ef26bb2 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.vault.feature.vault.item +package com.x8bit.bitwarden.ui.vault.feature.item import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.performClick diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt similarity index 96% rename from app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemViewModelTest.kt rename to app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt index a7581a4f64..e66f45a99d 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/item/VaultItemViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.vault.feature.vault.item +package com.x8bit.bitwarden.ui.vault.feature.item import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test