diff --git a/.github/renovate.json5 b/.github/renovate.json5 index e863a051..e3edd3d9 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -26,17 +26,6 @@ ], "enabled": false }, - { - "matchDatasources": [ - "maven" - ], - "matchPackageNames": [ - "dev.chrisbanes.compose:compose-bom" - ], - "registryUrls": [ - "https://repo.maven.apache.org/maven2/" - ] - } ], "regexManagers": [ { diff --git a/CHANGELOG.md b/CHANGELOG.md index a5d51c86..0b7e4919 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Special-case deleted stories in comments API +- Fix regression where save button had the incorrect visual state ## [1.17.0] - 2023-01-12 diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 589ddf0d..b405d235 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -23,6 +23,7 @@ dependencies { implementation(projects.core) implementation(projects.database) implementation(projects.model) + implementation(libs.accompanist.flowlayout) implementation(libs.androidx.browser) implementation(libs.androidx.compose.animation) implementation(libs.androidx.compose.foundation) 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 1d203bfe..22c1fae3 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 @@ -14,8 +14,6 @@ import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -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 @@ -45,6 +43,7 @@ import androidx.compose.ui.semantics.Role import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp +import com.google.accompanist.flowlayout.FlowRow import dev.msfjarvis.claw.common.res.ClawIcons import dev.msfjarvis.claw.common.ui.NetworkImage import dev.msfjarvis.claw.database.local.SavedPost @@ -201,15 +200,14 @@ private fun CommentsButton( } @Composable -@OptIn(ExperimentalLayoutApi::class) internal fun TagRow( tags: List, modifier: Modifier = Modifier, ) { FlowRow( modifier = modifier, - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(8.dp), + mainAxisSpacing = 8.dp, + crossAxisSpacing = 8.dp, ) { tags.forEach { tag -> TagText(tag) } } diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt index 377945b1..23887d4c 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt @@ -35,7 +35,7 @@ fun ClawAppBar( TopAppBar( title = title, modifier = modifier.shadow(8.dp), - colors = TopAppBarDefaults.topAppBarColors(containerColor = backgroundColor), + colors = TopAppBarDefaults.smallTopAppBarColors(containerColor = backgroundColor), navigationIcon = navigationIcon, actions = actions, ) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bb9d0d08..cb1116c7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -accompanist = "0.29.0-alpha" +accompanist = "0.28.0" agp = "7.4.0" androidx-compose-ui = "1.4.0-alpha04" androidx-test = "1.5.0" @@ -20,12 +20,13 @@ whetstone = "0.6.0-SNAPSHOT" workmanager = "2.8.0-rc01" [libraries] +accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } accompanist-sysuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } androidx-activity-compose = "androidx.activity:activity-compose:1.7.0-alpha03" androidx-benchmark-macro-junit4 = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha09" androidx-browser = "androidx.browser:browser:1.5.0-beta01" androidx-compose-animation = { module = "androidx.compose.animation:animation" } -androidx-compose-bom = "dev.chrisbanes.compose:compose-bom:2023.02.00-alpha01" +androidx-compose-bom = "androidx.compose:compose-bom:2023.01.00" androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } androidx-compose-material = { module = "androidx.compose.material:material" } androidx-compose-material3 = { module = "androidx.compose.material3:material3" }