github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-07 19:39:41 -05:00
Code Issues 1.1k Packages Projects Releases 122 Wiki Activity

[PR #6794] [MERGED] [PM-33517] feat: Add Plan row to Settings and premium upgrade flow #43963

New Issue
Closed
opened 2026-04-23 22:38:01 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-23 22:38:01 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6794
Author: @SaintPatrck
Created: 4/14/2026
Status: ✅ Merged
Merged: 4/22/2026
Merged by: @SaintPatrck

Base: main ← Head: premium-upgrade/PM-33517-settings-premium_bak

📝 Commits (1)

  • a6452ec [PM-33517] feat: Add Plan row to Settings and premium upgrade flow

📊 Changes

12 files changed (+369 additions, -63 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanNavigation.kt (+19 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanScreen.kt (+17 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanViewModel.kt (+75 -51)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsNavigation.kt (+6 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreen.kt (+3 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsViewModel.kt (+67 -4)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanScreenTest.kt (+1 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanViewModelTest.kt (+49 -4)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreenTest.kt (+10 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsViewModelTest.kt (+102 -0)
➕ ui/src/main/res/drawable/ic_plan.xml (+19 -0)
📝 ui/src/main/res/values/strings.xml (+1 -0)

📄 Description

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-33517

📔 Objective

Adds a Plan row to the Settings menu, gated behind FlagKey.MobilePremiumUpgrade, so authenticated users can reach the upgrade flow (Free) or a subscription management entry point (Premium).

  • Free users — tapping the Plan row opens a new PlanScreen showing monthly rate and feature highlights, launches checkout via AuthTab, and handles the post-checkout sync / pending-upgrade transitions.
  • Premium users — tapping the Plan row opens the same screen with an empty placeholder. Full subscription management (status badge, line items, manage plan / cancel) lands in PM-35455.
  • Plan row is placed between Appearance and Other in the Settings list and is hidden in pre-auth mode.

📸 Screenshots

image

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/6794 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 4/14/2026 **Status:** ✅ Merged **Merged:** 4/22/2026 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `premium-upgrade/PM-33517-settings-premium_bak` --- ### 📝 Commits (1) - [`a6452ec`](https://github.com/bitwarden/android/commit/a6452ec6e72190ca7d91a4c734a5853855b41139) [PM-33517] feat: Add Plan row to Settings and premium upgrade flow ### 📊 Changes **12 files changed** (+369 additions, -63 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanNavigation.kt` (+19 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanScreen.kt` (+17 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanViewModel.kt` (+75 -51) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsNavigation.kt` (+6 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreen.kt` (+3 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsViewModel.kt` (+67 -4) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanScreenTest.kt` (+1 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanViewModelTest.kt` (+49 -4) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreenTest.kt` (+10 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsViewModelTest.kt` (+102 -0) ➕ `ui/src/main/res/drawable/ic_plan.xml` (+19 -0) 📝 `ui/src/main/res/values/strings.xml` (+1 -0) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-33517 ## 📔 Objective Adds a Plan row to the Settings menu, gated behind `FlagKey.MobilePremiumUpgrade`, so authenticated users can reach the upgrade flow (Free) or a subscription management entry point (Premium). - **Free users** — tapping the Plan row opens a new `PlanScreen` showing monthly rate and feature highlights, launches checkout via AuthTab, and handles the post-checkout sync / pending-upgrade transitions. - **Premium users** — tapping the Plan row opens the same screen with an empty placeholder. Full subscription management (status badge, line items, manage plan / cancel) lands in [PM-35455]. - Plan row is placed between Appearance and Other in the Settings list and is hidden in pre-auth mode. [PM-35455]: https://bitwarden.atlassian.net/browse/PM-35455 ## 📸 Screenshots <img width="399" height="841" alt="image" src="https://github.com/user-attachments/assets/fc62dc43-d997-4e5d-a98b-c2b674e05c39" /> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-23 22:38:01 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#43963
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?