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

[PR #5249] [MERGED] 🍒PM-17660: Sync learn more cherry pick #5610

New Issue
Closed
opened 2025-11-27 00:10:48 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-27 00:10:48 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5249
Author: @david-livefront
Created: 5/22/2025
Status: ✅ Merged
Merged: 5/22/2025
Merged by: @david-livefront

Base: release/2025.05-rc20 ← Head: PM-17660-sync-learn-more-cherry-pick

📝 Commits (1)

  • 85316d6 🍒PM-17660: Add additional context for the sync feature

📊 Changes

11 files changed (+542 additions, -76 deletions)

View changed files

📝 authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt (+138 -53)
📝 authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModel.kt (+19 -1)
📝 authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/card/BitwardenActionCard.kt (+2 -2)
📝 authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/row/BitwardenTextRow.kt (+2 -1)
📝 authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsScreen.kt (+181 -0)
📝 authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsViewModel.kt (+16 -1)
📝 authenticator/src/main/res/values/strings.xml (+3 -1)
📝 authenticator/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreenTest.kt (+154 -17)
📝 authenticator/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModelTest.kt (+9 -0)
📝 authenticator/src/test/java/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsScreenTest.kt (+9 -0)
📝 authenticator/src/test/java/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsViewModelTest.kt (+9 -0)

📄 Description

🎟️ Tracking

PM-17660

📔 Objective

This PR updates the action card and Sync with Authenticator button in the Authenticator to better inform the user about how Authenticator Sync works.

Note that the toAnnotatedString and spanStyleOf extensions were pulled into the common library and do not exist in the Authentoicator yet. Those functions have been directly copied into the SettingsScreen for this RC, it it better in main 😄.

📸 Screenshots

Befoire After

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) 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/5249 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 5/22/2025 **Status:** ✅ Merged **Merged:** 5/22/2025 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `release/2025.05-rc20` ← **Head:** `PM-17660-sync-learn-more-cherry-pick` --- ### 📝 Commits (1) - [`85316d6`](https://github.com/bitwarden/android/commit/85316d6b2ba1512e948111cbedda903feea6df64) 🍒PM-17660: Add additional context for the sync feature ### 📊 Changes **11 files changed** (+542 additions, -76 deletions) <details> <summary>View changed files</summary> 📝 `authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt` (+138 -53) 📝 `authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModel.kt` (+19 -1) 📝 `authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/card/BitwardenActionCard.kt` (+2 -2) 📝 `authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/row/BitwardenTextRow.kt` (+2 -1) 📝 `authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsScreen.kt` (+181 -0) 📝 `authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsViewModel.kt` (+16 -1) 📝 `authenticator/src/main/res/values/strings.xml` (+3 -1) 📝 `authenticator/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreenTest.kt` (+154 -17) 📝 `authenticator/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModelTest.kt` (+9 -0) 📝 `authenticator/src/test/java/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsScreenTest.kt` (+9 -0) 📝 `authenticator/src/test/java/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsViewModelTest.kt` (+9 -0) </details> ### 📄 Description ## 🎟️ Tracking [PM-17660](https://bitwarden.atlassian.net/browse/PM-17660) ## 📔 Objective This PR updates the action card and `Sync with Authenticator` button in the Authenticator to better inform the user about how Authenticator Sync works. Note that the `toAnnotatedString` and `spanStyleOf` extensions were pulled into the common library and do not exist in the Authentoicator yet. Those functions have been directly copied into the `SettingsScreen` for this RC, it it better in main 😄. ## 📸 Screenshots | Befoire | After | | --- | --- | | <img src="https://github.com/user-attachments/assets/1b5df6c6-0129-4a88-bebb-6e4b6ed565ca" width="300" /> | <img src="https://github.com/user-attachments/assets/946d7518-2286-4b36-b9a8-6081610ba260" width="300" /> | | <img src="https://github.com/user-attachments/assets/c1fb09fe-2854-458e-ad54-55b69c65f011" width="300" /> | <img src="https://github.com/user-attachments/assets/94746e32-6e76-4edd-91ac-be0a19d2ce23" 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 - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) 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-17660]: https://bitwarden.atlassian.net/browse/PM-17660?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-27 00:10:48 -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#5610
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?