diff --git a/packages/camera/camera_platform_interface/lib/src/types/focus_mode.dart b/packages/camera/camera_platform_interface/lib/src/types/focus_mode.dart index 8da2a90fa858..99dcf67d1246 100644 --- a/packages/camera/camera_platform_interface/lib/src/types/focus_mode.dart +++ b/packages/camera/camera_platform_interface/lib/src/types/focus_mode.dart @@ -4,18 +4,18 @@ /// The possible focus modes that can be set for a camera. enum FocusMode { - /// Automatically determine focus settings. - auto, + /// Continuously automatically adjust the focus settings. + continuous, - /// Lock the currently determined focus settings. - locked, + /// Automatically determine the focus settings once upon setting this mode or the focus point. + auto, } /// Returns the focus mode as a String. String serializeFocusMode(FocusMode focusMode) { switch (focusMode) { - case FocusMode.locked: - return 'locked'; + case FocusMode.continuous: + return 'continuous'; case FocusMode.auto: return 'auto'; default: @@ -26,8 +26,8 @@ String serializeFocusMode(FocusMode focusMode) { /// Returns the focus mode for a given String. FocusMode deserializeFocusMode(String str) { switch (str) { - case "locked": - return FocusMode.locked; + case "continuous": + return FocusMode.continuous; case "auto": return FocusMode.auto; default: diff --git a/packages/camera/camera_platform_interface/test/events/camera_event_test.dart b/packages/camera/camera_platform_interface/test/events/camera_event_test.dart index e68446e135f0..76e5bd59e4e0 100644 --- a/packages/camera/camera_platform_interface/test/events/camera_event_test.dart +++ b/packages/camera/camera_platform_interface/test/events/camera_event_test.dart @@ -13,13 +13,13 @@ void main() { group('CameraInitializedEvent tests', () { test('Constructor should initialize all properties', () { final event = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.auto, true, true); + 1, 1024, 640, ExposureMode.auto, FocusMode.continuous, true, true); expect(event.cameraId, 1); expect(event.previewWidth, 1024); expect(event.previewHeight, 640); expect(event.exposureMode, ExposureMode.auto); - expect(event.focusMode, FocusMode.auto); + expect(event.focusMode, FocusMode.continuous); expect(event.exposurePointSupported, true); expect(event.focusPointSupported, true); }); @@ -30,7 +30,7 @@ void main() { 'previewWidth': 1024.0, 'previewHeight': 640.0, 'exposureMode': 'auto', - 'focusMode': 'auto', + 'focusMode': 'continuous', 'exposurePointSupported': true, 'focusPointSupported': true }); @@ -39,14 +39,14 @@ void main() { expect(event.previewWidth, 1024); expect(event.previewHeight, 640); expect(event.exposureMode, ExposureMode.auto); - expect(event.focusMode, FocusMode.auto); + expect(event.focusMode, FocusMode.continuous); expect(event.exposurePointSupported, true); expect(event.focusPointSupported, true); }); test('toJson should return a map with all fields', () { final event = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.auto, true, true); + 1, 1024, 640, ExposureMode.auto, FocusMode.continuous, true, true); final jsonMap = event.toJson(); @@ -55,52 +55,52 @@ void main() { expect(jsonMap['previewWidth'], 1024); expect(jsonMap['previewHeight'], 640); expect(jsonMap['exposureMode'], 'auto'); - expect(jsonMap['focusMode'], 'auto'); + expect(jsonMap['focusMode'], 'continuous'); expect(jsonMap['exposurePointSupported'], true); expect(jsonMap['focusPointSupported'], true); }); test('equals should return true if objects are the same', () { final firstEvent = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.auto, true, true); + 1, 1024, 640, ExposureMode.auto, FocusMode.continuous, true, true); final secondEvent = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.auto, true, true); + 1, 1024, 640, ExposureMode.auto, FocusMode.continuous, true, true); expect(firstEvent == secondEvent, true); }); test('equals should return false if cameraId is different', () { final firstEvent = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.auto, true, true); + 1, 1024, 640, ExposureMode.auto, FocusMode.continuous, true, true); final secondEvent = CameraInitializedEvent( - 2, 1024, 640, ExposureMode.auto, FocusMode.auto, true, true); + 2, 1024, 640, ExposureMode.auto, FocusMode.continuous, true, true); expect(firstEvent == secondEvent, false); }); test('equals should return false if previewWidth is different', () { final firstEvent = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.auto, true, true); + 1, 1024, 640, ExposureMode.auto, FocusMode.continuous, true, true); final secondEvent = CameraInitializedEvent( - 1, 2048, 640, ExposureMode.auto, FocusMode.auto, true, true); + 1, 2048, 640, ExposureMode.auto, FocusMode.continuous, true, true); expect(firstEvent == secondEvent, false); }); test('equals should return false if previewHeight is different', () { final firstEvent = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.auto, true, true); + 1, 1024, 640, ExposureMode.auto, FocusMode.continuous, true, true); final secondEvent = CameraInitializedEvent( - 1, 1024, 980, ExposureMode.auto, FocusMode.auto, true, true); + 1, 1024, 980, ExposureMode.auto, FocusMode.continuous, true, true); expect(firstEvent == secondEvent, false); }); test('equals should return false if exposureMode is different', () { final firstEvent = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.auto, true, true); + 1, 1024, 640, ExposureMode.auto, FocusMode.continuous, true, true); final secondEvent = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.locked, FocusMode.auto, true, true); + 1, 1024, 640, ExposureMode.locked, FocusMode.continuous, true, true); expect(firstEvent == secondEvent, false); }); @@ -108,34 +108,34 @@ void main() { test('equals should return false if exposurePointSupported is different', () { final firstEvent = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.auto, true, true); + 1, 1024, 640, ExposureMode.auto, FocusMode.continuous, true, true); final secondEvent = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.auto, false, true); + 1, 1024, 640, ExposureMode.auto, FocusMode.continuous, false, true); expect(firstEvent == secondEvent, false); }); test('equals should return false if focusMode is different', () { final firstEvent = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.auto, true, true); + 1, 1024, 640, ExposureMode.auto, FocusMode.continuous, true, true); final secondEvent = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.locked, true, true); + 1, 1024, 640, ExposureMode.auto, FocusMode.auto, true, true); expect(firstEvent == secondEvent, false); }); test('equals should return false if focusPointSupported is different', () { final firstEvent = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.auto, true, true); + 1, 1024, 640, ExposureMode.auto, FocusMode.continuous, true, true); final secondEvent = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.auto, true, false); + 1, 1024, 640, ExposureMode.auto, FocusMode.continuous, true, false); expect(firstEvent == secondEvent, false); }); test('hashCode should match hashCode of all properties', () { final event = CameraInitializedEvent( - 1, 1024, 640, ExposureMode.auto, FocusMode.auto, true, true); + 1, 1024, 640, ExposureMode.auto, FocusMode.continuous, true, true); final expectedHashCode = event.cameraId.hashCode ^ event.previewWidth.hashCode ^ event.previewHeight.hashCode ^ diff --git a/packages/camera/camera_platform_interface/test/method_channel/method_channel_camera_test.dart b/packages/camera/camera_platform_interface/test/method_channel/method_channel_camera_test.dart index c271dc01f6ae..338b9cd606ab 100644 --- a/packages/camera/camera_platform_interface/test/method_channel/method_channel_camera_test.dart +++ b/packages/camera/camera_platform_interface/test/method_channel/method_channel_camera_test.dart @@ -125,7 +125,7 @@ void main() { 1920, 1080, ExposureMode.auto, - FocusMode.auto, + FocusMode.continuous, true, true, )); @@ -165,7 +165,7 @@ void main() { 1920, 1080, ExposureMode.auto, - FocusMode.auto, + FocusMode.continuous, true, true, )); @@ -209,7 +209,7 @@ void main() { 1920, 1080, ExposureMode.auto, - FocusMode.auto, + FocusMode.continuous, true, true, )); @@ -228,7 +228,7 @@ void main() { 3840, 2160, ExposureMode.auto, - FocusMode.auto, + FocusMode.continuous, true, true, ); @@ -341,7 +341,7 @@ void main() { 1920, 1080, ExposureMode.auto, - FocusMode.auto, + FocusMode.continuous, true, true, ), @@ -669,15 +669,15 @@ void main() { ); // Act + await camera.setFocusMode(cameraId, FocusMode.continuous); await camera.setFocusMode(cameraId, FocusMode.auto); - await camera.setFocusMode(cameraId, FocusMode.locked); // Assert expect(channel.log, [ isMethodCall('setFocusMode', - arguments: {'cameraId': cameraId, 'mode': 'auto'}), + arguments: {'cameraId': cameraId, 'mode': 'continuous'}), isMethodCall('setFocusMode', - arguments: {'cameraId': cameraId, 'mode': 'locked'}), + arguments: {'cameraId': cameraId, 'mode': 'auto'}), ]); }); diff --git a/packages/camera/camera_platform_interface/test/types/focus_mode_test.dart b/packages/camera/camera_platform_interface/test/types/focus_mode_test.dart index ca7ad902820a..e2df3d1c2e3a 100644 --- a/packages/camera/camera_platform_interface/test/types/focus_mode_test.dart +++ b/packages/camera/camera_platform_interface/test/types/focus_mode_test.dart @@ -15,17 +15,17 @@ void main() { test("FocusMode enum should have items in correct index", () { final values = FocusMode.values; - expect(values[0], FocusMode.auto); - expect(values[1], FocusMode.locked); + expect(values[0], FocusMode.continuous); + expect(values[1], FocusMode.auto); }); test("serializeFocusMode() should serialize correctly", () { + expect(serializeFocusMode(FocusMode.continuous), "continuous"); expect(serializeFocusMode(FocusMode.auto), "auto"); - expect(serializeFocusMode(FocusMode.locked), "locked"); }); test("deserializeFocusMode() should deserialize correctly", () { + expect(deserializeFocusMode('continuous'), FocusMode.continuous); expect(deserializeFocusMode('auto'), FocusMode.auto); - expect(deserializeFocusMode('locked'), FocusMode.locked); }); }