expo-image-picker 14.3.1 → 14.4.0

package/CHANGELOG.md

@@ -10,7 +10,17 @@
 
 ### 💡 Others
 
-## 14.3.1 — 2023-07-04
+## 14.4.0 — 2023-07-28
+
+_This version does not introduce any user-facing changes._
+
+## 14.3.2 - 2023-07-23
+
+### 💡 Others
+
+- On Android, restore behavior from [#22658](https://github.com/expo/expo/pull/22658). ([#23617](https://github.com/expo/expo/pull/23617) by [@alanhughes](https://github.com/alanjhughes)) ([#22658](https://github.com/expo/expo/pull/22658), [#23617](https://github.com/expo/expo/pull/23617) by [@alanjhughes](https://github.com/alanjhughes))
+
+## 14.3.1 - 2023-07-04
 
 ### 🐛 Bug fixes
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '14.3.1'
+version = '14.4.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -67,7 +67,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 22
-    versionName "14.3.1"
+    versionName "14.4.0"
   }
   lintOptions {
     abortOnError false
@@ -82,8 +82,8 @@ android {
 dependencies {
   implementation project(':expo-modules-core')
 
-  implementation "androidx.activity:activity-ktx:1.7.1"
-  implementation "androidx.appcompat:appcompat:1.4.2"
+  implementation "androidx.activity:activity-ktx:1.7.2"
+  implementation "androidx.appcompat:appcompat:1.6.1"
   implementation "androidx.exifinterface:exifinterface:1.3.3"
   implementation "com.github.CanHub:Android-Image-Cropper:4.3.1"
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"

package/android/src/main/AndroidManifest.xml

@@ -1,37 +1,51 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Required for picking images from camera directly -->
-    <uses-permission android:name="android.permission.CAMERA"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools">
+  <!-- Required for picking images from camera directly -->
+  <uses-permission android:name="android.permission.CAMERA" />
 
-    <!-- Required for picking images from camera roll -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+  <!-- Required for picking images from camera roll -->
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+  <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
 
-    <application>
-      <activity
-        android:name="com.canhub.cropper.CropImageActivity"
-        android:theme="@style/Base.Theme.AppCompat"/>
-        <!-- https://developer.android.com/guide/topics/manifest/provider-element.html -->
-        <provider
-            android:name=".fileprovider.ImagePickerFileProvider"
-            android:authorities="${applicationId}.ImagePickerFileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/image_picker_provider_paths"/>
-        </provider>
-    </application>
+  <application>
+    <service
+      android:name="com.google.android.gms.metadata.ModuleDependencies"
+      android:enabled="false"
+      android:exported="false"
+      tools:ignore="MissingClass">
+      <intent-filter>
+        <action android:name="com.google.android.gms.metadata.MODULE_DEPENDENCIES" />
+      </intent-filter>
+      <meta-data
+        android:name="photopicker_activity:0:required"
+        android:value="" />
+    </service>
 
-    <queries>
-        <intent>
-            <!-- Required for picking images from the camera roll if targeting API 30 -->
-            <action android:name="android.media.action.IMAGE_CAPTURE" />
-        </intent>
-        <intent>
-            <!-- Required for picking images from the camera if targeting API 30 -->
-            <action android:name="android.media.action.ACTION_VIDEO_CAPTURE" />
-        </intent>
-    </queries>
+    <activity
+      android:name="com.canhub.cropper.CropImageActivity"
+      android:theme="@style/Base.Theme.AppCompat" />
+    <!-- https://developer.android.com/guide/topics/manifest/provider-element.html -->
+    <provider
+      android:name=".fileprovider.ImagePickerFileProvider"
+      android:authorities="${applicationId}.ImagePickerFileProvider"
+      android:exported="false"
+      android:grantUriPermissions="true">
+      <meta-data
+        android:name="android.support.FILE_PROVIDER_PATHS"
+        android:resource="@xml/image_picker_provider_paths" />
+    </provider>
+  </application>
+
+  <queries>
+    <intent>
+      <!-- Required for picking images from the camera roll if targeting API 30 -->
+      <action android:name="android.media.action.IMAGE_CAPTURE" />
+    </intent>
+    <intent>
+      <!-- Required for picking images from the camera if targeting API 30 -->
+      <action android:name="android.media.action.ACTION_VIDEO_CAPTURE" />
+    </intent>
+  </queries>
 </manifest>

package/android/src/main/java/expo/modules/imagepicker/ImagePickerExceptions.kt

@@ -10,6 +10,9 @@ internal class FailedToDeduceTypeException :
 internal class FailedToCreateFileException(path: String, cause: Throwable? = null) :
   CodedException("Failed to create the file '$path'", cause)
 
+internal class FailedToPickMediaException :
+  CodedException("Failed to parse PhotoPicker result")
+
 internal class FailedToExtractVideoMetadataException(file: File? = null, cause: Throwable? = null) :
   CodedException("Failed to extract metadata from video file '${file?.toUri()?.toString() ?: ""}'", cause)
 

package/android/src/main/java/expo/modules/imagepicker/ImagePickerModule.kt

@@ -166,6 +166,7 @@ class ImagePickerModule : Module() {
     when (val pickingResult = pickerLauncher()) {
       is ImagePickerContractResult.Success -> pickingResult
       is ImagePickerContractResult.Cancelled -> throw OperationCanceledException()
+      is ImagePickerContractResult.Error -> throw FailedToPickMediaException()
     }
   }
 

package/android/src/main/java/expo/modules/imagepicker/contracts/CameraContract.kt

@@ -23,7 +23,7 @@ import java.io.Serializable
 internal class CameraContract(
   private val appContextProvider: AppContextProvider,
 ) : AppContextActivityResultContract<CameraContractOptions, ImagePickerContractResult> {
-  val contentResolver: ContentResolver
+  private val contentResolver: ContentResolver
     get() = requireNotNull(appContextProvider.appContext.reactContext) {
       "React Application Context is null"
     }.contentResolver

package/android/src/main/java/expo/modules/imagepicker/contracts/ContractsUtils.kt

@@ -7,6 +7,7 @@ import expo.modules.imagepicker.MediaType
  * Data required to be returned upon successful contract completion
  */
 internal sealed class ImagePickerContractResult private constructor() {
-  class Cancelled : ImagePickerContractResult()
   class Success(val data: List<Pair<MediaType, Uri>>) : ImagePickerContractResult()
+  class Cancelled : ImagePickerContractResult()
+  class Error : ImagePickerContractResult()
 }

package/android/src/main/java/expo/modules/imagepicker/contracts/CropImageContract.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import androidx.core.net.toFile
 import androidx.core.net.toUri
 import androidx.core.os.bundleOf
@@ -54,7 +55,11 @@ internal class CropImageContract(
   }
 
   override fun parseResult(input: CropImageContractOptions, resultCode: Int, intent: Intent?): ImagePickerContractResult {
-    val result = intent?.getParcelableExtra<CropImage.ActivityResult?>(CropImage.CROP_IMAGE_EXTRA_RESULT)
+    val result = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      intent?.getParcelableExtra(CropImage.CROP_IMAGE_EXTRA_RESULT, CropImage.ActivityResult::class.java)
+    } else {
+      intent?.getParcelableExtra(CropImage.CROP_IMAGE_EXTRA_RESULT)
+    }
     if (resultCode == Activity.RESULT_CANCELED || result == null) {
       return ImagePickerContractResult.Cancelled()
     }

package/android/src/main/java/expo/modules/imagepicker/contracts/ImageLibraryContract.kt

@@ -27,75 +27,77 @@ import java.io.Serializable
 internal class ImageLibraryContract(
   private val appContextProvider: AppContextProvider,
 ) : AppContextActivityResultContract<ImageLibraryContractOptions, ImagePickerContractResult> {
-  val contentResolver: ContentResolver
+  private val contentResolver: ContentResolver
     get() = requireNotNull(appContextProvider.appContext.reactContext) {
       "React Application Context is null"
     }.contentResolver
 
   override fun createIntent(context: Context, input: ImageLibraryContractOptions): Intent {
-    if (PickVisualMedia.isPhotoPickerAvailable(context)) {
-      val request = PickVisualMediaRequest.Builder()
-        .setMediaType(
-          when (input.options.mediaTypes) {
-            MediaTypes.VIDEOS -> {
-              PickVisualMedia.VideoOnly
-            }
-
-            MediaTypes.IMAGES -> {
-              PickVisualMedia.ImageOnly
-            }
-
-            else -> {
-              PickVisualMedia.ImageAndVideo
-            }
+    val request = PickVisualMediaRequest.Builder()
+      .setMediaType(
+        when (input.options.mediaTypes) {
+          MediaTypes.VIDEOS -> {
+            PickVisualMedia.VideoOnly
           }
-        ).build()
 
-      if (input.options.allowsMultipleSelection) {
-        val selectionLimit = input.options.selectionLimit
+          MediaTypes.IMAGES -> {
+            PickVisualMedia.ImageOnly
+          }
 
-        if (selectionLimit == 1) {
-          // If multiple selection is allowed but the limit is 1, we should ignore
-          // the multiple selection flag and just treat it as a single selection.
-          return PickVisualMedia().createIntent(context, request)
+          else -> {
+            PickVisualMedia.ImageAndVideo
+          }
         }
+      )
+      .build()
 
-        if (selectionLimit > 1) {
-          return PickMultipleVisualMedia(selectionLimit).createIntent(context, request)
-        }
+    if (input.options.allowsMultipleSelection) {
+      val selectionLimit = input.options.selectionLimit
 
-        // If the selection limit is 0, it is the same as unlimited selection.
-        if (selectionLimit == UNLIMITED_SELECTION) {
-          return PickMultipleVisualMedia().createIntent(context, request)
-        }
+      if (selectionLimit == 1) {
+        // If multiple selection is allowed but the limit is 1, we should ignore
+        // the multiple selection flag and just treat it as a single selection.
+        return PickVisualMedia().createIntent(context, request)
       }
 
-      return PickVisualMedia().createIntent(context, request)
-    }
+      if (selectionLimit > 1) {
+        return PickMultipleVisualMedia(selectionLimit).createIntent(context, request)
+      }
 
-    return Intent(Intent.ACTION_GET_CONTENT)
-      .addCategory(Intent.CATEGORY_OPENABLE)
-      .setType(input.options.mediaTypes.toMimeType())
-      .apply {
-        if (input.options.allowsMultipleSelection) {
-          putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
-        }
-        if (input.options.mediaTypes == MediaTypes.ALL) {
-          putExtra(Intent.EXTRA_MIME_TYPES, arrayOf(MediaTypes.IMAGES.toMimeType(), MediaTypes.VIDEOS.toMimeType()))
-        }
+      // If the selection limit is 0, it is the same as unlimited selection.
+      if (selectionLimit == UNLIMITED_SELECTION) {
+        return PickMultipleVisualMedia().createIntent(context, request)
       }
+    }
+
+    return PickVisualMedia().createIntent(context, request)
   }
 
   override fun parseResult(input: ImageLibraryContractOptions, resultCode: Int, intent: Intent?) =
     if (resultCode == Activity.RESULT_CANCELED) {
       ImagePickerContractResult.Cancelled()
-    } else if (input.options.allowsMultipleSelection) {
-      val uris = requireNotNull(intent).getAllDataUris()
-      ImagePickerContractResult.Success(uris.map { uri -> uri.toMediaType(contentResolver) to uri })
     } else {
-      val uri = requireNotNull(requireNotNull(intent).data)
-      val type = uri.toMediaType(contentResolver)
-      ImagePickerContractResult.Success(listOf(type to uri))
+      intent?.takeIf { resultCode == Activity.RESULT_OK }?.getAllDataUris()?.let { uris ->
+        if (input.options.allowsMultipleSelection) {
+          ImagePickerContractResult.Success(
+            uris.map { uri ->
+              uri.toMediaType(contentResolver) to uri
+            }
+          )
+        } else {
+          if (intent.data != null) {
+            intent.data?.let {
+              val type = it.toMediaType(contentResolver)
+              ImagePickerContractResult.Success(listOf(type to it))
+            }
+          } else {
+            uris.firstOrNull()?.let { uri ->
+              val type = uri.toMediaType(contentResolver)
+              ImagePickerContractResult.Success(listOf(type to uri))
+            } ?: ImagePickerContractResult.Error()
+          }
+        }
+      } ?: ImagePickerContractResult.Error()
     }
 }
 

package/build/ExponentImagePicker.d.ts

@@ -1,3 +1,3 @@
-declare const _default: import("expo-modules-core").ProxyNativeModule;
+declare const _default: any;
 export default _default;
 //# sourceMappingURL=ExponentImagePicker.d.ts.map

package/build/ExponentImagePicker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExponentImagePicker.d.ts","sourceRoot":"","sources":["../src/ExponentImagePicker.ts"],"names":[],"mappings":";AACA,wBAAsD"}
+{"version":3,"file":"ExponentImagePicker.d.ts","sourceRoot":"","sources":["../src/ExponentImagePicker.ts"],"names":[],"mappings":";AACA,wBAA0D"}

package/build/ExponentImagePicker.js

@@ -1,3 +1,3 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-export default NativeModulesProxy.ExponentImagePicker;
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExponentImagePicker');
 //# sourceMappingURL=ExponentImagePicker.js.map

package/build/ExponentImagePicker.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExponentImagePicker.js","sourceRoot":"","sources":["../src/ExponentImagePicker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,eAAe,kBAAkB,CAAC,mBAAmB,CAAC","sourcesContent":["import { NativeModulesProxy } from 'expo-modules-core';\nexport default NativeModulesProxy.ExponentImagePicker;\n"]}
+{"version":3,"file":"ExponentImagePicker.js","sourceRoot":"","sources":["../src/ExponentImagePicker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,eAAe,mBAAmB,CAAC,qBAAqB,CAAC,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\nexport default requireNativeModule('ExponentImagePicker');\n"]}

package/ios/ImagePickerModule.swift

@@ -102,6 +102,7 @@ public class ImagePickerModule: Module, OnMediaPickingResultHandler {
     let options = pickingContext.options
 
     let picker = UIImagePickerController()
+    picker.fixCannotMoveEditingBox()
 
     if sourceType == .camera {
 #if targetEnvironment(simulator)

package/ios/UIImagePickerControllerExtentsion.swift

@@ -0,0 +1,58 @@
+// Copyright 2016-present 650 Industries. All rights reserved.
+
+extension UIImagePickerController {
+  func fixCannotMoveEditingBox() {
+    if let cropView = cropView,
+      let scrollView = scrollView,
+      scrollView.contentOffset.y == 0
+    {
+      let top = cropView.frame.minY + self.view.safeAreaInsets.top
+      let bottom = scrollView.frame.height - cropView.frame.height - top
+      scrollView.contentInset = UIEdgeInsets(top: top, left: 0, bottom: bottom, right: 0)
+
+      var offset: CGFloat = 0
+      if scrollView.contentSize.height > scrollView.contentSize.width {
+        offset = 0.5 * (scrollView.contentSize.height - scrollView.contentSize.width)
+      }
+      scrollView.contentOffset = CGPoint(x: 0, y: -top + offset)
+    }
+
+    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
+      self?.fixCannotMoveEditingBox()
+    }
+  }
+
+  var cropView: UIView? {
+    return findCropView(from: self.view)
+  }
+
+  var scrollView: UIScrollView? {
+    return findScrollView(from: self.view)
+  }
+
+  func findCropView(from view: UIView) -> UIView? {
+    let width = UIScreen.main.bounds.width
+    let size = view.bounds.size
+    if width == size.height, width == size.height {
+      return view
+    }
+    for view in view.subviews {
+      if let cropView = findCropView(from: view) {
+        return cropView
+      }
+    }
+    return nil
+  }
+
+  func findScrollView(from view: UIView) -> UIScrollView? {
+    if let scrollView = view as? UIScrollView {
+      return scrollView
+    }
+    for view in view.subviews {
+      if let scrollView = findScrollView(from: view) {
+        return scrollView
+      }
+    }
+    return nil
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-image-picker",
-  "version": "14.3.1",
+  "version": "14.4.0",
   "description": "Provides access to the system's UI for selecting images and videos from the phone's library or taking a photo with the camera.",
   "main": "build/ImagePicker.js",
   "types": "build/ImagePicker.d.ts",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "cf90d5c30c2a08a6493ebfa8aa3791aa70666759"
+  "gitHead": "663654577a7068c641b5e9474efbc502e3f334ea"
 }

package/src/ExponentImagePicker.ts

@@ -1,2 +1,2 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-export default NativeModulesProxy.ExponentImagePicker;
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExponentImagePicker');