[PR #4058] [MERGED] PM-13286: Update segmented control to match the TopAppBar #4651

New Issue

GiteaMirror · 2025-11-26T23:47:55-06:00

GiteaMirror commented

2025-11-26 23:47:55 -06:00

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4058
Author: @david-livefront
Created: 10/9/2024
Status: ✅ Merged
Merged: 10/10/2024
Merged by: @david-livefront

Base: main ← Head: update-segmented-control

📝 Commits (1)

e0b7cdf Update segmented control to match the TopAppBar

📊 Changes

6 files changed (+69 additions, -60 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/segment/BitwardenSegmentedButton.kt (+41 -15)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/segment/color/BitwardenSegmentedButtonColors.kt (+5 -4)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/BitwardenShapes.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/Shapes.kt (+2 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt (+20 -31)
📝 app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreenTest.kt (+0 -10)

📄 Description

🎟️ Tracking

PM-13286

📔 Objective

This PR updates the Segmented Control to look like it is part of the TopAppBar.

📸 Screenshots

Before	After

⏰ Reminders before review

Contributor guidelines followed
All formatters and local linters executed and passed
Written new unit and / or integration tests where applicable
Used internationalization (i18n) for all UI strings
CI builds passed
Communicated to DevOps any deployment requirements
Updated any necessary documentation or informed the documentation team

🦮 Reviewer guidelines

👍 (:+1:) or similar for great changes
📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
❓ (:question:) for questions
🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed
issue and could potentially benefit from discussion
🎨 (:art:) for suggestions / improvements
❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
⛏ (:pick:) for minor or nitpick changes

_{🔄 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/4058 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 10/9/2024 **Status:** ✅ Merged **Merged:** 10/10/2024 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `update-segmented-control` --- ### 📝 Commits (1) - [`e0b7cdf`](https://github.com/bitwarden/android/commit/e0b7cdfd3fefd0670e8b301fd2fa997df5753266) Update segmented control to match the TopAppBar ### 📊 Changes **6 files changed** (+69 additions, -60 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/segment/BitwardenSegmentedButton.kt` (+41 -15) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/segment/color/BitwardenSegmentedButtonColors.kt` (+5 -4) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/BitwardenShapes.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/Shapes.kt` (+2 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt` (+20 -31) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreenTest.kt` (+0 -10) </details> ### 📄 Description ## 🎟️ Tracking [PM-13286](https://bitwarden.atlassian.net/browse/PM-13286) ## 📔 Objective This PR updates the Segmented Control to look like it is part of the TopAppBar. ## 📸 Screenshots | Before | After | | --- | --- | | <img src="https://github.com/user-attachments/assets/45c35730-4bb1-45d7-876c-e0f283438721" width="300" /> | <img src="https://github.com/user-attachments/assets/e70a2848-fdd2-4f54-88c3-e5614fefe54d" width="300" /> | ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation or informed the documentation team ## 🦮 Reviewer guidelines  - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes [PM-13286]: https://bitwarden.atlassian.net/browse/PM-13286?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --- <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 2025-11-26 23:47:55 -06:00

GiteaMirror closed this issue