Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Made device orientation mandatory for locking capture orientation in …
…the platform interface.
  • Loading branch information
BeMacized committed Jan 5, 2021
commit 859076fb76bd1a9820a6be38d1a0671de283ee10
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ class MethodChannelCamera extends CameraPlatform {
}

@override
Future<void> lockCaptureOrientation(int cameraId,
[DeviceOrientation orientation]) async {
Future<void> lockCaptureOrientation(
int cameraId, DeviceOrientation orientation) async {
await _channel.invokeMethod<String>(
'lockCaptureOrientation',
<String, dynamic>{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,8 @@ abstract class CameraPlatform extends PlatformInterface {
}

/// Locks the capture orientation.
///
/// If [orientation] is omitted, the current device orientation is used.
Future<void> lockCaptureOrientation(int cameraId,
[DeviceOrientation orientation]) {
Future<void> lockCaptureOrientation(
int cameraId, DeviceOrientation orientation) {
throw UnimplementedError('lockCaptureOrientation() is not implemented.');
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ CameraLensDirection parseCameraLensDirection(String string) {

/// Returns the device orientation as a String.
String serializeDeviceOrientation(DeviceOrientation orientation) {
if (orientation == null) return null;
switch (orientation) {
case DeviceOrientation.portraitUp:
return 'portraitUp';
Expand All @@ -33,7 +32,6 @@ String serializeDeviceOrientation(DeviceOrientation orientation) {

/// Returns the device orientation for a given String.
DeviceOrientation deserializeDeviceOrientation(String str) {
if (str == null) return null;
switch (str) {
case "portraitUp":
return DeviceOrientation.portraitUp;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void main() {

// Act & Assert
expect(
() => cameraPlatform.lockCaptureOrientation(1),
() => cameraPlatform.lockCaptureOrientation(1, null),
throwsUnimplementedError,
);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -803,14 +803,11 @@ void main() {
);

// Act
await camera.lockCaptureOrientation(cameraId);
await camera.lockCaptureOrientation(
cameraId, DeviceOrientation.portraitUp);

// Assert
expect(channel.log, <Matcher>[
isMethodCall('lockCaptureOrientation',
arguments: {'cameraId': cameraId, 'orientation': null}),
isMethodCall('lockCaptureOrientation',
arguments: {'cameraId': cameraId, 'orientation': 'portraitUp'}),
]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ void main() {
});

test("serializeDeviceOrientation() should serialize correctly", () {
expect(serializeDeviceOrientation(null), null);
expect(serializeDeviceOrientation(DeviceOrientation.portraitUp),
"portraitUp");
expect(serializeDeviceOrientation(DeviceOrientation.portraitDown),
Expand All @@ -44,7 +43,6 @@ void main() {
});

test("deserializeDeviceOrientation() should deserialize correctly", () {
expect(deserializeDeviceOrientation(null), null);
expect(deserializeDeviceOrientation('portraitUp'),
DeviceOrientation.portraitUp);
expect(deserializeDeviceOrientation('portraitDown'),
Expand Down