diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md index e346f786ce24..0db64b8e8a76 100644 --- a/packages/camera/camera_android_camerax/CHANGELOG.md +++ b/packages/camera/camera_android_camerax/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.5.0+9 + +* Marks all Dart-wrapped Android native classes as `@immutable`. +* Updates `CONTRIBUTING.md` to note requirements of Dart-wrapped Android native classes. + ## 0.5.0+8 * Fixes unawaited_futures violations. diff --git a/packages/camera/camera_android_camerax/CONTRIBUTING.md b/packages/camera/camera_android_camerax/CONTRIBUTING.md index 3d365d791e57..d6e7fe61bdde 100644 --- a/packages/camera/camera_android_camerax/CONTRIBUTING.md +++ b/packages/camera/camera_android_camerax/CONTRIBUTING.md @@ -48,7 +48,10 @@ an `InstanceManager` (implementation in `InstanceManager.java`). If CameraX or other Android classes that you need to access do not have a duplicately named implementation in `lib/src/`, then follow the same structure -described above to add them. +described above to add them. Please note that any Dart-wrapped native Android +classes that you add should extend `JavaObject`. Additionally, they should be +annotated as `@immutable` to avoid lint errors with mock objects that are +generated for them that you may use for testing. For more information, please see the [design document][2] or feel free to ask any questions on the #hackers-ecosystem channel on [Discord][6]. For diff --git a/packages/camera/camera_android_camerax/lib/src/analyzer.dart b/packages/camera/camera_android_camerax/lib/src/analyzer.dart index 8cdcc137ae4c..8da367f00468 100644 --- a/packages/camera/camera_android_camerax/lib/src/analyzer.dart +++ b/packages/camera/camera_android_camerax/lib/src/analyzer.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:flutter/services.dart' show BinaryMessenger; -import 'package:meta/meta.dart' show protected; +import 'package:meta/meta.dart' show immutable, protected; import 'android_camera_camerax_flutter_api_impls.dart'; import 'camerax_library.g.dart'; @@ -16,6 +16,7 @@ import 'java_object.dart'; /// Wrapper of callback for analyzing images. /// /// See https://developer.android.com/reference/androidx/camera/core/ImageAnalysis.Analyzer. +@immutable class Analyzer extends JavaObject { /// Creates an [Analyzer]. Analyzer( diff --git a/packages/camera/camera_android_camerax/lib/src/camera.dart b/packages/camera/camera_android_camerax/lib/src/camera.dart index 8720fdf322f1..8bc1dbf75f87 100644 --- a/packages/camera/camera_android_camerax/lib/src/camera.dart +++ b/packages/camera/camera_android_camerax/lib/src/camera.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/services.dart' show BinaryMessenger; +import 'package:meta/meta.dart' show immutable; import 'android_camera_camerax_flutter_api_impls.dart'; import 'camera_info.dart'; @@ -14,6 +15,7 @@ import 'java_object.dart'; /// camera, and publich the state of the camera. /// /// See https://developer.android.com/reference/androidx/camera/core/Camera. +@immutable class Camera extends JavaObject { /// Constructs a [Camera] that is not automatically attached to a native object. Camera.detached( diff --git a/packages/camera/camera_android_camerax/lib/src/camera_info.dart b/packages/camera/camera_android_camerax/lib/src/camera_info.dart index 4ed78ddfbf37..6c0a62f9fd5d 100644 --- a/packages/camera/camera_android_camerax/lib/src/camera_info.dart +++ b/packages/camera/camera_android_camerax/lib/src/camera_info.dart @@ -5,6 +5,7 @@ import 'dart:async'; import 'package:flutter/services.dart' show BinaryMessenger; +import 'package:meta/meta.dart' show immutable; import 'android_camera_camerax_flutter_api_impls.dart'; import 'camera_state.dart'; @@ -18,6 +19,7 @@ import 'zoom_state.dart'; /// The metadata of a camera. /// /// See https://developer.android.com/reference/androidx/camera/core/CameraInfo. +@immutable class CameraInfo extends JavaObject { /// Constructs a [CameraInfo] that is not automatically attached to a native object. CameraInfo.detached( diff --git a/packages/camera/camera_android_camerax/lib/src/camera_selector.dart b/packages/camera/camera_android_camerax/lib/src/camera_selector.dart index 1df886b861bd..0e489d42457f 100644 --- a/packages/camera/camera_android_camerax/lib/src/camera_selector.dart +++ b/packages/camera/camera_android_camerax/lib/src/camera_selector.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable; import 'android_camera_camerax_flutter_api_impls.dart'; import 'camera_info.dart'; @@ -13,6 +14,7 @@ import 'java_object.dart'; /// Selects a camera for use. /// /// See https://developer.android.com/reference/androidx/camera/core/CameraSelector. +@immutable class CameraSelector extends JavaObject { /// Creates a [CameraSelector]. CameraSelector( diff --git a/packages/camera/camera_android_camerax/lib/src/camera_state.dart b/packages/camera/camera_android_camerax/lib/src/camera_state.dart index c3dc25a46895..1e8586a4023c 100644 --- a/packages/camera/camera_android_camerax/lib/src/camera_state.dart +++ b/packages/camera/camera_android_camerax/lib/src/camera_state.dart @@ -13,6 +13,7 @@ import 'java_object.dart'; /// A snapshot of the camera state. /// /// See https://developer.android.com/reference/androidx/camera/core/CameraState. +@immutable class CameraState extends JavaObject { /// Constructs a [CameraState] that is not automatically attached to a native object. CameraState.detached( diff --git a/packages/camera/camera_android_camerax/lib/src/camera_state_error.dart b/packages/camera/camera_android_camerax/lib/src/camera_state_error.dart index 89fb0f8ac176..c0f0cad43eb2 100644 --- a/packages/camera/camera_android_camerax/lib/src/camera_state_error.dart +++ b/packages/camera/camera_android_camerax/lib/src/camera_state_error.dart @@ -13,6 +13,7 @@ import 'java_object.dart'; /// The error that a camera has encountered. /// /// See https://developer.android.com/reference/androidx/camera/core/CameraState.StateError. +@immutable class CameraStateError extends JavaObject { /// Constructs a [CameraStateError] that is not automatically attached to a native object. CameraStateError.detached( diff --git a/packages/camera/camera_android_camerax/lib/src/exposure_state.dart b/packages/camera/camera_android_camerax/lib/src/exposure_state.dart index 4599a929995e..2376a5e4f6f8 100644 --- a/packages/camera/camera_android_camerax/lib/src/exposure_state.dart +++ b/packages/camera/camera_android_camerax/lib/src/exposure_state.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/services.dart' show BinaryMessenger; +import 'package:meta/meta.dart' show immutable; import 'android_camera_camerax_flutter_api_impls.dart'; import 'camerax_library.g.dart'; @@ -12,6 +13,7 @@ import 'java_object.dart'; /// Represents exposure related information of a camera. /// /// See https://developer.android.com/reference/androidx/camera/core/ExposureState. +@immutable class ExposureState extends JavaObject { /// Constructs a [ExposureState] that is not automatically attached to a native object. ExposureState.detached( diff --git a/packages/camera/camera_android_camerax/lib/src/image_analysis.dart b/packages/camera/camera_android_camerax/lib/src/image_analysis.dart index 7ffaba72ecad..4d2a335a3c34 100644 --- a/packages/camera/camera_android_camerax/lib/src/image_analysis.dart +++ b/packages/camera/camera_android_camerax/lib/src/image_analysis.dart @@ -5,6 +5,7 @@ import 'dart:async'; import 'package:flutter/services.dart' show BinaryMessenger; +import 'package:meta/meta.dart' show immutable; import 'analyzer.dart'; import 'android_camera_camerax_flutter_api_impls.dart'; @@ -16,6 +17,7 @@ import 'use_case.dart'; /// Use case for providing CPU accessible images for performing image analysis. /// /// See https://developer.android.com/reference/androidx/camera/core/ImageAnalysis. +@immutable class ImageAnalysis extends UseCase { /// Creates an [ImageAnalysis]. ImageAnalysis( diff --git a/packages/camera/camera_android_camerax/lib/src/image_capture.dart b/packages/camera/camera_android_camerax/lib/src/image_capture.dart index 4df8f29bcc0a..f7f45d15ffbb 100644 --- a/packages/camera/camera_android_camerax/lib/src/image_capture.dart +++ b/packages/camera/camera_android_camerax/lib/src/image_capture.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/services.dart' show BinaryMessenger; +import 'package:meta/meta.dart' show immutable; import 'camerax_library.g.dart'; import 'instance_manager.dart'; @@ -12,6 +13,7 @@ import 'use_case.dart'; /// Use case for picture taking. /// /// See https://developer.android.com/reference/androidx/camera/core/ImageCapture. +@immutable class ImageCapture extends UseCase { /// Creates an [ImageCapture]. ImageCapture({ diff --git a/packages/camera/camera_android_camerax/lib/src/image_proxy.dart b/packages/camera/camera_android_camerax/lib/src/image_proxy.dart index ded09123da6e..230ece35089a 100644 --- a/packages/camera/camera_android_camerax/lib/src/image_proxy.dart +++ b/packages/camera/camera_android_camerax/lib/src/image_proxy.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:flutter/services.dart' show BinaryMessenger; -import 'package:meta/meta.dart' show protected; +import 'package:meta/meta.dart' show immutable, protected; import 'android_camera_camerax_flutter_api_impls.dart'; import 'camerax_library.g.dart'; @@ -16,6 +16,7 @@ import 'plane_proxy.dart'; /// Representation of a single complete image buffer. /// /// See https://developer.android.com/reference/androidx/camera/core/ImageProxy. +@immutable class ImageProxy extends JavaObject { /// Constructs a [ImageProxy] that is not automatically attached to a native object. ImageProxy.detached( diff --git a/packages/camera/camera_android_camerax/lib/src/live_data.dart b/packages/camera/camera_android_camerax/lib/src/live_data.dart index 2a3c846d3037..40dc5fed693b 100644 --- a/packages/camera/camera_android_camerax/lib/src/live_data.dart +++ b/packages/camera/camera_android_camerax/lib/src/live_data.dart @@ -18,6 +18,7 @@ import 'zoom_state.dart'; /// Android Activity to which this plugin is attached. /// /// See https://developer.android.com/reference/androidx/lifecycle/LiveData. +@immutable class LiveData extends JavaObject { /// Constructs a [LiveData] that is not automatically attached to a native object. LiveData.detached({this.binaryMessenger, this.instanceManager}) diff --git a/packages/camera/camera_android_camerax/lib/src/observer.dart b/packages/camera/camera_android_camerax/lib/src/observer.dart index f3b9a8fd5003..912343b44a15 100644 --- a/packages/camera/camera_android_camerax/lib/src/observer.dart +++ b/packages/camera/camera_android_camerax/lib/src/observer.dart @@ -14,6 +14,7 @@ import 'live_data.dart'; /// Callback that can receive from [LiveData]. /// /// See https://developer.android.com/reference/androidx/lifecycle/Observer. +@immutable class Observer extends JavaObject { /// Constructor for [Observer]. Observer( diff --git a/packages/camera/camera_android_camerax/lib/src/pending_recording.dart b/packages/camera/camera_android_camerax/lib/src/pending_recording.dart index 179eaf855294..971ef49390ac 100644 --- a/packages/camera/camera_android_camerax/lib/src/pending_recording.dart +++ b/packages/camera/camera_android_camerax/lib/src/pending_recording.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/services.dart' show BinaryMessenger; +import 'package:meta/meta.dart' show immutable; import 'android_camera_camerax_flutter_api_impls.dart'; import 'camerax_library.g.dart'; @@ -13,6 +14,7 @@ import 'recording.dart'; /// Dart wrapping of PendingRecording CameraX class. /// /// See https://developer.android.com/reference/androidx/camera/video/PendingRecording +@immutable class PendingRecording extends JavaObject { /// Creates a [PendingRecording] that is not automatically attached to /// a native object. diff --git a/packages/camera/camera_android_camerax/lib/src/plane_proxy.dart b/packages/camera/camera_android_camerax/lib/src/plane_proxy.dart index d5b1661b0b40..d69892e19da7 100644 --- a/packages/camera/camera_android_camerax/lib/src/plane_proxy.dart +++ b/packages/camera/camera_android_camerax/lib/src/plane_proxy.dart @@ -5,7 +5,7 @@ import 'dart:typed_data'; import 'package:flutter/services.dart' show BinaryMessenger; -import 'package:meta/meta.dart' show protected; +import 'package:meta/meta.dart' show immutable, protected; import 'android_camera_camerax_flutter_api_impls.dart'; import 'camerax_library.g.dart'; @@ -15,6 +15,7 @@ import 'java_object.dart'; /// A single color plane of image data. /// /// See https://developer.android.com/reference/androidx/camera/core/ImageProxy.PlaneProxy. +@immutable class PlaneProxy extends JavaObject { /// Constructs a [PlaneProxy] that is not automatically attached to a native object. PlaneProxy.detached( diff --git a/packages/camera/camera_android_camerax/lib/src/preview.dart b/packages/camera/camera_android_camerax/lib/src/preview.dart index c3094d714179..a5307463a58c 100644 --- a/packages/camera/camera_android_camerax/lib/src/preview.dart +++ b/packages/camera/camera_android_camerax/lib/src/preview.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/services.dart' show BinaryMessenger; +import 'package:meta/meta.dart' show immutable; import 'camerax_library.g.dart'; import 'instance_manager.dart'; @@ -12,6 +13,7 @@ import 'use_case.dart'; /// Use case that provides a camera preview stream for display. /// /// See https://developer.android.com/reference/androidx/camera/core/Preview. +@immutable class Preview extends UseCase { /// Creates a [Preview]. Preview( diff --git a/packages/camera/camera_android_camerax/lib/src/process_camera_provider.dart b/packages/camera/camera_android_camerax/lib/src/process_camera_provider.dart index 88eab07f0bed..a2f8a1634ce0 100644 --- a/packages/camera/camera_android_camerax/lib/src/process_camera_provider.dart +++ b/packages/camera/camera_android_camerax/lib/src/process_camera_provider.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable; import 'android_camera_camerax_flutter_api_impls.dart'; import 'camera.dart'; @@ -16,6 +17,7 @@ import 'use_case.dart'; /// Provides an object to manage the camera. /// /// See https://developer.android.com/reference/androidx/camera/lifecycle/ProcessCameraProvider. +@immutable class ProcessCameraProvider extends JavaObject { /// Creates a detached [ProcessCameraProvider]. ProcessCameraProvider.detached( diff --git a/packages/camera/camera_android_camerax/lib/src/recorder.dart b/packages/camera/camera_android_camerax/lib/src/recorder.dart index 016d7f776f8f..43f33e317342 100644 --- a/packages/camera/camera_android_camerax/lib/src/recorder.dart +++ b/packages/camera/camera_android_camerax/lib/src/recorder.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable; import 'android_camera_camerax_flutter_api_impls.dart'; import 'camerax_library.g.dart'; @@ -13,6 +14,7 @@ import 'pending_recording.dart'; /// A dart wrapping of the CameraX Recorder class. /// /// See https://developer.android.com/reference/androidx/camera/video/Recorder. +@immutable class Recorder extends JavaObject { /// Creates a [Recorder]. Recorder( diff --git a/packages/camera/camera_android_camerax/lib/src/recording.dart b/packages/camera/camera_android_camerax/lib/src/recording.dart index 5d7c54c37e78..ece29b3fa83f 100644 --- a/packages/camera/camera_android_camerax/lib/src/recording.dart +++ b/packages/camera/camera_android_camerax/lib/src/recording.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/services.dart' show BinaryMessenger; +import 'package:meta/meta.dart' show immutable; import 'android_camera_camerax_flutter_api_impls.dart'; import 'camerax_library.g.dart'; @@ -12,6 +13,7 @@ import 'java_object.dart'; /// Wraps a CameraX recording class. /// /// See https://developer.android.com/reference/androidx/camera/video/Recording. +@immutable class Recording extends JavaObject { /// Constructs a detached [Recording] Recording.detached( diff --git a/packages/camera/camera_android_camerax/lib/src/surface.dart b/packages/camera/camera_android_camerax/lib/src/surface.dart index 42cad38721c0..e0ca96f639e3 100644 --- a/packages/camera/camera_android_camerax/lib/src/surface.dart +++ b/packages/camera/camera_android_camerax/lib/src/surface.dart @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +import 'package:meta/meta.dart' show immutable; + import 'java_object.dart'; /// Handle onto the raw buffer managed by screen compositor. /// /// See https://developer.android.com/reference/android/view/Surface.html. +@immutable class Surface extends JavaObject { /// Creates a detached [Surface]. Surface.detached({super.binaryMessenger, super.instanceManager}) diff --git a/packages/camera/camera_android_camerax/lib/src/use_case.dart b/packages/camera/camera_android_camerax/lib/src/use_case.dart index 256caf8c01bc..bb305c91a22a 100644 --- a/packages/camera/camera_android_camerax/lib/src/use_case.dart +++ b/packages/camera/camera_android_camerax/lib/src/use_case.dart @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +import 'package:meta/meta.dart' show immutable; + import 'java_object.dart'; /// An object representing the different functionalities of the camera. /// /// See https://developer.android.com/reference/androidx/camera/core/UseCase. +@immutable class UseCase extends JavaObject { /// Creates a detached [UseCase]. UseCase.detached({super.binaryMessenger, super.instanceManager}) diff --git a/packages/camera/camera_android_camerax/lib/src/video_capture.dart b/packages/camera/camera_android_camerax/lib/src/video_capture.dart index 0c624d159ed6..bb657cffc4b4 100644 --- a/packages/camera/camera_android_camerax/lib/src/video_capture.dart +++ b/packages/camera/camera_android_camerax/lib/src/video_capture.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable; import 'android_camera_camerax_flutter_api_impls.dart'; import 'camerax_library.g.dart'; @@ -14,6 +15,7 @@ import 'use_case.dart'; /// Dart wrapping of CameraX VideoCapture class. /// /// See https://developer.android.com/reference/androidx/camera/video/VideoCapture. +@immutable class VideoCapture extends UseCase { /// Creates a VideoCapture that is not automatically attached to a native object. VideoCapture.detached( diff --git a/packages/camera/camera_android_camerax/lib/src/zoom_state.dart b/packages/camera/camera_android_camerax/lib/src/zoom_state.dart index 98068820b154..4c93d41e0249 100644 --- a/packages/camera/camera_android_camerax/lib/src/zoom_state.dart +++ b/packages/camera/camera_android_camerax/lib/src/zoom_state.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/services.dart' show BinaryMessenger; +import 'package:meta/meta.dart' show immutable; import 'android_camera_camerax_flutter_api_impls.dart'; import 'camerax_library.g.dart'; @@ -12,6 +13,7 @@ import 'java_object.dart'; /// Represents zoom related information of a camera. /// /// See https://developer.android.com/reference/androidx/camera/core/ZoomState. +@immutable class ZoomState extends JavaObject { /// Constructs a [CameraInfo] that is not automatically attached to a native object. ZoomState.detached( diff --git a/packages/camera/camera_android_camerax/pubspec.yaml b/packages/camera/camera_android_camerax/pubspec.yaml index bc629f7c81bd..3eecf7f9c608 100644 --- a/packages/camera/camera_android_camerax/pubspec.yaml +++ b/packages/camera/camera_android_camerax/pubspec.yaml @@ -2,7 +2,7 @@ name: camera_android_camerax description: Android implementation of the camera plugin using the CameraX library. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.5.0+8 +version: 0.5.0+9 environment: sdk: ">=2.19.0 <4.0.0" diff --git a/packages/camera/camera_android_camerax/test/analyzer_test.mocks.dart b/packages/camera/camera_android_camerax/test/analyzer_test.mocks.dart index a08d2796cff7..0100036f79ef 100644 --- a/packages/camera/camera_android_camerax/test/analyzer_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/analyzer_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/analyzer_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:mockito/mockito.dart' as _i1; diff --git a/packages/camera/camera_android_camerax/test/android_camera_camerax_test.mocks.dart b/packages/camera/camera_android_camerax/test/android_camera_camerax_test.mocks.dart index 6a2aa4e080a7..1d3d6363bad1 100644 --- a/packages/camera/camera_android_camerax/test/android_camera_camerax_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/android_camera_camerax_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/android_camera_camerax_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'dart:async' as _i14; import 'dart:typed_data' as _i23; @@ -205,6 +207,7 @@ class _FakeDiagnosticsNode_12 extends _i1.SmartFake /// A class which mocks [Camera]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockCamera extends _i1.Mock implements _i7.Camera { @override _i14.Future<_i2.CameraInfo> getCameraInfo() => (super.noSuchMethod( @@ -233,6 +236,7 @@ class MockCamera extends _i1.Mock implements _i7.Camera { /// A class which mocks [CameraInfo]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockCameraInfo extends _i1.Mock implements _i2.CameraInfo { @override _i14.Future getSensorRotationDegrees() => (super.noSuchMethod( @@ -357,6 +361,7 @@ class MockCameraImageData extends _i1.Mock implements _i5.CameraImageData { /// A class which mocks [CameraSelector]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockCameraSelector extends _i1.Mock implements _i17.CameraSelector { @override _i14.Future> filter(List<_i2.CameraInfo>? cameraInfos) => @@ -375,6 +380,7 @@ class MockCameraSelector extends _i1.Mock implements _i17.CameraSelector { /// A class which mocks [ExposureState]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockExposureState extends _i1.Mock implements _i4.ExposureState { @override _i6.ExposureCompensationRange get exposureCompensationRange => @@ -400,6 +406,7 @@ class MockExposureState extends _i1.Mock implements _i4.ExposureState { /// A class which mocks [ImageAnalysis]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockImageAnalysis extends _i1.Mock implements _i18.ImageAnalysis { @override _i14.Future setAnalyzer(_i19.Analyzer? analyzer) => (super.noSuchMethod( @@ -424,6 +431,7 @@ class MockImageAnalysis extends _i1.Mock implements _i18.ImageAnalysis { /// A class which mocks [ImageCapture]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockImageCapture extends _i1.Mock implements _i20.ImageCapture { @override _i14.Future setFlashMode(int? newFlashMode) => (super.noSuchMethod( @@ -448,6 +456,7 @@ class MockImageCapture extends _i1.Mock implements _i20.ImageCapture { /// A class which mocks [ImageProxy]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockImageProxy extends _i1.Mock implements _i21.ImageProxy { @override int get format => (super.noSuchMethod( @@ -492,6 +501,7 @@ class MockImageProxy extends _i1.Mock implements _i21.ImageProxy { /// A class which mocks [PlaneProxy]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockPlaneProxy extends _i1.Mock implements _i22.PlaneProxy { @override _i23.Uint8List get buffer => (super.noSuchMethod( @@ -516,6 +526,7 @@ class MockPlaneProxy extends _i1.Mock implements _i22.PlaneProxy { /// A class which mocks [Preview]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockPreview extends _i1.Mock implements _i24.Preview { @override _i14.Future setSurfaceProvider() => (super.noSuchMethod( @@ -562,6 +573,7 @@ class MockPreview extends _i1.Mock implements _i24.Preview { /// A class which mocks [ProcessCameraProvider]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockProcessCameraProvider extends _i1.Mock implements _i25.ProcessCameraProvider { @override @@ -640,6 +652,7 @@ class MockProcessCameraProvider extends _i1.Mock /// A class which mocks [Recorder]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockRecorder extends _i1.Mock implements _i10.Recorder { @override _i14.Future<_i8.PendingRecording> prepareRecording(String? path) => @@ -670,6 +683,7 @@ class MockRecorder extends _i1.Mock implements _i10.Recorder { /// A class which mocks [PendingRecording]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockPendingRecording extends _i1.Mock implements _i8.PendingRecording { @override _i14.Future<_i9.Recording> start() => (super.noSuchMethod( @@ -698,6 +712,7 @@ class MockPendingRecording extends _i1.Mock implements _i8.PendingRecording { /// A class which mocks [Recording]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockRecording extends _i1.Mock implements _i9.Recording { @override _i14.Future close() => (super.noSuchMethod( @@ -740,6 +755,7 @@ class MockRecording extends _i1.Mock implements _i9.Recording { /// A class which mocks [VideoCapture]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockVideoCapture extends _i1.Mock implements _i27.VideoCapture { @override _i14.Future<_i10.Recorder> getOutput() => (super.noSuchMethod( @@ -822,7 +838,7 @@ class MockBuildContext extends _i1.Mock implements _i11.BuildContext { ), ) as _i11.InheritedWidget); @override - void visitAncestorElements(bool Function(_i11.Element)? visitor) => + void visitAncestorElements(_i11.ConditionalElementVisitor? visitor) => super.noSuchMethod( Invocation.method( #visitAncestorElements, @@ -1015,6 +1031,7 @@ class MockTestSystemServicesHostApi extends _i1.Mock /// A class which mocks [ZoomState]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockZoomState extends _i1.Mock implements _i16.ZoomState { @override double get minZoomRatio => (super.noSuchMethod( @@ -1033,6 +1050,7 @@ class MockZoomState extends _i1.Mock implements _i16.ZoomState { /// A class which mocks [LiveData]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockLiveCameraState extends _i1.Mock implements _i3.LiveData<_i15.CameraState> { MockLiveCameraState() { @@ -1063,6 +1081,7 @@ class MockLiveCameraState extends _i1.Mock /// A class which mocks [LiveData]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockLiveZoomState extends _i1.Mock implements _i3.LiveData<_i16.ZoomState> { MockLiveZoomState() { diff --git a/packages/camera/camera_android_camerax/test/camera_info_test.mocks.dart b/packages/camera/camera_android_camerax/test/camera_info_test.mocks.dart index 62483abcc5fc..8de0b8dfc69b 100644 --- a/packages/camera/camera_android_camerax/test/camera_info_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/camera_info_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/camera_info_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'dart:async' as _i5; @@ -89,6 +91,7 @@ class MockTestInstanceManagerHostApi extends _i1.Mock /// A class which mocks [LiveData]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockLiveCameraState extends _i1.Mock implements _i3.LiveData<_i4.CameraState> { MockLiveCameraState() { @@ -119,6 +122,7 @@ class MockLiveCameraState extends _i1.Mock /// A class which mocks [LiveData]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockLiveZoomState extends _i1.Mock implements _i3.LiveData<_i7.ZoomState> { MockLiveZoomState() { diff --git a/packages/camera/camera_android_camerax/test/camera_selector_test.mocks.dart b/packages/camera/camera_android_camerax/test/camera_selector_test.mocks.dart index 3b8bc4ad0b06..ec1277537901 100644 --- a/packages/camera/camera_android_camerax/test/camera_selector_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/camera_selector_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/camera_selector_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:mockito/mockito.dart' as _i1; diff --git a/packages/camera/camera_android_camerax/test/camera_state_error_test.mocks.dart b/packages/camera/camera_android_camerax/test/camera_state_error_test.mocks.dart index 0590cd5b44d7..fe9edb7d0b17 100644 --- a/packages/camera/camera_android_camerax/test/camera_state_error_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/camera_state_error_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/camera_state_error_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:mockito/mockito.dart' as _i1; diff --git a/packages/camera/camera_android_camerax/test/camera_state_test.mocks.dart b/packages/camera/camera_android_camerax/test/camera_state_test.mocks.dart index 3431bf69b8eb..93a2e3de0ec2 100644 --- a/packages/camera/camera_android_camerax/test/camera_state_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/camera_state_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/camera_state_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:mockito/mockito.dart' as _i1; diff --git a/packages/camera/camera_android_camerax/test/camera_test.mocks.dart b/packages/camera/camera_android_camerax/test/camera_test.mocks.dart index 7f3af283f1a3..47a15aedf993 100644 --- a/packages/camera/camera_android_camerax/test/camera_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/camera_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/camera_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:mockito/mockito.dart' as _i1; diff --git a/packages/camera/camera_android_camerax/test/exposure_state_test.mocks.dart b/packages/camera/camera_android_camerax/test/exposure_state_test.mocks.dart index 24445e698061..c6c32c614ede 100644 --- a/packages/camera/camera_android_camerax/test/exposure_state_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/exposure_state_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/exposure_state_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:mockito/mockito.dart' as _i1; diff --git a/packages/camera/camera_android_camerax/test/image_analysis_test.mocks.dart b/packages/camera/camera_android_camerax/test/image_analysis_test.mocks.dart index 421d9908c3a8..cbece720c1c2 100644 --- a/packages/camera/camera_android_camerax/test/image_analysis_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/image_analysis_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/image_analysis_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:camera_android_camerax/src/camerax_library.g.dart' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/packages/camera/camera_android_camerax/test/image_proxy_test.mocks.dart b/packages/camera/camera_android_camerax/test/image_proxy_test.mocks.dart index 175d917e68d3..cc9700c815dd 100644 --- a/packages/camera/camera_android_camerax/test/image_proxy_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/image_proxy_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/image_proxy_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:mockito/mockito.dart' as _i1; diff --git a/packages/camera/camera_android_camerax/test/live_data_test.mocks.dart b/packages/camera/camera_android_camerax/test/live_data_test.mocks.dart index 01779862a3c6..9ec79e910e24 100644 --- a/packages/camera/camera_android_camerax/test/live_data_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/live_data_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/live_data_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:camera_android_camerax/src/camerax_library.g.dart' as _i3; import 'package:mockito/mockito.dart' as _i1; diff --git a/packages/camera/camera_android_camerax/test/observer_test.mocks.dart b/packages/camera/camera_android_camerax/test/observer_test.mocks.dart index 9880bde0ae9a..56a2bf600d4c 100644 --- a/packages/camera/camera_android_camerax/test/observer_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/observer_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/observer_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:mockito/mockito.dart' as _i1; diff --git a/packages/camera/camera_android_camerax/test/pending_recording_test.mocks.dart b/packages/camera/camera_android_camerax/test/pending_recording_test.mocks.dart index 95c3ad771152..6b706ae24485 100644 --- a/packages/camera/camera_android_camerax/test/pending_recording_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/pending_recording_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/pending_recording_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'dart:async' as _i4; @@ -62,6 +64,7 @@ class MockTestInstanceManagerHostApi extends _i1.Mock /// A class which mocks [Recording]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockRecording extends _i1.Mock implements _i3.Recording { MockRecording() { _i1.throwOnMissingStub(this); diff --git a/packages/camera/camera_android_camerax/test/plane_proxy_test.mocks.dart b/packages/camera/camera_android_camerax/test/plane_proxy_test.mocks.dart index cd378700d83c..b1ff04cc880a 100644 --- a/packages/camera/camera_android_camerax/test/plane_proxy_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/plane_proxy_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/plane_proxy_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:mockito/mockito.dart' as _i1; diff --git a/packages/camera/camera_android_camerax/test/preview_test.mocks.dart b/packages/camera/camera_android_camerax/test/preview_test.mocks.dart index 467f4dc2978d..ae3783641cec 100644 --- a/packages/camera/camera_android_camerax/test/preview_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/preview_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/preview_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:camera_android_camerax/src/camerax_library.g.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; diff --git a/packages/camera/camera_android_camerax/test/process_camera_provider_test.mocks.dart b/packages/camera/camera_android_camerax/test/process_camera_provider_test.mocks.dart index 62d3de7cbfd2..194ad0008fba 100644 --- a/packages/camera/camera_android_camerax/test/process_camera_provider_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/process_camera_provider_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/process_camera_provider_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'dart:async' as _i3; diff --git a/packages/camera/camera_android_camerax/test/recorder_test.mocks.dart b/packages/camera/camera_android_camerax/test/recorder_test.mocks.dart index 10c709a057dc..b563ba1bb784 100644 --- a/packages/camera/camera_android_camerax/test/recorder_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/recorder_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/recorder_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'dart:async' as _i5; @@ -113,6 +115,7 @@ class MockTestInstanceManagerHostApi extends _i1.Mock /// A class which mocks [PendingRecording]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockPendingRecording extends _i1.Mock implements _i4.PendingRecording { MockPendingRecording() { _i1.throwOnMissingStub(this); diff --git a/packages/camera/camera_android_camerax/test/recording_test.mocks.dart b/packages/camera/camera_android_camerax/test/recording_test.mocks.dart index 0334ae2833d0..91362b6bcde8 100644 --- a/packages/camera/camera_android_camerax/test/recording_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/recording_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/recording_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:mockito/mockito.dart' as _i1; diff --git a/packages/camera/camera_android_camerax/test/system_services_test.mocks.dart b/packages/camera/camera_android_camerax/test/system_services_test.mocks.dart index f268a350bb38..4955031de913 100644 --- a/packages/camera/camera_android_camerax/test/system_services_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/system_services_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/system_services_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'dart:async' as _i3; diff --git a/packages/camera/camera_android_camerax/test/video_capture_test.mocks.dart b/packages/camera/camera_android_camerax/test/video_capture_test.mocks.dart index a8740b3d1a40..0a1034a62f90 100644 --- a/packages/camera/camera_android_camerax/test/video_capture_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/video_capture_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/video_capture_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'dart:async' as _i5; @@ -82,6 +84,7 @@ class MockTestInstanceManagerHostApi extends _i1.Mock /// A class which mocks [Recorder]. /// /// See the documentation for Mockito's code generation for more information. +// ignore: must_be_immutable class MockRecorder extends _i1.Mock implements _i4.Recorder { MockRecorder() { _i1.throwOnMissingStub(this); diff --git a/packages/camera/camera_android_camerax/test/zoom_state_test.mocks.dart b/packages/camera/camera_android_camerax/test/zoom_state_test.mocks.dart index cb52f890e53b..b904ec4d8231 100644 --- a/packages/camera/camera_android_camerax/test/zoom_state_test.mocks.dart +++ b/packages/camera/camera_android_camerax/test/zoom_state_test.mocks.dart @@ -1,7 +1,9 @@ -// Mocks generated by Mockito 5.4.0 from annotations +// Mocks generated by Mockito 5.4.1 from annotations // in camera_android_camerax/test/zoom_state_test.dart. // Do not manually edit this file. +// @dart=2.19 + // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:mockito/mockito.dart' as _i1;