icerockdev#34 Fix pass image max size params

ZiXOps · May 2, 2024 · 425c22f · 425c22f
1 parent 0cd5051
commit 425c22f
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 18 deletions.
diff --git a/media-test/src/androidMain/kotlin/dev/icerock/moko/media/test/MediaPickerControllerMock.kt b/media-test/src/androidMain/kotlin/dev/icerock/moko/media/test/MediaPickerControllerMock.kt
@@ -4,6 +4,7 @@
 
 package dev.icerock.moko.media.test
 
+import androidx.activity.ComponentActivity
 import dev.icerock.moko.media.Bitmap
 import dev.icerock.moko.media.FileMedia
 import dev.icerock.moko.media.Media
@@ -35,8 +36,7 @@ actual open class MediaPickerControllerMock actual constructor(
     }
 
     override fun bind(
-        lifecycle: androidx.lifecycle.Lifecycle,
-        fragmentManager: androidx.fragment.app.FragmentManager
+        activity: ComponentActivity
     ) {
         TODO("Not yet implemented")
     }

diff --git a/media/src/androidMain/kotlin/dev/icerock/moko/media/picker/ImagePickerDelegate.kt b/media/src/androidMain/kotlin/dev/icerock/moko/media/picker/ImagePickerDelegate.kt
@@ -32,14 +32,27 @@ internal class ImagePickerDelegate {
             val callbackData = callback ?: return@register
             callback = null
 
-            val callback = callbackData.callback
+            if (callbackData !is CallbackData.Gallery) {
+                callbackData.callback.invoke(
+                    Result.failure(
+                        IllegalStateException("Callback type should be Gallery")
+                    )
+                )
+                return@register
+            }
 
             if (uri == null) {
-                callback.invoke(Result.failure(CanceledException()))
+                callbackData.callback.invoke(Result.failure(CanceledException()))
                 return@register
             }
 
-            processResult(activity, callback, uri)
+            processResult(
+                context = activity,
+                callback = callbackData.callback,
+                uri = uri,
+                maxImageWidth = callbackData.maxWidth,
+                maxImageHeight = callbackData.maxHeight,
+            )
         }
 
         takePictureLauncherHolder.value = activityResultRegistry.register(
@@ -63,7 +76,13 @@ internal class ImagePickerDelegate {
                 return@register
             }
 
-            processResult(activity, callbackData.callback, callbackData.outputUri)
+            processResult(
+                context = activity,
+                callback = callbackData.callback,
+                uri = callbackData.outputUri,
+                maxImageWidth = callbackData.maxWidth,
+                maxImageHeight = callbackData.maxHeight,
+            )
         }
 
         val observer = object : LifecycleEventObserver {
@@ -89,7 +108,11 @@ internal class ImagePickerDelegate {
             this.callback = null
         }
 
-        this.callback = CallbackData.Gallery(callback)
+        this.callback = CallbackData.Gallery(
+            callback,
+            maxWidth,
+            maxHeight,
+        )
 
         pickVisualMediaLauncherHolder.value?.launch(
             PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)
@@ -107,7 +130,12 @@ internal class ImagePickerDelegate {
             this.callback = null
         }
 
-        this.callback = CallbackData.Camera(callback, outputUri)
+        this.callback = CallbackData.Camera(
+            callback,
+            outputUri,
+            maxWidth,
+            maxHeight,
+        )
 
         takePictureLauncherHolder.value?.launch(
             outputUri
@@ -152,12 +180,17 @@ internal class ImagePickerDelegate {
     }
 
     sealed class CallbackData(val callback: (Result<android.graphics.Bitmap>) -> Unit) {
-        class Gallery(callback: (Result<android.graphics.Bitmap>) -> Unit) :
-            CallbackData(callback)
+        class Gallery(
+            callback: (Result<android.graphics.Bitmap>) -> Unit,
+            val maxWidth: Int,
+            val maxHeight: Int,
+        ) : CallbackData(callback)
 
         class Camera(
             callback: (Result<android.graphics.Bitmap>) -> Unit,
-            val outputUri: Uri
+            val outputUri: Uri,
+            val maxWidth: Int,
+            val maxHeight: Int,
         ) : CallbackData(callback)
     }
 

diff --git a/media/src/androidMain/kotlin/dev/icerock/moko/media/picker/MediaPickerControllerImpl.kt b/media/src/androidMain/kotlin/dev/icerock/moko/media/picker/MediaPickerControllerImpl.kt
@@ -10,9 +10,8 @@ import android.os.Environment
 import androidx.activity.ComponentActivity
 import androidx.core.content.FileProvider
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.OnLifecycleEvent
 import dev.icerock.moko.media.Bitmap
 import dev.icerock.moko.media.FileMedia
 import dev.icerock.moko.media.Media
@@ -45,12 +44,13 @@ internal class MediaPickerControllerImpl(
         mediaPickerDelegate.bind(activity)
         filePickerDelegate.bind(activity)
 
-        val observer = object : LifecycleObserver {
+        val observer = object : LifecycleEventObserver {
 
-            @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-            fun onDestroyed(source: LifecycleOwner) {
-                this@MediaPickerControllerImpl.activityHolder.value = null
-                source.lifecycle.removeObserver(this)
+            override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+                if (event == Lifecycle.Event.ON_DESTROY) {
+                    this@MediaPickerControllerImpl.activityHolder.value = null
+                    source.lifecycle.removeObserver(this)
+                }
             }
         }
         activity.lifecycle.addObserver(observer)