feat: VFO-1 naming changes feature branch

[andrebispo5]

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-40631
https://bitwarden.atlassian.net/browse/PM-40635
https://bitwarden.atlassian.net/browse/PM-40638
https://bitwarden.atlassian.net/browse/PM-40805
https://bitwarden.atlassian.net/browse/PM-40761

📔 Objective

This is the feature branch for the VFO-1 terminology rename effort ("Owner"→"Vault", "Collection"→"Shared folder" + icon, "Organization"→"Vault"). It restores that work after a temporary revert, so the diff is byte-for-byte identical to the original changes, and now also includes two follow-on renames that stemmed from the same clarity push: "Move to vault"→"Move", and "Folders"→"My folders" (to disambiguate personal folders from "Shared folders"). It stays open as a draft, parked as the integration point further VFO-related renames stack on top of, until an explicit go-ahead to merge.

🔀 Referenced PRs

• [PM-40631] feat: Display personal vault as "My vault" instead of email address #7183 — PM-40631 Display personal vault as "My vault" instead of email address (merged)
• [PM-40635] feat: Update "collection" to "shared folder" #7189 — [PM-40635] Update "collection" to "shared folder" (merged)
• [PM-40638] feat: Rename "organization" to "vault" #7192 — [PM-40638] Rename "organization" to "vault" (merged)
• [PM-40805] feat: Rename "Move to vault" to "Move" #7200 — [PM-40805] Rename "Move to vault" to "Move" (merged)
• [PM-40761] feat: Rename "Folders" to "My folders" #7213 — [PM-40761] Rename "Folders" to "My folders" (merged)

[andrebispo5]

Do not merge until further notice.

[Copilot]

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.

[codecov]

Codecov Report

❌ Patch coverage is 78.57143% with 9 lines in your changes missing coverage. Please review.
✅ Project coverage is 86.09%. Comparing base (04edb4c) to head (3c5de4a).
⚠️ Report is 10 commits behind head on main.

Files with missing lines	Patch %	Lines
...den/ui/vault/feature/addedit/VaultAddEditScreen.kt	84.61%	0 Missing and 2 partials ⚠️
...8bit/bitwarden/ui/vault/model/VaultTrailingIcon.kt	0.00%	2 Missing ⚠️
...i/vault/feature/addedit/VaultAddEditItemContent.kt	66.66%	0 Missing and 1 partial ⚠️
.../ui/vault/feature/addedit/VaultAddEditViewModel.kt	75.00%	1 Missing ⚠️
...n/ui/vault/feature/item/model/VaultItemLocation.kt	0.00%	1 Missing ⚠️
...itemlisting/util/VaultItemListingDataExtensions.kt	0.00%	1 Missing ⚠️
...toorganization/VaultMoveToOrganizationViewModel.kt	66.66%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #7196      +/-   ##
==========================================
- Coverage   86.20%   86.09%   -0.12%     
==========================================
  Files         884      891       +7     
  Lines       64672    64869     +197     
  Branches     9673     9700      +27     
==========================================
+ Hits        55751    55846      +95     
- Misses       5456     5552      +96     
- Partials     3465     3471       +6     

Flag	Coverage Δ
app-data	17.73% <0.00%> (-0.03%)	⬇️
app-ui-auth-tools	18.74% <0.00%> (-0.04%)	⬇️
app-ui-platform	16.52% <5.71%> (-0.04%)	⬇️
app-ui-vault	27.31% <79.48%> (-0.05%)	⬇️
authenticator	6.10% <0.00%> (-0.02%)	⬇️
lib-core-network-bridge	4.13% <0.00%> (+0.11%)	⬆️
lib-data-ui	1.18% <0.00%> (+0.03%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.