Merge remote-tracking branch 'origin/main'

awxkee · Nov 16, 2024 · c17b0d6 · c17b0d6
2 parents 1ab6b2e + 8085e38
commit c17b0d6
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 49 deletions.
diff --git a/avifcoillibrary/src/main/java/com/github/awxkee/avifcoil/decoder/HeifDecoder.kt b/avifcoillibrary/src/main/java/com/github/awxkee/avifcoil/decoder/HeifDecoder.kt
@@ -29,7 +29,6 @@
 package com.github.awxkee.avifcoil.decoder
 
 import android.graphics.Bitmap
-import android.graphics.drawable.BitmapDrawable
 import android.os.Build
 import coil3.ImageLoader
 import coil3.asImage
@@ -41,7 +40,6 @@ import coil3.request.allowHardware
 import coil3.request.allowRgb565
 import coil3.request.bitmapConfig
 import coil3.size.Scale
-import coil3.size.ScaleDrawable
 import coil3.size.Size
 import coil3.size.pxOrElse
 import com.radzivon.bartoshyk.avif.coder.HeifCoder
@@ -53,7 +51,6 @@ import okio.ByteString.Companion.encodeUtf8
 class HeifDecoder(
     private val source: SourceFetchResult,
     private val options: Options,
-    private val imageLoader: ImageLoader,
     private val exceptionLogger: ((Exception) -> Unit)? = null,
 ) : Decoder {
 
@@ -85,18 +82,14 @@ class HeifDecoder(
             }
 
             if (options.size == Size.ORIGINAL) {
-                val originalImage =
-                    coder.decode(
-                        sourceData,
-                        preferredColorConfig = mPreferredColorConfig
-                    )
+                val originalImage = coder.decode(
+                    byteArray = sourceData,
+                    preferredColorConfig = mPreferredColorConfig
+                )
+
                 return@runInterruptible DecodeResult(
-                    ScaleDrawable(
-                        BitmapDrawable(
-                            options.context.resources,
-                            originalImage
-                        ), options.scale
-                    ).asImage(), false
+                    image = originalImage.asImage(),
+                    isSampled = false
                 )
             }
 
@@ -107,21 +100,17 @@ class HeifDecoder(
                 Scale.FIT -> ScaleMode.FIT
             }
 
-            val originalImage =
-                coder.decodeSampled(
-                    sourceData,
-                    dstWidth,
-                    dstHeight,
-                    preferredColorConfig = mPreferredColorConfig,
-                    scaleMode,
-                )
+            val originalImage = coder.decodeSampled(
+                byteArray = sourceData,
+                scaledWidth = dstWidth,
+                scaledHeight = dstHeight,
+                preferredColorConfig = mPreferredColorConfig,
+                scaleMode = scaleMode,
+            )
+
             return@runInterruptible DecodeResult(
-                ScaleDrawable(
-                    BitmapDrawable(
-                        options.context.resources,
-                        originalImage
-                    ), options.scale
-                ).asImage(), true
+                image = originalImage.asImage(),
+                isSampled = true
             )
         } catch (e: Exception) {
             exceptionLogger?.invoke(e)
@@ -135,9 +124,16 @@ class HeifDecoder(
             options: Options,
             imageLoader: ImageLoader
         ): Decoder? {
-            return if (AVAILABLE_BRANDS.any {
+            return if (
+                AVAILABLE_BRANDS.any {
                     result.source.source().rangeEquals(4, it)
-                }) HeifDecoder(result, options, imageLoader) else null
+                }
+            ) {
+                HeifDecoder(
+                    source = result,
+                    options = options
+                )
+            } else null
         }
 
         companion object {

diff --git a/...library/src/main/java/com/github/awxkee/avifcoil/decoder/animation/AnimatedAvifDecoder.kt b/...library/src/main/java/com/github/awxkee/avifcoil/decoder/animation/AnimatedAvifDecoder.kt
@@ -30,8 +30,8 @@ package com.github.awxkee.avifcoil.decoder.animation
 
 import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
 import android.os.Build
+import coil3.Image
 import coil3.ImageLoader
 import coil3.asImage
 import coil3.decode.DecodeResult
@@ -42,7 +42,6 @@ import coil3.request.allowHardware
 import coil3.request.allowRgb565
 import coil3.request.bitmapConfig
 import coil3.size.Scale
-import coil3.size.ScaleDrawable
 import coil3.size.Size
 import coil3.size.pxOrElse
 import com.radzivon.bartoshyk.avif.coder.AvifAnimatedDecoder
@@ -85,13 +84,12 @@ public class AnimatedAvifDecoder(
 
             if (options.size == Size.ORIGINAL) {
                 val originalImage = AvifAnimatedDecoder(sourceData)
+
                 return@runInterruptible DecodeResult(
-                    ScaleDrawable(
-                        originalImage.drawable(
-                            colorConfig = mPreferredColorConfig,
-                            scaleMode = ScaleMode.FIT,
-                        ), options.scale
-                    ).asImage(),
+                    image = originalImage.toCoilImage(
+                        colorConfig = mPreferredColorConfig,
+                        scaleMode = ScaleMode.FIT,
+                    ),
                     isSampled = false
                 )
             }
@@ -106,14 +104,12 @@ public class AnimatedAvifDecoder(
             val originalImage = AvifAnimatedDecoder(sourceData)
 
             DecodeResult(
-                ScaleDrawable(
-                    originalImage.drawable(
-                        dstWidth = dstWidth,
-                        dstHeight = dstHeight,
-                        colorConfig = mPreferredColorConfig,
-                        scaleMode = scaleMode
-                    ), options.scale
-                ).asImage(),
+                image = originalImage.toCoilImage(
+                    dstWidth = dstWidth,
+                    dstHeight = dstHeight,
+                    colorConfig = mPreferredColorConfig,
+                    scaleMode = scaleMode
+                ),
                 isSampled = true
             )
         } catch (e: Exception) {
@@ -122,12 +118,12 @@ public class AnimatedAvifDecoder(
         }
     }
 
-    private fun AvifAnimatedDecoder.drawable(
+    private fun AvifAnimatedDecoder.toCoilImage(
         dstWidth: Int = 0,
         dstHeight: Int = 0,
         colorConfig: PreferredColorConfig,
         scaleMode: ScaleMode
-    ): Drawable = if (getFramesCount() > 1) {
+    ): Image = if (getFramesCount() > 1) {
         AnimatedDrawable(
             frameStore = AvifAnimatedStore(
                 avifAnimatedDecoder = this,
@@ -157,7 +153,7 @@ public class AnimatedAvifDecoder(
                 )
             }
         )
-    }
+    }.asImage()
 
     public class Factory(
         private val preheatFrames: Int = 6,