expo-image-picker 16.0.0 → 16.0.2

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 16.0.2 — 2024-11-14
+
+_This version does not introduce any user-facing changes._
+
+## 16.0.1 — 2024-11-04
+
+### 🐛 Bug fixes
+
+- Fix incorrect width/height reported with EXIF tags 5 and 7 ([#32534](https://github.com/expo/expo/pull/32534) by [@gaearon](https://github.com/gaearon))
+
 ## 16.0.0 — 2024-10-22
 
 ### 🛠 Breaking changes

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '16.0.0'
+version = '16.0.2'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,7 +14,11 @@ android {
   namespace "expo.modules.imagepicker"
   defaultConfig {
     versionCode 22
-    versionName "16.0.0"
+    versionName "16.0.2"
+    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+  }
+  testOptions {
+    unitTests.includeAndroidResources = true
   }
 }
 
@@ -25,4 +29,8 @@ dependencies {
   implementation "com.github.CanHub:Android-Image-Cropper:4.3.1"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.3"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3"
+
+  if (project.findProject(':expo-modules-test-core')) {
+    androidTestImplementation project(':expo-modules-test-core')
+  }
 }

package/android/src/main/java/expo/modules/imagepicker/exporters/DimensionsExporter.kt

@@ -0,0 +1,34 @@
+package expo.modules.imagepicker.exporters
+
+import android.graphics.BitmapFactory
+import androidx.exifinterface.media.ExifInterface
+import java.io.File
+
+/**
+ * Image will be rotated to orientation suggested by the exif data, because of that the width and height
+ * returned by the picker should be switched if the image is rotated 90 or 270 degrees.
+ */
+class DimensionsExporter(private val file: File) {
+  private val isRotatedLandscape by lazy {
+    val exifInterface = ExifInterface(file.absolutePath)
+    val imageRotation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0)
+    return@lazy (
+      imageRotation == ExifInterface.ORIENTATION_ROTATE_90 ||
+        imageRotation == ExifInterface.ORIENTATION_ROTATE_270 ||
+        imageRotation == ExifInterface.ORIENTATION_TRANSPOSE ||
+        imageRotation == ExifInterface.ORIENTATION_TRANSVERSE
+      )
+  }
+
+  private val metadata by lazy {
+    val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+    BitmapFactory.decodeFile(file.absolutePath, options)
+    options
+  }
+
+  val width: Int
+    get() = if (isRotatedLandscape) metadata.outHeight else metadata.outWidth
+
+  val height
+    get() = if (isRotatedLandscape) metadata.outWidth else metadata.outHeight
+}

package/android/src/main/java/expo/modules/imagepicker/exporters/RawImageExporter.kt

@@ -1,8 +1,6 @@
 package expo.modules.imagepicker.exporters
 
 import android.content.ContentResolver
-import android.graphics.BitmapFactory
-import android.media.ExifInterface
 import android.net.Uri
 import expo.modules.imagepicker.copyFile
 import java.io.File
@@ -14,21 +12,11 @@ class RawImageExporter : ImageExporter {
     contentResolver: ContentResolver
   ): ImageExportResult {
     copyFile(source, output, contentResolver)
-    val exifInterface = ExifInterface(output.absolutePath)
-    val imageRotation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0)
-    val isRotatedLandscape = (imageRotation == ExifInterface.ORIENTATION_ROTATE_90 || imageRotation == ExifInterface.ORIENTATION_ROTATE_270)
-    val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
-
-    BitmapFactory.decodeFile(output.absolutePath, options)
-
-    // Image will be rotated to orientation suggested by the exif data, because of that the width and height
-    // returned by the picker should be switched if the image is rotated 90 or 270 degrees.
-    val width: Int = if (isRotatedLandscape) options.outHeight else options.outWidth
-    val height: Int = if (isRotatedLandscape) options.outWidth else options.outHeight
+    val dimensionsExporter = DimensionsExporter(output)
 
     return ImageExportResult(
-      width,
-      height,
+      dimensionsExporter.width,
+      dimensionsExporter.height,
       output
     )
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-image-picker",
-  "version": "16.0.0",
+  "version": "16.0.2",
   "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": "7c7d2362fff23bec26cd145ed34edd9c403551bd"
+  "gitHead": "b7b95a93855cb4863b626c4524fc6e8b3a2305eb"
 }