expo-camera 16.0.8 → 16.0.9

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 16.0.9 — 2024-12-05
+
+### 🐛 Bug fixes
+
+- Fix `zoom` on Android and adjust the magnitude on iOS. ([#33319](https://github.com/expo/expo/pull/33319) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 16.0.8 — 2024-11-29
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '16.0.8'
+version = '16.0.9'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,7 +14,7 @@ android {
   namespace "expo.modules.camera"
   defaultConfig {
     versionCode 32
-    versionName "16.0.8"
+    versionName "16.0.9"
   }
 }
 

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

@@ -136,9 +136,7 @@ class CameraViewModule : Module() {
       }
 
       Prop("zoom") { view, zoom: Float? ->
-        zoom?.let {
-          view.camera?.cameraControl?.setLinearZoom(it)
-        }
+        view.zoom = zoom ?: 0f
       }
 
       Prop("mode") { view, mode: CameraMode? ->
@@ -159,7 +157,13 @@ class CameraViewModule : Module() {
 
       Prop("videoQuality") { view, quality: VideoQuality? ->
         quality?.let {
-          view.videoQuality = it
+          if (view.videoQuality != quality) {
+            view.videoQuality = it
+          }
+          return@Prop
+        }
+        if (view.videoQuality != VideoQuality.VIDEO1080P) {
+          view.videoQuality = VideoQuality.VIDEO1080P
         }
       }
 
@@ -180,11 +184,12 @@ class CameraViewModule : Module() {
         pictureSize?.let {
           if (view.pictureSize != pictureSize) {
             view.pictureSize = it
-            return@Prop
           }
+          return@Prop
+        }
+        if (view.pictureSize.isNotEmpty()) {
+          view.pictureSize = ""
         }
-
-        view.pictureSize = ""
       }
 
       Prop("autoFocus") { view, autoFocus: FocusMode? ->
@@ -199,10 +204,14 @@ class CameraViewModule : Module() {
 
       Prop("mirror") { view, mirror: Boolean? ->
         mirror?.let {
-          view.mirror = it
-          return@Prop
+          if (view.mirror != mirror) {
+            view.mirror = it
+            return@Prop
+          }
+        }
+        if (view.mirror != false) {
+          view.mirror = false
         }
-        view.mirror = false
       }
 
       Prop("videoBitrate") { view, bitrate: Int? ->

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

@@ -146,6 +146,12 @@ class ExpoCameraView(
       shouldCreateCamera = true
     }
 
+  var zoom: Float = 0f
+    set(value) {
+      field = value
+      camera?.cameraControl?.setLinearZoom(value.coerceIn(0f, 1f))
+    }
+
   var autoFocus: FocusMode = FocusMode.OFF
     set(value) {
       field = value
@@ -415,6 +421,8 @@ class ExpoCameraView(
           camera?.let {
             observeCameraState(it.cameraInfo)
           }
+          // Set the previous zoom level after recreating the camera
+          camera?.cameraControl?.setLinearZoom(zoom.coerceIn(0f, 1f))
           this.cameraProvider = cameraProvider
         } catch (e: Exception) {
           onMountError(

package/ios/Current/CameraView.swift

@@ -286,7 +286,8 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
 
     do {
       try device.lockForConfiguration()
-      device.videoZoomFactor = (device.activeFormat.videoMaxZoomFactor - 1.0) * zoom + 1.0
+      let minZoom = 1.0
+      device.videoZoomFactor = minZoom * pow(device.activeFormat.videoMaxZoomFactor / minZoom, zoom)
     } catch {
       log.info("\(#function): \(error.localizedDescription)")
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-camera",
-  "version": "16.0.8",
+  "version": "16.0.9",
   "description": "A React component that renders a preview for the device's either front or back camera. Camera's parameters like zoom, auto focus, white balance and flash mode are adjustable. With expo-camera, one can also take photos and record videos that are saved to the app's cache. Morever, the component is also capable of detecting faces and bar codes appearing on the preview.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -50,5 +50,5 @@
       "optional": true
     }
   },
-  "gitHead": "728158f99d680cf64fb06f08301d3806c18c6f63"
+  "gitHead": "a1fac063b47a647f2a9737e201d502066c52d4b0"
 }