New Android method to calculate picture size

Finds biggest option among some hardcoded limits
maraujop · Jun 30, 2017 · d861e7d · d861e7d
1 parent 4f2b05d
commit d861e7d
Showing 1 changed file with 27 additions and 1 deletion.
diff --git a/android/src/main/java/com/wix/RNCameraKit/camera/CameraViewManager.java b/android/src/main/java/com/wix/RNCameraKit/camera/CameraViewManager.java
@@ -208,6 +208,32 @@ private static Camera.Size getOptimalPreviewSize(List<Camera.Size> sizes, int w,
         return optimalSize;
     }
 
+    private static Camera.Size getBiggestPictureSize(List<Camera.Size> sizes) {
+        int maxWidth = 2200;
+        int maxHeight = 3200;
+        Camera.Size bestSize = null;
+
+        for (Camera.Size size : sizes) {
+            if (size.width > maxWidth || size.height > maxHeight) {
+                continue;
+            }
+
+            if (bestSize == null) {
+                bestSize = size;
+                continue;
+            }
+
+            int resultArea = bestSize.width * bestSize.height;
+            int newArea = size.width * size.height;
+
+            if (newArea > resultArea) {
+                bestSize = size;
+            }
+        }
+
+        return bestSize;
+    }
+
     private static void updateCameraSize() {
         try {
             Camera camera = CameraViewManager.getCamera();
@@ -220,7 +246,7 @@ private static void updateCameraSize() {
             List<Camera.Size> supportedPreviewSizes = camera.getParameters().getSupportedPreviewSizes();
             List<Camera.Size> supportedPictureSizes = camera.getParameters().getSupportedPictureSizes();
             Camera.Size optimalSize = getOptimalPreviewSize(supportedPreviewSizes, size.x, size.y);
-            Camera.Size optimalPictureSize = getOptimalPreviewSize(supportedPictureSizes, size.x, size.y);
+            Camera.Size optimalPictureSize = getBiggestPictureSize(supportedPictureSizes);
             Camera.Parameters parameters = camera.getParameters();
             parameters.setPreviewSize(optimalSize.width, optimalSize.height);
             parameters.setPictureSize(optimalPictureSize.width, optimalPictureSize.height);