starred/android
1
0 Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-10-22 02:53:19 -05:00
Code Issues Packages Projects Releases 10 Wiki Activity

[PM-40638] feat: Rename "organization" to "vault" (#7192)

Browse Source
This commit is contained in:
André Bispo authored and GitHub committed 2026-07-22 15:07:00 +00:00
1 parent 1c67fd778d
commit dc2d0e6f5c
9 files changed
+30 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt
+1 -1
View File
@@ -372,7 +372,7 @@ fun VaultAddEditScreen(
.takeUnless { state.isAddItemMode },
OverflowMenuItemData(
text = stringResource(
id = BitwardenString.move_to_organization,
id = BitwardenString.move_to_vault,
),
onClick = {
viewModel.trySendAction(
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt
+1 -1
View File
@@ -202,7 +202,7 @@ fun VaultItemScreen(
)
.takeUnless { state.isCipherInCollection },
OverflowMenuItemData(
text = stringResource(id = BitwardenString.move_to_organization),
text = stringResource(id = BitwardenString.move_to_vault),
onClick = {
viewModel.trySendAction(
VaultItemAction.Common.MoveToOrganizationClick,
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationContent.kt
+2 -2
View File
@@ -39,7 +39,7 @@ fun VaultMoveToOrganizationContent(
if (!showOnlyCollections) {
item {
BitwardenMultiSelectButton(
label = stringResource(id = BitwardenString.organization),
label = stringResource(id = BitwardenString.vault),
options = state
.organizations
.map { it.name }
@@ -52,7 +52,7 @@ fun VaultMoveToOrganizationContent(
.first { it.name == selectedString },
)
},
supportingText = stringResource(id = BitwardenString.move_to_org_desc),
supportingText = stringResource(id = BitwardenString.move_to_vault_desc),
cardStyle = CardStyle.Full,
modifier = Modifier
.testTag("OrganizationListDropdown")
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationEmpty.kt
+1 -1
View File
@@ -26,7 +26,7 @@ fun VaultMoveToOrganizationEmpty(modifier: Modifier = Modifier) {
) {
Spacer(modifier = Modifier.height(8.dp))
Text(
text = stringResource(id = BitwardenString.no_orgs_to_list),
text = stringResource(id = BitwardenString.no_vaults_to_list),
style = BitwardenTheme.typography.bodyMedium,
color = BitwardenTheme.colorScheme.text.secondary,
textAlign = TextAlign.Center,
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt
+1 -1
View File
@@ -351,7 +351,7 @@ data class VaultMoveToOrganizationState(
get() = if (onlyShowCollections) {
BitwardenString.shared_folders.asText()
} else {
BitwardenString.move_to_organization.asText()
BitwardenString.move_to_vault.asText()
}
val appBarButtonText: Text
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt
+6 -6
View File
@@ -4422,7 +4422,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
.assertIsDisplayed()
composeTestRule
.onAllNodesWithText("Move to Organization")
.onAllNodesWithText("Move to vault")
.filterToOne(hasAnyAncestor(isPopup()))
.assertDoesNotExist()
@@ -4510,7 +4510,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
.assertIsDisplayed()
composeTestRule
.onAllNodesWithText("Move to Organization")
.onAllNodesWithText("Move to vault")
.filterToOne(hasAnyAncestor(isPopup()))
.assertIsDisplayed()
@@ -5181,7 +5181,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
// Confirm dropdown version of item is absent
composeTestRule
.onAllNodesWithText("Move to Organization")
.onAllNodesWithText("Move to vault")
.filter(hasAnyAncestor(isPopup()))
.assertCountEquals(0)
// Open the overflow menu
@@ -5191,7 +5191,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
// Confirm it does not exist
composeTestRule
.onAllNodesWithText("Move to Organization")
.onAllNodesWithText("Move to vault")
.filterToOne(hasAnyAncestor(isPopup()))
.assertIsNotDisplayed()
}
@@ -5216,7 +5216,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
// Confirm dropdown version of item is absent
composeTestRule
.onAllNodesWithText("Move to Organization")
.onAllNodesWithText("Move to vault")
.filter(hasAnyAncestor(isPopup()))
.assertCountEquals(0)
@@ -5225,7 +5225,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
.performClick()
composeTestRule
.onAllNodesWithText("Move to Organization")
.onAllNodesWithText("Move to vault")
.filterToOne(hasAnyAncestor(isPopup()))
.assertIsDisplayed()
}
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt
+6 -6
View File
@@ -1547,14 +1547,14 @@ class VaultItemScreenTest : BitwardenComposeTest() {
// Confirm dropdown version of item is absent
composeTestRule
.onAllNodesWithText("Move to Organization")
.onAllNodesWithText("Move to vault")
.filter(hasAnyAncestor(isPopup()))
.assertCountEquals(0)
// Open the overflow menu
composeTestRule.onNodeWithContentDescription("More options").performClick()
// Click on the move to organization hint item in the dropdown
composeTestRule
.onAllNodesWithText("Move to Organization")
.onAllNodesWithText("Move to vault")
.filterToOne(hasAnyAncestor(isPopup()))
.performClick()
verify {
@@ -1574,14 +1574,14 @@ class VaultItemScreenTest : BitwardenComposeTest() {
// Confirm dropdown version of item is absent
composeTestRule
.onAllNodesWithText("Move to Organization")
.onAllNodesWithText("Move to vault")
.filter(hasAnyAncestor(isPopup()))
.assertCountEquals(0)
// Open the overflow menu
composeTestRule.onNodeWithContentDescription("More options").performClick()
// Confirm it does not exist
composeTestRule
.onAllNodesWithText("Move to Organization")
.onAllNodesWithText("Move to vault")
.filterToOne(hasAnyAncestor(isPopup()))
.assertDoesNotExist()
}
@@ -1696,7 +1696,7 @@ class VaultItemScreenTest : BitwardenComposeTest() {
.assertIsDisplayed()
composeTestRule
.onAllNodesWithText("Move to Organization")
.onAllNodesWithText("Move to vault")
.filterToOne(hasAnyAncestor(isPopup()))
.assertDoesNotExist()
@@ -1724,7 +1724,7 @@ class VaultItemScreenTest : BitwardenComposeTest() {
.assertIsDisplayed()
composeTestRule
.onAllNodesWithText("Move to Organization")
.onAllNodesWithText("Move to vault")
.filterToOne(hasAnyAncestor(isPopup()))
.assertIsDisplayed()
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt
+9 -10
View File
@@ -60,7 +60,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
.onNodeWithText(text = "Shared folders")
.assertIsNotDisplayed()
composeTestRule
.onNodeWithText(text = "Move to Organization")
.onNodeWithText(text = "Move to vault")
.assertIsDisplayed()
mutableStateFlow.update { currentState ->
@@ -68,7 +68,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
}
composeTestRule
.onNodeWithText(text = "Move to Organization")
.onNodeWithText(text = "Move to vault")
.assertIsNotDisplayed()
composeTestRule
.onNodeWithText(text = "Shared folders")
@@ -104,7 +104,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
fun `the organization option field should update according to state`() {
composeTestRule
.onNodeWithContentDescription(
label = "mockOrganizationName-1. Organization",
label = "mockOrganizationName-1. Vault",
substring = true,
)
.assertIsDisplayed()
@@ -114,14 +114,14 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
}
composeTestRule
.onNodeWithContentDescription(label = "mockOrganizationName-1. Organization")
.onNodeWithContentDescription(label = "mockOrganizationName-1. Vault")
.assertIsNotDisplayed()
}
@Test
fun `the organization option field description should update according to state`() {
composeTestRule
.onNodeWithText(text = "Choose an organization that", substring = true)
.onNodeWithText(text = "Choose a vault that", substring = true)
.assertIsDisplayed()
mutableStateFlow.update { currentState ->
@@ -129,8 +129,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
}
composeTestRule
composeTestRule
.onNodeWithText(text = "Choose an organization that", substring = true)
.onNodeWithText(text = "Choose a vault that", substring = true)
.assertIsNotDisplayed()
}
@@ -169,7 +168,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
@Test
fun `selecting an organization should send OrganizationSelect action`() {
composeTestRule
.onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-1. Organization")
.onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-1. Vault")
.performClick()
// Choose the option from the menu
composeTestRule
@@ -201,7 +200,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
@Test
fun `the organization option field should display according to state`() {
composeTestRule
.onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-1. Organization")
.onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-1. Vault")
.assertIsDisplayed()
mutableStateFlow.update { currentState ->
@@ -214,7 +213,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
}
composeTestRule
.onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-2. Organization")
.onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-2. Vault")
.assertIsDisplayed()
}
ui/src/main/res/values/strings.xml
+3 -3
View File
@@ -341,9 +341,9 @@ Scanning will happen automatically.</string>
<string name="moved_item_to_org">%1$s moved to %2$s.</string>
<string name="you_must_select_at_least_one_shared_folder">You must select at least one shared folder.</string>
<string name="share">Share</string>
<string name="move_to_organization">Move to Organization</string>
<string name="no_orgs_to_list">No organizations to list.</string>
<string name="move_to_org_desc">Choose an organization that you wish to move this item to. Moving to an organization transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved.</string>
<string name="move_to_vault">Move to vault</string>
<string name="no_vaults_to_list">No vaults to list.</string>
<string name="move_to_vault_desc">Choose a vault that you wish to move this item to. Moving to another vault transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved.</string>
<string name="number_of_words">Number of words</string>
<string name="passphrase">Passphrase</string>
<string name="word_separator">Word separator</string>