More wrapping, start with meteringpoint

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

@@ -40,12 +40,10 @@ public FocusMeteringActionFlutterApiWrapper(
    */
   public void create(
       @NonNull FocusMeteringAction instance,
-      @NonNull Long meteringPointIdArg,
-      @Nullable Long meteringModeArg,
       @NonNull Reply<Void> callback) {
     if (!instanceManager.containsInstance(instance)) {
       focusMeteringActionFlutterApi.create(
-          instanceManager.addHostCreatedInstance(instance), code, callback);
+          instanceManager.addHostCreatedInstance(instance), callback);
     }
   }
 

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

@@ -92,6 +92,6 @@ Long addPoint(@NonNull Long identifier, @NonNull Long meteringPointId, @Nullable
         final FocusMeteringActionFlutterApiImpl flutterApi =
           new FocusMeteringActionFlutterApiImpl(binaryMessenger, instanceManager);
         flutterApi.create(newFocusMeteringAction, reply -> {});
-        return instanceManager.getIdentifierForStrongReference(newFocusMeteringAction); // TODO(camsim99): I'm here! Need to figure out how to handle list of metering points. Thinking use getter.
+        return instanceManager.getIdentifierForStrongReference(newFocusMeteringAction);
     }
 }

packages/camera/camera_android_camerax/lib/src/focus_metering_action.dart

@@ -17,8 +17,8 @@ class FocusMeteringAction extends JavaObject {
   FocusMeteringAction({
     BinaryMessenger? binaryMessenger,
     InstanceManager? instanceManager,
-    required this.meteringPoint,
-    required this.meteringMode,
+    required MeteringPoint meteringPoint,
+    int? meteringMode,
   }) : super.detached(
           binaryMessenger: binaryMessenger,
           instanceManager: instanceManager,
@@ -34,8 +34,6 @@ class FocusMeteringAction extends JavaObject {
   FocusMeteringAction.detached({
     BinaryMessenger? binaryMessenger,
     InstanceManager? instanceManager,
-    required this.meteringPoint,
-    required this.meteringMode,
   }) : super.detached(
           binaryMessenger: binaryMessenger,
           instanceManager: instanceManager,
@@ -46,12 +44,6 @@ class FocusMeteringAction extends JavaObject {
 
   late final _FocusMeteringActionHostApiImpl _api;
 
-  /// something
-  final MeteringPoint meteringPoint;
-
-  /// something
-  final int? meteringMode;
-
   /// Flag for metering mode that indicates the AF (Auto Focus) region is
   /// enabled.
   ///
@@ -75,7 +67,7 @@ class FocusMeteringAction extends JavaObject {
 
 /// Host API implementation of [FocusMeteringAction].
 class _FocusMeteringActionHostApiImpl extends FocusMeteringActionHostApi {
-  /// Constructs a [FocusMeteringActionHostApiImpl].
+  /// Constructs a [_FocusMeteringActionHostApiImpl].
   ///
   /// If [binaryMessenger] is null, the default [BinaryMessenger] will be used,
   /// which routes to the host platform.
@@ -104,10 +96,7 @@ class _FocusMeteringActionHostApiImpl extends FocusMeteringActionHostApi {
     final int identifier = instanceManager.addDartCreatedInstance(instance,
         onCopy: (FocusMeteringAction original) {
       return FocusMeteringAction.detached(
-          binaryMessenger: binaryMessenger,
-          instanceManager: instanceManager,
-          meteringPoint: meteringPoint,
-          meteringMode: meteringMode);
+          binaryMessenger: binaryMessenger, instanceManager: instanceManager);
     });
     create(identifier, instanceManager.getIdentifier(meteringPoint)!,
         meteringMode);
@@ -150,21 +139,15 @@ class FocusMeteringActionFlutterApiImpl extends FocusMeteringActionFlutterApi {
   final InstanceManager _instanceManager;
 
   @override
-  void create(int identifier, int meteringPointId, int? meteringMode) {
+  void create(int identifier) {
     _instanceManager.addHostCreatedInstance(
       FocusMeteringAction.detached(
-          binaryMessenger: _binaryMessenger,
-          instanceManager: _instanceManager,
-          meteringPoint: _instanceManager
-              .getInstanceWithWeakReference<MeteringPoint>(meteringPointId),
-          meteringMode: meteringMode),
+          binaryMessenger: _binaryMessenger, instanceManager: _instanceManager),
       identifier,
       onCopy: (FocusMeteringAction original) {
         return FocusMeteringAction.detached(
           binaryMessenger: _binaryMessenger,
           instanceManager: _instanceManager,
-          meteringMode: original.meteringMode,
-          meteringPoint: original.meteringPoint,
         );
       },
     );

packages/camera/camera_android_camerax/lib/src/focus_metering_result.dart

@@ -5,7 +5,7 @@
 import 'package:flutter/services.dart' show BinaryMessenger;
 import 'package:meta/meta.dart' show immutable;
 
-// TODO: add new flutter apis
+// TODO(camsim99): add new flutter apis
 import 'android_camera_camerax_flutter_api_impls.dart';
 import 'camerax_library.g.dart';
 import 'instance_manager.dart';

packages/camera/camera_android_camerax/lib/src/metering_point.dart

@@ -13,6 +13,23 @@ import 'java_object.dart';
 /// somethin
 @immutable
 class MeteringPoint extends JavaObject {
+  /// Creates a [MeteringPoint].
+  MeteringPoint({
+    BinaryMessenger? binaryMessenger,
+    InstanceManager? instanceManager,
+    required double x,
+    required double y,
+    required double? size,
+  }) : super.detached(
+          binaryMessenger: binaryMessenger,
+          instanceManager: instanceManager,
+        ) {
+    _api = _MeteringPointHostApiImpl(
+        binaryMessenger: binaryMessenger, instanceManager: instanceManager);
+    _api.createFromInstance(this, x, y, size);
+    AndroidCameraXCameraFlutterApis.instance.ensureSetUp();
+  }
+
   /// Creates a [MeteringPoint] that is not automatically attached to a
   /// native object.
   MeteringPoint.detached({
@@ -29,8 +46,11 @@ class MeteringPoint extends JavaObject {
 
   late final _MeteringPointHostApiImpl _api;
 
+  /// something
+  Future<double> getDefaultPointSize() => _api.getDefaultPointSize();
+
   /// somethin
-  Future<int> getSize() => _api.getSizeFromInstance(this);
+  Future<double> getSize() => _api.getSizeFromInstance(this);
 }
 
 /// Host API implementation of [MeteringPoint].
@@ -58,7 +78,7 @@ class _MeteringPointHostApiImpl extends MeteringPointHostApi {
   late final InstanceManager instanceManager;
 
   /// somethin
-  Future<int> getSizeFromInstance(MeteringPoint instance) {
+  Future<double> getSizeFromInstance(MeteringPoint instance) {
     final int identifier = instanceManager.getIdentifier(instance)!;
     return getSize(identifier);
   }

packages/camera/camera_android_camerax/pigeons/camerax_library.dart

@@ -469,7 +469,7 @@ abstract class FocusMeteringActionHostApi {
 
 @FlutterApi()
 abstract class FocusMeteringActionFlutterApi {
-  void create(int identifier, int meteringPointId, int? meteringMode);
+  void create(int identifier);
 }
 
 @HostApi()
@@ -484,12 +484,11 @@ abstract class FocusMeteringResultFlutterApi {
 
 @HostApi(dartHostTestHandler: 'TestMeteringPointHostApi')
 abstract class MeteringPointHostApi {
-  int getSize(int identifier);
-}
+  void create(int identifier, double x, double y, double? size);
 
-@FlutterApi()
-abstract class MeteringPointFlutterApi {
-  void create(int identifier);
+  double getDefaultPointSize();
+
+  double getSize(int identifier);
 }
 
 @HostApi(dartHostTestHandler: 'TestDisplayOrientedMeteringPointFactoryHostApi')