@capacitor-community/camera-preview 2.0.0-beta.0 → 2.1.0

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

@@ -1,45 +1,54 @@
 package com.ahm.capacitor.camera.preview;
 
-import android.Manifest;
 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.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.Display;
+import android.view.MotionEvent;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.getcapacitor.JSObject;
-import com.getcapacitor.NativePlugin;
+import com.getcapacitor.Logger;
+import com.getcapacitor.PermissionState;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.CapacitorPlugin;
+import com.getcapacitor.annotation.Permission;
+import com.getcapacitor.annotation.PermissionCallback;
 
 import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
 
-import java.util.List;
 import java.io.File;
+import java.util.List;
 
-@NativePlugin(
+import static android.Manifest.permission.CAMERA;
+
+@CapacitorPlugin(
+        name = "CameraPreview",
         permissions = {
-                Manifest.permission.CAMERA,
-                Manifest.permission.RECORD_AUDIO,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                Manifest.permission.READ_EXTERNAL_STORAGE
-        },
-        requestCodes = {
-                CameraPreview.REQUEST_CAMERA_PERMISSION
+                @Permission(strings = {CAMERA}, alias = CameraPreview.CAMERA_PERMISSION_ALIAS)
         }
 )
 public class CameraPreview extends Plugin implements CameraActivity.CameraPreviewListener {
+    static final String CAMERA_PERMISSION_ALIAS = "camera";
+
     private static String VIDEO_FILE_PATH = "";
     private static String VIDEO_FILE_EXTENSION = ".mp4";
-    static final int REQUEST_CAMERA_PERMISSION = 1234;
+
+    private String captureCallbackId = "";
+    private String snapshotCallbackId = "";
+    private String recordCallbackId = "";
+
+    // keep track of previously specified orientation to support locking orientation:
+    private int previousOrientationRequest = -1;
 
     private CameraActivity fragment;
     private int containerViewId = 20;
@@ -50,43 +59,49 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
 
         JSObject ret = new JSObject();
         ret.put("value", value);
-        call.success(ret);
+        call.resolve(ret);
     }
 
     @PluginMethod()
     public void start(PluginCall call) {
-        saveCall(call);
-
-        if (hasRequiredPermissions()) {
+        if (PermissionState.GRANTED.equals(getPermissionState(CAMERA_PERMISSION_ALIAS))) {
             startCamera(call);
         } else {
-            pluginRequestPermissions(new String[]{
-                    Manifest.permission.CAMERA,
-                    Manifest.permission.RECORD_AUDIO,
-                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                    Manifest.permission.READ_EXTERNAL_STORAGE
-            }, REQUEST_CAMERA_PERMISSION);
+            requestPermissionForAlias(CAMERA_PERMISSION_ALIAS, call, "handleCameraPermissionResult");
         }
     }
 
-    @PluginMethod
+    @PluginMethod()
     public void flip(PluginCall call) {
         try {
             fragment.switchCamera();
             call.resolve();
         } catch (Exception e) {
+            Logger.debug(getLogTag(), "Camera flip exception: " + e);
             call.reject("failed to flip camera");
         }
     }
 
+    @PluginMethod
+    public void setOpacity(PluginCall call) {
+      if (this.hasCamera(call) == false) {
+        call.error("Camera is not running");
+        return;
+      }
+
+      bridge.saveCall(call);
+      Float opacity = call.getFloat("opacity", 1F);
+      fragment.setOpacity(opacity);
+    }
+
     @PluginMethod()
     public void capture(PluginCall call) {
         if(this.hasCamera(call) == false){
-            call.error("Camera is not running");
+            call.reject("Camera is not running");
             return;
         }
-
-        saveCall(call);
+        bridge.saveCall(call);
+        captureCallbackId = call.getCallbackId();
 
         Integer quality = call.getInt("quality", 85);
         // Image Dimensions - Optional
@@ -95,6 +110,19 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         fragment.takePicture(width, height, quality);
     }
 
+    @PluginMethod()
+    public void captureSample(PluginCall call) {
+        if(this.hasCamera(call) == false){
+            call.reject("Camera is not running");
+            return;
+        }
+        bridge.saveCall(call);
+        snapshotCallbackId = call.getCallbackId();
+
+        Integer quality = call.getInt("quality", 85);
+        fragment.takeSnapshot(quality);
+    }
+
     @PluginMethod()
     public void stop(final PluginCall call) {
         bridge.getActivity().runOnUiThread(new Runnable() {
@@ -102,6 +130,9 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
             public void run() {
                 FrameLayout containerView = getBridge().getActivity().findViewById(containerViewId);
 
+                // allow orientation changes after closing camera:
+                getBridge().getActivity().setRequestedOrientation(previousOrientationRequest);
+
                 if (containerView != null) {
                     ((ViewGroup)getBridge().getWebView().getParent()).removeView(containerView);
                     getBridge().getWebView().setBackgroundColor(Color.WHITE);
@@ -111,7 +142,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
                     fragmentTransaction.commit();
                     fragment = null;
 
-                    call.success();
+                    call.resolve();
                 } else {
                     call.reject("camera already stopped");
                 }
@@ -122,7 +153,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
     @PluginMethod()
     public void getSupportedFlashModes(PluginCall call) {
         if(this.hasCamera(call) == false){
-            call.error("Camera is not running");
+            call.reject("Camera is not running");
             return;
         }
 
@@ -140,20 +171,20 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
 
         JSObject jsObject = new JSObject();
         jsObject.put("result", jsonFlashModes);
-        call.success(jsObject);
+        call.resolve(jsObject);
 
     }
 
     @PluginMethod()
     public void setFlashMode(PluginCall call) {
         if(this.hasCamera(call) == false){
-            call.error("Camera is not running");
+            call.reject("Camera is not running");
             return;
         }
 
         String flashMode = call.getString("flashMode");
         if(flashMode == null || flashMode.isEmpty() == true) {
-            call.error("flashMode required parameter is missing");
+            call.reject("flashMode required parameter is missing");
             return;
         }
 
@@ -165,36 +196,75 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         if (supportedFlashModes.indexOf(flashMode) > -1) {
             params.setFlashMode(flashMode);
         } else {
-            call.error("Flash mode not recognised: " + flashMode);
+            call.reject("Flash mode not recognised: " + flashMode);
             return;
         }
 
         fragment.setCameraParameters(params);
 
-        call.success();
+        call.resolve();
     }
 
-    @Override
-    protected void handleRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        super.handleRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == REQUEST_CAMERA_PERMISSION) {
-            boolean permissionsGranted = true;
-            for (int grantResult: grantResults) {
-                if (grantResult != 0) {
-                    permissionsGranted = false;
-                }
-            }
+    @PluginMethod()
+    public void startRecordVideo(final PluginCall call) {
+        if(this.hasCamera(call) == false){
+            call.reject("Camera is not running");
+            return;
+        }
+        final String filename = "videoTmp";
+        VIDEO_FILE_PATH = getActivity().getCacheDir().toString() + "/";
 
-            PluginCall savedCall = getSavedCall();
-            if (permissionsGranted) {
-                startCamera(savedCall);
-            } else {
-                savedCall.reject("permission failed");
+        final String position = call.getString("position", "front");
+        final Integer width = call.getInt("width", 0);
+        final Integer height = call.getInt("height", 0);
+        final Boolean withFlash = call.getBoolean("withFlash", false);
+        final Integer maxDuration = call.getInt("maxDuration", 0);
+        // final Integer quality = call.getInt("quality", 0);
+        bridge.saveCall(call);
+        recordCallbackId = call.getCallbackId();
+
+        bridge.getActivity().runOnUiThread(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);
             }
+        });
+
+        call.resolve();
+    }
+
+    @PluginMethod()
+    public void stopRecordVideo(PluginCall call) {
+        if(this.hasCamera(call) == false){
+            call.reject("Camera is not running");
+            return;
         }
 
+        System.out.println("stopRecordVideo - Callbackid=" + call.getCallbackId());
 
+        bridge.saveCall(call);
+        recordCallbackId = call.getCallbackId();
 
+        // bridge.getActivity().runOnUiThread(new Runnable() {
+        //     @Override
+        //     public void run() {
+        //         fragment.stopRecord();
+        //     }
+        // });
+
+        fragment.stopRecord();
+        // call.resolve();
+    }
+
+    @PermissionCallback
+    private void handleCameraPermissionResult(PluginCall call) {
+        if (PermissionState.GRANTED.equals(getPermissionState(CAMERA_PERMISSION_ALIAS))) {
+            startCamera(call);
+        } else {
+            Logger.debug(getLogTag(), "User denied camera permission: " + getPermissionState(CAMERA_PERMISSION_ALIAS).toString());
+            call.reject("Permission failed: user denied access to camera.");
+        }
     }
 
     private void startCamera(final PluginCall call) {
@@ -214,7 +284,11 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         final Integer paddingBottom = call.getInt("paddingBottom", 0);
         final Boolean toBack = call.getBoolean("toBack", false);
         final Boolean storeToFile = call.getBoolean("storeToFile", false);
+		final Boolean enableOpacity = call.getBoolean("enableOpacity", false);
+		final Boolean enableZoom = call.getBoolean("enableZoom", false);
         final Boolean disableExifHeaderStripping = call.getBoolean("disableExifHeaderStripping", true);
+        final Boolean lockOrientation = call.getBoolean("lockAndroidOrientation", false);
+        previousOrientationRequest = getBridge().getActivity().getRequestedOrientation();
 
         fragment = new CameraActivity();
         fragment.setEventListener(this);
@@ -225,11 +299,18 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         fragment.disableExifHeaderStripping = disableExifHeaderStripping;
         fragment.storeToFile = storeToFile;
         fragment.toBack = toBack;
+		fragment.enableOpacity = enableOpacity;
+		fragment.enableZoom = enableZoom;
 
         bridge.getActivity().runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 DisplayMetrics metrics = getBridge().getActivity().getResources().getDisplayMetrics();
+                // lock orientation if specified in options:
+                if (lockOrientation) {
+                    getBridge().getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
+                }
+
                 // offset
                 int computedX = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, x, metrics);
                 int computedY = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, y, metrics);
@@ -276,6 +357,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
                     ((ViewGroup)getBridge().getWebView().getParent()).addView(containerView);
                     if(toBack == true) {
                         getBridge().getWebView().getParent().bringChildToFront(getBridge().getWebView());
+						setupBroadcast();
                     }
 
                     FragmentManager fragmentManager = getBridge().getActivity().getFragmentManager();
@@ -283,7 +365,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
                     fragmentTransaction.add(containerView.getId(), fragment);
                     fragmentTransaction.commit();
 
-                    call.success();
+                    call.resolve();
                 } else {
                     call.reject("camera already started");
                 }
@@ -291,7 +373,6 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         });
     }
 
-
     @Override
     protected void handleOnResume() {
         super.handleOnResume();
@@ -301,29 +382,24 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
     public void onPictureTaken(String originalPicture) {
         JSObject jsObject = new JSObject();
         jsObject.put("value", originalPicture);
-        getSavedCall().success(jsObject);
+        bridge.getSavedCall(captureCallbackId).resolve(jsObject);
     }
 
     @Override
     public void onPictureTakenError(String message) {
-        getSavedCall().reject(message);
+        bridge.getSavedCall(captureCallbackId).reject(message);
     }
 
     @Override
     public void onSnapshotTaken(String originalPicture) {
-        JSONArray data = new JSONArray();
-        data.put(originalPicture);
-
-        PluginCall call = getSavedCall();
-
         JSObject jsObject = new JSObject();
-        jsObject.put("result", data);
-        call.success(jsObject);
+        jsObject.put("value", originalPicture);
+        bridge.getSavedCall(snapshotCallbackId).resolve(jsObject);
     }
 
     @Override
     public void onSnapshotTakenError(String message) {
-        getSavedCall().reject(message);
+        bridge.getSavedCall(snapshotCallbackId).reject(message);
     }
 
     @Override
@@ -343,9 +419,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
 
     @Override
     public void onCameraStarted() {
-        PluginCall pluginCall = getSavedCall();
         System.out.println("camera started");
-        pluginCall.success();
     }
 
     @Override
@@ -354,20 +428,22 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
     }
     @Override
     public void onStartRecordVideoError(String message) {
-        getSavedCall().reject(message);
+        bridge.getSavedCall(recordCallbackId).reject(message);
     }
     @Override
     public void onStopRecordVideo(String file) {
-        PluginCall pluginCall = getSavedCall();
+        PluginCall pluginCall = bridge.getSavedCall(recordCallbackId);
         JSObject jsObject = new JSObject();
         jsObject.put("videoFilePath", file);
-        pluginCall.success(jsObject);
+        pluginCall.resolve(jsObject);
     }
     @Override
     public void onStopRecordVideoError(String error) {
-        getSavedCall().reject(error);
+        bridge.getSavedCall(recordCallbackId).reject(error);
     }
 
+
+
     private boolean hasView(PluginCall call) {
         if(fragment == null) {
             return false;
@@ -388,64 +464,33 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         return true;
     }
 
-    @PluginMethod()
-    public void startRecordVideo(final PluginCall call) {
-        if(this.hasCamera(call) == false){
-            call.error("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 Boolean withFlash = call.getBoolean("withFlash", false);
-        final Integer maxDuration = call.getInt("maxDuration", 0);
-        // final Integer quality = call.getInt("quality", 0);
-
-        bridge.getActivity().runOnUiThread(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);
-            }
-        });
-
-        call.success();
-    }
-
-    @PluginMethod()
-    public void stopRecordVideo(PluginCall call) {
-       if(this.hasCamera(call) == false){
-            call.error("Camera is not running");
-            return;
-        }
-
-        saveCall(call);
-
-        // bridge.getActivity().runOnUiThread(new Runnable() {
-        //     @Override
-        //     public void run() {
-        //         fragment.stopRecord();
-        //     }
-        // });
-
-        fragment.stopRecord();
-        // call.success();
-    }
-
     private String getFilePath(String filename) {
         String fileName = filename;
 
         int i = 1;
 
         while (new File(VIDEO_FILE_PATH + fileName + VIDEO_FILE_EXTENSION).exists()) {
-        // Add number suffix if file exists
-        fileName = filename + '_' + i;
-        i++;
+            // Add number suffix if file exists
+            fileName = filename + '_' + i;
+            i++;
         }
 
         return VIDEO_FILE_PATH + fileName + VIDEO_FILE_EXTENSION;
     }
+
+	private void setupBroadcast() {
+	  /** When touch event is triggered, relay it to camera view if needed so it can support pinch zoom */
+
+	  getBridge().getWebView().setClickable(true);
+	  getBridge().getWebView().setOnTouchListener(new View.OnTouchListener() {
+	  @Override
+	    public boolean onTouch(View v, MotionEvent event) {
+		  if ((null != fragment) && (fragment.toBack == true)) {
+			fragment.frameContainerLayout.dispatchTouchEvent(event);
+		  }
+		  return false;
+		}
+	  });
+	}
+	
 }

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

@@ -0,0 +1,31 @@
+package com.ahm.capacitor.camera.preview;
+
+import android.content.Context;
+import android.graphics.SurfaceTexture;
+import android.view.SurfaceHolder;
+import android.view.TextureView;
+
+class CustomTextureView extends TextureView implements TextureView.SurfaceTextureListener{
+  private final String TAG = "CustomTextureView";
+
+  CustomTextureView(Context context){
+    super(context);
+  }
+
+  @Override
+  public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+  }
+
+  @Override
+  public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+  }
+
+  @Override
+  public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+    return true;
+  }
+
+  @Override
+  public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+  }
+}