Skip to content
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.

Sign up for GitHub

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

Fix width of rows #4676

Merged
merged 3 commits into from
Mar 11, 2022
Merged

Fix width of rows #4676

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09ed7be
Fix row max width calculation
epan-stripe Mar 9, 2022
8dda99e
Update visibleFields calculation method
epan-stripe Mar 10, 2022
ff61884
Merge branch 'michelleb/credit-card-compose' into elena/credit-card-c…
epan-stripe Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/RowElementUI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ internal fun RowElementUI(
val fields = controller.fields
val cardStyle = CardStyle(isSystemInDarkTheme())

val numVisibleFields = fields.filter { !hiddenIdentifiers.contains(it.identifier) }.size
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be private?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's already a local variable

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh my bad, thought it was inside of a class


// An attempt was made to do this with a row, and a vertical divider created with a box.
// The row had a height of IntrinsicSize.Min, and the box/vertical divider filled the height
// when adding in the trailing icon this broke and caused the overall height of the row to
Expand All @@ -44,7 +46,7 @@ internal fun RowElementUI(
top.linkTo(parent.top)
}
.fillMaxWidth(
(1f / fields.size.toFloat())
(1f / numVisibleFields.toFloat())
),
hiddenIdentifiers
)
Expand Down