From 2e1a5bf717a4c174122c612cb262fe86ad813f35 Mon Sep 17 00:00:00 2001
From: Iulian Onofrei <iulian.onofrei@yahoo.com>
Date: Fri, 14 Sep 2018 12:07:34 +0300
Subject: [PATCH 1/2] Fixed code style

---
 SDVersion/SDiOSVersion/SDiOSVersion.h | 2 +-
 SDVersion/SDiOSVersion/SDiOSVersion.m | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/SDVersion/SDiOSVersion/SDiOSVersion.h b/SDVersion/SDiOSVersion/SDiOSVersion.h
index 216e53b..06d0bca 100755
--- a/SDVersion/SDiOSVersion/SDiOSVersion.h
+++ b/SDVersion/SDiOSVersion/SDiOSVersion.h
@@ -10,7 +10,7 @@
 typedef NS_ENUM(NSInteger, DeviceVersion){
     UnknownDevice         = 0,
     Simulator             = 1,
-	
+    
     iPhone4               = 3,
     iPhone4S              = 4,
     iPhone5               = 5,
diff --git a/SDVersion/SDiOSVersion/SDiOSVersion.m b/SDVersion/SDiOSVersion/SDiOSVersion.m
index fcf181c..ebd856b 100755
--- a/SDVersion/SDiOSVersion/SDiOSVersion.m
+++ b/SDVersion/SDiOSVersion/SDiOSVersion.m
@@ -116,12 +116,13 @@ + (DeviceVersion)deviceVersion
 
 + (DeviceSize)resolutionSize
 {
+    CGSize screenSize = [UIScreen mainScreen].bounds.size;
     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) {

From b4930d044c67c9db356f2997ea52709b29c416e6 Mon Sep 17 00:00:00 2001
From: Iulian Onofrei <iulian.onofrei@yahoo.com>
Date: Fri, 14 Sep 2018 12:08:40 +0300
Subject: [PATCH 2/2] Added 6Dot1inch and 6Dot5inch Screen enum values

---
 SDVersion/SDiOSVersion/SDiOSVersion.h |  4 +++-
 SDVersion/SDiOSVersion/SDiOSVersion.m | 10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/SDVersion/SDiOSVersion/SDiOSVersion.h b/SDVersion/SDiOSVersion/SDiOSVersion.h
index 06d0bca..475b18f 100755
--- a/SDVersion/SDiOSVersion/SDiOSVersion.h
+++ b/SDVersion/SDiOSVersion/SDiOSVersion.h
@@ -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
diff --git a/SDVersion/SDiOSVersion/SDiOSVersion.m b/SDVersion/SDiOSVersion/SDiOSVersion.m
index ebd856b..b74cd99 100755
--- a/SDVersion/SDiOSVersion/SDiOSVersion.m
+++ b/SDVersion/SDiOSVersion/SDiOSVersion.m
@@ -116,7 +116,9 @@ + (DeviceVersion)deviceVersion
 
 + (DeviceSize)resolutionSize
 {
-    CGSize screenSize = [UIScreen mainScreen].bounds.size;
+    UIScreen *screen = [UIScreen mainScreen];
+    CGSize screenSize = screen.bounds.size;
+    CGFloat screenScale = screen.scale;
     CGFloat screenHeight = 0;
     
     if ([SDiOSVersion versionGreaterThanOrEqualTo:@"8"]) {
@@ -135,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;
 }
@@ -161,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)];
 }