capacitor-camera-module 0.0.34 → 0.0.35

package/android/src/main/java/com/eddieagvictoria/cameramodule/CameraModulePlugin.java

@@ -578,117 +578,61 @@ public class CameraModulePlugin extends Plugin {
             return;
         }
 
-        imageCapture.takePicture(
-            ContextCompat.getMainExecutor(getContext()),
-            new ImageCapture.OnImageCapturedCallback() {
-
-                @Override
-                public void onCaptureSuccess(
-                    @NonNull ImageProxy image
-                ) {
-                    try {
-                        Bitmap bitmap = imageProxyToBitmap(image);
-                        if (bitmap == null) {
-                            image.close();
-                            call.reject("Failed to convert image");
-                            return;
+        try {
+            File photoFile = File.createTempFile(
+                "photo_",
+                ".jpg",
+                getContext().getCacheDir()
+            );
+
+            ImageCapture.OutputFileOptions options =
+                new ImageCapture.OutputFileOptions.Builder(photoFile).build();
+
+            imageCapture.takePicture(
+                options,
+                ContextCompat.getMainExecutor(getContext()),
+                new ImageCapture.OnImageSavedCallback() {
+
+                    @Override
+                    public void onImageSaved(
+                        @NonNull ImageCapture.OutputFileResults output
+                    ) {
+                        try {
+                            Bitmap bitmap = BitmapFactory.decodeFile(photoFile.getAbsolutePath());
+                            Bitmap resized = resizeBitmap(bitmap, 1024);
+
+                            ByteArrayOutputStream out = new ByteArrayOutputStream();
+                            resized.compress(Bitmap.CompressFormat.JPEG, 80, out);
+
+                            String base64 = Base64.encodeToString(
+                                out.toByteArray(),
+                                Base64.NO_WRAP
+                            );
+
+                            bitmap.recycle();
+                            resized.recycle();
+                            photoFile.delete();
+
+                            JSObject ret = new JSObject();
+                            ret.put("base64", base64);
+                            ret.put("mimeType", "image/jpeg");
+                            call.resolve(ret);
+
+                        } catch (Exception e) {
+                            call.reject("Error processing image", e);
                         }
-                        int rotation = image.getImageInfo().getRotationDegrees();
-                        bitmap = rotateBitmap(bitmap, rotation);
-                        image.close();
-
-                        Bitmap resized = resizeBitmap(bitmap, 1024);
-
-                        ByteArrayOutputStream outputStream =
-                            new ByteArrayOutputStream();
-                        resized.compress(
-                            Bitmap.CompressFormat.JPEG,
-                            80,
-                            outputStream
-                        );
-
-                        byte[] bytes = outputStream.toByteArray();
-                        String base64 =
-                            Base64.encodeToString(bytes, Base64.NO_WRAP);
-
-                        bitmap.recycle();
-                        resized.recycle();
-
-                        JSObject ret = new JSObject();
-                        ret.put("base64", base64);
-                        ret.put("mimeType", "image/jpeg");
-                        call.resolve(ret);
-
-                    } catch (Exception e) {
-                        call.reject("Error capturing image", e);
                     }
-                }
 
-                @Override
-                public void onError(
-                    @NonNull ImageCaptureException exception
-                ) {
-                    call.reject("Capture failed", exception);
+                    @Override
+                    public void onError(@NonNull ImageCaptureException exception) {
+                        call.reject("Capture failed", exception);
+                    }
                 }
-            }
-        );
-    }
-
-    private Bitmap imageProxyToBitmap(ImageProxy image) {
-        Image mediaImage = image.getImage();
-        if (mediaImage == null) return null;
-
-        ByteBuffer yBuffer = image.getPlanes()[0].getBuffer();
-        ByteBuffer uBuffer = image.getPlanes()[1].getBuffer();
-        ByteBuffer vBuffer = image.getPlanes()[2].getBuffer();
-
-        int ySize = yBuffer.remaining();
-        int uSize = uBuffer.remaining();
-        int vSize = vBuffer.remaining();
-
-        byte[] nv21 = new byte[ySize + uSize + vSize];
-
-        yBuffer.get(nv21, 0, ySize);
-        vBuffer.get(nv21, ySize, vSize);
-        uBuffer.get(nv21, ySize + vSize, uSize);
-
-        YuvImage yuvImage =
-            new YuvImage(
-                nv21,
-                ImageFormat.NV21,
-                image.getWidth(),
-                image.getHeight(),
-                null
             );
 
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        yuvImage.compressToJpeg(
-            new Rect(0, 0, image.getWidth(), image.getHeight()),
-            100,
-            out
-        );
-
-        byte[] jpegBytes = out.toByteArray();
-        return BitmapFactory.decodeByteArray(jpegBytes, 0, jpegBytes.length);
-    }
-
-
-
-    private Bitmap rotateBitmap(Bitmap bitmap, int rotationDegrees) {
-        if (rotationDegrees == 0) return bitmap;
-
-        Matrix matrix = new Matrix();
-        matrix.postRotate(rotationDegrees);
-
-        return Bitmap.createBitmap(
-            bitmap,
-            0,
-            0,
-            bitmap.getWidth(),
-            bitmap.getHeight(),
-            matrix,
-            true
-        );
+        } catch (Exception e) {
+            call.reject("Error creating file", e);
+        }
     }
 
 
@@ -876,5 +820,28 @@ public class CameraModulePlugin extends Plugin {
         }
     }
 
+    private void restartNormalPreview() {
+        if (cameraProvider == null) return;
+
+        cameraProvider.unbindAll();
+
+        Preview preview = new Preview.Builder().build();
+        preview.setSurfaceProvider(previewView.getSurfaceProvider());
+
+        imageCapture = new ImageCapture.Builder()
+            .setCaptureMode(ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY)
+            .build();
+
+        CameraSelector cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA;
+
+        cameraProvider.bindToLifecycle(
+            getActivity(),
+            cameraSelector,
+            preview,
+            imageCapture
+        );
+    }
+
+
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-camera-module",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "description": "Plugin to request permissiones view camera take phots",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",