PM-15067 - Design Audit - Prevent Account Lockout Screen #4361
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…en' of https://github.com/bitwarden/android into phil/PM-15067-design-audit-prevent-account-lockout-screen
phil-livefront
requested review from
brian-livefront,
david-livefront,
dseverns-livefront,
ahaisting-livefront and
a team
as code owners
|
New Issues
Fixed Issues
|
| @@ -75,102 +68,57 @@ fun PreventAccountLockoutScreen( | |||
| ) | |||
| }, | |||
| ) { | |||
| Column( | |||
| NeverLoseAccessContent( | |||
There was a problem hiding this comment.
Can we call this PreventAccountLockoutContent to keep it consistent with the screen
| .clip(RoundedCornerShape(size = 4.dp)) | ||
| .background(BitwardenTheme.colorScheme.background.tertiary), | ||
| ) { | ||
| private fun NeverLoseAccessContent(modifier: Modifier) { |
There was a problem hiding this comment.
The convention here is to provide a default Modifier as well
| @@ -107,7 +108,7 @@ private fun BitwardenContentBlock( | |||
| ?: Spacer(Modifier.width(16.dp)) | |||
| } | |||
|
|
|||
| Column { | |||
| Column(modifier = Modifier.padding(end = 16.dp)) { | |||
There was a problem hiding this comment.
Can we leave this in the spacer?
There was a problem hiding this comment.
I couldn't get it to work as it was, it was still going to the very edge of the view. Any ideas why? On iOS we use spacers to space out views easily vs adding a spacer for padding reasons so I was pretty confused here haha.
There was a problem hiding this comment.
Wanna give this a whirl:
Column(modifier = Modifier.weight(weight = 1f, fill = false)) {
Spacer(Modifier.height(12.dp))
Text(
text = headerText,
style = headerTextStyle,
)
subtitleText?.let {
Spacer(Modifier.height(4.dp))
Text(
text = it,
style = subtitleTextStyle,
color = BitwardenTheme.colorScheme.text.secondary,
)
}
Spacer(Modifier.height(12.dp))
}
Spacer(Modifier.width(16.dp))There was a problem hiding this comment.
worked like a charm. thanks!
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #4361 +/- ##
==========================================
- Coverage 89.02% 89.02% -0.01%
==========================================
Files 451 451
Lines 39137 39106 -31
Branches 5524 5523 -1
==========================================
- Hits 34843 34813 -30
Misses 2368 2368
+ Partials 1926 1925 -1 ☔ View full report in Codecov by Sentry. 🚨 Try these New Features:
|
david-livefront
previously approved these changes
Nov 22, 2024
phil-livefront
deleted the
phil/PM-15067-design-audit-prevent-account-lockout-screen
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🎟️ Tracking
PM-15067
📔 Objective
PreventAccountLockoutScreento use theBitwardenContentCardwhich matches the figma designs📸 Screenshots
⏰ Reminders before review
🦮 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 confirmedissue 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