From 1f1772fed9d39fac9947209f99ac78a3f1549555 Mon Sep 17 00:00:00 2001
From: Colin White <colin@colinwhite.me>
Date: Wed, 11 May 2022 21:31:36 -0400
Subject: [PATCH] Clean up Lint warnings. (#1269)

---
 .../src/androidTest/java/coil/request/DisposableTest.kt      | 2 --
 coil-base/src/main/java/coil/drawable/CrossfadeDrawable.kt   | 1 +
 coil-gif/src/main/java/coil/decode/ImageDecoderDecoder.kt    | 1 -
 coil-gif/src/main/java/coil/drawable/MovieDrawable.kt        | 5 ++++-
 coil-gif/src/main/java/coil/drawable/ScaleDrawable.kt        | 1 +
 coil-singleton/src/test/java/coil/ImageLoaderFactoryTest.kt  | 2 --
 docs/image_loaders.md                                        | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/coil-base/src/androidTest/java/coil/request/DisposableTest.kt b/coil-base/src/androidTest/java/coil/request/DisposableTest.kt
index c7dc92f190..ae41d37bc0 100644
--- a/coil-base/src/androidTest/java/coil/request/DisposableTest.kt
+++ b/coil-base/src/androidTest/java/coil/request/DisposableTest.kt
@@ -17,7 +17,6 @@ import coil.util.TestActivity
 import coil.util.activity
 import coil.util.requestManager
 import coil.util.runTestMain
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.first
 import org.junit.After
@@ -29,7 +28,6 @@ import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class DisposableTest {
 
     private lateinit var context: Context
diff --git a/coil-base/src/main/java/coil/drawable/CrossfadeDrawable.kt b/coil-base/src/main/java/coil/drawable/CrossfadeDrawable.kt
index 3280c60874..24921d6b97 100644
--- a/coil-base/src/main/java/coil/drawable/CrossfadeDrawable.kt
+++ b/coil-base/src/main/java/coil/drawable/CrossfadeDrawable.kt
@@ -115,6 +115,7 @@ class CrossfadeDrawable @JvmOverloads constructor(
         maxAlpha = alpha
     }
 
+    @Deprecated("Deprecated in Java")
     @Suppress("DEPRECATION")
     override fun getOpacity(): Int {
         val start = start
diff --git a/coil-gif/src/main/java/coil/decode/ImageDecoderDecoder.kt b/coil-gif/src/main/java/coil/decode/ImageDecoderDecoder.kt
index b411d38771..6a43c67dc1 100644
--- a/coil-gif/src/main/java/coil/decode/ImageDecoderDecoder.kt
+++ b/coil-gif/src/main/java/coil/decode/ImageDecoderDecoder.kt
@@ -164,7 +164,6 @@ class ImageDecoderDecoder @JvmOverloads constructor(
         return ScaleDrawable(baseDrawable, options.scale)
     }
 
-    @RequiresApi(28)
     class Factory @JvmOverloads constructor(
         private val enforceMinimumFrameDelay: Boolean = true
     ) : Decoder.Factory {
diff --git a/coil-gif/src/main/java/coil/drawable/MovieDrawable.kt b/coil-gif/src/main/java/coil/drawable/MovieDrawable.kt
index 9449e51fdd..256b060640 100644
--- a/coil-gif/src/main/java/coil/drawable/MovieDrawable.kt
+++ b/coil-gif/src/main/java/coil/drawable/MovieDrawable.kt
@@ -192,8 +192,11 @@ class MovieDrawable @JvmOverloads constructor(
         paint.alpha = alpha
     }
 
+    @Deprecated("Deprecated in Java")
+    @Suppress("DEPRECATION")
     override fun getOpacity(): Int {
-        return if (paint.alpha == 255 && (pixelOpacity == OPAQUE || (pixelOpacity == UNCHANGED && movie.isOpaque))) {
+        return if (paint.alpha == 255 &&
+            (pixelOpacity == OPAQUE || (pixelOpacity == UNCHANGED && movie.isOpaque))) {
             PixelFormat.OPAQUE
         } else {
             PixelFormat.TRANSLUCENT
diff --git a/coil-gif/src/main/java/coil/drawable/ScaleDrawable.kt b/coil-gif/src/main/java/coil/drawable/ScaleDrawable.kt
index 28719ba1ab..e444721c74 100644
--- a/coil-gif/src/main/java/coil/drawable/ScaleDrawable.kt
+++ b/coil-gif/src/main/java/coil/drawable/ScaleDrawable.kt
@@ -48,6 +48,7 @@ class ScaleDrawable @JvmOverloads constructor(
         child.alpha = alpha
     }
 
+    @Deprecated("Deprecated in Java")
     @Suppress("DEPRECATION")
     override fun getOpacity() = child.opacity
 
diff --git a/coil-singleton/src/test/java/coil/ImageLoaderFactoryTest.kt b/coil-singleton/src/test/java/coil/ImageLoaderFactoryTest.kt
index deea524267..0abf877b4b 100644
--- a/coil-singleton/src/test/java/coil/ImageLoaderFactoryTest.kt
+++ b/coil-singleton/src/test/java/coil/ImageLoaderFactoryTest.kt
@@ -3,7 +3,6 @@ package coil
 import android.app.Application
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
@@ -15,7 +14,6 @@ import kotlin.test.assertFalse
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
 
-@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(RobolectricTestRunner::class)
 class ImageLoaderFactoryTest {
 
diff --git a/docs/image_loaders.md b/docs/image_loaders.md
index 97ff6fbcba..f1bcd1b5ba 100644
--- a/docs/image_loaders.md
+++ b/docs/image_loaders.md
@@ -56,8 +56,8 @@ class FakeImageLoader(private val context: Context) : ImageLoader {
 
     override val defaults = DefaultRequestOptions()
     override val components = ComponentRegistry()
-    override val memoryCache get() = null
-    override val diskCache get() = null
+    override val memoryCache: MemoryCache? get() = null
+    override val diskCache: DiskCache? get() = null
 
     override fun enqueue(request: ImageRequest): Disposable {
         // Always call onStart before onSuccess.