@capgo/camera-preview 7.4.0-alpha.24 → 7.4.0-alpha.27

package/android/src/main/java/com/ahm/capacitor/camera/preview/CameraXView.java

@@ -1,5 +1,7 @@
 package com.ahm.capacitor.camera.preview;
 
+import static androidx.core.content.ContextCompat.getSystemService;
+
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
@@ -21,10 +23,13 @@ import android.util.Size;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.WindowMetrics;
 import android.webkit.WebView;
 import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.OptIn;
+import androidx.annotation.RequiresApi;
 import androidx.camera.camera2.interop.Camera2CameraInfo;
 import androidx.camera.camera2.interop.ExperimentalCamera2Interop;
 import androidx.camera.core.AspectRatio;
@@ -447,10 +452,29 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     String aspectRatio = sessionConfig.getAspectRatio();
 
     // Get comprehensive display information
-    DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-    int screenWidthPx = metrics.widthPixels;
-    int screenHeightPx = metrics.heightPixels;
-    float density = metrics.density;
+    int screenWidthPx, screenHeightPx;
+    float density;
+
+    // Get density using DisplayMetrics (available on all API levels)
+    WindowManager windowManager = (WindowManager) this.context.getSystemService(
+        Context.WINDOW_SERVICE
+      );
+    DisplayMetrics displayMetrics = new DisplayMetrics();
+    windowManager.getDefaultDisplay().getMetrics(displayMetrics);
+    density = displayMetrics.density;
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+      // API 30+ (Android 11+) - use WindowMetrics for screen dimensions
+      WindowMetrics metrics = windowManager.getCurrentWindowMetrics();
+      Rect bounds = metrics.getBounds();
+      screenWidthPx = bounds.width();
+      screenHeightPx = bounds.height();
+    } else {
+      // API < 30 - use legacy DisplayMetrics for screen dimensions
+      screenWidthPx = displayMetrics.widthPixels;
+      screenHeightPx = displayMetrics.heightPixels;
+    }
+
     int screenWidthDp = (int) (screenWidthPx / density);
     int screenHeightDp = (int) (screenHeightPx / density);
 
@@ -544,8 +568,8 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
           );
 
           // For centered mode with aspect ratio, calculate maximum size that fits
-          int availableWidth = metrics.widthPixels;
-          int availableHeight = metrics.heightPixels;
+          int availableWidth = screenWidthPx;
+          int availableHeight = screenHeightPx;
 
           Log.d(
             TAG,
@@ -3091,10 +3115,28 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     );
 
     // Get comprehensive display information
-    DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-    int screenWidthPx = metrics.widthPixels;
-    int screenHeightPx = metrics.heightPixels;
-    float density = metrics.density;
+    WindowManager windowManager = (WindowManager) this.context.getSystemService(
+        Context.WINDOW_SERVICE
+      );
+    int screenWidthPx, screenHeightPx;
+    float density;
+
+    // Get density using DisplayMetrics (available on all API levels)
+    DisplayMetrics displayMetrics = new DisplayMetrics();
+    windowManager.getDefaultDisplay().getMetrics(displayMetrics);
+    density = displayMetrics.density;
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+      // API 30+ (Android 11+) - use WindowMetrics for screen dimensions
+      WindowMetrics metrics = windowManager.getCurrentWindowMetrics();
+      Rect bounds = metrics.getBounds();
+      screenWidthPx = bounds.width();
+      screenHeightPx = bounds.height();
+    } else {
+      // API < 30 - use legacy DisplayMetrics for screen dimensions
+      screenWidthPx = displayMetrics.widthPixels;
+      screenHeightPx = displayMetrics.heightPixels;
+    }
 
     // Get WebView dimensions
     int webViewWidth = webView.getWidth();

package/ios/Sources/CapgoCameraPreviewPlugin/CameraController.swift

@@ -504,23 +504,23 @@ extension CameraController {
         dataOutput?.connections.forEach { $0.videoOrientation = videoOrientation }
         photoOutput?.connections.forEach { $0.videoOrientation = videoOrientation }
     }
-    
+
     private func setDefaultZoomAfterFlip() {
         let device = (currentCameraPosition == .rear) ? rearCamera : frontCamera
         guard let device = device else {
             print("[CameraPreview] No device available for default zoom after flip")
             return
         }
-        
+
         // Set zoom to 1.0x in UI terms, accounting for display multiplier
         let multiplier = self.getDisplayZoomMultiplier()
         let targetUIZoom: Float = 1.0  // We want 1.0x in the UI
         let nativeZoom = multiplier != 1.0 ? (targetUIZoom / multiplier) : targetUIZoom
-        
+
         let minZoom = device.minAvailableVideoZoomFactor
         let maxZoom = min(device.maxAvailableVideoZoomFactor, saneMaxZoomFactor)
         let clampedZoom = max(minZoom, min(CGFloat(nativeZoom), maxZoom))
-        
+
         do {
             try device.lockForConfiguration()
             device.videoZoomFactor = clampedZoom
@@ -621,7 +621,7 @@ extension CameraController {
 
         // Update video orientation
         self.updateVideoOrientation()
-        
+
         // Set default 1.0 zoom level after camera switch to prevent iOS 18+ zoom jumps
         DispatchQueue.main.async { [weak self] in
             self?.setDefaultZoomAfterFlip()

package/ios/Sources/CapgoCameraPreviewPlugin/Plugin.swift

@@ -170,18 +170,62 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         }
 
         var values: [Float] = []
-        if hasUltraWide { values.append(0.5) }
+        if hasUltraWide {
+            values.append(0.5)
+        }
         if hasWide {
             values.append(1.0)
-            values.append(2.0)
+            if self.isProModelSupportingOptical2x() {
+                values.append(2.0)
+            }
+        }
+        if hasTele {
+            // Use the virtual device's switch-over zoom factors when available
+            let displayMultiplier = self.cameraController.getDisplayZoomMultiplier()
+            var teleStep: Float
+
+            if #available(iOS 13.0, *) {
+                let switchFactors = device.virtualDeviceSwitchOverVideoZoomFactors
+                if !switchFactors.isEmpty {
+                    // Choose the highest switch-over factor (typically the wide->tele threshold)
+                    let maxSwitch = switchFactors.map { $0.floatValue }.max() ?? Float(device.maxAvailableVideoZoomFactor)
+                    teleStep = maxSwitch * displayMultiplier
+                } else {
+                    teleStep = Float(device.maxAvailableVideoZoomFactor) * displayMultiplier
+                }
+            } else {
+                teleStep = Float(device.maxAvailableVideoZoomFactor) * displayMultiplier
+            }
+            values.append(teleStep)
         }
-        if hasTele { values.append(3.0) }
 
         // Deduplicate and sort
         let uniqueSorted = Array(Set(values)).sorted()
         call.resolve(["values": uniqueSorted])
     }
 
+    private func isProModelSupportingOptical2x() -> Bool {
+        // Detects iPhone 14 Pro/Pro Max, 15 Pro/Pro Max, and 16 Pro/Pro Max
+        var systemInfo = utsname()
+        uname(&systemInfo)
+        let mirror = Mirror(reflecting: systemInfo.machine)
+        let identifier = mirror.children.reduce("") { partialResult, element in
+            guard let value = element.value as? Int8, value != 0 else { return partialResult }
+            return partialResult + String(UnicodeScalar(UInt8(value)))
+        }
+
+        // Known identifiers: 14 Pro (iPhone15,2), 14 Pro Max (iPhone15,3),
+        // 15 Pro (iPhone16,1), 15 Pro Max (iPhone16,2),
+        // 16 Pro (iPhone17,1), 16 Pro Max (iPhone17,2),
+        // 17 Pro (iPhone18,1), 17 Pro Max (iPhone18,2)
+        let supportedIdentifiers: Set<String> = [
+            "iPhone15,2", "iPhone15,3", // 14 Pro / 14 Pro Max
+            "iPhone16,1", "iPhone16,2", // 15 Pro / 15 Pro Max
+            "iPhone17,1", "iPhone17,2" // 16 Pro / 16 Pro Max
+        ]
+        return supportedIdentifiers.contains(identifier)
+    }
+
     @objc func rotated() {
         guard let previewView = self.previewView,
               let posX = self.posX,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/camera-preview",
-  "version": "7.4.0-alpha.24",
+  "version": "7.4.0-alpha.27",
   "description": "Camera preview",
   "license": "MIT",
   "repository": {