[PM-40631][PM-40635][PM-40638] feat: Re-add VFO-1 naming changes (#7183, #7189, #7192)#7196
[PM-40631][PM-40635][PM-40638] feat: Re-add VFO-1 naming changes (#7183, #7189, #7192)#7196andrebispo5 wants to merge 1 commit into
Conversation
|
Do not merge until further notice. |
There was a problem hiding this comment.
Pull request overview
This PR restores the previously reverted VFO-1 terminology updates across the Android UI, replacing “Owner/Collection/Organization” wording with “Vault/Shared folder/Vault” in relevant screens, strings, icons, and tests.
Changes:
- Replaces “Collections” UI strings and icon usage with “Shared folders” equivalents.
- Updates “Owner” selection UI to “Vault” terminology (including “My vault” for the personal vault) and adjusts model/test data to use
Text+ immutable owner lists. - Updates Compose/UI tests to assert the new terminology and icon usage.
Reviewed changes
Copilot reviewed 26 out of 26 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| ui/src/main/res/values/strings.xml | Adds new “shared folders”/“select vault” string keys and updates terminology in default resources. |
| ui/src/main/res/drawable/ic_shared_folder.xml | Adds new shared-folder vector asset. |
| ui/src/main/res/drawable/ic_collections.xml | Removes the old collections vector asset. |
| app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/model/VaultTrailingIcon.kt | Switches trailing icon and content description from collections to shared folders. |
| app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt | Updates vault list header/icon to “Shared folders” + new drawable. |
| app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt | Updates app bar text and validation error message to shared-folder terminology. |
| app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt | Updates item listing collection header/icon to shared-folder terminology. |
| app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt | Updates empty-state string mapping for collection listings to shared-folder text. |
| app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt | Updates overflow menu item label to “Shared folders”. |
| app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/model/VaultItemLocation.kt | Updates collection location icon to shared-folder drawable. |
| app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt | Updates owner selection validation string and shifts owners list to ImmutableList + Text names. |
| app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt | Updates owner bottom sheet to “Select vault” and refactors selection state handling. |
| app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditItemContent.kt | Updates ownership field label to “Vault” and displays Text owner names. |
| app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt | Uses my_vault label for personal vault and returns immutable owner lists with Text names. |
| app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/components/CollectionItemSelector.kt | Updates header + empty state text to “Shared folders” terminology. |
| app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt | Updates assertions for “SHARED FOLDERS” header. |
| app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt | Updates expected trailing icon drawable + content descriptions. |
| app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensionsTest.kt | Updates owner test data to use Text + persistent lists. |
| app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt | Updates assertions from “Collections” to “Shared folders”. |
| app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt | Updates assertions for shared-folder terminology and counts. |
| app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataUtil.kt | Updates expected icon drawable + content descriptions to shared-folder equivalents. |
| app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt | Updates overflow menu assertions from “Collections” to “Shared folders”. |
| app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt | Updates owner names to Text, personal vault to my_vault, and owner lists to immutable lists. |
| app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt | Updates UI assertions for “My vault” / “Select vault” and shared-folder overflow menu label. |
| app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt | Updates test state to use persistent/immutable owner lists and Text owner names. |
| app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchUtil.kt | Updates expected trailing icon drawable + content descriptions in search test utilities. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| <string name="vault_is_locked">Vault is locked</string> | ||
| <string name="go_to_my_vault">Go to my vault</string> | ||
| <string name="collections">Collections</string> | ||
| <string name="no_items_collection">There are no items in this collection.</string> | ||
| <string name="shared_folders">Shared folders</string> | ||
| <string name="there_are_no_items_in_this_shared_folder">There are no items in this shared folder.</string> |
| <string name="owner">Owner</string> | ||
| <string name="no_collections_to_list">There are no collections to list.</string> | ||
| <string name="there_are_no_shared_folders_to_list">There are no shared folders to list.</string> | ||
| <string name="moved_item_to_org">%1$s moved to %2$s.</string> | ||
| <string name="select_one_collection">You must select at least one collection.</string> | ||
| <string name="you_must_select_at_least_one_shared_folder">You must select at least one shared folder.</string> |
| var selectedOwner by rememberSaveable { | ||
| mutableStateOf(state.selectedOwner) | ||
| } |
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #7196 +/- ##
==========================================
- Coverage 86.20% 86.09% -0.12%
==========================================
Files 884 887 +3
Lines 64672 64750 +78
Branches 9673 9674 +1
==========================================
- Hits 55751 55746 -5
- Misses 5456 5538 +82
- Partials 3465 3466 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Summary
Opened as a draft intentionally — this is parked and should not be merged until a later, explicit go-ahead.
Test plan
:app:compileStandardDebugKotlin/:app:compileStandardDebugUnitTestKotlinpass:app:testStandardDebugUnitTestpassesdetektand:app:lintStandardDebugpassdc2d0e6f5(main's tip right before the revert) is empty — confirms exact restoration