@capacitor-community/camera-preview 3.0.0 → 3.1.2

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

@@ -1,5 +1,7 @@
 package com.ahm.capacitor.camera.preview;
 
+import static android.Manifest.permission.CAMERA;
+
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.pm.ActivityInfo;
@@ -13,7 +15,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Logger;
 import com.getcapacitor.PermissionState;
@@ -23,21 +24,13 @@ import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
 import com.getcapacitor.annotation.Permission;
 import com.getcapacitor.annotation.PermissionCallback;
-
-import org.json.JSONArray;
-
 import java.io.File;
 import java.util.List;
+import org.json.JSONArray;
 
-import static android.Manifest.permission.CAMERA;
-
-@CapacitorPlugin(
-        name = "CameraPreview",
-        permissions = {
-                @Permission(strings = {CAMERA}, alias = CameraPreview.CAMERA_PERMISSION_ALIAS)
-        }
-)
+@CapacitorPlugin(name = "CameraPreview", permissions = { @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 = "";
@@ -46,6 +39,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
     private String captureCallbackId = "";
     private String snapshotCallbackId = "";
     private String recordCallbackId = "";
+    private String cameraStartCallbackId = "";
 
     // keep track of previously specified orientation to support locking orientation:
     private int previousOrientationRequest = -1;
@@ -53,7 +47,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
     private CameraActivity fragment;
     private int containerViewId = 20;
 
-    @PluginMethod()
+    @PluginMethod
     public void echo(PluginCall call) {
         String value = call.getString("value");
 
@@ -62,7 +56,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         call.resolve(ret);
     }
 
-    @PluginMethod()
+    @PluginMethod
     public void start(PluginCall call) {
         if (PermissionState.GRANTED.equals(getPermissionState(CAMERA_PERMISSION_ALIAS))) {
             startCamera(call);
@@ -71,7 +65,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         }
     }
 
-    @PluginMethod()
+    @PluginMethod
     public void flip(PluginCall call) {
         try {
             fragment.switchCamera();
@@ -84,19 +78,19 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
 
     @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);
+        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()
+    @PluginMethod
     public void capture(PluginCall call) {
-        if(this.hasCamera(call) == false){
+        if (this.hasCamera(call) == false) {
             call.reject("Camera is not running");
             return;
         }
@@ -110,9 +104,9 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         fragment.takePicture(width, height, quality);
     }
 
-    @PluginMethod()
+    @PluginMethod
     public void captureSample(PluginCall call) {
-        if(this.hasCamera(call) == false){
+        if (this.hasCamera(call) == false) {
             call.reject("Camera is not running");
             return;
         }
@@ -123,36 +117,40 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         fragment.takeSnapshot(quality);
     }
 
-    @PluginMethod()
+    @PluginMethod
     public void stop(final PluginCall call) {
-        bridge.getActivity().runOnUiThread(new Runnable() {
-            @Override
-            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);
-                    FragmentManager fragmentManager = getActivity().getFragmentManager();
-                    FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
-                    fragmentTransaction.remove(fragment);
-                    fragmentTransaction.commit();
-                    fragment = null;
-
-                    call.resolve();
-                } else {
-                    call.reject("camera already stopped");
+        bridge
+            .getActivity()
+            .runOnUiThread(
+                new Runnable() {
+                    @Override
+                    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);
+                            FragmentManager fragmentManager = getActivity().getFragmentManager();
+                            FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+                            fragmentTransaction.remove(fragment);
+                            fragmentTransaction.commit();
+                            fragment = null;
+
+                            call.resolve();
+                        } else {
+                            call.reject("camera already stopped");
+                        }
+                    }
                 }
-            }
-        });
+            );
     }
 
-    @PluginMethod()
+    @PluginMethod
     public void getSupportedFlashModes(PluginCall call) {
-        if(this.hasCamera(call) == false){
+        if (this.hasCamera(call) == false) {
             call.reject("Camera is not running");
             return;
         }
@@ -164,7 +162,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         JSONArray jsonFlashModes = new JSONArray();
 
         if (supportedFlashModes != null) {
-            for (int i=0; i<supportedFlashModes.size(); i++) {
+            for (int i = 0; i < supportedFlashModes.size(); i++) {
                 jsonFlashModes.put(new String(supportedFlashModes.get(i)));
             }
         }
@@ -172,18 +170,17 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         JSObject jsObject = new JSObject();
         jsObject.put("result", jsonFlashModes);
         call.resolve(jsObject);
-
     }
 
-    @PluginMethod()
+    @PluginMethod
     public void setFlashMode(PluginCall call) {
-        if(this.hasCamera(call) == false){
+        if (this.hasCamera(call) == false) {
             call.reject("Camera is not running");
             return;
         }
 
         String flashMode = call.getString("flashMode");
-        if(flashMode == null || flashMode.isEmpty() == true) {
+        if (flashMode == null || flashMode.isEmpty() == true) {
             call.reject("flashMode required parameter is missing");
             return;
         }
@@ -205,9 +202,9 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         call.resolve();
     }
 
-    @PluginMethod()
+    @PluginMethod
     public void startRecordVideo(final PluginCall call) {
-        if(this.hasCamera(call) == false){
+        if (this.hasCamera(call) == false) {
             call.reject("Camera is not running");
             return;
         }
@@ -223,20 +220,24 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         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);
-            }
-        });
+        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()
+    @PluginMethod
     public void stopRecordVideo(PluginCall call) {
-        if(this.hasCamera(call) == false){
+        if (this.hasCamera(call) == false) {
             call.reject("Camera is not running");
             return;
         }
@@ -268,7 +269,6 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
     }
 
     private void startCamera(final PluginCall call) {
-
         String position = call.getString("position");
 
         if (position == null || position.isEmpty() || "rear".equals(position)) {
@@ -284,8 +284,8 @@ 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 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();
@@ -299,78 +299,91 @@ 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);
-
-                // size
-                int computedWidth;
-                int computedHeight;
-                int computedPaddingBottom;
-
-                if(paddingBottom != 0) {
-                    computedPaddingBottom = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, paddingBottom, metrics);
-                } else {
-                    computedPaddingBottom = 0;
-                }
-
-                if(width != 0) {
-                    computedWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, width, metrics);
-                } else {
-                    Display defaultDisplay = getBridge().getActivity().getWindowManager().getDefaultDisplay();
-                    final Point size = new Point();
-                    defaultDisplay.getSize(size);
-
-                    computedWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX, size.x, metrics);
-                }
-
-                if(height != 0) {
-                    computedHeight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, height, metrics) - computedPaddingBottom;
-                } else {
-                    Display defaultDisplay = getBridge().getActivity().getWindowManager().getDefaultDisplay();
-                    final Point size = new Point();
-                    defaultDisplay.getSize(size);
-
-                    computedHeight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX, size.y, metrics) - computedPaddingBottom;
-                }
-
-                fragment.setRect(computedX, computedY, computedWidth, computedHeight);
-
-                FrameLayout containerView = getBridge().getActivity().findViewById(containerViewId);
-                if(containerView == null){
-                    containerView = new FrameLayout(getActivity().getApplicationContext());
-                    containerView.setId(containerViewId);
-
-                    getBridge().getWebView().setBackgroundColor(Color.TRANSPARENT);
-                    ((ViewGroup)getBridge().getWebView().getParent()).addView(containerView);
-                    if(toBack == true) {
-                        getBridge().getWebView().getParent().bringChildToFront(getBridge().getWebView());
-						setupBroadcast();
+        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);
+
+                        // size
+                        int computedWidth;
+                        int computedHeight;
+                        int computedPaddingBottom;
+
+                        if (paddingBottom != 0) {
+                            computedPaddingBottom = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, paddingBottom, metrics);
+                        } else {
+                            computedPaddingBottom = 0;
+                        }
+
+                        if (width != 0) {
+                            computedWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, width, metrics);
+                        } else {
+                            Display defaultDisplay = getBridge().getActivity().getWindowManager().getDefaultDisplay();
+                            final Point size = new Point();
+                            defaultDisplay.getSize(size);
+
+                            computedWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX, size.x, metrics);
+                        }
+
+                        if (height != 0) {
+                            computedHeight =
+                                (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, height, metrics) - computedPaddingBottom;
+                        } else {
+                            Display defaultDisplay = getBridge().getActivity().getWindowManager().getDefaultDisplay();
+                            final Point size = new Point();
+                            defaultDisplay.getSize(size);
+
+                            computedHeight =
+                                (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX, size.y, metrics) - computedPaddingBottom;
+                        }
+
+                        fragment.setRect(computedX, computedY, computedWidth, computedHeight);
+
+                        FrameLayout containerView = getBridge().getActivity().findViewById(containerViewId);
+                        if (containerView == null) {
+                            containerView = new FrameLayout(getActivity().getApplicationContext());
+                            containerView.setId(containerViewId);
+
+                            getBridge().getWebView().setBackgroundColor(Color.TRANSPARENT);
+                            ((ViewGroup) getBridge().getWebView().getParent()).addView(containerView);
+                            if (toBack == true) {
+                                getBridge().getWebView().getParent().bringChildToFront(getBridge().getWebView());
+                                setupBroadcast();
+                            }
+
+                            FragmentManager fragmentManager = getBridge().getActivity().getFragmentManager();
+                            FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+                            fragmentTransaction.add(containerView.getId(), fragment);
+                            fragmentTransaction.commit();
+
+                            // NOTE: we don't return invoke call.resolve here because it must be invoked in onCameraStarted
+                            // otherwise the plugin start method might resolve/return before the camera is actually set in CameraActivity
+                            // onResume method (see this line mCamera = Camera.open(defaultCameraId);) and the next subsequent plugin
+                            // method invocations (for example, getSupportedFlashModes) might fails with "Camera is not running" error
+                            // because camera is not available yet and hasCamera method will return false
+                            // Please also see https://developer.android.com/reference/android/hardware/Camera.html#open%28int%29
+                            bridge.saveCall(call);
+                            cameraStartCallbackId = call.getCallbackId();
+                        } else {
+                            call.reject("camera already started");
+                        }
                     }
-
-                    FragmentManager fragmentManager = getBridge().getActivity().getFragmentManager();
-                    FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
-                    fragmentTransaction.add(containerView.getId(), fragment);
-                    fragmentTransaction.commit();
-
-                    call.resolve();
-                } else {
-                    call.reject("camera already started");
                 }
-            }
-        });
+            );
     }
 
     @Override
@@ -403,33 +416,29 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
     }
 
     @Override
-    public void onFocusSet(int pointX, int pointY) {
-
-    }
+    public void onFocusSet(int pointX, int pointY) {}
 
     @Override
-    public void onFocusSetError(String message) {
-
-    }
+    public void onFocusSetError(String message) {}
 
     @Override
-    public void onBackButton() {
-
-    }
+    public void onBackButton() {}
 
     @Override
     public void onCameraStarted() {
-        System.out.println("camera started");
+        PluginCall pluginCall = bridge.getSavedCall(cameraStartCallbackId);
+        pluginCall.resolve();
+        bridge.releaseCall(pluginCall);
     }
 
     @Override
-    public void onStartRecordVideo() {
+    public void onStartRecordVideo() {}
 
-    }
     @Override
     public void onStartRecordVideoError(String message) {
         bridge.getSavedCall(recordCallbackId).reject(message);
     }
+
     @Override
     public void onStopRecordVideo(String file) {
         PluginCall pluginCall = bridge.getSavedCall(recordCallbackId);
@@ -437,15 +446,14 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         jsObject.put("videoFilePath", file);
         pluginCall.resolve(jsObject);
     }
+
     @Override
     public void onStopRecordVideoError(String error) {
         bridge.getSavedCall(recordCallbackId).reject(error);
     }
 
-
-
     private boolean hasView(PluginCall call) {
-        if(fragment == null) {
+        if (fragment == null) {
             return false;
         }
 
@@ -453,11 +461,11 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
     }
 
     private boolean hasCamera(PluginCall call) {
-        if(this.hasView(call) == false){
+        if (this.hasView(call) == false) {
             return false;
         }
 
-        if(fragment.getCamera() == null) {
+        if (fragment.getCamera() == null) {
             return false;
         }
 
@@ -478,19 +486,22 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         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;
-		}
-	  });
-	}
-	
+    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/CustomSurfaceView.java

@@ -4,22 +4,20 @@ import android.content.Context;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
-class CustomSurfaceView extends SurfaceView implements SurfaceHolder.Callback{
-  private final String TAG = "CustomSurfaceView";
+class CustomSurfaceView extends SurfaceView implements SurfaceHolder.Callback {
 
-  CustomSurfaceView(Context context){
-    super(context);
-  }
+    private final String TAG = "CustomSurfaceView";
 
-  @Override
-  public void surfaceCreated(SurfaceHolder holder) {
-  }
+    CustomSurfaceView(Context context) {
+        super(context);
+    }
 
-  @Override
-  public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-  }
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {}
 
-  @Override
-  public void surfaceDestroyed(SurfaceHolder holder) {
-  }
+    @Override
+    public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
+
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {}
 }

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

@@ -5,27 +5,25 @@ import android.graphics.SurfaceTexture;
 import android.view.SurfaceHolder;
 import android.view.TextureView;
 
-class CustomTextureView extends TextureView implements TextureView.SurfaceTextureListener{
-  private final String TAG = "CustomTextureView";
+class CustomTextureView extends TextureView implements TextureView.SurfaceTextureListener {
 
-  CustomTextureView(Context context){
-    super(context);
-  }
+    private final String TAG = "CustomTextureView";
 
-  @Override
-  public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-  }
+    CustomTextureView(Context context) {
+        super(context);
+    }
 
-  @Override
-  public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
-  }
+    @Override
+    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {}
 
-  @Override
-  public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
-    return true;
-  }
+    @Override
+    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {}
 
-  @Override
-  public void onSurfaceTextureUpdated(SurfaceTexture surface) {
-  }
+    @Override
+    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+        return true;
+    }
+
+    @Override
+    public void onSurfaceTextureUpdated(SurfaceTexture surface) {}
 }