Migrate coil to coil3

Author: jeluchu

app/build.gradle.kts

@@ -35,7 +35,8 @@ android {
 }
 
 dependencies {
-    implementation(libs.bundles.ui.compose)
+    implementation(platform(libs.compose.bom))
+    implementation(libs.bundles.compose.bom)
     implementation(libs.androidx.appcompat)
     implementation(project(":jchucomponents-core"))
     implementation(project(":jchucomponents-ui"))

gradle/libs.versions.toml

@@ -1,32 +1,32 @@
 [versions]
-jchucomponents = "2.0.0-alpha18"
+jchucomponents = "2.0.0-beta01"
 agp = "8.5.2"
 kotlin = "2.1.10"
 dokka = "1.9.20"
 androidx-activity = "1.10.0"
-androidx-compose = "1.7.7"
 androidx-lifecycle = "2.8.7"
 androidx-navigation = "2.8.6"
 com-squareup-okhttp3 = "4.12.0"
 com-squareup-retrofit2 = "2.11.0"
-coil-kt = "2.7.0"
+coil-kt = "3.1.0"
 org-jetbrains-kotlin = "2.1.10"
 org-jetbrains-kotlinx = "1.10.1"
+composeBom = "2025.01.01"
 
 [libraries]
 androidx-datastore = "androidx.datastore:datastore-preferences:1.1.2"
 androidx-activity-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-browser = "androidx.browser:browser:1.8.0"
-androidx-compose-animation = { module = "androidx.compose.animation:animation", version.ref = "androidx-compose" }
-androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose" }
-androidx-compose-foundation-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidx-compose" }
-androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "androidx-compose" }
-androidx-compose-material-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "androidx-compose" }
+androidx-compose-animation = { module = "androidx.compose.animation:animation" }
+androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" }
+androidx-compose-foundation-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" }
+androidx-compose-material = { module = "androidx.compose.material:material" }
+androidx-compose-material-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-compose-material3 = "androidx.compose.material3:material3:1.3.1"
-androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "androidx-compose" }
-androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose" }
-androidx-compose-ui-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose" }
-androidx-compose-ui-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose" }
+androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
+androidx-compose-ui = { module = "androidx.compose.ui:ui" }
+androidx-compose-ui-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
+androidx-compose-ui-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 androidx-core-core-ktx = "androidx.core:core-ktx:1.15.0"
 androidx-core-core-splashscreen = "androidx.core:core-splashscreen:1.0.1"
 androidx-lifecycle-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
@@ -40,11 +40,12 @@ com-squareup-okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logg
 com-squareup-okhttp3-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "com-squareup-okhttp3" }
 com-squareup-retrofit2-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "com-squareup-retrofit2" }
 com-squareup-retrofit2-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "com-squareup-retrofit2" }
-coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil-kt" }
+coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil-kt" }
 org-jetbrains-kotlinx-kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "org-jetbrains-kotlinx" }
 org-jetbrains-kotlinx-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "org-jetbrains-kotlinx" }
 androidx-appcompat = "androidx.appcompat:appcompat:1.7.0"
 revenuecat = "com.revenuecat.purchases:purchases:8.10.4"
+compose-bom = { group = "androidx.compose", name ="compose-bom", version.ref = "composeBom" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
@@ -89,7 +90,7 @@ qr-third-party = [
 ui-androidx = [
     "androidx-core-core-splashscreen",
 ]
-ui-compose = [
+compose-bom = [
     "androidx-activity-activity-compose",
     "androidx-compose-animation",
     "androidx-compose-foundation",

jchucomponents-prefs/build.gradle.kts

@@ -49,6 +49,7 @@ android {
 dependencies {
     implementation(libs.bundles.preferences.androidx)
     implementation(libs.bundles.preferences.google)
+    implementation(platform(libs.compose.bom))
     implementation(libs.bundles.preferences.compose)
 }
 

jchucomponents-ui/build.gradle.kts

@@ -48,7 +48,8 @@ android {
 }
 
 dependencies {
-    implementation(libs.bundles.ui.compose)
+    implementation(platform(libs.compose.bom))
+    implementation(libs.bundles.compose.bom)
     implementation(libs.bundles.ui.androidx)
     implementation(project(":jchucomponents-ktx"))
     debugImplementation(libs.androidx.compose.ui.ui.tooling.preview)

jchucomponents-ui/src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/cards/BenefitsCard.kt

@@ -66,7 +66,9 @@ fun BenefitsCard(
     }
 
     Column(
-        modifier = Modifier.weight(1f)
+        modifier = Modifier.weight(1f),
+        horizontalAlignment = Alignment.Start,
+        verticalArrangement = Arrangement.spacedBy(5.dp)
     ) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
@@ -81,14 +83,15 @@ fun BenefitsCard(
 
             if (benefitsDefaults.isNew) {
                 Surface(
-                    shape = 5.cornerRadius(),
+                    shape = 7.cornerRadius(),
                     color = benefitsDefaults.colors.badgeContainerColor
                 ) {
                     Text(
                         text = "New",
                         fontSize = 16.sp,
                         modifier = Modifier.padding(
-                            horizontal = 5.dp
+                            vertical = 3.dp,
+                            horizontal = 9.dp
                         ),
                         fontWeight = FontWeight.ExtraBold,
                         color = benefitsDefaults.colors.badgeContentColor
@@ -101,6 +104,7 @@ fun BenefitsCard(
         description?.let { description ->
             Text(
                 fontSize = 12.sp,
+                lineHeight = 17.sp,
                 text = description,
                 color = benefitsDefaults.colors.contentColor.copy(.7f),
             )

jchucomponents-ui/src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/images/BlurImage.kt

@@ -6,8 +6,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.DefaultAlpha
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
-import coil.compose.AsyncImage
-import coil.request.ImageRequest
+import coil3.compose.AsyncImage
+import coil3.request.ImageRequest
+import coil3.request.allowHardware
+import coil3.request.crossfade
+import coil3.request.transformations
 import com.jeluchu.jchucomponents.ui.composables.images.transformations.BlurTransformation
 
 @Composable

jchucomponents-ui/src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/images/CoilExtensions.kt

@@ -1,11 +1,14 @@
 package com.jeluchu.jchucomponents.ui.composables.images
 
+import android.annotation.SuppressLint
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
-import coil.compose.rememberAsyncImagePainter
-import coil.request.ImageRequest
-import coil.size.Size
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import coil3.compose.rememberAsyncImagePainter
+import coil3.request.ImageRequest
+import coil3.size.Size
+import kotlinx.coroutines.flow.collect
 
 @Composable
 fun String.remotetoPaiter(): Painter? =
@@ -16,8 +19,11 @@ fun String.remotetoPaiter(): Painter? =
             .build()
     )
         .state
+        .collectAsStateWithLifecycle()
+        .value
         .painter
 
+@SuppressLint("StateFlowValueCalledInComposition")
 @Composable
 fun CharSequence.remotetoPaiter(): Painter? =
     rememberAsyncImagePainter(
@@ -27,4 +33,6 @@ fun CharSequence.remotetoPaiter(): Painter? =
             .build()
     )
         .state
+        .collectAsStateWithLifecycle()
+        .value
         .painter

jchucomponents-ui/src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/images/NetworkImage.kt

@@ -13,9 +13,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.DefaultAlpha
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
-import coil.compose.AsyncImage
-import coil.request.ImageRequest
-import coil.transform.Transformation
+import coil3.compose.AsyncImage
+import coil3.request.ImageRequest
+import coil3.request.allowHardware
+import coil3.request.crossfade
+import coil3.request.transformations
+import coil3.transform.Transformation
 import com.jeluchu.jchucomponents.ui.extensions.toPainter
 import com.jeluchu.jchucomponents.ui.R
 
@@ -59,7 +62,6 @@ fun NetworkImage(
         .transformations(transformations)
         .crossfade(isCrossfade)
         .allowHardware(isAllowHardware)
-        .error(error)
         .build(),
     alpha = alpha,
     placeholder = loading.toPainter(),

jchucomponents-ui/src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/images/transformations/BlurTransformation.kt

@@ -1,8 +1,8 @@
 package com.jeluchu.jchucomponents.ui.composables.images.transformations
 
 import android.graphics.Bitmap
-import coil.size.Size
-import coil.transform.Transformation
+import coil3.size.Size
+import coil3.transform.Transformation
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlin.math.abs
@@ -11,7 +11,7 @@ import kotlin.math.roundToInt
 class BlurTransformation(
     private val radius: Int = 25,
     private val scale: Float = 0.5f
-) : Transformation {
+) : Transformation() {
 
     override val cacheKey: String = "${javaClass.name}-$radius"
 

jchucomponents-ui/src/main/kotlin/com/jeluchu/jchucomponents/ui/dragndrop/ReorderableItem.kt

@@ -23,7 +23,6 @@ import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.zIndex
 import com.jeluchu.jchucomponents.ui.dragndrop.states.ReorderableState
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun LazyItemScope.ReorderableItem(
     reorderableState: ReorderableState<*>,
@@ -36,13 +35,12 @@ fun LazyItemScope.ReorderableItem(
     state = reorderableState,
     key = key,
     modifier = modifier,
-    defaultDraggingModifier = Modifier.animateItemPlacement(),
+    defaultDraggingModifier = Modifier.animateItem(),
     orientationLocked = orientationLocked,
     index = index,
     content = content
 )
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun LazyGridItemScope.ReorderableItem(
     reorderableState: ReorderableState<*>,
@@ -54,7 +52,7 @@ fun LazyGridItemScope.ReorderableItem(
     state = reorderableState,
     key = key,
     modifier = modifier,
-    defaultDraggingModifier = Modifier.animateItemPlacement(),
+    defaultDraggingModifier = Modifier.animateItem(),
     orientationLocked = false,
     index = index,
     content = content

jchucomponents-ui/src/main/kotlin/com/jeluchu/jchucomponents/ui/extensions/coil/ImageExtensions.kt

@@ -2,18 +2,19 @@ package com.jeluchu.jchucomponents.ui.extensions.coil
 
 import android.content.Context
 import android.graphics.Bitmap
-import androidx.core.graphics.drawable.toBitmapOrNull
-import coil.imageLoader
-import coil.request.CachePolicy
-import coil.request.ErrorResult
-import coil.request.ImageRequest
-import coil.request.SuccessResult
+import coil3.imageLoader
+import coil3.request.CachePolicy
+import coil3.request.ErrorResult
+import coil3.request.ImageRequest
+import coil3.request.SuccessResult
+import coil3.request.allowHardware
+import coil3.toBitmap
 
 suspend fun Context.getImageToBitmap(
     url: String,
     force: Boolean = false,
     isHardware: Boolean = false
-): Bitmap? {
+): Bitmap {
     val request = ImageRequest.Builder(this).data(url).apply {
         if (force) {
             memoryCachePolicy(CachePolicy.DISABLED)
@@ -24,6 +25,6 @@ suspend fun Context.getImageToBitmap(
 
     return when (val result = imageLoader.execute(request)) {
         is ErrorResult -> throw result.throwable
-        is SuccessResult -> result.drawable.toBitmapOrNull()
+        is SuccessResult -> result.image.toBitmap()
     }
 }