Merge pull request #28 from Apparence-io/fix/android_zoom

Fix/android zoom

Author: g-apparence

CHANGELOG.md

@@ -3,7 +3,7 @@
 - stability between rebuilds improved on Flutter side
 - [android] check size is correctly set before starting camera
 - CameraPreview try 3 times to start if camera is locked (each try are 1s ellapsed)
--
+- Fix android zoom when taking picture
 ## 0.1.0
 - image stream available to use MLkit or other image live processing (Only android)
 ## 0.0.2+3

android/src/main/java/com/apparence/camerawesome/CameraPicture.java

@@ -167,6 +167,7 @@ private void captureStillPicture() throws CameraAccessException {
                 takePhotoRequestBuilder.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON);
                 break;
         }
+        takePhotoRequestBuilder.set(CaptureRequest.SCALER_CROP_REGION, mCameraSession.getZoomArea());
         takePhotoRequestBuilder.set(CaptureRequest.JPEG_ORIENTATION, orientation);
         mCameraSession.getCaptureSession().stopRepeating();
         mCameraSession.getCaptureSession().capture(takePhotoRequestBuilder.build(), mCaptureCallback, null);

android/src/main/java/com/apparence/camerawesome/CameraPreview.java

@@ -112,6 +112,7 @@ void createCameraPreviewSession(final CameraDevice cameraDevice) throws CameraAc
         mPreviewRequestBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
         // save initial region for zoom management
         mInitialCropRegion = mPreviewRequestBuilder.get(CaptureRequest.SCALER_CROP_REGION);
+        mCameraSession.setZoomArea(mInitialCropRegion);
         initPreviewRequest();
         // only start preview ImageReader if asked for it
         if(streamPreviewImages) {
@@ -270,8 +271,10 @@ private void updateZoom() {
         // ¯\_(ツ)_/¯ for some devices calculating the Rect for zoom=1 results in a bit different
         // Rect that device claims as its no-zoom crop region and the preview freezes
         if (scaledZoom != 1.0f) {
+            mCameraSession.setZoomArea(zoomPreviewArea);
             mPreviewRequestBuilder.set(CaptureRequest.SCALER_CROP_REGION, zoomPreviewArea);
         } else {
+            mCameraSession.setZoomArea(mInitialCropRegion);
             mPreviewRequestBuilder.set(CaptureRequest.SCALER_CROP_REGION, mInitialCropRegion);
         }
     }

android/src/main/java/com/apparence/camerawesome/CameraSession.java

@@ -1,5 +1,6 @@
 package com.apparence.camerawesome;
 
+import android.graphics.Rect;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraCaptureSession;
 import android.hardware.camera2.CameraDevice;
@@ -38,6 +39,8 @@ public class CameraSession {
 
     private CameraDevice cameraDevice;
 
+    private Rect zoomArea;
+
     void createCameraCaptureSession(final CameraDevice cameraDevice) throws CameraAccessException {
         this.cameraDevice = cameraDevice;
         cameraDevice.createCaptureSession(new ArrayList<>(surfaces.values()), new CameraCaptureSession.StateCallback() {
@@ -126,6 +129,14 @@ public void setCaptureSession(CameraCaptureSession mCaptureSession) {
         this.mCaptureSession = mCaptureSession;
     }
 
+    public Rect getZoomArea() {
+        return zoomArea;
+    }
+
+    public void setZoomArea(Rect zoomArea) {
+        this.zoomArea = zoomArea;
+    }
+
     /**
      * Used to signal that session is ready to all class using CameraSession
      */

example/pubspec.lock

@@ -49,7 +49,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.0"
+    version: "0.1.1"
   characters:
     dependency: transitive
     description:

example/test_driver/app.dart

@@ -65,10 +65,12 @@ void main() {
     var takePhotoBtnFinder = find.byKey(ValueKey("takePhotoButton"));
     // change photo size preset
     var previousResolution = (find.byKey(ValueKey("resolutionTxt")).evaluate().first.widget as Text).data;
-    await tester.tap(find.byKey(ValueKey("resolutionButton")));
+    var resolButtonFinder = find.byKey(ValueKey("resolutionButton"));
+    (resolButtonFinder.evaluate().first.widget as FlatButton).onPressed();
     await tester.pump(Duration(milliseconds: 1000));
     await tester.pumpAndSettle(Duration(milliseconds: 1000));
-    await tester.tap(find.byKey(ValueKey("resOption")).at(1));
+    var optionsFinder = find.byKey(ValueKey("resOption"));
+    await tester.tap(optionsFinder.last);
     await tester.pump(Duration(milliseconds: 500));
     var currentResolution = (find.byKey(ValueKey("resolutionTxt")).evaluate().first.widget as Text).data;
     expect(previousResolution, isNot(equals(currentResolution)));