Skip to content

[PM-40631][PM-40635][PM-40638] feat: Re-add VFO-1 naming changes (#7183, #7189, #7192)#7196

Draft
andrebispo5 wants to merge 1 commit into
mainfrom
readd-vfo1-naming-changes
Draft

[PM-40631][PM-40635][PM-40638] feat: Re-add VFO-1 naming changes (#7183, #7189, #7192)#7196
andrebispo5 wants to merge 1 commit into
mainfrom
readd-vfo1-naming-changes

Conversation

@andrebispo5

Copy link
Copy Markdown
Contributor

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:compileStandardDebugUnitTestKotlin pass
  • :app:testStandardDebugUnitTest passes
  • detekt and :app:lintStandardDebug pass
  • Diff against dc2d0e6f5 (main's tip right before the revert) is empty — confirms exact restoration

@github-actions github-actions Bot added app:password-manager Bitwarden Password Manager app context app:authenticator Bitwarden Authenticator app context labels Jul 22, 2026
@andrebispo5 andrebispo5 changed the title Re-add VFO-1 naming changes (#7183, #7189, #7192) [PM-40631][PM-40635][PM-40638] feat: Re-add VFO-1 naming changes (#7183, #7189, #7192) Jul 22, 2026
@andrebispo5 andrebispo5 added the t:feature Change Type - Feature Development label Jul 22, 2026
@andrebispo5
andrebispo5 marked this pull request as ready for review July 22, 2026 19:58
@andrebispo5
andrebispo5 requested review from a team and david-livefront as code owners July 22, 2026 19:58
Copilot AI review requested due to automatic review settings July 22, 2026 19:58
@andrebispo5 andrebispo5 added the hold do not merge yet label Jul 22, 2026
@andrebispo5

Copy link
Copy Markdown
Contributor Author

Do not merge until further notice.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment on lines 283 to +286
<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>
Comment on lines 339 to +342
<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>
Comment on lines +808 to 810
var selectedOwner by rememberSaveable {
mutableStateOf(state.selectedOwner)
}
@vvolkgang
vvolkgang marked this pull request as draft July 22, 2026 20:29
@codecov

codecov Bot commented Jul 22, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 71.87500% with 9 lines in your changes missing coverage. Please review.
✅ Project coverage is 86.09%. Comparing base (04edb4c) to head (6db4af6).

Files with missing lines Patch % Lines
...den/ui/vault/feature/addedit/VaultAddEditScreen.kt 81.81% 0 Missing and 2 partials ⚠️
...8bit/bitwarden/ui/vault/model/VaultTrailingIcon.kt 0.00% 2 Missing ⚠️
...i/vault/feature/addedit/VaultAddEditItemContent.kt 50.00% 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 50.00% 1 Missing ⚠️
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     
Flag Coverage Δ
app-data 17.76% <0.00%> (+<0.01%) ⬆️
app-ui-auth-tools 18.78% <0.00%> (+<0.01%) ⬆️
app-ui-platform 16.55% <0.00%> (+<0.01%) ⬆️
app-ui-vault 27.36% <79.31%> (-0.01%) ⬇️
authenticator 6.12% <0.00%> (+<0.01%) ⬆️
lib-core-network-bridge 4.01% <0.00%> (-0.01%) ⬇️
lib-data-ui 1.15% <0.00%> (-0.01%) ⬇️

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

app:authenticator Bitwarden Authenticator app context app:password-manager Bitwarden Password Manager app context hold do not merge yet t:feature Change Type - Feature Development

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants