#34 Replace MaterialFilePicker dependency and fragmentActivity usage

gradle/libs.versions.toml

@@ -1,23 +1,21 @@
 [versions]
-kotlinVersion = "1.8.10"
+kotlinVersion = "1.9.10"
 androidAppCompatVersion = "1.6.1"
 materialDesignVersion = "1.8.0"
 androidLifecycleVersion = "2.3.1"
 androidExifInterface = "1.3.6"
-androidMediaFilePicker = "1.9.1"
 coroutinesVersion = "1.6.4"
 mokoMvvmVersion = "0.16.0"
-mokoPermissionsVersion = "0.15.0"
+mokoPermissionsVersion = "0.18.0"
 mokoTestVersion = "0.6.1"
 mokoMediaVersion = "0.11.0"
-composeJetBrainsVersion = "1.3.1"
+composeJetBrainsVersion = "1.5.1"
 
 [libraries]
 appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }
 material = { module = "com.google.android.material:material", version.ref = "materialDesignVersion" }
 lifecycle = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "androidLifecycleVersion" }
 exifInterface = { module = "androidx.exifinterface:exifinterface", version.ref = "androidExifInterface" }
-mediaFilePicker = { module = "com.github.icerockdev:MaterialFilePicker", version.ref = "androidMediaFilePicker" }
 coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutinesVersion" }
 
 mokoPermissions = { module = "dev.icerock.moko:permissions", version.ref = "mokoPermissionsVersion" }

media-compose/src/androidMain/kotlin/dev/icerock/moko/media/compose/BindMediaPickerEffect.android.kt

@@ -10,7 +10,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.fragment.app.FragmentActivity
-import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.LifecycleOwner
 import dev.icerock.moko.media.picker.MediaPickerController
 
@@ -21,8 +20,10 @@ actual fun BindMediaPickerEffect(mediaPickerController: MediaPickerController) {
     val context: Context = LocalContext.current
 
     LaunchedEffect(mediaPickerController, lifecycleOwner, context) {
-        val fragmentManager: FragmentManager = (context as FragmentActivity).supportFragmentManager
+        val activity: FragmentActivity = checkNotNull(context as? FragmentActivity) {
+            "$context context is not instance of FragmentActivity"
+        }
 
-        mediaPickerController.bind(lifecycleOwner.lifecycle, fragmentManager)
+        mediaPickerController.bind(activity)
     }
 }

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")
     }

media-test/src/iosMain/kotlin/dev/icerock/moko/media/test/createBitmapMock.kt

@@ -5,10 +5,12 @@
 package dev.icerock.moko.media.test
 
 import dev.icerock.moko.media.Bitmap
+import kotlinx.cinterop.ExperimentalForeignApi
 import platform.CoreGraphics.CGRectMake
 import platform.CoreImage.CIImage
 import platform.UIKit.UIImage
 
+@OptIn(ExperimentalForeignApi::class)
 actual fun createBitmapMock(): Bitmap {
     val image = CIImage.clearImage.imageByCroppingToRect(CGRectMake(0.0, 0.0, 1.0, 1.0))
     return Bitmap(UIImage(image))

media/build.gradle.kts

@@ -15,7 +15,4 @@ dependencies {
 
     androidMainImplementation(libs.appCompat)
     androidMainImplementation(libs.exifInterface)
-
-    // TODO #34 remove external dependency
-    androidMainImplementation(libs.mediaFilePicker)
 }

media/src/androidMain/kotlin/dev/icerock/moko/media/picker/FilePickerDelegate.kt

@@ -0,0 +1,86 @@
+package dev.icerock.moko.media.picker
+
+import android.annotation.SuppressLint
+import android.content.ContentResolver
+import android.provider.OpenableColumns
+import androidx.activity.ComponentActivity
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.ActivityResultRegistryOwner
+import androidx.activity.result.contract.ActivityResultContracts
+import dev.icerock.moko.media.FileMedia
+import kotlinx.coroutines.flow.MutableStateFlow
+import java.io.File
+
+internal class FilePickerDelegate {
+
+    private var callback: CallbackData? = null
+
+    private val filePickerLauncherHolder =
+        MutableStateFlow<ActivityResultLauncher<Array<String>>?>(null)
+
+    fun bind(activity: ComponentActivity) {
+        val activityResultRegistryOwner = activity as ActivityResultRegistryOwner
+        val activityResultRegistry = activityResultRegistryOwner.activityResultRegistry
+
+        filePickerLauncherHolder.value = activityResultRegistry.register(
+            PICK_FILE_KEY,
+            ActivityResultContracts.OpenDocument(),
+        ) { uri ->
+            val callbackData = callback ?: return@register
+            callback = null
+
+            val callback = callbackData.callback
+
+            if (uri == null) {
+                callback.invoke(Result.failure(CanceledException()))
+                return@register
+            }
+
+            val path = uri.path
+            if (path == null) {
+                callback.invoke(Result.failure(java.lang.IllegalStateException("File is null")))
+                return@register
+            }
+
+            @SuppressLint("Range")
+            val fileNameWithExtension = if (uri.scheme == ContentResolver.SCHEME_CONTENT) {
+                val cursor = activity.contentResolver.query(uri, null, null, null, null)
+                cursor?.use {
+                    if (!it.moveToFirst()) null
+                    else it.getString(it.getColumnIndex(OpenableColumns.DISPLAY_NAME))
+                }
+            } else null
+
+            val file = File(path)
+            val name = file.name
+            val result = Result.success(
+                FileMedia(
+                    fileNameWithExtension ?: name,
+                    uri.toString(),
+                )
+            )
+            callback.invoke(result)
+        }
+    }
+
+    fun pickFile(callback: (Result<FileMedia>) -> Unit) {
+        this.callback?.let {
+            it.callback.invoke(Result.failure(IllegalStateException("Callback should be null")))
+            this.callback = null
+        }
+
+        this.callback = CallbackData(callback)
+
+        filePickerLauncherHolder.value?.launch(
+            arrayOf(
+                "*/*",
+            )
+        )
+    }
+
+    class CallbackData(val callback: (Result<FileMedia>) -> Unit)
+
+    companion object {
+        private const val PICK_FILE_KEY = "PickFileKey"
+    }
+}