Fixed runaway coroutine for canceled capture on iOS and fixed onClick…

… events being consumed by DesiredSizeView on Android
lightningkite · Jul 10, 2024 · a5f2596 · a5f2596
1 parent 3ec283a
commit a5f2596
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/library/src/androidMain/kotlin/com/lightningkite/kiteui/views/direct/modifiers.android.kt b/library/src/androidMain/kotlin/com/lightningkite/kiteui/views/direct/modifiers.android.kt
@@ -196,6 +196,20 @@ class DesiredSizeView(context: Context) : ViewGroup(context) {
             requestLayout()
         }
 
+    private var clickListenerForChild: OnClickListener? = null
+    override fun setOnClickListener(l: OnClickListener?) {
+        clickListenerForChild = l
+        getChildAt(0)?.let {
+            it.setOnClickListener(l)
+            clickListenerForChild = null
+        }
+    }
+
+    override fun onViewAdded(child: View?) {
+        super.onViewAdded(child)
+        setOnClickListener(clickListenerForChild)
+    }
+
     override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
         getChildAt(0).measure(
             MeasureSpec.makeMeasureSpec(r - l, MeasureSpec.EXACTLY),

diff --git a/library/src/iosMain/kotlin/com/lightningkite/kiteui/ExternalServices.kt b/library/src/iosMain/kotlin/com/lightningkite/kiteui/ExternalServices.kt
@@ -350,6 +350,14 @@ actual object ExternalServices {
                         })
                     }
                 }
+
+                override fun imagePickerControllerDidCancel(picker: UIImagePickerController) {
+                    picker.dismissViewControllerAnimated(true) {
+                        dispatch_async(queue = dispatch_get_main_queue(), block = {
+                            cont.resume(null)
+                        })
+                    }
+                }
             }
         controller.delegate = delegate
         controller.extensionStrongRef = delegate