image: raw transparent gaps

Author: OxygenCobalt

app/src/main/java/org/oxycblt/auxio/image/coil/GalleryComposeFetcher.kt

@@ -22,7 +22,6 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.Canvas
-import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Path
 import android.graphics.PorterDuff
@@ -56,8 +55,6 @@ import kotlinx.coroutines.withContext
 import okio.FileSystem
 import okio.buffer
 import okio.source
-import org.oxycblt.auxio.R
-import org.oxycblt.auxio.util.getColorCompat
 import org.oxycblt.musikr.covers.CoverCollection
 
 data class GalleryCoverCollection(
@@ -109,7 +106,6 @@ private constructor(
                     outputSizePx = outputSize,
                     gapWidthPx = outputSize * ComposeCoverDefaults.GAP_RATIO,
                     cornerRadiusPx = cornerRadiusPx,
-                    backgroundColor = context.getColorCompat(R.color.sel_cover_bg).defaultColor,
                     zOrder = data.zOrder.validatedZOrder(),
                 ),
             )
@@ -132,7 +128,6 @@ private constructor(
             val outputSizePx: Int,
             val gapWidthPx: Float,
             val cornerRadiusPx: Float,
-            val backgroundColor: Int = Color.parseColor("#0f111a"),
             val zOrder: List<Int> = listOf(0, 1, 2, 3),
         )
 
@@ -144,13 +139,6 @@ private constructor(
             val result = createBitmap(config.outputSizePx, config.outputSizePx)
             val canvas = Canvas(result)
 
-            canvas.drawColor(config.backgroundColor)
-
-            val gapPaint =
-                Paint(Paint.ANTI_ALIAS_FLAG).apply {
-                    color = config.backgroundColor
-                    style = Paint.Style.FILL
-                }
             val imagePaint = Paint(Paint.ANTI_ALIAS_FLAG)
 
             val totalSize = config.outputSizePx.toFloat()
@@ -265,8 +253,6 @@ private constructor(
                     continue
                 }
 
-                canvas.drawPath(visiblePath, gapPaint)
-
                 if (tile.innerRect.width() > 0 && tile.innerRect.height() > 0) {
                     val clipSave = canvas.save()
                     canvas.clipPath(visiblePath)

app/src/main/java/org/oxycblt/auxio/image/coil/SmatteringComposeFetcher.kt

@@ -30,7 +30,6 @@ import android.graphics.Rect
 import android.graphics.RectF
 import androidx.core.graphics.createBitmap
 import androidx.core.graphics.drawable.toDrawable
-import androidx.core.graphics.toColorInt
 import androidx.core.graphics.withRotation
 import coil3.ImageLoader
 import coil3.asImage
@@ -57,8 +56,6 @@ import kotlinx.coroutines.withContext
 import okio.FileSystem
 import okio.buffer
 import okio.source
-import org.oxycblt.auxio.R
-import org.oxycblt.auxio.util.getColorCompat
 import org.oxycblt.musikr.covers.CoverCollection
 
 private const val OUTSET_PERCENT = 0.08f
@@ -116,7 +113,6 @@ private constructor(
                     cornerRadiusPx = cornerRadiusPx,
                     fanAngleDeg = data.fanAngleDeg,
                     tiltAngleDeg = data.tiltAngleDeg,
-                    backgroundColor = context.getColorCompat(R.color.sel_cover_bg).defaultColor,
                     zOrder = data.zOrder.validatedZOrder(),
                 ),
             )
@@ -141,7 +137,6 @@ private constructor(
             val cornerRadiusPx: Float,
             val fanAngleDeg: Float,
             val tiltAngleDeg: Float,
-            val backgroundColor: Int = "#0f111a".toColorInt(),
             val zOrder: List<Int> = listOf(0, 1, 2, 3),
         )
 
@@ -153,12 +148,9 @@ private constructor(
             val result = createBitmap(config.outputSizePx, config.outputSizePx)
             val canvas = Canvas(result)
 
-            canvas.drawColor(config.backgroundColor)
-
-            val gapPaint =
+            val clearPaint =
                 Paint(Paint.ANTI_ALIAS_FLAG).apply {
-                    color = config.backgroundColor
-                    style = Paint.Style.FILL
+                    xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR)
                 }
             val imagePaint = Paint(Paint.ANTI_ALIAS_FLAG)
 
@@ -250,7 +242,7 @@ private constructor(
                     }
 
                 canvas.withRotation(rotation, centerX, centerY) {
-                    drawPath(gapPath, gapPaint)
+                    drawPath(gapPath, clearPaint)
 
                     if (innerRect.width() > 0 && innerRect.height() > 0) {
                         val savedLayer = saveLayer(innerRect, null)

app/src/main/java/org/oxycblt/auxio/image/coil/StackComposeFetcher.kt

@@ -30,7 +30,6 @@ import android.graphics.Rect
 import android.graphics.RectF
 import androidx.core.graphics.createBitmap
 import androidx.core.graphics.drawable.toDrawable
-import androidx.core.graphics.toColorInt
 import coil3.ImageLoader
 import coil3.asImage
 import coil3.decode.DataSource
@@ -56,8 +55,6 @@ import kotlinx.coroutines.withContext
 import okio.FileSystem
 import okio.buffer
 import okio.source
-import org.oxycblt.auxio.R
-import org.oxycblt.auxio.util.getColorCompat
 import org.oxycblt.musikr.covers.CoverCollection
 
 data class StackCoverCollection(
@@ -109,7 +106,6 @@ private constructor(
                     outputSizePx = outputSize,
                     gapWidthPx = outputSize * ComposeCoverDefaults.GAP_RATIO,
                     cornerRadiusPx = cornerRadiusPx,
-                    backgroundColor = context.getColorCompat(R.color.sel_cover_bg).defaultColor,
                     zOrder = data.zOrder.validatedZOrder(),
                 ),
             )
@@ -132,7 +128,6 @@ private constructor(
             val outputSizePx: Int,
             val gapWidthPx: Float,
             val cornerRadiusPx: Float,
-            val backgroundColor: Int = "#0f111a".toColorInt(),
             val zOrder: List<Int> = listOf(0, 1, 2, 3),
         )
 
@@ -144,12 +139,9 @@ private constructor(
             val result = createBitmap(config.outputSizePx, config.outputSizePx)
             val canvas = Canvas(result)
 
-            canvas.drawColor(config.backgroundColor)
-
-            val gapPaint =
+            val clearPaint =
                 Paint(Paint.ANTI_ALIAS_FLAG).apply {
-                    color = config.backgroundColor
-                    style = Paint.Style.FILL
+                    xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR)
                 }
             val imagePaint = Paint(Paint.ANTI_ALIAS_FLAG)
 
@@ -231,7 +223,7 @@ private constructor(
                                 Path.Direction.CW,
                             )
                         }
-                    canvas.drawPath(gapPath, gapPaint)
+                    canvas.drawPath(gapPath, clearPaint)
                 }
 
                 if (innerRect.width() > 0 && innerRect.height() > 0) {