diff --git a/core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt b/core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt index ec08d66d2..a7c67524a 100644 --- a/core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt +++ b/core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt @@ -18,6 +18,7 @@ import androidx.core.graphics.alpha import androidx.core.graphics.applyCanvas import androidx.core.graphics.blue import androidx.core.graphics.createBitmap +import androidx.core.graphics.drawable.toDrawable import androidx.core.graphics.get import androidx.core.graphics.green import androidx.core.graphics.red @@ -338,9 +339,9 @@ object ImageUtil { decoder?.recycle() val whiteColor = Color.WHITE - if (image == null) return ColorDrawable(whiteColor) + if (image == null) return whiteColor.toDrawable() if (image.width < 50 || image.height < 50) { - return ColorDrawable(whiteColor) + return whiteColor.toDrawable() } val top = 5 @@ -381,7 +382,7 @@ object ImageUtil { !color.isWhite() && color.isCloseTo(other) } if (isNotWhiteAndCloseTo.all { it }) { - return ColorDrawable(topLeftPixel) + return topLeftPixel.toDrawable() } val cornerPixels = listOf(topLeftPixel, topRightPixel, botLeftPixel, botRightPixel) @@ -496,8 +497,8 @@ object ImageUtil { val isLandscape = context.resources.configuration?.orientation == Configuration.ORIENTATION_LANDSCAPE if (isLandscape) { return when { - darkBG -> ColorDrawable(blackColor) - else -> ColorDrawable(whiteColor) + darkBG -> blackColor.toDrawable() + else -> whiteColor.toDrawable() } } @@ -518,7 +519,7 @@ object ImageUtil { intArrayOf(whiteColor, whiteColor, blackColor, blackColor) } darkBG -> { - return ColorDrawable(blackColor) + return blackColor.toDrawable() } topIsBlackStreak || ( @@ -537,7 +538,7 @@ object ImageUtil { intArrayOf(whiteColor, whiteColor, blackColor, blackColor) } else -> { - return ColorDrawable(whiteColor) + return whiteColor.toDrawable() } }