Did you know there's a coil3?

pyamsoft · Feb 7, 2025 · 9de7a47 · 9de7a47
1 parent bf639ab
commit 9de7a47
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 33 deletions.
diff --git a/build.gradle b/build.gradle
@@ -156,7 +156,7 @@ subprojects {
 
           artifactId project.name
           groupId "com.github.pyamsoft.pydroid"
-          version "27.2.1"
+          version "27.3.0"
         }
       }
     }

diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
@@ -48,7 +48,7 @@ dependencies {
   implementation("androidx.activity:activity-compose:${rootProject.extra["activity"]}")
 
   // Compose Image loading
-  implementation("io.coil-kt:coil-compose-base:2.7.0")
+  implementation("io.coil-kt.coil3:coil-compose-core:3.1.0")
 
   implementation("androidx.core:core-ktx:${rootProject.extra["core"]}")
 

diff --git a/ui/src/main/java/com/pyamsoft/pydroid/ui/ModuleProvider.kt b/ui/src/main/java/com/pyamsoft/pydroid/ui/ModuleProvider.kt
@@ -17,7 +17,7 @@
 package com.pyamsoft.pydroid.ui
 
 import androidx.annotation.CheckResult
-import coil.ImageLoader
+import coil3.ImageLoader
 import com.pyamsoft.pydroid.core.ThreadEnforcer
 import com.pyamsoft.pydroid.ui.debug.InAppDebugStatus
 import com.pyamsoft.pydroid.ui.theme.Theming

diff --git a/ui/src/main/java/com/pyamsoft/pydroid/ui/PYDroidComponent.kt b/ui/src/main/java/com/pyamsoft/pydroid/ui/PYDroidComponent.kt
@@ -19,7 +19,7 @@ package com.pyamsoft.pydroid.ui
 import android.app.Application
 import android.content.Context
 import androidx.annotation.CheckResult
-import coil.ImageLoader
+import coil3.ImageLoader
 import com.pyamsoft.pydroid.bootstrap.about.AboutModule
 import com.pyamsoft.pydroid.bootstrap.changelog.ChangeLogModule
 import com.pyamsoft.pydroid.bootstrap.datapolicy.DataPolicyModule

diff --git a/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/app/AppComponent.kt b/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/app/AppComponent.kt
@@ -19,7 +19,7 @@ package com.pyamsoft.pydroid.ui.internal.app
 import android.content.Context
 import androidx.activity.ComponentActivity
 import androidx.annotation.CheckResult
-import coil.ImageLoader
+import coil3.ImageLoader
 import com.pyamsoft.pydroid.billing.BillingModule
 import com.pyamsoft.pydroid.bootstrap.changelog.ChangeLogModule
 import com.pyamsoft.pydroid.bootstrap.datapolicy.DataPolicyModule

diff --git a/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/app/AppHeader.kt b/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/app/AppHeader.kt
@@ -35,8 +35,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import coil.ImageLoader
-import coil.compose.AsyncImage
+import coil3.ImageLoader
+import coil3.compose.AsyncImage
 import com.pyamsoft.pydroid.theme.keylines
 import com.pyamsoft.pydroid.ui.defaults.ImageDefaults
 import com.pyamsoft.pydroid.ui.internal.test.createNewTestImageLoader

diff --git a/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/billing/dialog/BillingDialog.kt b/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/billing/dialog/BillingDialog.kt
@@ -28,7 +28,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.LifecycleEventEffect
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.lifecycleScope
-import coil.ImageLoader
+import coil3.ImageLoader
 import com.pyamsoft.pydroid.billing.BillingLauncher
 import com.pyamsoft.pydroid.core.Logger
 import com.pyamsoft.pydroid.theme.keylines

diff --git a/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/billing/dialog/BillingDialogComponent.kt b/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/billing/dialog/BillingDialogComponent.kt
@@ -17,7 +17,7 @@
 package com.pyamsoft.pydroid.ui.internal.billing.dialog
 
 import androidx.annotation.CheckResult
-import coil.ImageLoader
+import coil3.ImageLoader
 import com.pyamsoft.pydroid.billing.BillingModule
 import com.pyamsoft.pydroid.bootstrap.changelog.ChangeLogModule
 import com.pyamsoft.pydroid.ui.app.AppProvider

diff --git a/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/billing/dialog/BillingScreen.kt b/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/billing/dialog/BillingScreen.kt
@@ -38,7 +38,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import coil.ImageLoader
+import coil3.ImageLoader
 import com.pyamsoft.pydroid.billing.BillingSku
 import com.pyamsoft.pydroid.billing.BillingState
 import com.pyamsoft.pydroid.theme.keylines

diff --git a/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/changelog/dialog/ChangeLogDialog.kt b/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/changelog/dialog/ChangeLogDialog.kt
@@ -25,7 +25,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.window.Dialog
-import coil.ImageLoader
+import coil3.ImageLoader
 import com.pyamsoft.pydroid.theme.keylines
 import com.pyamsoft.pydroid.ui.app.rememberDialogProperties
 import com.pyamsoft.pydroid.ui.changelog.ChangeLogProvider

diff --git a/...c/main/java/com/pyamsoft/pydroid/ui/internal/changelog/dialog/ChangeLogDialogComponent.kt b/...c/main/java/com/pyamsoft/pydroid/ui/internal/changelog/dialog/ChangeLogDialogComponent.kt
@@ -17,7 +17,7 @@
 package com.pyamsoft.pydroid.ui.internal.changelog.dialog
 
 import androidx.annotation.CheckResult
-import coil.ImageLoader
+import coil3.ImageLoader
 import com.pyamsoft.pydroid.bootstrap.changelog.ChangeLogModule
 import com.pyamsoft.pydroid.ui.changelog.ChangeLogProvider
 

diff --git a/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/changelog/dialog/ChangeLogScreen.kt b/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/changelog/dialog/ChangeLogScreen.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import coil.ImageLoader
+import coil3.ImageLoader
 import com.pyamsoft.pydroid.theme.keylines
 import com.pyamsoft.pydroid.ui.R
 import com.pyamsoft.pydroid.ui.defaults.TypographyDefaults

diff --git a/...main/java/com/pyamsoft/pydroid/ui/internal/datapolicy/dialog/DataPolicyDialogComponent.kt b/...main/java/com/pyamsoft/pydroid/ui/internal/datapolicy/dialog/DataPolicyDialogComponent.kt
@@ -17,7 +17,7 @@
 package com.pyamsoft.pydroid.ui.internal.datapolicy.dialog
 
 import androidx.annotation.CheckResult
-import coil.ImageLoader
+import coil3.ImageLoader
 import com.pyamsoft.pydroid.bootstrap.datapolicy.DataPolicyModule
 import com.pyamsoft.pydroid.ui.app.AppProvider
 

diff --git a/...ain/java/com/pyamsoft/pydroid/ui/internal/datapolicy/dialog/DataPolicyDisclosureDialog.kt b/...ain/java/com/pyamsoft/pydroid/ui/internal/datapolicy/dialog/DataPolicyDisclosureDialog.kt
@@ -26,7 +26,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.window.Dialog
-import coil.ImageLoader
+import coil3.ImageLoader
 import com.pyamsoft.pydroid.theme.keylines
 import com.pyamsoft.pydroid.ui.app.rememberDialogProperties
 import com.pyamsoft.pydroid.ui.changelog.ChangeLogProvider

diff --git a/...ain/java/com/pyamsoft/pydroid/ui/internal/datapolicy/dialog/DataPolicyDisclosureScreen.kt b/...ain/java/com/pyamsoft/pydroid/ui/internal/datapolicy/dialog/DataPolicyDisclosureScreen.kt
@@ -38,7 +38,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import coil.ImageLoader
+import coil3.ImageLoader
 import com.pyamsoft.pydroid.theme.keylines
 import com.pyamsoft.pydroid.ui.R
 import com.pyamsoft.pydroid.ui.haptics.LocalHapticManager

diff --git a/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/test/TestImageLoader.kt b/ui/src/main/java/com/pyamsoft/pydroid/ui/internal/test/TestImageLoader.kt
@@ -22,17 +22,18 @@ import android.graphics.drawable.ColorDrawable
 import androidx.annotation.CheckResult
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
-import coil.ComponentRegistry
-import coil.ImageLoader
-import coil.decode.DataSource.MEMORY
-import coil.disk.DiskCache
-import coil.memory.MemoryCache
-import coil.request.DefaultRequestOptions
-import coil.request.Disposable
-import coil.request.ErrorResult
-import coil.request.ImageRequest
-import coil.request.ImageResult
-import coil.request.SuccessResult
+import coil3.ComponentRegistry
+import coil3.ImageLoader
+import coil3.asImage
+import coil3.decode.DataSource.MEMORY
+import coil3.disk.DiskCache
+import coil3.memory.MemoryCache
+import coil3.request.Disposable
+import coil3.request.ErrorResult
+import coil3.request.ImageRequest
+import coil3.request.ImageRequest.Defaults
+import coil3.request.ImageResult
+import coil3.request.SuccessResult
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.async
@@ -51,7 +52,7 @@ private class TestImageLoader(context: Context) : ImageLoader {
         override val job: Deferred<ImageResult> =
             MainScope().async<ImageResult> {
               ErrorResult(
-                  drawable = null,
+                  image = null,
                   request = ImageRequest.Builder(context).build(),
                   throwable = RuntimeException("Test"),
               )
@@ -60,25 +61,25 @@ private class TestImageLoader(context: Context) : ImageLoader {
         override fun dispose() {}
       }
 
-  override val components: ComponentRegistry = ComponentRegistry()
+  override val components = ComponentRegistry()
 
-  override val defaults: DefaultRequestOptions = DefaultRequestOptions()
+  override val defaults = Defaults()
 
   override val diskCache: DiskCache? = null
 
   override val memoryCache: MemoryCache? = null
 
   override fun enqueue(request: ImageRequest): Disposable {
     request.apply {
-      target?.onStart(placeholder = loadingDrawable)
-      target?.onSuccess(result = successDrawable)
+      target?.onStart(placeholder = loadingDrawable.asImage())
+      target?.onSuccess(result = successDrawable.asImage())
     }
     return disposable
   }
 
   override suspend fun execute(request: ImageRequest): ImageResult {
     return SuccessResult(
-        drawable = successDrawable,
+        image = successDrawable.asImage(),
         request = request,
         dataSource = MEMORY,
     )