Skip to content

Commit 7dff4f1

Browse files
authored
[camera_avfoundation] 🐛 Fix inverted orientation strings (flutter#5261)
- Fixes flutter#117981 - Fixes flutter#101878 Tests are also updated correspondingly.
1 parent 64dbd3a commit 7dff4f1

File tree

5 files changed

+15
-11
lines changed

5 files changed

+15
-11
lines changed

packages/camera/camera_avfoundation/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.9.13+7
2+
3+
* Fixes inverted orientation strings.
4+
15
## 0.9.13+6
26

37
* Fixes incorrect use of `NSError` that could cause crashes on launch.

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraOrientationTests.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ - (void)testOrientationNotifications {
2828
expectedChannelOrientation:@"portraitUp"
2929
cameraPlugin:cameraPlugin
3030
messenger:mockMessenger];
31-
[self rotate:UIDeviceOrientationLandscapeRight
31+
[self rotate:UIDeviceOrientationLandscapeLeft
3232
expectedChannelOrientation:@"landscapeLeft"
3333
cameraPlugin:cameraPlugin
3434
messenger:mockMessenger];
35-
[self rotate:UIDeviceOrientationLandscapeLeft
35+
[self rotate:UIDeviceOrientationLandscapeRight
3636
expectedChannelOrientation:@"landscapeRight"
3737
cameraPlugin:cameraPlugin
3838
messenger:mockMessenger];

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraPropertiesTests.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ - (void)testFLTGetVideoFormatFromString {
8484
- (void)testFLTGetUIDeviceOrientationForString {
8585
XCTAssertEqual(UIDeviceOrientationPortraitUpsideDown,
8686
FLTGetUIDeviceOrientationForString(@"portraitDown"));
87-
XCTAssertEqual(UIDeviceOrientationLandscapeRight,
88-
FLTGetUIDeviceOrientationForString(@"landscapeLeft"));
8987
XCTAssertEqual(UIDeviceOrientationLandscapeLeft,
88+
FLTGetUIDeviceOrientationForString(@"landscapeLeft"));
89+
XCTAssertEqual(UIDeviceOrientationLandscapeRight,
9090
FLTGetUIDeviceOrientationForString(@"landscapeRight"));
9191
XCTAssertEqual(UIDeviceOrientationPortrait, FLTGetUIDeviceOrientationForString(@"portraitUp"));
9292
XCTAssertEqual(UIDeviceOrientationUnknown, FLTGetUIDeviceOrientationForString(@"unknown"));
@@ -96,9 +96,9 @@ - (void)testFLTGetStringForUIDeviceOrientation {
9696
XCTAssertEqualObjects(@"portraitDown",
9797
FLTGetStringForUIDeviceOrientation(UIDeviceOrientationPortraitUpsideDown));
9898
XCTAssertEqualObjects(@"landscapeLeft",
99-
FLTGetStringForUIDeviceOrientation(UIDeviceOrientationLandscapeRight));
100-
XCTAssertEqualObjects(@"landscapeRight",
10199
FLTGetStringForUIDeviceOrientation(UIDeviceOrientationLandscapeLeft));
100+
XCTAssertEqualObjects(@"landscapeRight",
101+
FLTGetStringForUIDeviceOrientation(UIDeviceOrientationLandscapeRight));
102102
XCTAssertEqualObjects(@"portraitUp",
103103
FLTGetStringForUIDeviceOrientation(UIDeviceOrientationPortrait));
104104
XCTAssertEqualObjects(@"portraitUp", FLTGetStringForUIDeviceOrientation(-1));

packages/camera/camera_avfoundation/ios/Classes/CameraProperties.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ UIDeviceOrientation FLTGetUIDeviceOrientationForString(NSString *orientation) {
9090
if ([orientation isEqualToString:@"portraitDown"]) {
9191
return UIDeviceOrientationPortraitUpsideDown;
9292
} else if ([orientation isEqualToString:@"landscapeLeft"]) {
93-
return UIDeviceOrientationLandscapeRight;
94-
} else if ([orientation isEqualToString:@"landscapeRight"]) {
9593
return UIDeviceOrientationLandscapeLeft;
94+
} else if ([orientation isEqualToString:@"landscapeRight"]) {
95+
return UIDeviceOrientationLandscapeRight;
9696
} else if ([orientation isEqualToString:@"portraitUp"]) {
9797
return UIDeviceOrientationPortrait;
9898
} else {
@@ -104,9 +104,9 @@ UIDeviceOrientation FLTGetUIDeviceOrientationForString(NSString *orientation) {
104104
switch (orientation) {
105105
case UIDeviceOrientationPortraitUpsideDown:
106106
return @"portraitDown";
107-
case UIDeviceOrientationLandscapeRight:
108-
return @"landscapeLeft";
109107
case UIDeviceOrientationLandscapeLeft:
108+
return @"landscapeLeft";
109+
case UIDeviceOrientationLandscapeRight:
110110
return @"landscapeRight";
111111
case UIDeviceOrientationPortrait:
112112
default:

packages/camera/camera_avfoundation/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: camera_avfoundation
22
description: iOS implementation of the camera plugin.
33
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_avfoundation
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
5-
version: 0.9.13+6
5+
version: 0.9.13+7
66

77
environment:
88
sdk: ">=2.19.0 <4.0.0"

0 commit comments

Comments
 (0)