[Android] Preserve captured photo result after process death and camera reinitialization

filekit-dialogs-compose/src/androidMain/kotlin/io/github/vinceglb/filekit/dialogs/compose/CameraPicker.android.kt

@@ -0,0 +1,48 @@
+package io.github.vinceglb.filekit.dialogs.compose
+
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import io.github.vinceglb.filekit.PlatformFile
+import io.github.vinceglb.filekit.dialogs.CustomTakePicture
+import io.github.vinceglb.filekit.dialogs.FileKitCameraFacing
+import io.github.vinceglb.filekit.dialogs.FileKitOpenCameraSettings
+import io.github.vinceglb.filekit.dialogs.toAndroidUri
+import io.github.vinceglb.filekit.path
+import kotlin.let
+
+@Composable
+public actual fun rememberCameraPickerLauncher(
+    cameraFacing: FileKitCameraFacing,
+    openCameraSettings: FileKitOpenCameraSettings,
+    onResult: (PlatformFile?) -> Unit,
+): PhotoResultLauncher {
+    val currentOnResult by rememberUpdatedState(onResult)
+    var currentPhotoPath by rememberSaveable { mutableStateOf<String?>(null) }
+
+    val takePictureLauncher = rememberLauncherForActivityResult(
+        CustomTakePicture(cameraFacing)
+    ) { success ->
+        if (success) {
+            currentOnResult(currentPhotoPath?.let(::PlatformFile))
+        } else {
+            currentOnResult(null)
+        }
+    }
+
+    val authority = openCameraSettings.authority
+    val returnedLauncher = remember(authority) {
+        PhotoResultLauncher { _, destinationFile ->
+            val newPhotoPath = destinationFile.path
+            currentPhotoPath = newPhotoPath
+            val uri = destinationFile.toAndroidUri(authority)
+            takePictureLauncher.launch(uri)
+        }
+    }
+    return returnedLauncher
+}

filekit-dialogs-compose/src/iosMain/kotlin/io/github/vinceglb/filekit/dialogs/compose/CameraPicker.ios.kt

@@ -0,0 +1,54 @@
+package io.github.vinceglb.filekit.dialogs.compose
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.rememberUpdatedState
+import io.github.vinceglb.filekit.FileKit
+import io.github.vinceglb.filekit.PlatformFile
+import io.github.vinceglb.filekit.dialogs.FileKitCameraFacing
+import io.github.vinceglb.filekit.dialogs.FileKitOpenCameraSettings
+import io.github.vinceglb.filekit.dialogs.openCameraPicker
+import kotlinx.coroutines.launch
+
+@Composable
+public actual fun rememberCameraPickerLauncher(
+    cameraFacing: FileKitCameraFacing,
+    openCameraSettings: FileKitOpenCameraSettings,
+    onResult: (PlatformFile?) -> Unit,
+): PhotoResultLauncher {
+    // Init FileKit
+    InitFileKit()
+
+    // Coroutine
+    val coroutineScope = rememberCoroutineScope()
+
+    // Updated state
+    val currentOnResult by rememberUpdatedState(onResult)
+
+    // FileKit
+    val fileKit = remember { FileKit }
+
+    // FileKit launcher
+    // FIXME: Add openCameraSettings as a key to remember().
+    //  To support this safely, openCameraSettings should be a data class (or override equals() and hashCode())
+    //  and annotated with @Immutable.
+    //  Note: On iOS, openCameraSettings is currently an empty class and not actually used,
+    //  so it's safe to temporarily skip it as a key.
+    val returnedLauncher = remember(cameraFacing) {
+        PhotoResultLauncher { type, destinationFile ->
+            coroutineScope.launch {
+                val result = fileKit.openCameraPicker(
+                    type = type,
+                    cameraFacing = cameraFacing,
+                    destinationFile = destinationFile,
+                    openCameraSettings = openCameraSettings,
+                )
+                currentOnResult(result)
+            }
+        }
+    }
+
+    return returnedLauncher
+}

filekit-dialogs-compose/src/mobileMain/kotlin/io/github/vinceglb/filekit/dialogs/compose/CameraPicker.kt

@@ -0,0 +1,13 @@
+package io.github.vinceglb.filekit.dialogs.compose
+
+import androidx.compose.runtime.Composable
+import io.github.vinceglb.filekit.PlatformFile
+import io.github.vinceglb.filekit.dialogs.FileKitCameraFacing
+import io.github.vinceglb.filekit.dialogs.FileKitOpenCameraSettings
+
+@Composable
+public expect fun rememberCameraPickerLauncher(
+    cameraFacing: FileKitCameraFacing = FileKitCameraFacing.Back,
+    openCameraSettings: FileKitOpenCameraSettings = FileKitOpenCameraSettings.createDefault(),
+    onResult: (PlatformFile?) -> Unit,
+): PhotoResultLauncher

filekit-dialogs-compose/src/mobileMain/kotlin/io/github/vinceglb/filekit/dialogs/compose/FileKitCompose.mobile.kt

@@ -1,53 +1,13 @@
 package io.github.vinceglb.filekit.dialogs.compose
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.rememberUpdatedState
 import io.github.vinceglb.filekit.FileKit
-import io.github.vinceglb.filekit.PlatformFile
-import io.github.vinceglb.filekit.dialogs.FileKitOpenCameraSettings
 import io.github.vinceglb.filekit.dialogs.FileKitShareSettings
-import io.github.vinceglb.filekit.dialogs.openCameraPicker
 import io.github.vinceglb.filekit.dialogs.shareFile
 import kotlinx.coroutines.launch
 
-@Composable
-public fun rememberCameraPickerLauncher(
-    openCameraSettings: FileKitOpenCameraSettings = FileKitOpenCameraSettings.createDefault(),
-    onResult: (PlatformFile?) -> Unit,
-): PhotoResultLauncher {
-    // Init FileKit
-    InitFileKit()
-
-    // Coroutine
-    val coroutineScope = rememberCoroutineScope()
-
-    // Updated state
-    val currentOnResult by rememberUpdatedState(onResult)
-
-    // FileKit
-    val fileKit = remember { FileKit }
-
-    // FileKit launcher
-    val returnedLauncher = remember {
-        PhotoResultLauncher { type, cameraFacing, destinationFile ->
-            coroutineScope.launch {
-                val result = fileKit.openCameraPicker(
-                    type = type,
-                    cameraFacing = cameraFacing,
-                    destinationFile = destinationFile,
-                    openCameraSettings = openCameraSettings,
-                )
-                currentOnResult(result)
-            }
-        }
-    }
-
-    return returnedLauncher
-}
-
 @Composable
 public fun rememberShareFileLauncher(
     shareSettings: FileKitShareSettings = FileKitShareSettings.createDefault(),

filekit-dialogs-compose/src/mobileMain/kotlin/io/github/vinceglb/filekit/dialogs/compose/FileKitResultLauncher.mobile.kt

@@ -3,7 +3,6 @@ package io.github.vinceglb.filekit.dialogs.compose
 import io.github.vinceglb.filekit.FileKit
 import io.github.vinceglb.filekit.PlatformFile
 import io.github.vinceglb.filekit.cacheDir
-import io.github.vinceglb.filekit.dialogs.FileKitCameraFacing
 import io.github.vinceglb.filekit.dialogs.FileKitCameraType
 import io.github.vinceglb.filekit.div
 import kotlin.uuid.ExperimentalUuidApi
@@ -12,17 +11,15 @@ import kotlin.uuid.Uuid
 public class PhotoResultLauncher(
     private val onLaunch: (
         type: FileKitCameraType,
-        cameraFacing: FileKitCameraFacing,
         destinationFile: PlatformFile,
     ) -> Unit,
 ) {
     @OptIn(ExperimentalUuidApi::class)
     public fun launch(
         type: FileKitCameraType = FileKitCameraType.Photo,
-        cameraFacing: FileKitCameraFacing = FileKitCameraFacing.Back,
-        destinationFile: PlatformFile = FileKit.cacheDir / "${Uuid.random()}.jpg",
+        destinationFile: PlatformFile = FileKit.cacheDir / "${Uuid.random()}.jpg"
     ) {
-        onLaunch(type, cameraFacing, destinationFile)
+        onLaunch(type, destinationFile)
     }
 }
 

samples/sample-compose/composeApp/src/androidMain/kotlin/App.android.kt

@@ -1,4 +1,3 @@
-
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Share
@@ -24,6 +23,7 @@ import io.github.vinceglb.filekit.filesDir
 actual fun TakePhoto(onPhotoTaken: (PlatformFile?) -> Unit) {
     val context = LocalContext.current
     val takePhotoLauncher = rememberCameraPickerLauncher(
+        cameraFacing = FileKitCameraFacing.Back,
         openCameraSettings = FileKitOpenCameraSettings(
             authority = "${context.packageName}.fileprovider"
         )
@@ -34,10 +34,7 @@ actual fun TakePhoto(onPhotoTaken: (PlatformFile?) -> Unit) {
     Button(
         onClick = {
             val destinationFile = FileKit.filesDir / "photo_${System.currentTimeMillis()}.jpg"
-            takePhotoLauncher.launch(
-                destinationFile = destinationFile,
-                cameraFacing = FileKitCameraFacing.Front
-            )
+            takePhotoLauncher.launch(destinationFile = destinationFile)
         }
     ) {
         Text("Take photo")

samples/sample-compose/composeApp/src/iosMain/kotlin/App.ios.kt

@@ -22,17 +22,15 @@ import kotlin.time.ExperimentalTime
 @OptIn(ExperimentalTime::class)
 @Composable
 actual fun TakePhoto(onPhotoTaken: (PlatformFile?) -> Unit) {
-    val takePhotoLauncher = rememberCameraPickerLauncher {
-        onPhotoTaken(it)
-    }
+    val takePhotoLauncher = rememberCameraPickerLauncher(
+        cameraFacing = FileKitCameraFacing.Back,
+        onResult = onPhotoTaken,
+    )
 
     Button(
         onClick = {
             val destinationFile = FileKit.filesDir / "photo_${Clock.System.now().toEpochMilliseconds()}.jpg"
-            takePhotoLauncher.launch(
-                cameraFacing = FileKitCameraFacing.Front,
-                destinationFile = destinationFile,
-            )
+            takePhotoLauncher.launch(destinationFile = destinationFile)
         }
     ) {
         Text("Take photo")