Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make adjusting screenshot coordinate configurable - screenshotOrientation settings api #277

Merged
merged 10 commits into from
Jan 31, 2020
Merged

fix: make adjusting screenshot coordinate configurable - screenshotOrientation settings api #277

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2ad9289
fix: make adjusting screenshot coordinate configurable
KazuCocoa Jan 26, 2020
8e1d1a0
Rename
KazuCocoa Jan 29, 2020
84bf3ff
fix compile error
KazuCocoa Jan 29, 2020
8d033b2
rename, change the default value
KazuCocoa Jan 29, 2020
0a3c626
set an arbitrary orientation
KazuCocoa Jan 30, 2020
e77a936
Use UIInterfaceOrientation
KazuCocoa Jan 30, 2020
b78445a
tweak docstring, add screenshotOrientationForUser to return readable …
KazuCocoa Jan 30, 2020
9440004
Add error response
KazuCocoa Jan 31, 2020
963b3ab
use switch for UIInterfaceOrientation
KazuCocoa Jan 31, 2020
7edcaaa
Tweak messages
KazuCocoa Jan 31, 2020
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
20 changes: 11 additions & 9 deletions WebDriverAgentLib/Utilities/FBConfiguration.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,16 +377,18 @@ + (NSInteger)screenshotOrientation

+ (NSString *)humanReadableScreenshotOrientation
{
if (FBScreenshotOrientation == UIInterfaceOrientationPortrait) {
return @"portrait";
} else if (FBScreenshotOrientation == UIInterfaceOrientationPortraitUpsideDown) {
return @"portraitUpsideDown";
} else if (FBScreenshotOrientation == UIInterfaceOrientationLandscapeRight) {
return @"landscapeRight";
} else if (FBScreenshotOrientation == UIInterfaceOrientationLandscapeLeft) {
return @"landscapeLeft";
switch (FBScreenshotOrientation) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

case UIInterfaceOrientationPortrait:
return @"portrait";
case UIInterfaceOrientationPortraitUpsideDown:
return @"portraitUpsideDown";
case UIInterfaceOrientationLandscapeRight:
return @"landscapeRight";
case UIInterfaceOrientationLandscapeLeft:
return @"landscapeLeft";
case UIInterfaceOrientationUnknown:
return @"auto";
}
return @"auto";
}
#endif

Expand Down
21 changes: 13 additions & 8 deletions WebDriverAgentLib/Utilities/FBImageUtils.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,19 @@ BOOL FBIsPngImage(NSData *imageData)
return (NSData *)UIImagePNGRepresentation(image);
}
} else {
if (FBConfiguration.screenshotOrientation == UIInterfaceOrientationPortraitUpsideDown) {
imageOrientation = UIImageOrientationDown;
} else if (FBConfiguration.screenshotOrientation == UIInterfaceOrientationLandscapeRight) {
imageOrientation = UIImageOrientationLeft;
} else if (FBConfiguration.screenshotOrientation == UIInterfaceOrientationLandscapeLeft) {
imageOrientation = UIImageOrientationRight;
} else {
imageOrientation = UIImageOrientationUp;
switch (FBConfiguration.screenshotOrientation) {
case UIInterfaceOrientationPortraitUpsideDown:
imageOrientation = UIImageOrientationDown;
break;
case UIInterfaceOrientationLandscapeRight:
imageOrientation = UIImageOrientationLeft;
break;
case UIInterfaceOrientationLandscapeLeft:
imageOrientation = UIImageOrientationRight;
break;
default:
imageOrientation = UIImageOrientationUp;
break;
}
}

Expand Down