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

[Paywalls V2] Make edgeToEdge top/bottom badge extend to entire stack background #2070

Merged
merged 2 commits into from
Jan 22, 2025
Merged

[Paywalls V2] Make edgeToEdge top/bottom badge extend to entire stack background #2070

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d04646
[Paywalls V2] Make edgeToEdge top/bottom badge extend to entire stack…
tonidero Jan 20, 2025
8251eb6
Make preview have a rectangle badge shape
tonidero Jan 22, 2025
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
108 changes: 61 additions & 47 deletions ...in/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/stack/StackComponentView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.layout.Placeable
import androidx.compose.ui.layout.SubcomposeLayout
Expand Down Expand Up @@ -220,23 +221,10 @@ private fun StackWithLongEdgeToEdgeBadge(
}.first()
val badgePlaceable = badgeMeasurable.measure(constraints)
val badgeHeight = badgePlaceable.height
val backgroundCornerRadiusExtension = when (val stackCornerRadiuses = stackState.shape.cornerRadiuses) {
is CornerRadiuses.Percentage -> stackPlaceable.height / 2
is CornerRadiuses.Dp -> {
(
if (topBadge) {
maxOf(stackCornerRadiuses.topLeading, stackCornerRadiuses.topTrailing)
} else {
maxOf(stackCornerRadiuses.bottomLeading, stackCornerRadiuses.bottomTrailing)
}
).dp.roundToPx()
}
}

// Decide the final size of this layout
val totalWidth = stackPlaceable.width
val totalHeight = stackPlaceable.height + badgeHeight
val backgroundHeight = badgeHeight + backgroundCornerRadiusExtension

// Subcompose the background
val backgroundMeasurable = subcompose("background") {
Expand All @@ -245,36 +233,64 @@ private fun StackWithLongEdgeToEdgeBadge(
val shadowStyle = badgeStack.shadow?.let { rememberShadowStyle(shadow = it) }
val backgroundShape = when (val badgeCornerRadiuses = badgeStack.shape.cornerRadiuses) {
is CornerRadiuses.Percentage -> {
if (topBadge) {
(badgeStack.shape.toShape() as? RoundedCornerShape)?.let { composeShape ->
RoundedCornerShape(
topStartPercent = badgeCornerRadiuses.topLeading,
topEndPercent = badgeCornerRadiuses.topTrailing,
topStart = composeShape.topStart.makeAbsolute(stackPlaceable, LocalDensity.current),
topEnd = composeShape.topEnd.makeAbsolute(stackPlaceable, LocalDensity.current),
bottomEnd = composeShape.bottomEnd.makeAbsolute(stackPlaceable, LocalDensity.current),
bottomStart = composeShape.bottomStart.makeAbsolute(stackPlaceable, LocalDensity.current),
)
} else {
RoundedCornerShape(
bottomEndPercent = badgeCornerRadiuses.bottomTrailing,
bottomStartPercent = badgeCornerRadiuses.bottomLeading,
)
}
} ?: RectangleShape
}
is CornerRadiuses.Dp -> if (topBadge) {
Shape.Rectangle(
corners = CornerRadiuses.Dp(
topLeading = badgeCornerRadiuses.topLeading,
topTrailing = badgeCornerRadiuses.topTrailing,
bottomLeading = 0.0,
bottomTrailing = 0.0,
),
).toShape()
} else {
Shape.Rectangle(
corners = CornerRadiuses.Dp(
topLeading = 0.0,
topTrailing = 0.0,
bottomLeading = badgeCornerRadiuses.bottomLeading,
bottomTrailing = badgeCornerRadiuses.bottomTrailing,
),
).toShape()
is CornerRadiuses.Dp -> {
when (val mainStackCornerRadiuses = stackState.shape.cornerRadiuses) {
is CornerRadiuses.Dp -> if (topBadge) {
Shape.Rectangle(
corners = CornerRadiuses.Dp(
topLeading = badgeCornerRadiuses.topLeading,
topTrailing = badgeCornerRadiuses.topTrailing,
bottomLeading = mainStackCornerRadiuses.bottomLeading,
bottomTrailing = mainStackCornerRadiuses.bottomTrailing,
),
).toShape()
} else {
Shape.Rectangle(
corners = CornerRadiuses.Dp(
topLeading = mainStackCornerRadiuses.topLeading,
topTrailing = mainStackCornerRadiuses.topTrailing,
bottomLeading = badgeCornerRadiuses.bottomLeading,
bottomTrailing = badgeCornerRadiuses.bottomTrailing,
),
).toShape()
}
is CornerRadiuses.Percentage ->
(stackState.shape.toShape() as? RoundedCornerShape)?.let { composeShape ->
if (topBadge) {
RoundedCornerShape(
topStart = CornerSize(badgeCornerRadiuses.topLeading.dp),
topEnd = CornerSize(badgeCornerRadiuses.topTrailing.dp),
bottomEnd = composeShape.bottomEnd.makeAbsolute(
stackPlaceable,
LocalDensity.current,
),
bottomStart = composeShape.bottomStart.makeAbsolute(
stackPlaceable,
LocalDensity.current,
),
)
} else {
RoundedCornerShape(
topStart = composeShape.topStart.makeAbsolute(
stackPlaceable,
LocalDensity.current,
),
topEnd = composeShape.topEnd.makeAbsolute(stackPlaceable, LocalDensity.current),
bottomEnd = CornerSize(badgeCornerRadiuses.bottomTrailing.dp),
bottomStart = CornerSize(badgeCornerRadiuses.bottomLeading.dp),
)
}
} ?: RectangleShape
}
}
}

Expand All @@ -294,16 +310,12 @@ private fun StackWithLongEdgeToEdgeBadge(
}.first()
val backgroundPlaceable = backgroundMeasurable.measure(
// We know exactly how big this needs to be.
Constraints.fixed(width = totalWidth, height = backgroundHeight),
Constraints.fixed(width = totalWidth, height = totalHeight),
)

// Lay it all out
layout(totalWidth, totalHeight) {
if (topBadge) {
backgroundPlaceable.placeRelative(0, 0)
} else {
backgroundPlaceable.placeRelative(0, totalHeight - backgroundHeight)
}
backgroundPlaceable.placeRelative(0, 0)

var yPosition = 0

Expand Down Expand Up @@ -723,7 +735,9 @@ private fun StackComponentView_Preview_EdgeToEdge_Badge(
Box(
modifier = Modifier.padding(all = 32.dp),
) {
val badgeShape = Shape.Pill
val badgeShape = Shape.Rectangle(
corners = CornerRadiuses.Dp(all = 20.0),
)
StackComponentView(
style = StackComponentStyle(
children = previewChildren(),
Expand Down