From d9f1237ff311565e065d91f3bf53328d8772b50b Mon Sep 17 00:00:00 2001 From: davotoula Date: Thu, 7 May 2026 21:23:55 +0200 Subject: [PATCH] Fix scheduled-post card edges around the rounded corners --- .../vitorpamplona/amethyst/ui/components/SwipeToDelete.kt | 2 +- .../screen/loggedIn/scheduledposts/ScheduledPostsScreen.kt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/SwipeToDelete.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/SwipeToDelete.kt index d740a6d54..c528a4ed2 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/SwipeToDelete.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/SwipeToDelete.kt @@ -166,7 +166,7 @@ fun ConfirmDeleteBackground( if (!settled) { Color(0xFFFF1744) } else { - MaterialTheme.colorScheme.surfaceVariant + Color.Transparent }, label = "ConfirmDeleteBackground", ) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/scheduledposts/ScheduledPostsScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/scheduledposts/ScheduledPostsScreen.kt index 0d74a803e..ee383a362 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/scheduledposts/ScheduledPostsScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/scheduledposts/ScheduledPostsScreen.kt @@ -71,7 +71,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip -import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.draw.drawWithContent import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Size import androidx.compose.ui.graphics.Brush @@ -267,7 +267,8 @@ private fun Modifier.urgentEdge(enabled: Boolean): Modifier { remember(gradientStart, gradientEnd) { Brush.verticalGradient(listOf(gradientStart, gradientEnd)) } - return this.drawBehind { + return this.drawWithContent { + drawContent() drawRect( brush = brush, topLeft = Offset(0f, 8.dp.toPx()), @@ -318,6 +319,7 @@ private fun ScheduledPostCardCollapsed( modifier = Modifier .fillMaxWidth() + .clip(RoundedCornerShape(14.dp)) .urgentEdge(!isFailed && post.publishAtSec - nowSec in 1..URGENT_THRESHOLD_SEC), colors = CardDefaults.cardColors(containerColor = containerColor), border = BorderStroke(1.dp, borderColor),