capacitor-community-multilens-camerapreview 7.1.5 → 7.1.7

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

@@ -2,12 +2,13 @@ package com.ahm.capacitor.camera.preview;
 
 import static android.Manifest.permission.CAMERA;
 
+import android.annotation.SuppressLint;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.pm.ActivityInfo;
 import android.graphics.Color;
 import android.graphics.Point;
-import android.hardware.Camera;
+
 import android.content.Context;
 import android.hardware.camera2.*;
 import android.hardware.camera2.params.OutputConfiguration;
@@ -86,7 +87,7 @@ public class CameraPreviewMultiLens extends Plugin implements CameraActivity.Cam
 
     @PluginMethod
     public void setOpacity(PluginCall call) {
-        if (this.hasCamera(call) == false) {
+        if (this.hasView(call) == false) {
             //call.error("Camera is not running");
             return;
         }
@@ -98,7 +99,7 @@ public class CameraPreviewMultiLens extends Plugin implements CameraActivity.Cam
 
     @PluginMethod
     public void capture(PluginCall call) {
-        if (this.hasCamera(call) == false) {
+        if (this.hasView(call) == false) {
             call.reject("Camera is not running");
             return;
         }
@@ -114,7 +115,7 @@ public class CameraPreviewMultiLens extends Plugin implements CameraActivity.Cam
 
     @PluginMethod
     public void captureSample(PluginCall call) {
-        if (this.hasCamera(call) == false) {
+        if (this.hasView(call) == false) {
             call.reject("Camera is not running");
             return;
         }
@@ -131,6 +132,7 @@ public class CameraPreviewMultiLens extends Plugin implements CameraActivity.Cam
             .getActivity()
             .runOnUiThread(
                 new Runnable() {
+                    @SuppressLint("WrongConstant")
                     @Override
                     public void run() {
                         FrameLayout containerView = getBridge().getActivity().findViewById(containerViewId);
@@ -158,61 +160,71 @@ public class CameraPreviewMultiLens extends Plugin implements CameraActivity.Cam
 
     @PluginMethod
     public void getSupportedFlashModes(PluginCall call) {
-        if (this.hasCamera(call) == false) {
+        if (this.hasView(call) == false) {
             call.reject("Camera is not running");
             return;
         }
 
-        Camera camera = fragment.getCamera();
-        Camera.Parameters params = camera.getParameters();
-        List<String> supportedFlashModes;
-        supportedFlashModes = params.getSupportedFlashModes();
-        JSONArray jsonFlashModes = new JSONArray();
-
-        if (supportedFlashModes != null) {
-            for (int i = 0; i < supportedFlashModes.size(); i++) {
-                jsonFlashModes.put(new String(supportedFlashModes.get(i)));
+        try {
+            CameraManager cameraManager = (CameraManager) getContext().getSystemService(Context.CAMERA_SERVICE);
+            String cameraId = fragment.getCameraId();
+            CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(cameraId);
+            Boolean flashAvailable = characteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE);
+            JSONArray jsonFlashModes = new JSONArray();
+            if (flashAvailable) {
+                jsonFlashModes.put("on");
+                jsonFlashModes.put("off");
+                jsonFlashModes.put("auto");
             }
+            JSObject jsObject = new JSObject();
+            jsObject.put("result", jsonFlashModes);
+            call.resolve(jsObject);
+        } catch (CameraAccessException e) {
+            call.reject("Failed to get flash modes");
         }
-
-        JSObject jsObject = new JSObject();
-        jsObject.put("result", jsonFlashModes);
-        call.resolve(jsObject);
     }
+
     @PluginMethod
     public void getSupportedZoomLevels(PluginCall call) {
+        if (this.hasView(call) == false) {
+            call.reject("Camera is not running");
+            return;
+        }
 
         try {
+            CameraManager cameraManager = (CameraManager) getContext().getSystemService(Context.CAMERA_SERVICE);
+            String cameraId = fragment.getCameraId();
+            CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(cameraId);
+            Float maxZoom = characteristics.get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM);
+
             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);
+            if (maxZoom != null) {
+                for (int i = 1; i <= (int) (maxZoom * 10); i++) {
+                    jsonZoomLevels.put(i * 10);
                 }
             }
             JSObject jsObject = new JSObject();
             jsObject.put("result", jsonZoomLevels);
             call.resolve(jsObject);
         } catch (CameraAccessException e) {
-            call.reject("Can't get Camera Id's");
+            call.reject("Failed to get zoom levels");
         }
     }
+
     @PluginMethod
     public void setZoom(PluginCall call) {
+        if (this.hasView(call) == false) {
+            call.reject("Camera is not running");
+            return;
+        }
         int zoomFactor = call.getInt("zoomFactor", 0);
-        //this does nothing in android
+        fragment.setZoom(zoomFactor);
         call.resolve();
     }
 
     @PluginMethod
     public void setFlashMode(PluginCall call) {
-        if (this.hasCamera(call) == false) {
+        if (this.hasView(call) == false) {
             call.reject("Camera is not running");
             return;
         }
@@ -223,39 +235,24 @@ public class CameraPreviewMultiLens extends Plugin implements CameraActivity.Cam
             return;
         }
 
-        Camera camera = fragment.getCamera();
-        Camera.Parameters params = camera.getParameters();
-
-        List<String> supportedFlashModes;
-        supportedFlashModes = camera.getParameters().getSupportedFlashModes();
-        if (supportedFlashModes.indexOf(flashMode) > -1) {
-            params.setFlashMode(flashMode);
-        } else {
-            call.reject("Flash mode not recognised: " + flashMode);
-            return;
-        }
-
-        fragment.setCameraParameters(params);
+        fragment.setFlashMode(flashMode);
 
         call.resolve();
     }
 
     @PluginMethod
     public void startRecordVideo(final PluginCall call) {
-        if (this.hasCamera(call) == false) {
+        if (this.hasView(call) == false) {
             call.reject("Camera is not running");
             return;
         }
         final String filename = "videoTmp";
         VIDEO_FILE_PATH = getActivity().getCacheDir().toString() + "/";
 
-        final String position = call.getString("position", "front");
-        final Integer width = call.getInt("width", 0);
-        final Integer height = call.getInt("height", 0);
+        final int quality = call.getInt("quality", 70);
         final Boolean withFlash = call.getBoolean("withFlash", false);
         final Integer maxDuration = call.getInt("maxDuration", 0);
-        final String lens = call.getString("zoomFactor", "0");
-        // final Integer quality = call.getInt("quality", 0);
+
         bridge.saveCall(call);
         recordCallbackId = call.getCallbackId();
 
@@ -265,8 +262,7 @@ public class CameraPreviewMultiLens extends Plugin implements CameraActivity.Cam
                 new Runnable() {
                     @Override
                     public void run() {
-                        // fragment.startRecord(getFilePath(filename), position, width, height, quality, withFlash);
-                        fragment.startRecord(getFilePath(filename), position, width, height, 70, withFlash, maxDuration, lens);
+                        fragment.startRecord(getFilePath(filename), quality, withFlash, maxDuration);
                     }
                 }
             );
@@ -276,7 +272,7 @@ public class CameraPreviewMultiLens extends Plugin implements CameraActivity.Cam
 
     @PluginMethod
     public void stopRecordVideo(PluginCall call) {
-        if (this.hasCamera(call) == false) {
+        if (this.hasView(call) == false) {
             call.reject("Camera is not running");
             return;
         }
@@ -515,17 +511,7 @@ public class CameraPreviewMultiLens extends Plugin implements CameraActivity.Cam
         return true;
     }
 
-    private boolean hasCamera(PluginCall call) {
-        if (this.hasView(call) == false) {
-            return false;
-        }
-
-        if (fragment.getCamera() == null) {
-            return false;
-        }
 
-        return true;
-    }
 
     private String getFilePath(String filename) {
         String fileName = filename;

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

@@ -383,4 +383,8 @@ class Preview extends RelativeLayout implements SurfaceHolder.Callback, TextureV
             mTextureView.setAlpha(opacity);
         }
     }
+
+    public Surface getSurface() {
+        return null;
+    }
 }

package/package.json

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