From 85d676049938560367480b6c9616702b9471ac60 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 13 Dec 2024 14:30:02 -0600 Subject: [PATCH] Remove accompanist-flowlayout --- app/build.gradle.kts | 1 - app/src/main/java/org/tasks/compose/ChipGroup.kt | 9 ++++++--- .../main/java/org/tasks/compose/edit/AttachmentRow.kt | 9 ++++++--- deps_fdroid.txt | 11 +++-------- deps_googleplay.txt | 11 +++-------- gradle/libs.versions.toml | 1 - 6 files changed, 18 insertions(+), 24 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 004909ab8..0a9d0ea26 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -246,7 +246,6 @@ dependencies { implementation(libs.coil.svg) implementation(libs.coil.gif) - implementation(libs.accompanist.flowlayout) implementation(libs.accompanist.permissions) googleplayImplementation(platform(libs.firebase)) diff --git a/app/src/main/java/org/tasks/compose/ChipGroup.kt b/app/src/main/java/org/tasks/compose/ChipGroup.kt index 827465426..3cff943a5 100644 --- a/app/src/main/java/org/tasks/compose/ChipGroup.kt +++ b/app/src/main/java/org/tasks/compose/ChipGroup.kt @@ -1,15 +1,18 @@ package org.tasks.compose +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.google.accompanist.flowlayout.FlowRow +@OptIn(ExperimentalLayoutApi::class) @Composable fun ChipGroup(modifier: Modifier = Modifier, content: @Composable () -> Unit) { FlowRow( - mainAxisSpacing = 4.dp, - crossAxisSpacing = 4.dp, + horizontalArrangement = Arrangement.spacedBy(4.dp), + verticalArrangement = Arrangement.spacedBy(4.dp), modifier = modifier, ) { content() diff --git a/app/src/main/java/org/tasks/compose/edit/AttachmentRow.kt b/app/src/main/java/org/tasks/compose/edit/AttachmentRow.kt index 2ce322a7a..fe76ffc44 100644 --- a/app/src/main/java/org/tasks/compose/edit/AttachmentRow.kt +++ b/app/src/main/java/org/tasks/compose/edit/AttachmentRow.kt @@ -3,9 +3,12 @@ package org.tasks.compose.edit import android.content.res.Configuration import androidx.compose.foundation.border import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -49,7 +52,6 @@ import coil.decode.SvgDecoder import coil.decode.VideoFrameDecoder import coil.request.CachePolicy import coil.request.ImageRequest -import com.google.accompanist.flowlayout.FlowRow import com.todoroo.andlib.utility.AndroidUtilities import org.tasks.R import org.tasks.compose.DisabledText @@ -60,6 +62,7 @@ import org.tasks.themes.TasksTheme private val SIZE = 128.dp +@OptIn(ExperimentalLayoutApi::class) @Composable fun AttachmentRow( attachments: List, @@ -87,8 +90,8 @@ fun AttachmentRow( content = { if (attachments.isNotEmpty()) { FlowRow( - mainAxisSpacing = 8.dp, - crossAxisSpacing = 8.dp, + horizontalArrangement = Arrangement.spacedBy(8.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(top = 24.dp, bottom = 24.dp, end = 16.dp) ) { attachments.forEach { diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 74ed285a4..66583c2a4 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -295,8 +295,8 @@ +| | | +--- androidx.compose.runtime:runtime-livedata:1.7.6 (c) +| | | \--- androidx.compose.runtime:runtime-saveable:1.7.6 (c) +| | +--- androidx.compose.ui:ui:1.7.6 (c) -+| | +--- androidx.compose.ui:ui-util:1.7.6 (c) +| | +--- androidx.compose.ui:ui-viewbinding:1.7.6 (c) ++| | +--- androidx.compose.ui:ui-util:1.7.6 (c) +| | +--- androidx.compose.ui:ui-text:1.7.6 (c) +| | +--- androidx.compose.ui:ui-graphics:1.7.6 (c) +| | +--- androidx.compose.ui:ui-geometry:1.7.6 (c) @@ -1246,13 +1246,12 @@ +| +--- androidx.compose.ui:ui-viewbinding:1.7.5 -> 1.7.6 (c) +| +--- androidx.compose.runtime:runtime:1.7.5 -> 1.7.6 (c) +| +--- androidx.compose.runtime:runtime-saveable:1.7.5 -> 1.7.6 (c) -+| +--- androidx.compose.ui:ui-util:1.7.5 -> 1.7.6 (c) +| +--- androidx.compose.material:material-android:1.7.5 (c) +| +--- androidx.compose.material:material-icons-extended-android:1.7.5 (c) +| +--- androidx.compose.material3:material3-android:1.3.1 (c) +| +--- androidx.compose.runtime:runtime-android:1.7.5 -> 1.7.6 (c) +| +--- androidx.compose.ui:ui-android:1.7.5 -> 1.7.6 (c) -+| +--- androidx.compose.ui:ui-util-android:1.7.5 -> 1.7.6 (c) ++| +--- androidx.compose.ui:ui-util:1.7.5 -> 1.7.6 (c) +| +--- androidx.compose.animation:animation:1.7.5 -> 1.7.6 (c) +| +--- androidx.compose.foundation:foundation-layout:1.7.5 -> 1.7.6 (c) +| +--- androidx.compose.ui:ui-text:1.7.5 -> 1.7.6 (c) @@ -1262,6 +1261,7 @@ +| +--- androidx.compose.ui:ui-graphics:1.7.5 -> 1.7.6 (c) +| +--- androidx.compose.ui:ui-geometry:1.7.5 -> 1.7.6 (c) +| +--- androidx.compose.ui:ui-unit:1.7.5 -> 1.7.6 (c) ++| +--- androidx.compose.ui:ui-util-android:1.7.5 -> 1.7.6 (c) +| +--- androidx.compose.ui:ui-text-android:1.7.5 -> 1.7.6 (c) +| +--- androidx.compose.material:material-icons-core-android:1.7.5 (c) +| +--- androidx.compose.material:material-ripple-android:1.7.5 (c) @@ -1358,11 +1358,6 @@ +| +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*) +| +--- io.coil-kt:coil-base:2.7.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.0 -> 2.0.21 (*) -++--- com.google.accompanist:accompanist-flowlayout:0.36.0 -+| +--- androidx.compose.foundation:foundation:1.7.0 -> 1.7.6 (*) -+| +--- androidx.compose.ui:ui-util:1.7.0 -> 1.7.6 (*) -+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.8.1 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 2.0.21 (*) +\--- com.google.accompanist:accompanist-permissions:0.36.0 + +--- androidx.activity:activity-compose:1.9.0 -> 1.9.3 (*) + +--- androidx.compose.foundation:foundation:1.7.0 -> 1.7.6 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 483f2575b..135fa4f4b 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -666,13 +666,12 @@ +| | | +--- androidx.compose.ui:ui-viewbinding:1.7.5 -> 1.7.6 (c) +| | | +--- androidx.compose.runtime:runtime:1.7.5 -> 1.7.6 (c) +| | | +--- androidx.compose.runtime:runtime-saveable:1.7.5 -> 1.7.6 (c) -+| | | +--- androidx.compose.ui:ui-util:1.7.5 -> 1.7.6 (c) +| | | +--- androidx.compose.material:material-android:1.7.5 (c) +| | | +--- androidx.compose.material:material-icons-extended-android:1.7.5 (c) +| | | +--- androidx.compose.material3:material3-android:1.3.1 (c) +| | | +--- androidx.compose.runtime:runtime-android:1.7.5 -> 1.7.6 (c) +| | | +--- androidx.compose.ui:ui-android:1.7.5 -> 1.7.6 (c) -+| | | +--- androidx.compose.ui:ui-util-android:1.7.5 -> 1.7.6 (c) ++| | | +--- androidx.compose.ui:ui-util:1.7.5 -> 1.7.6 (c) +| | | +--- androidx.compose.animation:animation:1.7.5 -> 1.7.6 (c) +| | | +--- androidx.compose.foundation:foundation-layout:1.7.5 -> 1.7.6 (c) +| | | +--- androidx.compose.ui:ui-text:1.7.5 -> 1.7.6 (c) @@ -682,6 +681,7 @@ +| | | +--- androidx.compose.ui:ui-graphics:1.7.5 -> 1.7.6 (c) +| | | +--- androidx.compose.ui:ui-geometry:1.7.5 -> 1.7.6 (c) +| | | +--- androidx.compose.ui:ui-unit:1.7.5 -> 1.7.6 (c) ++| | | +--- androidx.compose.ui:ui-util-android:1.7.5 -> 1.7.6 (c) +| | | +--- androidx.compose.ui:ui-text-android:1.7.5 -> 1.7.6 (c) +| | | +--- androidx.compose.material:material-icons-core-android:1.7.5 (c) +| | | +--- androidx.compose.material:material-ripple-android:1.7.5 (c) @@ -829,8 +829,8 @@ +| | | +--- androidx.compose.runtime:runtime-livedata:1.7.6 (c) +| | | \--- androidx.compose.runtime:runtime-saveable:1.7.6 (c) +| | +--- androidx.compose.ui:ui:1.7.6 (c) -+| | +--- androidx.compose.ui:ui-util:1.7.6 (c) +| | +--- androidx.compose.ui:ui-viewbinding:1.7.6 (c) ++| | +--- androidx.compose.ui:ui-util:1.7.6 (c) +| | +--- androidx.compose.ui:ui-text:1.7.6 (c) +| | +--- androidx.compose.ui:ui-graphics:1.7.6 (c) +| | +--- androidx.compose.ui:ui-geometry:1.7.6 (c) @@ -1669,11 +1669,6 @@ +| +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*) +| +--- io.coil-kt:coil-base:2.7.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.0 -> 2.0.21 (*) -++--- com.google.accompanist:accompanist-flowlayout:0.36.0 -+| +--- androidx.compose.foundation:foundation:1.7.0 -> 1.7.6 (*) -+| +--- androidx.compose.ui:ui-util:1.7.0 -> 1.7.6 (*) -+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.8.1 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 2.0.21 (*) +\--- com.google.accompanist:accompanist-permissions:0.36.0 + +--- androidx.activity:activity-compose:1.9.0 -> 1.9.3 (*) + +--- androidx.compose.foundation:foundation:1.7.0 -> 1.7.6 (*) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2576fc08c..cae9fac3e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -70,7 +70,6 @@ xpp3 = "1.1.6" wearCompose = "1.4.0" [libraries] -accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }