Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: upgrade to Coil3 #7052

Merged
merged 2 commits into from
Feb 3, 2025
Merged

refactor: upgrade to Coil3 #7052

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cc0110
Upgrade to Coil3
Pittvandewitt Jan 30, 2025
8748f67
Convert to bitmap directly
Pittvandewitt Feb 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ dependencies {
/* Coil */
coreLibraryDesugaring(libs.desugaring)
implementation(libs.coil)
implementation(libs.coil.network.okhttp)

/* Room */
ksp(libs.room.compiler)
Expand Down
23 changes: 15 additions & 8 deletions app/src/main/java/com/github/libretube/helpers/ImageHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ import android.net.Uri
import android.widget.ImageView
import androidx.core.graphics.drawable.toBitmapOrNull
import androidx.core.net.toUri
import coil.ImageLoader
import coil.disk.DiskCache
import coil.request.CachePolicy
import coil.request.ImageRequest
import coil3.ImageLoader
import coil3.asDrawable
import coil3.disk.DiskCache
import coil3.disk.directory
import coil3.network.okhttp.OkHttpNetworkFetcherFactory
import coil3.request.CachePolicy
import coil3.request.ImageRequest
import coil3.request.crossfade
import com.github.libretube.BuildConfig
import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.extensions.toAndroidUri
Expand Down Expand Up @@ -46,8 +50,10 @@ object ImageHelper {

imageLoader = ImageLoader.Builder(context)
.crossfade(true)
.okHttpClient {
httpClient.build()
.components {
add(
OkHttpNetworkFetcherFactory(httpClient.build())
)
}
.apply {
if (maxCacheSize.isEmpty()) {
Expand Down Expand Up @@ -110,14 +116,15 @@ object ImageHelper {
.data(url)
.build()

return imageLoader.execute(request).drawable?.toBitmapOrNull()
imageLoader.execute(request)
return imageLoader.execute(request).image?.asDrawable(context.resources)?.toBitmapOrNull()
Pittvandewitt marked this conversation as resolved.
Show resolved Hide resolved
Pittvandewitt marked this conversation as resolved.
Show resolved Hide resolved
}

private fun getImageWithCallback(context: Context, url: String?, onSuccess: (Drawable) -> Unit) {
val request = ImageRequest.Builder(context)
.data(url)
.target { drawable ->
onSuccess(drawable)
onSuccess(drawable.asDrawable(context.resources))
}
.build()

Expand Down
5 changes: 3 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ espresso = "3.6.1"
workRuntime = "2.9.1"
retrofit = "2.11.0"
desugaring = "2.1.4"
coil = "2.7.0"
coil = "3.0.4"
room = "2.6.1"
kotlinxSerialization = "1.6.3"
kotlinxDatetime = "0.6.1"
Expand Down Expand Up @@ -62,7 +62,8 @@ androidx-media3-ui = { group="androidx.media3", name="media3-ui", version.ref="m
newpipeextractor = { module = "com.github.teamnewpipe:NewPipeExtractor", version.ref = "newpipeextractor" }
square-retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
desugaring = { group = "com.android.tools", name = "desugar_jdk_libs_nio", version.ref = "desugaring" }
coil = { group = "io.coil-kt", name = "coil", version.ref="coil" }
coil = { group = "io.coil-kt.coil3", name = "coil", version.ref = "coil" }
coil-network-okhttp = { group = "io.coil-kt.coil3", name = "coil-network-okhttp", version.ref = "coil"}
lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" }
lifecycle-livedata = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycle" }
Expand Down
Loading