Merge pull request #174 from qdsfdhvh/feature/android_context_in_opti…

…ons_extra support androidContext in options extra
qdsfdhvh · Jun 3, 2023 · 0a57809 · 0a57809
2 parents cf8615e + b532cf1
commit 0a57809
Show file tree

Hide file tree

Showing 24 changed files with 213 additions and 71 deletions.
diff --git a/app/android/src/main/java/com/seiko/imageloader/demo/MainActivity.kt b/app/android/src/main/java/com/seiko/imageloader/demo/MainActivity.kt
@@ -11,6 +11,7 @@ import com.seiko.imageloader.component.setupDefaultComponents
 import com.seiko.imageloader.demo.util.LocalResLoader
 import com.seiko.imageloader.demo.util.ResLoader
 import com.seiko.imageloader.demo.util.commonConfig
+import com.seiko.imageloader.option.androidContext
 import okio.Path.Companion.toOkioPath
 
 class MainActivity : ComponentActivity() {
@@ -29,8 +30,11 @@ class MainActivity : ComponentActivity() {
     private fun generateImageLoader(): ImageLoader {
         return ImageLoader {
             commonConfig()
+            options {
+                androidContext(applicationContext)
+            }
             components {
-                setupDefaultComponents(applicationContext)
+                setupDefaultComponents()
             }
             interceptor {
                 memoryCacheConfig {

diff --git a/extension/blur/src/commonMain/kotlin/com/seiko/imageloader/intercept/BlurInterceptor.kt b/extension/blur/src/commonMain/kotlin/com/seiko/imageloader/intercept/BlurInterceptor.kt
@@ -1,18 +1,16 @@
 package com.seiko.imageloader.intercept
 
 import com.seiko.imageloader.Bitmap
-import com.seiko.imageloader.model.BlurEffects
 import com.seiko.imageloader.model.ImageResult
-import com.seiko.imageloader.model.KEY_BLUR_RADIUS
+import com.seiko.imageloader.model.blurEffects
 
 // blur only support Bitmap
 class BlurInterceptor : Interceptor {
     override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
         val request = chain.request
         val result = chain.proceed(request)
         if (result is ImageResult.Bitmap) {
-            val blurEffects = request.extra[KEY_BLUR_RADIUS] as? BlurEffects
-                ?: return result
+            val blurEffects = request.blurEffects ?: return result
             return result.copy(bitmap = blur(result.bitmap, blurEffects.radius))
         }
         return result

diff --git a/extension/blur/src/commonMain/kotlin/com/seiko/imageloader/model/ImageRequest.blur.kt b/extension/blur/src/commonMain/kotlin/com/seiko/imageloader/model/ImageRequest.blur.kt
@@ -6,8 +6,11 @@ fun ImageRequestBuilder.blur(radius: Int) {
     }
 }
 
+internal val ImageRequest.blurEffects: BlurEffects?
+    get() = extra[KEY_BLUR_RADIUS] as? BlurEffects
+
 internal data class BlurEffects(
     val radius: Int,
 )
 
-internal const val KEY_BLUR_RADIUS = "KEY_BLUR_RADIUS"
+private const val KEY_BLUR_RADIUS = "KEY_BLUR_RADIUS"
diff --git a/...-loader/src/androidMain/kotlin/com/seiko/imageloader/component/SetupComponents.android.kt b/...-loader/src/androidMain/kotlin/com/seiko/imageloader/component/SetupComponents.android.kt
@@ -16,9 +16,9 @@ import com.seiko.imageloader.component.mapper.ResourceIntMapper
 import com.seiko.imageloader.component.mapper.ResourceUriMapper
 
 fun ComponentRegistryBuilder.setupAndroidComponents(
-    context: Context,
-    density: Density = Density(context),
-    maxImageSize: Int = 4096,
+    context: Context? = null,
+    density: Density? = context?.let { Density(it) },
+    maxImageSize: Int = BitmapFactoryDecoder.DEFAULT_MAX_PARALLELISM,
 ) {
     // Mappers
     add(ResourceUriMapper(context))

diff --git a/...er/src/androidMain/kotlin/com/seiko/imageloader/component/decoder/BitmapFactoryDecoder.kt b/...er/src/androidMain/kotlin/com/seiko/imageloader/component/decoder/BitmapFactoryDecoder.kt
@@ -5,6 +5,7 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.os.Build.VERSION.SDK_INT
 import com.seiko.imageloader.option.Options
+import com.seiko.imageloader.option.androidContext
 import com.seiko.imageloader.util.DecodeUtils
 import com.seiko.imageloader.util.ExifData
 import com.seiko.imageloader.util.ExifUtils
@@ -83,7 +84,7 @@ class BitmapFactoryDecoder private constructor(
 
     /** Compute and set [BitmapFactory.Options.inPreferredConfig]. */
     private fun BitmapFactory.Options.configureConfig(exifData: ExifData) {
-        var config = options.config.toBitmapConfig()
+        var config = options.imageConfig.toBitmapConfig()
 
         // Disable hardware bitmaps if we need to perform EXIF transformations.
         if (exifData.isFlipped || exifData.isRotated) {
@@ -164,16 +165,22 @@ class BitmapFactoryDecoder private constructor(
         }
     }
 
-    class Factory constructor(
-        private val context: Context,
-        private val maxImageSize: Int,
+    class Factory(
+        private val context: Context? = null,
+        private val maxImageSize: Int = DEFAULT_MAX_IMAGE_SIZE,
         maxParallelism: Int = DEFAULT_MAX_PARALLELISM,
     ) : Decoder.Factory {
 
         private val parallelismLock = Semaphore(maxParallelism)
 
         override suspend fun create(source: DecodeSource, options: Options): Decoder {
-            return BitmapFactoryDecoder(context, source, options, maxImageSize, parallelismLock)
+            return BitmapFactoryDecoder(
+                context = context ?: options.androidContext,
+                source = source,
+                options = options,
+                maxImageSize = maxImageSize,
+                parallelismLock = parallelismLock,
+            )
         }
     }
 
@@ -195,5 +202,6 @@ class BitmapFactoryDecoder private constructor(
 
     internal companion object {
         internal const val DEFAULT_MAX_PARALLELISM = 4
+        internal const val DEFAULT_MAX_IMAGE_SIZE = 4096
     }
 }
diff --git a/image-loader/src/androidMain/kotlin/com/seiko/imageloader/component/decoder/GifDecoder.kt b/image-loader/src/androidMain/kotlin/com/seiko/imageloader/component/decoder/GifDecoder.kt
@@ -40,7 +40,7 @@ class GifDecoder private constructor(
         val movie: Movie? = bufferedSource.use { Movie.decodeStream(it.inputStream()) }
         check(movie != null && movie.width() > 0 && movie.height() > 0) { "Failed to decode GIF." }
 
-        val config = options.config.toBitmapConfig()
+        val config = options.imageConfig.toBitmapConfig()
         val movieConfig = when {
             // movie.isOpaque && options.allowRgb565 -> Bitmap.Config.RGB_565
             config.isHardware -> Bitmap.Config.ARGB_8888

diff --git a/...der/src/androidMain/kotlin/com/seiko/imageloader/component/decoder/ImageDecoderDecoder.kt b/...der/src/androidMain/kotlin/com/seiko/imageloader/component/decoder/ImageDecoderDecoder.kt
@@ -12,6 +12,7 @@ import com.seiko.imageloader.component.fetcher.ContentUriFetcher
 import com.seiko.imageloader.component.fetcher.ResourceUriFetcher
 import com.seiko.imageloader.model.metadata
 import com.seiko.imageloader.option.Options
+import com.seiko.imageloader.option.androidContext
 import com.seiko.imageloader.toImage
 import com.seiko.imageloader.util.FrameDelayRewritingSource
 import com.seiko.imageloader.util.ScaleDrawable
@@ -103,7 +104,7 @@ class ImageDecoderDecoder private constructor(
     }
 
     private fun ImageDecoder.configureImageDecoderProperties() {
-        val config = options.config.toBitmapConfig()
+        val config = options.imageConfig.toBitmapConfig()
         allocator = if (config.isHardware) {
             ImageDecoder.ALLOCATOR_HARDWARE
         } else {
@@ -143,15 +144,20 @@ class ImageDecoderDecoder private constructor(
         return ScaleDrawable(baseDrawable, options.scale)
     }
 
-    class Factory @JvmOverloads constructor(
-        private val context: Context,
+    class Factory(
+        private val context: Context? = null,
         private val enforceMinimumFrameDelay: Boolean = true,
     ) : Decoder.Factory {
 
         override suspend fun create(source: DecodeSource, options: Options): Decoder? {
             if (!options.playAnimate) return null
             if (!isApplicable(source.source)) return null
-            return ImageDecoderDecoder(context, source, options, enforceMinimumFrameDelay)
+            return ImageDecoderDecoder(
+                context = context ?: options.androidContext,
+                source = source,
+                options = options,
+                enforceMinimumFrameDelay = enforceMinimumFrameDelay,
+            )
         }
 
         private fun isApplicable(source: BufferedSource): Boolean {

diff --git a/image-loader/src/androidMain/kotlin/com/seiko/imageloader/component/decoder/SvgDecoder.kt b/image-loader/src/androidMain/kotlin/com/seiko/imageloader/component/decoder/SvgDecoder.kt
@@ -4,6 +4,7 @@ import androidx.compose.ui.unit.Density
 import com.caverock.androidsvg.SVG
 import com.seiko.imageloader.model.mimeType
 import com.seiko.imageloader.option.Options
+import com.seiko.imageloader.option.androidContext
 import com.seiko.imageloader.util.SVGPainter
 import com.seiko.imageloader.util.isSvg
 
@@ -27,15 +28,15 @@ class SvgDecoder private constructor(
         )
     }
 
-    class Factory constructor(
-        private val density: Density,
+    class Factory(
+        private val density: Density? = null,
     ) : Decoder.Factory {
 
         override suspend fun create(source: DecodeSource, options: Options): Decoder? {
             if (!isApplicable(source)) return null
             return SvgDecoder(
                 source = source,
-                density = density,
+                density = density ?: Density(options.androidContext),
                 options = options,
             )
         }

diff --git a/...-loader/src/androidMain/kotlin/com/seiko/imageloader/component/fetcher/AssetUriFetcher.kt b/...-loader/src/androidMain/kotlin/com/seiko/imageloader/component/fetcher/AssetUriFetcher.kt
@@ -7,6 +7,7 @@ import com.seiko.imageloader.model.extraData
 import com.seiko.imageloader.model.metadata
 import com.seiko.imageloader.model.mimeType
 import com.seiko.imageloader.option.Options
+import com.seiko.imageloader.option.androidContext
 import com.seiko.imageloader.util.getMimeTypeFromUrl
 import com.seiko.imageloader.util.isAssetUri
 import okio.buffer
@@ -28,11 +29,16 @@ class AssetUriFetcher private constructor(
         )
     }
 
-    class Factory(private val context: Context) : Fetcher.Factory {
+    class Factory(
+        private val context: Context? = null,
+    ) : Fetcher.Factory {
         override fun create(data: Any, options: Options): Fetcher? {
             if (data !is Uri) return null
             if (!isAssetUri(data)) return null
-            return AssetUriFetcher(context, data)
+            return AssetUriFetcher(
+                context = context ?: options.androidContext,
+                data = data,
+            )
         }
     }
 

diff --git a/...oader/src/androidMain/kotlin/com/seiko/imageloader/component/fetcher/ContentUriFetcher.kt b/...oader/src/androidMain/kotlin/com/seiko/imageloader/component/fetcher/ContentUriFetcher.kt
@@ -15,6 +15,7 @@ import com.seiko.imageloader.model.extraData
 import com.seiko.imageloader.model.metadata
 import com.seiko.imageloader.model.mimeType
 import com.seiko.imageloader.option.Options
+import com.seiko.imageloader.option.androidContext
 import okio.buffer
 import okio.source
 import android.net.Uri as AndroidUri
@@ -78,13 +79,16 @@ class ContentUriFetcher private constructor(
     }
 
     class Factory(
-        private val context: Context,
+        private val context: Context? = null,
     ) : Fetcher.Factory {
 
         override fun create(data: Any, options: Options): Fetcher? {
             if (data !is Uri) return null
             if (!isApplicable(data)) return null
-            return ContentUriFetcher(context, data)
+            return ContentUriFetcher(
+                context = context ?: options.androidContext,
+                data = data,
+            )
         }
 
         private fun isApplicable(data: Uri) = data.scheme == SCHEME_CONTENT

diff --git a/...ader/src/androidMain/kotlin/com/seiko/imageloader/component/fetcher/ResourceUriFetcher.kt b/...ader/src/androidMain/kotlin/com/seiko/imageloader/component/fetcher/ResourceUriFetcher.kt
@@ -21,6 +21,7 @@ import com.seiko.imageloader.model.extraData
 import com.seiko.imageloader.model.metadata
 import com.seiko.imageloader.model.mimeType
 import com.seiko.imageloader.option.Options
+import com.seiko.imageloader.option.androidContext
 import com.seiko.imageloader.toImage
 import com.seiko.imageloader.util.DrawableUtils
 import com.seiko.imageloader.util.getMimeTypeFromUrl
@@ -64,7 +65,7 @@ class ResourceUriFetcher private constructor(
                 FetchResult.Bitmap(
                     bitmap = DrawableUtils.convertToBitmap(
                         drawable = drawable,
-                        config = options.config.toBitmapConfig(),
+                        config = options.imageConfig.toBitmapConfig(),
                         scale = options.scale,
                         allowInexactSize = options.allowInexactSize,
                     ),
@@ -98,11 +99,17 @@ class ResourceUriFetcher private constructor(
         throw IllegalStateException("Invalid $SCHEME_ANDROID_RESOURCE URI: $data")
     }
 
-    class Factory(private val context: Context) : Fetcher.Factory {
+    class Factory(
+        private val context: Context? = null,
+    ) : Fetcher.Factory {
         override fun create(data: Any, options: Options): Fetcher? {
             if (data !is Uri) return null
             if (!isApplicable(data)) return null
-            return ResourceUriFetcher(context, data, options)
+            return ResourceUriFetcher(
+                context = context ?: options.androidContext,
+                data = data,
+                options = options,
+            )
         }
 
         private fun isApplicable(data: Uri): Boolean {
@@ -162,6 +169,7 @@ private fun Context.getXmlDrawableCompat(resources: Resources, @XmlRes resId: In
                     theme,
                 )
             }
+
             "animated-vector" -> {
                 return AnimatedVectorDrawableCompat.createFromXmlInner(
                     this,

diff --git a/image-loader/src/androidMain/kotlin/com/seiko/imageloader/component/keyer/UriKeyer.kt b/image-loader/src/androidMain/kotlin/com/seiko/imageloader/component/keyer/UriKeyer.kt
@@ -5,8 +5,9 @@ import android.content.Context
 import android.content.res.Configuration
 import com.eygraber.uri.Uri
 import com.seiko.imageloader.option.Options
+import com.seiko.imageloader.option.androidContext
 
-class UriKeyer(private val context: Context) : Keyer {
+class UriKeyer(private val context: Context? = null) : Keyer {
     override fun key(data: Any, options: Options, type: Keyer.Type): String? {
         if (data !is Uri) return null
 
@@ -15,11 +16,12 @@ class UriKeyer(private val context: Context) : Keyer {
         // android uri is mapper to android.resource://example.package.name/12345678,
         // but resId is changeable, here is convert resId to entryName.
         val resId = data.pathSegments.lastOrNull()?.toIntOrNull() ?: return data.toString()
-        val entryName = context.resources.getResourceEntryName(resId)
+        val androidContext = context ?: options.androidContext
+        val entryName = androidContext.resources.getResourceEntryName(resId)
         val newUri = data.buildUpon().path(entryName).build()
 
         // 'android.resource' uris can change if night mode is enabled/disabled.
-        return "$newUri-${context.resources.configuration.nightMode}"
+        return "$newUri-${androidContext.resources.configuration.nightMode}"
     }
 
     private val Configuration.nightMode: Int

diff --git a/...loader/src/androidMain/kotlin/com/seiko/imageloader/component/mapper/ResourceIntMapper.kt b/...loader/src/androidMain/kotlin/com/seiko/imageloader/component/mapper/ResourceIntMapper.kt
@@ -6,13 +6,15 @@ import android.content.res.Resources
 import androidx.annotation.DrawableRes
 import com.eygraber.uri.Uri
 import com.seiko.imageloader.option.Options
+import com.seiko.imageloader.option.androidContext
 
-class ResourceIntMapper(private val context: Context) : Mapper<Uri> {
+class ResourceIntMapper(private val context: Context? = null) : Mapper<Uri> {
 
     override fun map(data: Any, options: Options): Uri? {
         if (data !is Int) return null
-        if (!isApplicable(data, context)) return null
-        return Uri.parse("$SCHEME_ANDROID_RESOURCE://${context.packageName}/$data")
+        val androidContext = context ?: options.androidContext
+        if (!isApplicable(data, androidContext)) return null
+        return Uri.parse("$SCHEME_ANDROID_RESOURCE://${androidContext.packageName}/$data")
     }
 
     private fun isApplicable(@DrawableRes data: Int, context: Context): Boolean {

diff --git a/...loader/src/androidMain/kotlin/com/seiko/imageloader/component/mapper/ResourceUriMapper.kt b/...loader/src/androidMain/kotlin/com/seiko/imageloader/component/mapper/ResourceUriMapper.kt
@@ -4,20 +4,24 @@ import android.content.ContentResolver.SCHEME_ANDROID_RESOURCE
 import android.content.Context
 import com.eygraber.uri.Uri
 import com.seiko.imageloader.option.Options
+import com.seiko.imageloader.option.androidContext
 
 /**
  * Maps android.resource uris with resource names to uris containing their resources ID. i.e.:
  *
  * android.resource://example.package.name/drawable/image -> android.resource://example.package.name/12345678
  */
-class ResourceUriMapper(private val context: Context) : Mapper<Uri> {
+class ResourceUriMapper(
+    private val context: Context? = null,
+) : Mapper<Uri> {
 
     override fun map(data: Any, options: Options): Uri? {
         if (data !is Uri) return null
         if (!isApplicable(data)) return null
 
         val packageName = data.authority.orEmpty()
-        val resources = context.packageManager.getResourcesForApplication(packageName)
+        val androidContext = context ?: options.androidContext
+        val resources = androidContext.packageManager.getResourcesForApplication(packageName)
         val (type, name) = data.pathSegments
         val id = resources.getIdentifier(name, type, packageName)
         check(id != 0) { "Invalid $SCHEME_ANDROID_RESOURCE URI: $data" }

diff --git a/image-loader/src/androidMain/kotlin/com/seiko/imageloader/option/Options.android.kt b/image-loader/src/androidMain/kotlin/com/seiko/imageloader/option/Options.android.kt
@@ -0,0 +1,16 @@
+package com.seiko.imageloader.option
+
+import android.content.Context
+
+fun OptionsBuilder.androidContext(context: Context) {
+    extra {
+        set(KEY_ANDROID_CONTEXT, context)
+    }
+}
+
+val Options.androidContext: Context
+    get() = requireNotNull(extra[KEY_ANDROID_CONTEXT] as? Context) {
+        "not androidContext in options extra"
+    }
+
+private const val KEY_ANDROID_CONTEXT = "KEY_ANDROID_CONTEXT"