Finish non cam2 wrpaping

Author: camsim99

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/FocusMeteringActionFlutterApiImpl.java

@@ -15,18 +15,18 @@
  * <p>This class may handle adding native instances that are attached to a Dart instance or passing
  * arguments of callbacks methods to a Dart instance.
  */
-public class FocusMeteringActionFlutterApiWrapper {
+public class FocusMeteringActionFlutterApiImpl {
   private final BinaryMessenger binaryMessenger;
   private final InstanceManager instanceManager;
   private FocusMeteringActionFlutterApi focusMeteringActionFlutterApi;
 
   /**
-   * Constructs a {@link FocusMeteringActionFlutterApiWrapper}.
+   * Constructs a {@link FocusMeteringActionFlutterApiImpl}.
    *
    * @param binaryMessenger used to communicate with Dart over asynchronous messages
    * @param instanceManager maintains instances stored to communicate with attached Dart objects
    */
-  public FocusMeteringActionFlutterApiWrapper(
+  public FocusMeteringActionFlutterApiImpl(
       @NonNull BinaryMessenger binaryMessenger, @NonNull InstanceManager instanceManager) {
     this.binaryMessenger = binaryMessenger;
     this.instanceManager = instanceManager;

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/FocusMeteringActionHostApiImpl.java

@@ -32,29 +32,35 @@ public class FocusMeteringActionHostApiImpl implements FocusMeteringActionHostAp
   public static class FocusMeteringActionProxy {
     /** Creates an instance of {@link FocusMeteringAction}. */
     public @NonNull FocusMeteringAction create(
-        @NonNull MeteringPoint meteringPoint, @Nullable meteringMode) {
-      FocusMeteringAction.Builder focusMeteringActionBuilder;
-      if (meteringMode == null) {
-        focusMeteringActionBuilder = new FocusMeteringAction.Builder(meteringPoint);
-      } else {
-        focusMeteringActionBuilder = new FocusMeteringAction.Builder(meteringPoint, meteringMode);
+        @NonNull List<MeteringPoint> meteringPoints, @NonNull List<Integer> meteringPointModes) {
+      if (meteringPoints.size() != meteringPointModes.size()) {
+        throw new IllegalArgumentException("The number of specified metering points must match the number of specified metering point modes.");
       }
+      FocusMeteringAction.Builder focusMeteringActionBuilder;
 
-      return focusMeteringActionBuilder.build();
-    }
+      for (int i = 0; i < meteringPoints.size(); i++) {
+        MeteringPoint meteringPoint = meteringPoints.get(i);
+        Integer meteringMode = meteringPointModes.get(i);
+        if (i == 0) {
+          // On the first iteration, create the builder to add points to.
+          if (meteringMode == null) {
+            focusMeteringActionBuilder = new FocusMeteringAction.Builder(meteringPoint);
+          } else {
+            focusMeteringActionBuilder = new FocusMeteringAction.Builder(meteringPoint, meteringMode);
+          }
+          continue;
+        }
 
-    public @NonNull FocusMeteringAction create(
-        @NonNull FocusMeteringAction focusMeteringAction,
-        @NonNull MeteringPoint meteringPoint, @Nullable meteringMode) {
-        FocusMetering newFocusMeteringAction;
+        // For any i(teration) > 0, add metering points in order as specified by input lists.
         if (meteringMode == null) {
-        newFocusMeteringAction = focusMeteringAction.addPoint(meteringPoint);
-      } else {
-        newFocusMeteringAction = focusMeteringAction.addPoint(meteringPoint, meteringMode);
+          focusMeteringActionBuilder.add(meteringPoint);
+        } else {
+          focusMeteringActionBuilder.add(meteringPoint, meteringMode);
+        }
       }
 
-        return newFocusMeteringAction;
-        }
+      return focusMeteringActionBuilder.build();
+    }
   }
 
   /**
@@ -80,18 +86,15 @@ public FocusMeteringActionHostApiImpl(@NonNull InstanceManager instanceManager)
 
 
   @Override
-  public void create(@NonNull Long identifier, @NonNull Long meteringPointId, @Nullable Long meteringMode) {
+  public void create(@NonNull Long identifier, @NonNull List<MeteringPointInfo> meteringPointInfos) {
+    final List<MeteringPoint> meteringPoints = new ArrayList<MeteringPoint>();
+    final List<Integer> meteringPointModes = new ArrayList<int>();
+    for (MeteringPointInfo meteringPointInfo : meteringPointInfos) {
+      meteringPoint.add(instanceManager.getInstance(meteringPointInfo.getMeteringPointId()));
+      meteringPointModes.add(meteringPointIngo.getMeteringMode().intValue());
+    }
+
     instanceManager.addDartCreatedInstance(
-        proxy.create(Objects.requireNonNull(instanceManager.getInstance(meteringPointId)), meteringMode), identifier);
+        proxy.create(meteringPoints, meteringPointModes), identifier);
   }
-
-  @Override
-  @NonNull 
-    Long addPoint(@NonNull Long identifier, @NonNull Long meteringPointId, @Nullable Long meteringMode) {
-        FocusMeteringAction newFocusMeteringAction = proxy.addPoint(Objects.requireNonNull(instanceManager.getInstance(identifier)), Objects.requireNonNull(instanceManager.getInstance(meteringPointId)), meteringMode);
-        final FocusMeteringActionFlutterApiImpl flutterApi =
-          new FocusMeteringActionFlutterApiImpl(binaryMessenger, instanceManager);
-        flutterApi.create(newFocusMeteringAction, reply -> {});
-        return instanceManager.getIdentifierForStrongReference(newFocusMeteringAction);
-    }
 }

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/FocusMeteringResultFlutterApiImpl.java

@@ -0,0 +1,55 @@
+// 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.camerax;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import io.flutter.plugin.common.BinaryMessenger;
+import io.flutter.plugins.camerax.GeneratedCameraXLibrary.FocusMeteringResultFlutterApi;
+
+/**
+ * Flutter API implementation for {@link FocusMeteringResult}.
+ *
+ * <p>This class may handle adding native instances that are attached to a Dart instance or passing
+ * arguments of callbacks methods to a Dart instance.
+ */
+public class FocusMeteringResultFlutterApiImpl {
+  private final BinaryMessenger binaryMessenger;
+  private final InstanceManager instanceManager;
+  private FocusMeteringResultFlutterApi focusMeteringResultFlutterApi;
+
+  /**
+   * Constructs a {@link FocusMeteringResultFlutterApiImpl}.
+   *
+   * @param binaryMessenger used to communicate with Dart over asynchronous messages
+   * @param instanceManager maintains instances stored to communicate with attached Dart objects
+   */
+  public FocusMeteringResultFlutterApiImpl(
+      @NonNull BinaryMessenger binaryMessenger, @NonNull InstanceManager instanceManager) {
+    this.binaryMessenger = binaryMessenger;
+    this.instanceManager = instanceManager;
+    focusMeteringResultFlutterApi = new FocusMeteringResultFlutterApi(binaryMessenger);
+  }
+
+  /**
+   * Stores the {@link FocusMeteringResult} instance and notifies Dart to create and store a new
+   * {@link FocusMeteringResult} instance that is attached to this one. If {@code instance} has
+   * already been added, this method does nothing.
+   */
+  public void create(
+      @NonNull FocusMeteringResult instance,
+      @NonNull Reply<Void> callback) {
+    if (!instanceManager.containsInstance(instance)) {
+      FocusMeteringResultFlutterApi.create(
+          instanceManager.addHostCreatedInstance(instance), callback);
+    }
+  }
+
+  /** Sets the Flutter API used to send messages to Dart. */
+  @VisibleForTesting
+  void setApi(@NonNull FocusMeteringResultFlutterApi api) {
+    this.focusMeteringResultFlutterApi = api;
+  }
+}

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/FocusMeteringResultHostApiImpl.java

@@ -0,0 +1,67 @@
+// 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.camerax;
+
+import android.util.Size;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import io.flutter.plugins.camerax.GeneratedCameraXLibrary.FocusMeteringResultHostApi;
+import io.flutter.plugins.camerax.GeneratedCameraXLibrary.ResolutionInfo;
+import io.flutter.plugins.camerax.GeneratedCameraXLibrary.VideoQuality;
+import io.flutter.plugins.camerax.GeneratedCameraXLibrary.VideoQualityData;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Host API implementation for {@link FocusMeteringResult}.
+ *
+ * <p>This class may handle instantiating and adding native object instances that are attached to a
+ * Dart instance or handle method calls on the associated native class or an instance of the class.
+ */
+public class FocusMeteringResultHostApiImpl implements FocusMeteringResultHostApi {
+  private final InstanceManager instanceManager;
+
+  private final FocusMeteringResultProxy proxy;
+
+  /** Proxy for constructors and static method of {@link FocusMeteringResult}. */
+  @VisibleForTesting
+  public static class FocusMeteringResultProxy {
+    /** Returns whether or not the {@link FocusMeteringResult} was successful. */
+    public @NonNull
+  public Boolean isFocusSuccessful(@NonNull FocusMeteringResult focusMeteringResult) {
+    return focusMeteringResult.isFocusSuccessful();
+  }
+  }
+
+  /**
+   * Constructs a {@link FocusMeteringResultHostApiImpl}.
+   *
+   * @param instanceManager maintains instances stored to communicate with attached Dart objects
+   */
+  public FocusMeteringResultHostApiImpl(@NonNull InstanceManager instanceManager) {
+    this(instanceManager, new FocusMeteringResultProxy());
+  }
+
+  /**
+   * Constructs a {@link FocusMeteringResultHostApiImpl}.
+   *
+   * @param instanceManager maintains instances stored to communicate with attached Dart objects
+   * @param proxy proxy for constructors and static method of {@link FocusMeteringResult}
+   */
+  FocusMeteringResultHostApiImpl(
+      @NonNull InstanceManager instanceManager, @NonNull FocusMeteringResultProxy proxy) {
+    this.instanceManager = instanceManager;
+    this.proxy = proxy;
+  }
+
+
+  @Override
+  @NonNull
+  public Boolean isFocusSuccessful(@NonNull Long identifier) {
+    return proxy.isFocusSuccessful(instanceManager.getInstance(identifier));
+  }
+}