From 6b03dca5f47947a8fe1dd7989b19ff5d23030c2e Mon Sep 17 00:00:00 2001 From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com> Date: Wed, 22 Feb 2023 00:04:11 +0700 Subject: [PATCH] Use Compose Foundation's flow layout (#9123) --- app/build.gradle.kts | 1 - .../eu/kanade/presentation/browse/ExtensionsScreen.kt | 5 +++-- .../presentation/manga/components/MangaInfoHeader.kt | 9 ++++++--- gradle/compose.versions.toml | 1 - 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index be2da8e9d..e715cae02 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -158,7 +158,6 @@ dependencies { implementation(compose.ui.tooling) implementation(compose.ui.util) implementation(compose.accompanist.webview) - implementation(compose.accompanist.flowlayout) implementation(compose.accompanist.permissions) implementation(compose.accompanist.themeadapter) implementation(compose.accompanist.systemuicontroller) diff --git a/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt index b894960c5..9e4e7857c 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt @@ -3,8 +3,10 @@ package eu.kanade.presentation.browse import androidx.annotation.StringRes import androidx.compose.animation.core.animateDpAsState 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.FlowRow import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.RowScope @@ -34,7 +36,6 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.google.accompanist.flowlayout.FlowRow import eu.kanade.presentation.browse.components.BaseBrowseItem import eu.kanade.presentation.browse.components.ExtensionIcon import eu.kanade.presentation.manga.components.DotSeparatorNoSpaceText @@ -287,7 +288,7 @@ private fun ExtensionItemContent( // Won't look good but it's not like we can ellipsize overflowing content FlowRow( modifier = Modifier.secondaryItemAlpha(), - mainAxisSpacing = 4.dp, + horizontalArrangement = Arrangement.spacedBy(4.dp), ) { ProvideTextStyle(value = MaterialTheme.typography.bodySmall) { if (extension is Extension.Installed && extension.lang.isNotEmpty()) { diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt index fc6efe7b1..15c7014f4 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt @@ -10,6 +10,7 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.RowScope @@ -72,7 +73,6 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage -import com.google.accompanist.flowlayout.FlowRow import eu.kanade.presentation.components.DropdownMenu import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.model.SManga @@ -266,11 +266,11 @@ fun ExpandableMangaDescription( if (expanded) { FlowRow( modifier = Modifier.padding(horizontal = 16.dp), - mainAxisSpacing = 4.dp, - crossAxisSpacing = 8.dp, + horizontalArrangement = Arrangement.spacedBy(4.dp), ) { tags.forEach { TagsChip( + modifier = Modifier.padding(vertical = 4.dp), text = it, onClick = { tagSelected = it @@ -286,6 +286,7 @@ fun ExpandableMangaDescription( ) { items(items = tags) { TagsChip( + modifier = Modifier.padding(vertical = 4.dp), text = it, onClick = { tagSelected = it @@ -640,10 +641,12 @@ private fun MangaSummary( @Composable private fun TagsChip( text: String, + modifier: Modifier = Modifier, onClick: () -> Unit, ) { CompositionLocalProvider(LocalMinimumInteractiveComponentEnforcement provides false) { SuggestionChip( + modifier = modifier, onClick = onClick, label = { Text(text = text, style = MaterialTheme.typography.bodySmall) }, border = null, diff --git a/gradle/compose.versions.toml b/gradle/compose.versions.toml index e9bd3c883..046aa4030 100644 --- a/gradle/compose.versions.toml +++ b/gradle/compose.versions.toml @@ -19,7 +19,6 @@ material-icons = { module = "androidx.compose.material:material-icons-extended" material-core = { module = "androidx.compose.material:material" } accompanist-webview = { module = "com.google.accompanist:accompanist-webview", version.ref = "accompanist" } -accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-themeadapter = { module = "com.google.accompanist:accompanist-themeadapter-material3", version.ref = "accompanist" } accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }