Don't automatically convert ColorDrawable -> ColorPainter in AsyncIma…

…gePainter. (#1762) * Don't automatically convert ColorDrawable -> ColorPainter in AsyncImagePainter. * Spotless.
coil-kt · May 14, 2023 · 970f637 · 970f637
1 parent 779fd54
commit 970f637
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/coil-compose-base/src/main/java/coil/compose/AsyncImagePainter.kt b/coil-compose-base/src/main/java/coil/compose/AsyncImagePainter.kt
@@ -1,7 +1,6 @@
 package coil.compose
 
 import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.lazy.LazyColumn
@@ -16,7 +15,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.geometry.isUnspecified
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.DefaultAlpha
 import androidx.compose.ui.graphics.FilterQuality
@@ -25,7 +23,6 @@ import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.drawscope.DrawScope.Companion.DefaultFilterQuality
 import androidx.compose.ui.graphics.painter.BitmapPainter
-import androidx.compose.ui.graphics.painter.ColorPainter
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
@@ -335,7 +332,6 @@ class AsyncImagePainter internal constructor(
     /** Convert this [Drawable] into a [Painter] using Compose primitives if possible. */
     private fun Drawable.toPainter() = when (this) {
         is BitmapDrawable -> BitmapPainter(bitmap.asImageBitmap(), filterQuality = filterQuality)
-        is ColorDrawable -> ColorPainter(Color(color))
         else -> DrawablePainter(mutate())
     }
 

diff --git a/coil-test-paparazzi/src/test/java/coil/test/PaparazziTest.kt b/coil-test-paparazzi/src/test/java/coil/test/PaparazziTest.kt
@@ -2,7 +2,6 @@ package coil.test
 
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.LayerDrawable
 import android.widget.ImageView
 import androidx.compose.ui.layout.ContentScale
 import app.cash.paparazzi.DeviceConfig.Companion.PIXEL_6
@@ -55,7 +54,7 @@ class PaparazziTest {
     fun loadCompose() {
         val url = "https://www.example.com/image.jpg"
         // Wrap the color drawable so it isn't automatically converted into a ColorPainter.
-        val drawable = object : LayerDrawable(arrayOf(ColorDrawable(Color.RED))) {
+        val drawable = object : ColorDrawable(Color.RED) {
             override fun getIntrinsicWidth() = 100
             override fun getIntrinsicHeight() = 100
         }

diff --git a/coil-test-roborazzi/src/test/java/coil/test/RoborazziComposeTest.kt b/coil-test-roborazzi/src/test/java/coil/test/RoborazziComposeTest.kt
@@ -2,7 +2,6 @@ package coil.test
 
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.LayerDrawable
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
@@ -38,7 +37,7 @@ class RoborazziComposeTest {
     fun loadCompose() {
         val url = "https://www.example.com/image.jpg"
         // Wrap the color drawable so it isn't automatically converted into a ColorPainter.
-        val drawable = object : LayerDrawable(arrayOf(ColorDrawable(Color.RED))) {
+        val drawable = object : ColorDrawable(Color.RED) {
             override fun getIntrinsicWidth() = 100
             override fun getIntrinsicHeight() = 100
         }