expo-camera 14.1.2 → 15.0.0

package/CHANGELOG.md

@@ -10,25 +10,41 @@
 
 ### 💡 Others
 
-## 14.1.2 — 2024-04-08
+## 15.0.0 — 2024-04-18
+
+### 🎉 New features
+
+- Add ability to disable permissions in config plugin by passing `false` instead of permission messages. ([#28107](https://github.com/expo/expo/pull/28107) by [@EvanBacon](https://github.com/EvanBacon))
+- Add `pictureSize` prop to `CameraView` component. ([#27664](https://github.com/expo/expo/pull/27664) by [@alanjhughes](https://github.com/alanjhughes))
+- Allow user to remove `NSMicrophoneUsageDescription` and ignore the `mute` prop if they don't intend to use video. ([#28156](https://github.com/expo/expo/pull/28156) by [@alanjhughes](https://github.com/alanjhughes))
+- Add `animateShutter` prop to provide feedback when a picture is taken. Also added shutter sound on android. ([#28211](https://github.com/expo/expo/pull/28211) by [@alanjhughes](https://github.com/alanjhughes))
 
 ### 🐛 Bug fixes
 
 - Allow users using xcode 14 to still build when including camera. ([#27873](https://github.com/expo/expo/pull/27873) by [@alanjhughes](https://github.com/alanjhughes))
 - Fix an issue where the permission functions were being imported from the wrong file. ([#27988](https://github.com/expo/expo/pull/27988) by [@alanjhughes](https://github.com/alanjhughes))
+- Fix an issue on `iOS` where the barcode types did not match the typescript representation. Also enabled scanning `upc_a` codes on `iOS`. ([#28233](https://github.com/expo/expo/pull/28233) by [@alanjhughes](https://github.com/alanjhughes))
+
+### 💡 Others
 
-## 14.1.1 — 2024-03-13
+- drop unused web `name` property. ([#27437](https://github.com/expo/expo/pull/27437) by [@EvanBacon](https://github.com/EvanBacon))
+- On `Android`, requesting audio permissions was meant to be optional in the config plugin. ([#27365](https://github.com/expo/expo/pull/27365) by [@alanjhughes](https://github.com/alanjhughes))
+- Prevent unnecessary configuration changes wherever possible. ([#27919](https://github.com/expo/expo/pull/27919) by [@alanjhughes](https://github.com/alanjhughes))
+- On `Android`, only recreate camera after certain props have changed. ([#27952](https://github.com/expo/expo/pull/27952) by [@alanjhughes](https://github.com/alanjhughes))
+- Removed deprecated backward compatible Gradle settings. ([#28083](https://github.com/expo/expo/pull/28083) by [@kudo](https://github.com/kudo))
+- Promote `next` package to stable. ([#28226](https://github.com/expo/expo/pull/28226) by [@alanjhughes](https://github.com/alanjhughes))
+
+## 14.1.1 - 2024-03-13
 
 _This version does not introduce any user-facing changes._
 
-## 14.1.0 — 2024-03-13
+## 14.1.0 - 2024-03-13
 
 ### 🐛 Bug fixes
 
 - On `Android`, fix empty qualities being passed to QualitySelector ([#27126](https://github.com/expo/expo/pull/27126) by [@leonhh](https://github.com/leonhh))
 - On `web`, prevent creating a webworker when rendering on the server ([#27222](https://github.com/expo/expo/pull/27222) by [@marklawlor](https://github.com/marklawlor))
 - On `iOS`, fix method call on an optional variable. ([#27235](https://github.com/expo/expo/pull/27235) by [@alanjhughes](https://github.com/alanjhughes))
-- On `iOS`, fix the orientation value in `onResponsiveOrientationChanged` when `exif` is set to true. ([#27314](https://github.com/expo/expo/pull/27314) by [@alanjhughes](https://github.com/alanjhughes))
 - Fix scanned frame bounds when scanning a barcode. ([#27207](https://github.com/expo/expo/pull/27207) by [@tamagokun](https://github.com/tamagokun))
 - Fix incorrect prop name `flash` being passed to native. ([#27394](https://github.com/expo/expo/pull/27394) by [@alanjhughes](https://github.com/alanjhughes))
 - Ensure `mute` prop is passed to native so it is correctly initialiased even when not provided from JS. ([#27546](https://github.com/expo/expo/pull/27546) by [@alanjhughes](https://github.com/alanjhughes))
@@ -36,13 +52,13 @@ _This version does not introduce any user-facing changes._
 - On `iOS`, fix an issue where the configuration can be interuppted when the dev menu is presented on intial launch. ([#27572](https://github.com/expo/expo/pull/27572) by [@alanjhughes](https://github.com/alanjhughes))
 - On `iOS`, fix `getAvailablePictureSizes` in the legacy package. ([#27642](https://github.com/expo/expo/pull/27642) by [@alanjhughes](https://github.com/alanjhughes))
 
-## 14.0.6 — 2024-03-07
+## 14.0.6 - 2024-03-07
 
 ### 🐛 Bug fixes
 
 - On `iOS`, fix the orientation value in `onResponsiveOrientationChanged` when `exif` is set to true. ([#27314](https://github.com/expo/expo/pull/27314) by [@alanjhughes](https://github.com/alanjhughes))
 
-## 14.0.5 — 2024-02-16
+## 14.0.5 - 2024-02-16
 
 ### 🎉 New features
 
@@ -50,34 +66,32 @@ _This version does not introduce any user-facing changes._
 
 ### 🐛 Bug fixes
 
-- Set a higher resolution for barcode scans to allow scanning of high resolution barcodes. ([#26886](https://github.com/expo/expo/pull/26886)) by [@byudaniel](https://github.com/byudaniel))
+- Set a higher resolution for barcode scans to allow scanning of high resolution barcodes. ([#26886](https://github.com/expo/expo/pull/26886)) by [@byudaniel](https://github.com/byudaniel)) ([#26886](https://github.com/expo/expo/pull/26886) by [@byudaniel](https://github.com/byudaniel))
 - Fix barcode types casing errors. ([#26888](https://github.com/expo/expo/pull/26888) by [@byudaniel](https://github.com/byudaniel))
 - On `Android`, fix the camera not being released when the view is destroyed. ([#27086](https://github.com/expo/expo/pull/27086) by [@alanjhughes](https://github.com/alanjhughes))
 
 ### 💡 Others
 
 - Make the casing of `Barcode` consistent. ([#26900](https://github.com/expo/expo/pull/26900) by [@alanjhughes](https://github.com/alanjhughes))
-- On `Android`, requesting audio permissions was meant to be optional in the config plugin. ([#27365](https://github.com/expo/expo/pull/27365) by [@alanjhughes](https://github.com/alanjhughes))
 
-## 14.0.4 — 2024-02-06
+## 14.0.4 - 2024-02-06
 
 _This version does not introduce any user-facing changes._
 
-## 14.0.3 — 2024-01-26
+## 14.0.3 - 2024-01-26
 
 ### 🐛 Bug fixes
 
-- Fix naming of web files. ([#26505](https://github.com/expo/expo/pull/26505) by [@alanjhughes](https://github.com/alanjhughes))
 - On `iOS`, barcode types were not converted correctly causing the scanner to not start immediately. ([#26704](https://github.com/expo/expo/pull/26704) by [@alanjhughes](https://github.com/alanjhughes))
 - On `iOS`, fix `maxDuration` timescale on videos. ([#26882](https://github.com/expo/expo/pull/26882) by [@alanjhughes](https://github.com/alanjhughes))
 
-## 14.0.2 — 2024-01-23
+## 14.0.2 - 2024-01-23
 
 ### 🐛 Bug fixes
 
 - Fix naming of web files. ([#26505](https://github.com/expo/expo/pull/26505) by [@alanjhughes](https://github.com/alanjhughes))
 
-## 14.0.1 — 2023-12-19
+## 14.0.1 - 2023-12-19
 
 _This version does not introduce any user-facing changes._
 

package/android/build.gradle

@@ -1,119 +1,33 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '14.1.2'
+version = '15.0.0'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-if (expoModulesCorePlugin.exists()) {
-  apply from: expoModulesCorePlugin
-  applyKotlinExpoModulesCorePlugin()
-  // Remove this check, but keep the contents after SDK49 support is dropped
-  if (safeExtGet("expoProvidesDefaultConfig", false)) {
-    useExpoPublishing()
-    useCoreDependencies()
-  }
-}
-
-buildscript {
-  // Simple helper that allows the root project to override versions declared by this library.
-  ext.safeExtGet = { prop, fallback ->
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-  }
-
-  // Ensures backward compatibility
-  ext.getKotlinVersion = {
-    if (ext.has("kotlinVersion")) {
-      ext.kotlinVersion()
-    } else {
-      ext.safeExtGet("kotlinVersion", "1.8.10")
-    }
-  }
-
-  repositories {
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
-  }
-}
-
-// Remove this if and it's contents, when support for SDK49 is dropped
-if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-  afterEvaluate {
-    publishing {
-      publications {
-        release(MavenPublication) {
-          from components.release
-        }
-      }
-      repositories {
-        maven {
-          url = mavenLocal().url
-        }
-      }
-    }
-  }
-}
+apply from: expoModulesCorePlugin
+applyKotlinExpoModulesCorePlugin()
+useCoreDependencies()
+useDefaultAndroidSdkVersions()
+useExpoPublishing()
 
 android {
-  // Remove this if and it's contents, when support for SDK49 is dropped
-  if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-    compileSdkVersion safeExtGet("compileSdkVersion", 34)
-
-    defaultConfig {
-      minSdkVersion safeExtGet("minSdkVersion", 23)
-      targetSdkVersion safeExtGet("targetSdkVersion", 34)
-    }
-
-    publishing {
-      singleVariant("release") {
-        withSourcesJar()
-      }
-    }
-
-    lintOptions {
-      abortOnError false
-    }
-  }
-
-  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
-  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
-    compileOptions {
-      sourceCompatibility JavaVersion.VERSION_11
-      targetCompatibility JavaVersion.VERSION_11
-    }
-
-    kotlinOptions {
-      jvmTarget = JavaVersion.VERSION_11.majorVersion
-    }
-  }
-
   namespace "expo.modules.camera"
   defaultConfig {
     versionCode 32
-    versionName "14.1.2"
+    versionName "15.0.0"
   }
 }
 
 repositories {
-  mavenCentral()
   maven {
     url "$projectDir/maven"
   }
 }
 
 dependencies {
-  // Remove this if and it's contents, when support for SDK49 is dropped
-  if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-    implementation project(':expo-modules-core')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
-  }
-  def camerax_version = "1.4.0-alpha02"
+  def camerax_version = "1.4.0-alpha04"
 
-  api "androidx.exifinterface:exifinterface:1.3.6"
+  api "androidx.exifinterface:exifinterface:1.3.7"
   api 'com.google.android:cameraview:1.0.0'
 
   implementation "androidx.camera:camera-core:${camerax_version}"
@@ -124,7 +38,7 @@ dependencies {
   implementation "androidx.camera:camera-view:${camerax_version}"
   implementation "androidx.camera:camera-extensions:${camerax_version}"
   implementation "com.google.mlkit:barcode-scanning:17.2.0"
-  implementation 'androidx.camera:camera-mlkit-vision:1.4.0-alpha02'
+  implementation "androidx.camera:camera-mlkit-vision:${camerax_version}"
 
   api 'com.google.android:cameraview:1.0.0'
 }

package/android/src/main/java/expo/modules/camera/CameraExceptions.kt

@@ -3,5 +3,7 @@ package expo.modules.camera
 import expo.modules.kotlin.exception.CodedException
 
 class CameraExceptions {
-  class CameraIsNotRunning : CodedException(message = "Camera is not running")
+  class ImageCaptureFailed : CodedException(message = "Failed to capture image")
+
+  class VideoRecordingFailed(cause: String?) : CodedException("Video recording failed: $cause")
 }

package/android/src/main/java/expo/modules/camera/CameraViewHelper.kt

@@ -1,110 +1,25 @@
 package expo.modules.camera
 
-import androidx.exifinterface.media.ExifInterface
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
-import android.media.CamcorderProfile
-import android.os.Bundle
-
-import com.google.android.cameraview.CameraView
-
+import expo.modules.camera.records.CameraType
 import java.io.ByteArrayOutputStream
-import java.io.IOException
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Calendar
+import java.util.Locale
 
 object CameraViewHelper {
   // Utilities
   @JvmStatic
-  fun getCorrectCameraRotation(rotation: Int, facing: Int) =
-    if (facing == CameraView.FACING_FRONT) {
+  fun getCorrectCameraRotation(rotation: Int, facing: CameraType) =
+    if (facing == CameraType.FRONT) {
       (rotation - 90 + 360) % 360
     } else {
       (-rotation + 90 + 360) % 360
     }
 
-  @JvmStatic
-  fun getCamcorderProfile(cameraId: Int, quality: Int): CamcorderProfile {
-    var profile = CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_HIGH)
-    when (quality) {
-      VIDEO_2160P -> profile = CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_2160P)
-      VIDEO_1080P -> profile = CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_1080P)
-      VIDEO_720P -> profile = CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_720P)
-      VIDEO_480P -> profile = CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_480P)
-      VIDEO_4x3 -> {
-        profile = CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_480P)
-        profile.videoFrameWidth = 640
-      }
-    }
-    return profile
-  }
-
-  @JvmStatic
-  fun getExifData(exifInterface: ExifInterface): Bundle {
-    val exifMap = Bundle()
-    for ((type, name) in exifTags) {
-      if (exifInterface.getAttribute(name) != null) {
-        when (type) {
-          "string" -> exifMap.putString(name, exifInterface.getAttribute(name))
-          "int" -> exifMap.putInt(name, exifInterface.getAttributeInt(name, 0))
-          "double" -> exifMap.putDouble(name, exifInterface.getAttributeDouble(name, 0.0))
-        }
-      }
-    }
-    exifInterface.latLong?.let {
-      exifMap.putDouble(ExifInterface.TAG_GPS_LATITUDE, it[0])
-      exifMap.putDouble(ExifInterface.TAG_GPS_LONGITUDE, it[1])
-      exifMap.putDouble(ExifInterface.TAG_GPS_ALTITUDE, exifInterface.getAltitude(0.0))
-    }
-    return exifMap
-  }
-
-  @JvmStatic
-  @Throws(IllegalArgumentException::class)
-  fun setExifData(baseExif: ExifInterface, exifMap: Map<String, Any>) {
-    for ((_, name) in exifTags) {
-      exifMap[name]?.let {
-        // Convert possible type to string before putting into baseExif
-        when (it) {
-          is String -> baseExif.setAttribute(name, it)
-          is Number -> baseExif.setAttribute(name, it.toDouble().toBigDecimal().toPlainString())
-          is Boolean -> baseExif.setAttribute(name, it.toString())
-        }
-      }
-    }
-
-    if (exifMap.containsKey(ExifInterface.TAG_GPS_LATITUDE) &&
-      exifMap.containsKey(ExifInterface.TAG_GPS_LONGITUDE) &&
-      exifMap[ExifInterface.TAG_GPS_LATITUDE] is Number &&
-      exifMap[ExifInterface.TAG_GPS_LONGITUDE] is Number
-    ) {
-      baseExif.setLatLong(
-        exifMap[ExifInterface.TAG_GPS_LATITUDE] as Double,
-        exifMap[ExifInterface.TAG_GPS_LONGITUDE] as Double
-      )
-    }
-
-    if (exifMap.containsKey(ExifInterface.TAG_GPS_ALTITUDE) &&
-      exifMap[ExifInterface.TAG_GPS_ALTITUDE] is Number
-    ) {
-      baseExif.setAltitude(exifMap[ExifInterface.TAG_GPS_ALTITUDE] as Double)
-    }
-  }
-
-  @JvmStatic
-  @Throws(IOException::class)
-  fun addExifData(baseExif: ExifInterface, additionalExif: ExifInterface) {
-    for (tagInfo in exifTags) {
-      val name = tagInfo[1]
-      additionalExif.getAttribute(name)?.let {
-        baseExif.setAttribute(name, it)
-      }
-    }
-    baseExif.saveAttributes()
-  }
-
   fun generateSimulatorPhoto(width: Int, height: Int): ByteArray {
     val fakePhotoBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
     val canvas = Canvas(fakePhotoBitmap)
@@ -122,7 +37,6 @@ object CameraViewHelper {
 
     val stream = ByteArrayOutputStream()
     fakePhotoBitmap.compress(Bitmap.CompressFormat.PNG, 90, stream)
-    val fakePhotoByteArray = stream.toByteArray()
-    return fakePhotoByteArray
+    return stream.toByteArray()
   }
 }