Merge pull request #82 from spoonconsulting/change-wide-angle-paramet…

…ers-value

use wide instead ultra-wide-angle

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [2.0.23](https://github.com/spoonconsulting/cordova-plugin-simple-camera-preview/compare/v2.0.22...v2.0.23) (2024-07-17)
+* **Android:** Use parameter lens with values wide or default
+* **iOS:** Use parameter lens with values wide or default
+
 ## [2.0.22](https://github.com/spoonconsulting/cordova-plugin-simple-camera-preview/compare/v2.0.21...v2.0.22) (2024-07-12)
 * **iOS:** Release memory when exiting capture preview
 

README.md

@@ -114,22 +114,22 @@ SimpleCameraPreview.deviceHasUltraWideCamera(size, (value: boolean) => {
 
 ### switchCameraTo(option, successCallback, errorCallback)
 
-Switch camera between ultra-wide or default
+Switch camera between wide or auto
 
-The variable captureDevice can take two values:
+The variable lens can take two values:
 ```javascript
-  "ultra-wide-angle"
+  "wide"
 
   or
 
-  "default"
+  "auto"
 ```
 <br>
 
 ```javascript
 
 const params = {
-  captureDevice: "ultra-wide-angle",
+  lens: "wide",
 }
 
 SimpleCameraPreview.switchCameraTo(

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoonconsulting/cordova-plugin-simple-camera-preview",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "description": "Cordova plugin that allows camera interaction from HTML code for showing camera preview below or on top of the HTML.",
   "keywords": [
     "cordova",

plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<plugin id="@spoonconsulting/cordova-plugin-simple-camera-preview" version="2.0.22" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="@spoonconsulting/cordova-plugin-simple-camera-preview" version="2.0.23" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
 
   <name>cordova-plugin-simple-camera-preview</name>
   <description>Cordova plugin that allows camera interaction from HTML code. Show camera preview popup on top of the HTML.</description>

src/android/CameraPreviewFragment.java

@@ -85,7 +85,7 @@ public class CameraPreviewFragment extends Fragment {
 
     private static float ratio = (4 / (float) 3);
     private static final String TAG = "SimpleCameraPreview";
-    private String captureDevice;
+    private String lens;
 
     public CameraPreviewFragment() {
 
@@ -100,7 +100,7 @@ public CameraPreviewFragment(int cameraDirection, CameraStartedCallback cameraSt
             e.printStackTrace();
         }
         try {
-            this.captureDevice = options.getString("captureDevice");
+            this.lens = options.getString("lens");
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -136,7 +136,7 @@ public void startCamera() {
             startCameraCallback.onCameraStarted(new Exception("Unable to start camera"));
             return;
         }
-        setUpCamera(captureDevice,cameraProvider);
+        setUpCamera(lens,cameraProvider);
 
         preview.setSurfaceProvider(viewFinder.getSurfaceProvider());
 
@@ -359,9 +359,9 @@ public void switchCameraTo(String device, CameraSwitchedCallback cameraSwitchedC
     }
 
     @SuppressLint("RestrictedApi")
-    public void setUpCamera(String captureDevice, ProcessCameraProvider cameraProvider) {
+    public void setUpCamera(String lens, ProcessCameraProvider cameraProvider) {
         CameraSelector cameraSelector;
-        if (captureDevice != null && captureDevice.equals("ultra-wide-angle")) {
+        if (lens != null && lens.equals("wide")) {
             cameraSelector = new CameraSelector.Builder()
                     .addCameraFilter(cameraInfos -> {
                         List<Camera2CameraInfoImpl> backCameras = new ArrayList<>();

src/android/SimpleCameraPreview.java

@@ -152,10 +152,10 @@ private boolean enable(JSONObject options, CallbackContext callbackContext) {
             e.printStackTrace();
         }
 
-        String captureDevice = "default";
+        String lens = "default";
         try {
-            if (options.getString("captureDevice") != null && !options.getString("captureDevice").equals("null")) {
-                captureDevice = options.getString("captureDevice");
+            if (options.getString("lens") != null && !options.getString("lens").equals("null")) {
+                lens = options.getString("lens");
             }
         } catch (JSONException | NumberFormatException e) {
             e.printStackTrace();
@@ -169,7 +169,7 @@ private boolean enable(JSONObject options, CallbackContext callbackContext) {
         }
 
         try {
-            cameraPreviewOptions.put("captureDevice", captureDevice);
+            cameraPreviewOptions.put("lens", lens);
         } catch (JSONException e) {
             e.printStackTrace();
         }

src/ios/CameraSessionManager.m

@@ -56,7 +56,7 @@ - (void) setupSession:(NSString *)defaultCamera completion:(void(^)(BOOL started
 
                 AVCaptureDevice *videoDevice;
                 videoDevice = [self cameraWithPosition:self.defaultCamera captureDeviceType:AVCaptureDeviceTypeBuiltInWideAngleCamera];
-                if ([options[@"captureDevice"] isEqual:@"ultra-wide-angle"] && [self deviceHasUltraWideCamera]) {
+                if ([options[@"lens"] isEqual:@"wide"] && [self deviceHasUltraWideCamera]) {
                     if (@available(iOS 13.0, *)) {
                         videoDevice = [self cameraWithPosition:self.defaultCamera captureDeviceType:AVCaptureDeviceTypeBuiltInUltraWideCamera];
                     }
@@ -185,7 +185,7 @@ - (void)switchCameraTo:(NSString*)cameraMode completion:(void (^)(BOOL success))
         BOOL cameraSwitched = FALSE;
         if (@available(iOS 13.0, *)) {
             AVCaptureDevice *ultraWideCamera;
-            if([cameraMode isEqualToString:@"ultra-wide-angle"]) {
+            if([cameraMode isEqualToString:@"wide"]) {
                 ultraWideCamera = [self cameraWithPosition:self.defaultCamera captureDeviceType:AVCaptureDeviceTypeBuiltInUltraWideCamera];
             } else {
                 ultraWideCamera = [self cameraWithPosition:self.defaultCamera captureDeviceType:AVCaptureDeviceTypeBuiltInWideAngleCamera];

src/ios/SimpleCameraPreview.m

@@ -74,9 +74,9 @@ - (void) enable:(CDVInvokedUrlCommand*)command {
                 NSInteger targetSize = ((NSNumber*)config[@"targetSize"]).intValue;
                 [setupSessionOptions setValue:[NSNumber numberWithInteger:targetSize] forKey:@"targetSize"];
             }
-            NSString *captureDevice = config[@"captureDevice"];
+            NSString *captureDevice = config[@"lens"];
             if (captureDevice && [captureDevice length] > 0) {
-                [setupSessionOptions setValue:captureDevice forKey:@"captureDevice"];
+                [setupSessionOptions setValue:captureDevice forKey:@"lens"];
             }
         } @catch(NSException *exception) {
             [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"targetSize not well defined"] callbackId:command.callbackId];

www/SimpleCameraPreview.js

@@ -30,8 +30,8 @@ SimpleCameraPreview.torchSwitch = function (options, onSuccess, onError) {
 
 SimpleCameraPreview.switchCameraTo = function (options, onSuccess, onError) {
   options = options || {};
-  options.captureDevice = options.captureDevice || "default";
-  exec(onSuccess, onError, PLUGIN_NAME, "switchCameraTo", [options.captureDevice]);
+  options.lens = options.lens || "default";
+  exec(onSuccess, onError, PLUGIN_NAME, "switchCameraTo", [options.lens]);
 };
 
 SimpleCameraPreview.deviceHasFlash = function (onSuccess, onError) {