Progress on final implementation of android rework

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraCaptureCallback.java

@@ -36,7 +36,7 @@ private CameraCaptureCallback(
    *
    * @param cameraStateListener instance which will be called when the camera state changes.
    * @param captureTimeouts specifying the different timeout counters that should be taken into
-   *                        account.
+   *     account.
    * @return a configured instance of the {@link CameraCaptureCallback} class.
    */
   public static CameraCaptureCallback create(
@@ -107,9 +107,7 @@ private void process(CaptureResult result) {
               || aeState == CaptureResult.CONTROL_AE_STATE_FLASH_REQUIRED) {
             setCameraState(CameraState.STATE_WAITING_PRECAPTURE_DONE);
           } else if (captureTimeouts.getPreCaptureMetering().getIsExpired()) {
-            Log.w(
-                TAG,
-                "Metering timeout waiting for pre-capture to start, moving on with capture");
+            Log.w(TAG, "Metering timeout waiting for pre-capture to start, moving on with capture");
 
             setCameraState(CameraState.STATE_WAITING_PRECAPTURE_DONE);
           }
@@ -122,8 +120,7 @@ private void process(CaptureResult result) {
             cameraStateListener.onConverged();
           } else if (captureTimeouts.getPreCaptureMetering().getIsExpired()) {
             Log.w(
-                TAG,
-                "Metering timeout waiting for pre-capture to finish, moving on with capture");
+                TAG, "Metering timeout waiting for pre-capture to finish, moving on with capture");
             cameraStateListener.onConverged();
           }
 
@@ -157,14 +154,10 @@ public void onCaptureCompleted(
     process(result);
   }
 
-  /**
-   * An interface that describes the different state changes implementers can be informed about.
-   */
+  /** An interface that describes the different state changes implementers can be informed about. */
   interface CameraCaptureStateListener {
 
-    /**
-     * Called when the {@link android.hardware.camera2.CaptureRequest} has been converged.
-     */
+    /** Called when the {@link android.hardware.camera2.CaptureRequest} has been converged. */
     void onConverged();
 
     /**

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraProperties.java

@@ -253,8 +253,8 @@ public CameraPropertiesImpl(String cameraName, CameraManager cameraManager)
 
   @Override
   public String getCameraName() {
-      return "WOOPS";
-//    return cameraName;
+    return "WOOPS";
+    //    return cameraName;
   }
 
   @Override

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraUtils.java

@@ -1,22 +1,17 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 package io.flutter.plugins.camera;
 
 import android.app.Activity;
 import android.content.Context;
-import android.graphics.ImageFormat;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraManager;
 import android.hardware.camera2.CameraMetadata;
-import android.hardware.camera2.params.StreamConfigurationMap;
-import android.util.Size;
 import io.flutter.embedding.engine.systemchannels.PlatformChannel;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -26,27 +21,24 @@ public final class CameraUtils {
 
   private CameraUtils() {}
 
+  /**
+   * Gets the {@link CameraManager} singleton.
+   *
+   * @param context The context to get the {@link CameraManager} singleton from.
+   * @return The {@link CameraManager} singleton.
+   */
   static CameraManager getCameraManager(Context context) {
     return (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
   }
 
-  static PlatformChannel.DeviceOrientation getDeviceOrientationFromDegrees(int degrees) {
-    // Round to the nearest 90 degrees.
-    degrees = (int) (Math.round(degrees / 90.0) * 90) % 360;
-    // Determine the corresponding device orientation.
-    switch (degrees) {
-      case 90:
-        return PlatformChannel.DeviceOrientation.LANDSCAPE_LEFT;
-      case 180:
-        return PlatformChannel.DeviceOrientation.PORTRAIT_DOWN;
-      case 270:
-        return PlatformChannel.DeviceOrientation.LANDSCAPE_RIGHT;
-      case 0:
-      default:
-        return PlatformChannel.DeviceOrientation.PORTRAIT_UP;
-    }
-  }
-
+  /**
+   * Serializes the {@link PlatformChannel.DeviceOrientation} to a string value.
+   *
+   * @param orientation The orientation to serialize.
+   * @return The serialized orientation.
+   * @throws UnsupportedOperationException when the provided orientation not have a corresponding
+   *     string value.
+   */
   static String serializeDeviceOrientation(PlatformChannel.DeviceOrientation orientation) {
     if (orientation == null)
       throw new UnsupportedOperationException("Could not serialize null device orientation.");
@@ -61,10 +53,19 @@ static String serializeDeviceOrientation(PlatformChannel.DeviceOrientation orien
         return "landscapeRight";
       default:
         throw new UnsupportedOperationException(
-                "Could not serialize device orientation: " + orientation.toString());
+            "Could not serialize device orientation: " + orientation.toString());
     }
   }
 
+  /**
+   * Deserializes a string value to its corresponding {@link PlatformChannel.DeviceOrientation}
+   * value.
+   *
+   * @param orientation The string value to deserialize.
+   * @return The deserialized orientation.
+   * @throws UnsupportedOperationException when the provided string value does not have a
+   *     corresponding {@link PlatformChannel.DeviceOrientation}.
+   */
   static PlatformChannel.DeviceOrientation deserializeDeviceOrientation(String orientation) {
     if (orientation == null)
       throw new UnsupportedOperationException("Could not deserialize null device orientation.");
@@ -79,19 +80,19 @@ static PlatformChannel.DeviceOrientation deserializeDeviceOrientation(String ori
         return PlatformChannel.DeviceOrientation.LANDSCAPE_RIGHT;
       default:
         throw new UnsupportedOperationException(
-                "Could not deserialize device orientation: " + orientation);
+            "Could not deserialize device orientation: " + orientation);
     }
   }
 
-  static Size computeBestCaptureSize(StreamConfigurationMap streamConfigurationMap) {
-    // For still image captures, we use the largest available size.
-    return Collections.max(
-            Arrays.asList(streamConfigurationMap.getOutputSizes(ImageFormat.JPEG)),
-            new CompareSizesByArea());
-  }
-
+  /**
+   * Gets all the available cameras for the device.
+   *
+   * @param activity The current Android activity.
+   * @return A map of all the available cameras, with their name as their key.
+   * @throws CameraAccessException when the camera could not be accessed.
+   */
   public static List<Map<String, Object>> getAvailableCameras(Activity activity)
-          throws CameraAccessException {
+      throws CameraAccessException {
     CameraManager cameraManager = (CameraManager) activity.getSystemService(Context.CAMERA_SERVICE);
     String[] cameraNames = cameraManager.getCameraIdList();
     List<Map<String, Object>> cameras = new ArrayList<>();
@@ -118,13 +119,4 @@ public static List<Map<String, Object>> getAvailableCameras(Activity activity)
     }
     return cameras;
   }
-
-  private static class CompareSizesByArea implements Comparator<Size> {
-    @Override
-    public int compare(Size lhs, Size rhs) {
-      // We cast here to ensure the multiplications won't overflow.
-      return Long.signum(
-              (long) lhs.getWidth() * lhs.getHeight() - (long) rhs.getWidth() * rhs.getHeight());
-    }
-  }
-}
+}