Merge pull request #49 from Dorofeev/#48-picker-close-handle

#48 added handling of close picker screen
icerockdev · Apr 22, 2021 · 46bbdfe · 46bbdfe
2 parents 6ffc870 + 3876bd0
commit 46bbdfe
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 2 deletions.
diff --git a/...osMain/kotlin/dev/icerock/moko/media/picker/AdaptivePresentationDelegateToContinuation.kt b/...osMain/kotlin/dev/icerock/moko/media/picker/AdaptivePresentationDelegateToContinuation.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.media.picker
+
+import platform.UIKit.UIAdaptivePresentationControllerDelegateProtocol
+import platform.darwin.NSObject
+import kotlin.coroutines.Continuation
+
+internal expect class AdaptivePresentationDelegateToContinuation(
+    continuation: Continuation<*>
+) : NSObject, UIAdaptivePresentationControllerDelegateProtocol
diff --git a/media/src/iosMain/kotlin/dev/icerock/moko/media/picker/ios/MediaPickerController.kt b/media/src/iosMain/kotlin/dev/icerock/moko/media/picker/ios/MediaPickerController.kt
@@ -7,6 +7,7 @@ package dev.icerock.moko.media.picker.ios
 import dev.icerock.moko.media.Bitmap
 import dev.icerock.moko.media.FileMedia
 import dev.icerock.moko.media.Media
+import dev.icerock.moko.media.picker.AdaptivePresentationDelegateToContinuation
 import dev.icerock.moko.media.picker.DEFAULT_MAX_IMAGE_HEIGHT
 import dev.icerock.moko.media.picker.DEFAULT_MAX_IMAGE_WIDTH
 import dev.icerock.moko.media.picker.DocumentPickerDelegateToContinuation
@@ -25,6 +26,7 @@ import platform.UIKit.UIViewController
 import kotlin.coroutines.suspendCoroutine
 import platform.CoreServices.kUTTypeData
 import platform.UIKit.UIDocumentPickerMode
+import platform.UIKit.presentationController
 
 class MediaPickerController(
     override val permissionsController: PermissionsController,
@@ -49,9 +51,12 @@ class MediaPickerController(
 
         @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
         var delegatePtr: ImagePickerDelegateToContinuation? // strong reference to delegate (view controller have weak ref)
+        var presentationDelegate: AdaptivePresentationDelegateToContinuation?
         val media = suspendCoroutine<Media> { continuation ->
             val localDelegatePtr = ImagePickerDelegateToContinuation(continuation)
             delegatePtr = localDelegatePtr
+            val localPresentationDelegatePtr = AdaptivePresentationDelegateToContinuation(continuation)
+            presentationDelegate = localPresentationDelegatePtr
 
             val controller = UIImagePickerController()
             controller.sourceType = source.toSourceType()
@@ -62,17 +67,21 @@ class MediaPickerController(
                 animated = true,
                 completion = null
             )
+            controller.presentationController?.delegate = localPresentationDelegatePtr
         }
         delegatePtr = null
-
+        presentationDelegate = null
         return media.preview
     }
 
     override suspend fun pickFiles(): FileMedia {
         var delegatePtr: DocumentPickerDelegateToContinuation? // strong reference to delegate (view controller have weak ref)
+        var presentationDelegate: AdaptivePresentationDelegateToContinuation?
         val fileMedia = suspendCoroutine<FileMedia> { continuation ->
             val localDelegatePtr = DocumentPickerDelegateToContinuation(continuation)
             delegatePtr = localDelegatePtr
+            val localPresentationDelegatePtr = AdaptivePresentationDelegateToContinuation(continuation)
+            presentationDelegate = localPresentationDelegatePtr
 
             val controller = UIDocumentPickerViewController(
                     documentTypes = listOf(kStandardFileTypesId),
@@ -84,8 +93,10 @@ class MediaPickerController(
                     animated = true,
                     completion = null
             )
+            controller.presentationController?.delegate = localPresentationDelegatePtr
         }
         delegatePtr = null
+        presentationDelegate = null
         return fileMedia
     }
 

diff --git a/...64Main/kotlin/dev/icerock/moko/media/picker/AdaptivePresentationDelegateToContinuation.kt b/...64Main/kotlin/dev/icerock/moko/media/picker/AdaptivePresentationDelegateToContinuation.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.media.picker
+
+import platform.UIKit.UIAdaptivePresentationControllerDelegateProtocol
+import platform.UIKit.UIPresentationController
+import platform.darwin.NSObject
+import kotlin.coroutines.Continuation
+
+internal actual class AdaptivePresentationDelegateToContinuation actual constructor(
+    private val continuation: Continuation<*>
+) : NSObject(), UIAdaptivePresentationControllerDelegateProtocol {
+    override fun presentationControllerDidDismiss(presentationController: UIPresentationController) {
+        continuation.resumeWith(Result.failure(CanceledException()))
+    }
+}
diff --git a/.../src/iosX64Main/kotlin/dev/icerock/moko/media/picker/ImagePickerDelegateToContinuation.kt b/.../src/iosX64Main/kotlin/dev/icerock/moko/media/picker/ImagePickerDelegateToContinuation.kt
@@ -30,6 +30,11 @@ internal actual class ImagePickerDelegateToContinuation actual constructor(
     private val continuation: Continuation<Media>
 ) : NSObject(), UINavigationControllerDelegateProtocol, UIImagePickerControllerDelegateProtocol {
 
+    override fun imagePickerControllerDidCancel(picker: UIImagePickerController) {
+        picker.dismissModalViewControllerAnimated(true)
+        continuation.resumeWith(Result.failure(CanceledException()))
+    }
+
     override fun imagePickerController(
         picker: UIImagePickerController,
         didFinishPickingMediaWithInfo: Map<Any?, *>

diff --git a/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/ImageSelectionViewModel.kt b/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/ImageSelectionViewModel.kt
@@ -32,7 +32,7 @@ class ImageSelectionViewModel(
             try {
                 val file = mediaPickerController.pickFiles()
                 _textState.value = file.name
-            } catch(canceled: CanceledException) {
+            } catch (canceled: CanceledException) {
                 _textState.value = "canceled"
             } catch (exc: Exception) {
                 _textState.value = exc.toString()
@@ -46,6 +46,8 @@ class ImageSelectionViewModel(
                 val image = mediaPickerController.pickImage(source)
                 _selectedImage.value = image
                 _textState.value = "image selected"
+            } catch (canceled: CanceledException) {
+                _textState.value = "canceled"
             } catch (exc: Exception) {
                 exc.printStackTrace()
                 _selectedImage.value = null