Skip to content

Commit a1a412e

Browse files
committed
Remove camera app-facing package changes
The app-facing camera package should be submitted as a separate follow-up PR after the implementation packages are published. This removes the dependency_overrides that were blocking merge.
1 parent 9908720 commit a1a412e

6 files changed

Lines changed: 5 additions & 120 deletions

File tree

packages/camera/camera/CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
## 0.12.1
1+
## NEXT
22

3-
* Adds `setJpegImageQuality` for controlling JPEG compression quality.
43
* Updates minimum supported SDK version to Flutter 3.38/Dart 3.10.
54

65
## 0.12.0+1

packages/camera/camera/example/pubspec.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,3 @@ dev_dependencies:
3131

3232
flutter:
3333
uses-material-design: true
34-
# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
35-
# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins
36-
dependency_overrides:
37-
camera_android_camerax: {path: ../../../../packages/camera/camera_android_camerax}
38-
camera_avfoundation: {path: ../../../../packages/camera/camera_avfoundation}

packages/camera/camera/lib/src/camera_controller.dart

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -994,24 +994,6 @@ class CameraController extends ValueNotifier<CameraValue> {
994994
}
995995
}
996996

997-
/// Sets the JPEG compression quality for still image capture.
998-
///
999-
/// The [quality] must be between 1 (lowest) and 100 (highest).
1000-
Future<void> setJpegImageQuality(int quality) async {
1001-
if (quality < 1 || quality > 100) {
1002-
throw ArgumentError.value(
1003-
quality,
1004-
'quality',
1005-
'Must be between 1 and 100.',
1006-
);
1007-
}
1008-
try {
1009-
await CameraPlatform.instance.setJpegImageQuality(_cameraId, quality);
1010-
} on PlatformException catch (e) {
1011-
throw CameraException(e.code, e.message);
1012-
}
1013-
}
1014-
1015997
/// Check whether the camera platform supports image streaming.
1016998
bool supportsImageStreaming() =>
1017999
CameraPlatform.instance.supportsImageStreaming();

packages/camera/camera/pubspec.yaml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
44
Dart.
55
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera
66
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
7-
version: 0.12.1
7+
version: 0.12.0+1
88

99
environment:
1010
sdk: ^3.10.0
@@ -21,9 +21,9 @@ flutter:
2121
default_package: camera_web
2222

2323
dependencies:
24-
camera_android_camerax: ^0.7.1
25-
camera_avfoundation: ^0.10.1
26-
camera_platform_interface: ^2.13.0
24+
camera_android_camerax: ^0.7.0
25+
camera_avfoundation: ^0.10.0
26+
camera_platform_interface: ^2.12.0
2727
camera_web: ^0.3.3
2828
flutter:
2929
sdk: flutter
@@ -38,8 +38,3 @@ dev_dependencies:
3838

3939
topics:
4040
- camera
41-
# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
42-
# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins
43-
dependency_overrides:
44-
camera_android_camerax: {path: ../../../packages/camera/camera_android_camerax}
45-
camera_avfoundation: {path: ../../../packages/camera/camera_avfoundation}

packages/camera/camera/test/camera_preview_test.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,6 @@ class FakeController extends ValueNotifier<CameraValue>
149149
Future<Iterable<VideoStabilizationMode>>
150150
getSupportedVideoStabilizationModes() async => <VideoStabilizationMode>[];
151151

152-
@override
153-
Future<void> setJpegImageQuality(int quality) async {}
154-
155152
@override
156153
bool supportsImageStreaming() => true;
157154
}

packages/camera/camera/test/camera_test.dart

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -885,83 +885,6 @@ void main() {
885885
},
886886
);
887887

888-
test('setJpegImageQuality() calls CameraPlatform', () async {
889-
final cameraController = CameraController(
890-
const CameraDescription(
891-
name: 'cam',
892-
lensDirection: CameraLensDirection.back,
893-
sensorOrientation: 90,
894-
),
895-
ResolutionPreset.max,
896-
);
897-
await cameraController.initialize();
898-
899-
await cameraController.setJpegImageQuality(50);
900-
901-
verify(
902-
CameraPlatform.instance.setJpegImageQuality(cameraController.cameraId, 50),
903-
).called(1);
904-
});
905-
906-
test(
907-
'setJpegImageQuality() throws CameraException on PlatformException',
908-
() async {
909-
final cameraController = CameraController(
910-
const CameraDescription(
911-
name: 'cam',
912-
lensDirection: CameraLensDirection.back,
913-
sensorOrientation: 90,
914-
),
915-
ResolutionPreset.max,
916-
);
917-
await cameraController.initialize();
918-
919-
when(
920-
CameraPlatform.instance.setJpegImageQuality(
921-
cameraController.cameraId,
922-
50,
923-
),
924-
).thenThrow(
925-
PlatformException(
926-
code: 'TEST_ERROR',
927-
message: 'This is a test error message',
928-
),
929-
);
930-
931-
expect(
932-
cameraController.setJpegImageQuality(50),
933-
throwsA(
934-
isA<CameraException>().having(
935-
(CameraException error) => error.description,
936-
'TEST_ERROR',
937-
'This is a test error message',
938-
),
939-
),
940-
);
941-
},
942-
);
943-
944-
test('setJpegImageQuality() throws ArgumentError for invalid values', () async {
945-
final cameraController = CameraController(
946-
const CameraDescription(
947-
name: 'cam',
948-
lensDirection: CameraLensDirection.back,
949-
sensorOrientation: 90,
950-
),
951-
ResolutionPreset.max,
952-
);
953-
await cameraController.initialize();
954-
955-
expect(
956-
() => cameraController.setJpegImageQuality(0),
957-
throwsA(isA<ArgumentError>()),
958-
);
959-
expect(
960-
() => cameraController.setJpegImageQuality(101),
961-
throwsA(isA<ArgumentError>()),
962-
);
963-
});
964-
965888
test('setExposureMode() calls $CameraPlatform', () async {
966889
final cameraController = CameraController(
967890
const CameraDescription(
@@ -4229,12 +4152,6 @@ class MockCameraPlatform extends Mock
42294152
) async => super.noSuchMethod(
42304153
Invocation.method(#setVideoStabilizationMode, <Object?>[cameraId, mode]),
42314154
);
4232-
4233-
@override
4234-
Future<void> setJpegImageQuality(int? cameraId, int? quality) async =>
4235-
super.noSuchMethod(
4236-
Invocation.method(#setJpegImageQuality, <Object?>[cameraId, quality]),
4237-
);
42384155
}
42394156

42404157
class MockCameraDescription extends CameraDescription {

0 commit comments

Comments
 (0)