github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-11 20:54:58 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

[PR #4777] [MERGED] PM-18388 add hyphens on segmented button labels #5204

New Issue
Closed
opened 2025-11-26 23:55:31 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-26 23:55:31 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4777
Author: @dseverns-livefront
Created: 2/24/2025
Status: ✅ Merged
Merged: 2/27/2025
Merged by: @phil-livefront

Base: main ← Head: PM-18388-dont-scale-text-segmented-buttons

📝 Commits (3)

  • b8d3c5a PM-18388 add hyphens on segmented button labels
  • 46cc629 padding based on font scale and making sure that the buttons fill and have even heights at all scales
  • 674a816 even out the padding on the row

📊 Changes

2 files changed (+33 additions, -6 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/segment/BitwardenSegmentedButton.kt (+21 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt (+12 -4)

📄 Description

🎟️ Tracking

PM-18388

📔 Objective

  • Provide a better experience visually when the options in the generated segmented control wrap to second line by adding a hyphen.
  • Adjust some spacing to better match the design.
  • Vertical spacing on buttons determined by font scale.
  • Button heights will now fill the row height like in design and button heights will be uniform to match the largest (intrinsic min).

📸 Screenshots

Font scale x1

before after
scale_1_before scale_1_after

Font scale x1.3

before after
scale_1_3_before scale_1_3_after

Font scale x2

before after
scale_2_before scale_2_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/4777 **Author:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Created:** 2/24/2025 **Status:** ✅ Merged **Merged:** 2/27/2025 **Merged by:** [@phil-livefront](https://github.com/phil-livefront) **Base:** `main` ← **Head:** `PM-18388-dont-scale-text-segmented-buttons` --- ### 📝 Commits (3) - [`b8d3c5a`](https://github.com/bitwarden/android/commit/b8d3c5ad6a6578be003b53d13670489bf23bd13f) PM-18388 add hyphens on segmented button labels - [`46cc629`](https://github.com/bitwarden/android/commit/46cc6297017c2e3eec7ae11d475cc241054ba4a5) padding based on font scale and making sure that the buttons fill and have even heights at all scales - [`674a816`](https://github.com/bitwarden/android/commit/674a816671dd62c8e6b6b312a49c85dc19a9d6ef) even out the padding on the row ### 📊 Changes **2 files changed** (+33 additions, -6 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/segment/BitwardenSegmentedButton.kt` (+21 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt` (+12 -4) </details> ### 📄 Description ## 🎟️ Tracking [PM-18388](https://bitwarden.atlassian.net/browse/PM-18388) <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> ## 📔 Objective - Provide a better experience visually when the options in the generated segmented control wrap to second line by adding a hyphen. - Adjust some spacing to better match the design. - Vertical spacing on buttons determined by font scale. - Button heights will now fill the row height like in design and button heights will be uniform to match the largest (intrinsic min). <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> ## 📸 Screenshots **Font scale x1** | before | after | |--------|--------| | ![scale_1_before](https://github.com/user-attachments/assets/c28d4898-e548-48f1-885c-75b7abf1668b) | ![scale_1_after](https://github.com/user-attachments/assets/77be5f17-f330-45fe-994f-e5d737f35a44) | **Font scale x1.3** | before | after | |--------|--------| | ![scale_1_3_before](https://github.com/user-attachments/assets/ef118898-6ac9-46b7-95be-3ade16c131e1) | ![scale_1_3_after](https://github.com/user-attachments/assets/1b61c2f6-5ee5-47c1-a1e7-a5d933e7a9e0) | **Font scale x2** | before | after | |--------|--------| | ![scale_2_before](https://github.com/user-attachments/assets/29200237-7531-44d8-9d65-8adb33e1cf5e) | ![scale_2_after](https://github.com/user-attachments/assets/f5012683-3b4c-418f-a9ac-9568192ced83) | <!-- Required for any UI changes; delete if not applicable. Use fixed width images for better display. --> ## ⏰ 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 <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+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-18388]: https://bitwarden.atlassian.net/browse/PM-18388?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:55:31 -06: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#5204
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?