-
Notifications
You must be signed in to change notification settings - Fork 843
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactor usage of the ContentCard to always use the ContentBlock component. #4357
Conversation
val localDensity = LocalDensity.current | ||
Column { | ||
Row( | ||
modifier = modifier |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The passed in modifier should always be on the outermost composable.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To avoid the column completely you could always use the bottomDivider
modifier extension.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do'h good catch this is an error
…lock component remove custom instruction row stuffs
a0dce6c
to
ad82edc
Compare
New Issues
Fixed Issues
|
@@ -25,7 +25,7 @@ data class ContentBlockData( | |||
@DrawableRes iconVectorResource: Int? = null, | |||
) : this( | |||
headerText = AnnotatedString(headerText), | |||
subtitleText = subtitleText, | |||
subtitleText = subtitleText?.let { AnnotatedString(it) }, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we make this:
subtitleText = subtitleText?.toAnnotatedString(),
headerText = AnnotatedString(headerText), | ||
subtitleText = subtitleText, | ||
headerText = headerText.toAnnotatedString(), | ||
subtitleText = subtitleText?.toAnnotatedString(), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
Row( | ||
modifier = modifier | ||
.fillMaxWidth() | ||
.background(backgroundColor), | ||
.background(backgroundColor) | ||
.bottomDivider( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we have an scenarios where the incoming modifier
will have a padding applied?
If so we might want to do something like this:
modifier = Modifier
.fillMaxWidth()
.background(backgroundColor)
.bottomDivider(
enabled = showDivider,
paddingStart = dividerStartPadding,
)
.then(modifier),
That will enforce that the background and divider is applied before any padding on the modifier.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #4357 +/- ##
=======================================
Coverage 88.99% 89.00%
=======================================
Files 453 452 -1
Lines 39097 39076 -21
Branches 5510 5509 -1
=======================================
- Hits 34794 34778 -16
+ Misses 2377 2372 -5
Partials 1926 1926 ☔ View full report in Codecov by Sentry. 🚨 Try these New Features:
|
🎟️ Tracking
In support of the changes for https://bitwarden.atlassian.net/browse/PM-15067 and other design audits
📔 Objective
📸 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