capacitor-community-multilens-camerapreview 0.0.2 → 0.0.4

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

@@ -16,6 +16,7 @@ import android.graphics.YuvImage;
 import android.hardware.Camera;
 import android.hardware.Camera.PictureCallback;
 import android.hardware.Camera.ShutterCallback;
+import android.hardware.camera2.CameraManager;
 import android.media.AudioManager;
 import android.media.CamcorderProfile;
 import android.media.MediaRecorder;
@@ -480,7 +481,6 @@ public class CameraActivity extends Fragment {
         }
     }
 
-
     public void setCameraParameters(Camera.Parameters params) {
         cameraParameters = params;
 

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

@@ -8,8 +8,9 @@ import android.content.pm.ActivityInfo;
 import android.graphics.Color;
 import android.graphics.Point;
 import android.hardware.Camera;
-import android.hardware.camera2.CameraAccessException;
-import android.hardware.camera2.CameraManager;
+import android.content.Context;
+import android.hardware.camera2.*;
+import android.hardware.camera2.params.OutputConfiguration;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.Display;
@@ -28,6 +29,7 @@ import com.getcapacitor.annotation.Permission;
 import com.getcapacitor.annotation.PermissionCallback;
 import java.io.File;
 import java.util.List;
+import java.util.Set;
 import org.json.JSONArray;
 
 @CapacitorPlugin(name = "CameraPreview", permissions = { @Permission(strings = { CAMERA }, alias = CameraPreview.CAMERA_PERMISSION_ALIAS) })
@@ -176,28 +178,33 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
     }
     @PluginMethod
     public void getSupportedZoomLevels(PluginCall call) {
-        if (this.hasCamera(call) == false) {
-            call.reject("Camera is not running");
-            return;
-        }
-        Camera camera = fragment.getCamera();
-        Camera.Parameters params = camera.getParameters();
-        Boolean zoomSupported = params.isZoomSupported();
-        List<Integer> ZoomLevels;
-        JSONArray jsonZoomLevels = new JSONArray();
-        if(zoomSupported){
-            ZoomLevels = params.getZoomRatios();
-            for (int i = 0; i < ZoomLevels.size(); i++) {
-                if(i == 0){
-                    zoomLevel = ZoomLevels.get(i);
+
+        try {
+            JSONArray jsonZoomLevels = new JSONArray();
+            Context context = getContext();
+            CameraManager cameraManager = (CameraManager)context.getSystemService(Context.CAMERA_SERVICE);
+            String[] cameraIdList = cameraManager.getCameraIdList(); // may be empty
+            // iterate over available camera devices
+            for (String cameraId : cameraIdList) {
+                CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(cameraId);
+                Set<String> physicalIds = characteristics.getPhysicalCameraIds();
+                System.out.println(physicalIds);
+                for(String id : physicalIds){
+                    jsonZoomLevels.put(id);
                 }
-                jsonZoomLevels.put(new String(String.valueOf(ZoomLevels.get(i))));
             }
+            JSObject jsObject = new JSObject();
+            jsObject.put("result", jsonZoomLevels);
+            call.resolve(jsObject);
+        } catch (CameraAccessException e) {
+            call.reject("Can't get Camera Id's");
         }
-
-        JSObject jsObject = new JSObject();
-        jsObject.put("result", jsonZoomLevels);
-        call.resolve(jsObject);
+    }
+    @PluginMethod
+    public void setZoom(PluginCall call) {
+        int zoomFactor = call.getInt("zoomFactor", 0);
+        //this does nothing in android
+        call.resolve();
     }
 
     @PluginMethod
@@ -296,18 +303,11 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
             call.reject("Permission failed: user denied access to camera.");
         }
     }
-
-    public static void setZoom(int zoomLevel) {
-        Camera Cam = fragment.getCamera();
-        Camera.Parameters params = Cam.getParameters();
-        if(params.isZoomSupported()){
-            params.setZoom(zoomLevel);
-        }
-    }
+    
 
     private void startCamera(final PluginCall call) {
         String position = call.getString("position");
-        int zoomFactor = call.getInt("zoomFactor", 100);
+        //int zoomFactor = call.getInt("zoomFactor", 0);
 
         if (position == null || position.isEmpty() || "rear".equals(position)) {
             position = "back";
@@ -339,7 +339,6 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         fragment.toBack = toBack;
         fragment.enableOpacity = enableOpacity;
         fragment.enableZoom = enableZoom;
-        zoomLevel = zoomFactor;
         bridge
             .getActivity()
             .runOnUiThread(
@@ -467,8 +466,6 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         PluginCall pluginCall = bridge.getSavedCall(cameraStartCallbackId);
         pluginCall.resolve();
         bridge.releaseCall(pluginCall);
-
-        setZoom(zoomLevel);
     }
 
     @Override

package/ios/Plugin/Plugin.swift

@@ -235,7 +235,15 @@ public class CameraPreview: CAPPlugin {
             call.reject("failed to get supported cameras")
         }
     }
-    
+    @objc func setZoom(_ call: CAPPluginCall) {
+        self.zoomFactor = call.getString("zoomFactor") ?? "wide"
+        do {
+            try self.cameraController.setZoom(lens: self.zoomFactor)
+            call.resolve()
+        } catch {
+            call.reject("failed to set zoom")
+        }
+    }
     @objc func setFlashMode(_ call: CAPPluginCall) {
         guard let flashMode = call.getString("flashMode") else {
             call.reject("failed to set flash mode. required parameter flashMode is missing")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-community-multilens-camerapreview",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "fork of capacitor community camera preview with support for switchting lenses",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",