Skip to content

Added 6.1 and 6.5 inch screen sizes #89

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

Open
revolter wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added 6.1 and 6.5 inch screen sizes #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e1a5bf
Fixed code style
revolter Sep 14, 2018
b4930d0
Added 6Dot1inch and 6Dot5inch Screen enum values
revolter Sep 14, 2018
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
6 changes: 4 additions & 2 deletions SDVersion/SDiOSVersion/SDiOSVersion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
typedef NS_ENUM(NSInteger, DeviceVersion){
UnknownDevice = 0,
Simulator = 1,
iPhone4 = 3,
iPhone4S = 4,
iPhone5 = 5,
Expand Down Expand Up @@ -57,7 +57,9 @@ typedef NS_ENUM(NSInteger, DeviceSize){
Screen4inch = 2,
Screen4Dot7inch = 3,
Screen5Dot5inch = 4,
Screen5Dot8inch = 5
Screen5Dot8inch = 5,
Screen6Dot1inch = 6,
Screen6Dot5inch = 7
};

@interface SDiOSVersion : NSObject
Expand Down
13 changes: 11 additions & 2 deletions SDVersion/SDiOSVersion/SDiOSVersion.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,15 @@ + (DeviceVersion)deviceVersion

+ (DeviceSize)resolutionSize
{
UIScreen *screen = [UIScreen mainScreen];
CGSize screenSize = screen.bounds.size;
CGFloat screenScale = screen.scale;
CGFloat screenHeight = 0;

if ([SDiOSVersion versionGreaterThanOrEqualTo:@"8"]) {
screenHeight = MAX([[UIScreen mainScreen] bounds].size.height, [[UIScreen mainScreen] bounds].size.width);
screenHeight = MAX(screenSize.height, screenSize.width);
} else {
screenHeight = [[UIScreen mainScreen] bounds].size.height;
screenHeight = screenSize.height;
}

if (screenHeight == 480) {
Expand All @@ -134,6 +137,10 @@ + (DeviceSize)resolutionSize
return Screen5Dot5inch;
} else if (screenHeight == 812) {
return Screen5Dot8inch;
} else if (screenHeight == 896 && screenScale == 2) {
return Screen6Dot1inch;
} else if (screenHeight == 896 && screenScale == 3) {
return Screen6Dot5inch;
} else
return UnknownSize;
}
Expand All @@ -160,6 +167,8 @@ + (NSString *)deviceSizeName:(DeviceSize)deviceSize
@(Screen4Dot7inch) : @"4.7 inch",
@(Screen5Dot5inch) : @"5.5 inch",
@(Screen5Dot8inch) : @"5.8 inch",
@(Screen6Dot1inch) : @"6.1 inch",
@(Screen6Dot5inch) : @"6.5 inch"
}[@(deviceSize)];
}

Expand Down