Merge remote-tracking branch 'upstream/main'

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -1,24 +1,9 @@
 ## 0.5.0
 
-* Updates minimum Flutter version to 3.3.
-* Creates camera_android_camerax plugin for development.
-* Adds CameraInfo class and removes unnecessary code from plugin.
-* Adds CameraSelector class.
-* Adds ProcessCameraProvider class.
-* Bump CameraX version to 1.3.0-alpha02.
-* Adds Camera and UseCase classes, along with methods for binding UseCases to a lifecycle with the ProcessCameraProvider.
-* Bump CameraX version to 1.3.0-alpha03 and Kotlin version to 1.8.0.
-* Changes instance manager to allow the separate creation of identical objects.
-* Adds Preview and Surface classes, along with other methods needed to implement camera preview.
-* Adds implementation of availableCameras().
-* Implements camera preview, createCamera, initializeCamera, onCameraError, onDeviceOrientationChanged, and onCameraInitialized.
-* Adds integration test to plugin.
-* Bump CameraX version to 1.3.0-alpha04.
-* Fixes instance manager hot restart behavior and fixes Java casting issue.
-* Implements image capture.
-* Fixes cast of CameraInfo to fix integration test failure.
-* Updates internal Java InstanceManager to only stop finalization callbacks when stopped.
-* Implements image streaming.
-* Provides LifecycleOwner implementation for Activities that use the plugin that do not implement it themselves.
-* Implements retrieval of camera information.
-* Implements onCameraClosing callback method for indicating the camera is closing and bumps CameraX version to 1.3.0-alpha05.
+* Initial release of this `camera` implementation that supports:
+    * Image capture
+    * Video recording
+    * Displaying a live camera preview
+    * Image streaming
+
+  See [`README.md`](README.md) for more details on the limitations of this implementation.

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

@@ -594,10 +594,10 @@ public interface CameraInfoHostApi {
     @NonNull 
     Long getSensorRotationDegrees(@NonNull Long identifier);
 
-    @NonNull 
-    Long getLiveCameraState(@NonNull Long identifier);
+    @NonNull
+    Long getCameraState(@NonNull Long identifier);
 
-    @NonNull 
+    @NonNull
     Long getExposureState(@NonNull Long identifier);
 
     @NonNull 
@@ -636,7 +636,34 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable CameraInfo
       {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
-                binaryMessenger, "dev.flutter.pigeon.CameraInfoHostApi.getLiveCameraState", getCodec());
+                binaryMessenger, "dev.flutter.pigeon.CameraInfoHostApi.getCameraState", getCodec());
+        if (api != null) {
+          channel.setMessageHandler(
+              (message, reply) -> {
+                ArrayList<Object> wrapped = new ArrayList<Object>();
+                ArrayList<Object> args = (ArrayList<Object>) message;
+                Number identifierArg = (Number) args.get(0);
+                try {
+                  Long output =
+                      api.getCameraState(
+                          (identifierArg == null) ? null : identifierArg.longValue());
+                  wrapped.add(0, output);
+                } catch (Throwable exception) {
+                  ArrayList<Object> wrappedError = wrapError(exception);
+                  wrapped = wrappedError;
+                }
+                reply.reply(wrapped);
+              });
+        } else {
+          channel.setMessageHandler(null);
+        }
+      }
+      {
+        BasicMessageChannel<Object> channel =
+            new BasicMessageChannel<>(
+                binaryMessenger,
+                "dev.flutter.pigeon.CameraInfoHostApi.getExposureState",
+                getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {

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

@@ -35,6 +35,10 @@ class AndroidCameraXCameraFlutterApis {
     SystemServicesFlutterApiImpl? systemServicesFlutterApiImpl,
     CameraStateErrorFlutterApiImpl? cameraStateErrorFlutterApiImpl,
     CameraStateFlutterApiImpl? cameraStateFlutterApiImpl,
+    PendingRecordingFlutterApiImpl? pendingRecordingFlutterApiImpl,
+    RecordingFlutterApiImpl? recordingFlutterApiImpl,
+    RecorderFlutterApiImpl? recorderFlutterApiImpl,
+    VideoCaptureFlutterApiImpl? videoCaptureFlutterApiImpl,
     ExposureStateFlutterApiImpl? exposureStateFlutterApiImpl,
     ZoomStateFlutterApiImpl? zoomStateFlutterApiImpl,
     LiveDataFlutterApiImpl? liveDataFlutterApiImpl,
@@ -59,6 +63,14 @@ class AndroidCameraXCameraFlutterApis {
         cameraStateErrorFlutterApiImpl ?? CameraStateErrorFlutterApiImpl();
     this.cameraStateFlutterApiImpl =
         cameraStateFlutterApiImpl ?? CameraStateFlutterApiImpl();
+    this.pendingRecordingFlutterApiImpl =
+        pendingRecordingFlutterApiImpl ?? PendingRecordingFlutterApiImpl();
+    this.recordingFlutterApiImpl =
+        recordingFlutterApiImpl ?? RecordingFlutterApiImpl();
+    this.recorderFlutterApiImpl =
+        recorderFlutterApiImpl ?? RecorderFlutterApiImpl();
+    this.videoCaptureFlutterApiImpl =
+        videoCaptureFlutterApiImpl ?? VideoCaptureFlutterApiImpl();
     this.exposureStateFlutterApiImpl =
         exposureStateFlutterApiImpl ?? ExposureStateFlutterApiImpl();
     this.zoomStateFlutterApiImpl =
@@ -159,6 +171,10 @@ class AndroidCameraXCameraFlutterApis {
       SystemServicesFlutterApi.setup(systemServicesFlutterApiImpl);
       CameraStateErrorFlutterApi.setup(cameraStateErrorFlutterApiImpl);
       CameraStateFlutterApi.setup(cameraStateFlutterApiImpl);
+      PendingRecordingFlutterApi.setup(pendingRecordingFlutterApiImpl);
+      RecordingFlutterApi.setup(recordingFlutterApiImpl);
+      RecorderFlutterApi.setup(recorderFlutterApiImpl);
+      VideoCaptureFlutterApi.setup(videoCaptureFlutterApiImpl);
       ExposureStateFlutterApi.setup(exposureStateFlutterApiImpl);
       ZoomStateFlutterApi.setup(zoomStateFlutterApiImpl);
       AnalyzerFlutterApi.setup(analyzerFlutterApiImpl);

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

@@ -37,8 +37,8 @@ class CameraInfo extends JavaObject {
       _api.getSensorRotationDegreesFromInstance(this);
 
   /// Starts listening for the camera closing.
-  Future<LiveData<CameraState>> getLiveCameraState() =>
-      _api.getLiveCameraStateFromInstance(this);
+  Future<LiveData<CameraState>> getCameraState() =>
+      _api.getCameraStateFromInstance(this);
 
   /// Gets the exposure state of the camera.
   Future<ExposureState> getExposureState() =>