Merge pull request #216 from imashnake0/coil-3

Upgrade to Coil 3
imashnake0 · Dec 28, 2024 · 8f958e2 · 8f958e2
2 parents 21a3238 + 20a28ad
commit 8f958e2
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 10 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -74,7 +74,7 @@ dependencies {
     implementation(libs.compose.ui.toolingPreview)
 
     // Coil
-    implementation(libs.coil.compose)
+    implementation(libs.bundles.coil)
 
     // Kotlin
     implementation(libs.kotlin.coroutines.android)

diff --git a/app/src/main/kotlin/com/imashnake/animite/features/media/MediaPage.kt b/app/src/main/kotlin/com/imashnake/animite/features/media/MediaPage.kt
@@ -66,8 +66,9 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.text.HtmlCompat
 import androidx.hilt.navigation.compose.hiltViewModel
-import coil.compose.AsyncImage
-import coil.request.ImageRequest
+import coil3.compose.AsyncImage
+import coil3.request.ImageRequest
+import coil3.request.crossfade
 import com.imashnake.animite.R
 import com.imashnake.animite.api.anilist.sanitize.media.Media
 import com.imashnake.animite.core.Constants

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -38,7 +38,7 @@ dependencies {
     implementation(libs.boswelja.composeMarkdown.material3)
 
     // Coil
-    implementation(libs.coil.compose)
+    implementation(libs.bundles.coil)
 
     // Kotlin
     implementation(libs.kotlin.coroutines.android)

diff --git a/core/src/main/kotlin/com/imashnake/animite/core/extensions/ImageRequestExt.kt b/core/src/main/kotlin/com/imashnake/animite/core/extensions/ImageRequestExt.kt
@@ -2,7 +2,8 @@ package com.imashnake.animite.core.extensions
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
-import coil.request.ImageRequest
+import coil3.request.ImageRequest
+import coil3.request.crossfade
 import com.imashnake.animite.core.Constants
 
 /**

diff --git a/core/src/main/kotlin/com/imashnake/animite/core/ui/MediaSmall.kt b/core/src/main/kotlin/com/imashnake/animite/core/ui/MediaSmall.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
-import coil.compose.AsyncImage
+import coil3.compose.AsyncImage
 import com.imashnake.animite.core.R
 import com.imashnake.animite.core.extensions.crossfadeModel
 import com.imashnake.animite.core.extensions.landscapeCutoutPadding

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -41,7 +41,7 @@ datastore = "1.1.1"
 
 # COIL
 # https://github.com/coil-kt/coil/blob/main/CHANGELOG.md.
-coil = "2.7.0"
+coil = "3.0.4"
 
 # Compose
 # https://developer.android.com/jetpack/androidx/releases/compose.
@@ -110,7 +110,8 @@ compose-test-ui-testJunit4 = { group = "androidx.compose.ui", name = "ui-test-ju
 apollo-runtime = { group = "com.apollographql.apollo3", name = "apollo-runtime" }
 apollo-cache-memory = { group = "com.apollographql.apollo3", name = "apollo-normalized-cache", version.ref = "apollo" }
 apollo-cache-sqlite = { group = "com.apollographql.apollo3", name = "apollo-normalized-cache-sqlite", version.ref = "apollo" }
-coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
+coil-compose = { group = "io.coil-kt.coil3", name = "coil-compose", version.ref = "coil" }
+coil-network = { group = "io.coil-kt.coil3", name = "coil-network-okhttp", version.ref = "coil" }
 boswelja-composeMarkdown-material3 = { group = "io.github.boswelja.markdown", name = "material3", version.ref = "composeMarkdown" }
 kotlin-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" }
 kotlin-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
@@ -132,3 +133,8 @@ compose = [
     "compose-runtime",
     "compose-ui",
 ]
+
+coil = [
+    "coil-compose",
+    "coil-network"
+]
diff --git a/profile/build.gradle.kts b/profile/build.gradle.kts
@@ -52,7 +52,7 @@ dependencies {
     implementation(libs.boswelja.composeMarkdown.material3)
 
     // Coil
-    implementation(libs.coil.compose)
+    implementation(libs.bundles.coil)
 
     // Kotlin
     implementation(libs.kotlin.coroutines.android)

diff --git a/profile/src/main/kotlin/com/imashnake/animite/profile/ProfileScreen.kt b/profile/src/main/kotlin/com/imashnake/animite/profile/ProfileScreen.kt
@@ -30,7 +30,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import coil.compose.AsyncImage
+import coil3.compose.AsyncImage
 import com.boswelja.markdown.material3.MarkdownDocument
 import com.boswelja.markdown.material3.m3TextStyles
 import com.imashnake.animite.api.anilist.sanitize.profile.User