diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 53e8797a..271486dc 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -47,7 +47,6 @@ { "matchPackageNames": [ "com.squareup.anvil", - "dev.chrisbanes.compose:compose-bom", ], "enabled": false, }, diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt index 0100214f..c306275d 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt @@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.absoluteOffset import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -30,7 +31,6 @@ import androidx.compose.material.icons.filled.Favorite import androidx.compose.material.icons.filled.FavoriteBorder import androidx.compose.material3.Badge import androidx.compose.material3.BadgedBox -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -186,7 +186,6 @@ private fun SaveButton( } @Composable -@OptIn(ExperimentalMaterial3Api::class) private fun CommentsButton( commentCount: Int?, modifier: Modifier = Modifier, @@ -197,6 +196,8 @@ private fun CommentsButton( if (commentCount != null) { Badge( containerColor = MaterialTheme.colorScheme.tertiaryContainer, + // Required to make the badge label look visually okay + modifier = Modifier.absoluteOffset(y = (-8).dp), ) { Text( text = commentCount.toString(), diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 34f388cd..81f888f7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ androidx-activity-compose = "androidx.activity:activity-compose:1.8.0" androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmark" } androidx-browser = "androidx.browser:browser:1.6.0" androidx-compose-animation = { module = "androidx.compose.animation:animation" } -androidx-compose-bom = "dev.chrisbanes.compose:compose-bom:2023.11.00-alpha01" +androidx-compose-bom = "dev.chrisbanes.compose:compose-bom:2023.12.00-alpha01" androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } androidx-compose-glance = { module = "androidx.glance:glance-appwidget", version.ref = "glance" } androidx-compose-glance-m3 = { module = "androidx.glance:glance-material3", version.ref = "glance" }