Merge pull request #8 from gzucm/pull1.0.0

deviceSize method consider landscape orientation status
sebyddd · Oct 16, 2014 · bb10061 · bb10061
2 parents b90fa03 + da6f882
commit bb10061
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/SDiPhoneVersion/SDiPhoneVersion.m b/SDiPhoneVersion/SDiPhoneVersion.m
@@ -72,7 +72,14 @@ +(DeviceVersion)deviceVersion {
 
 +(DeviceSize)deviceSize {
 
-    CGFloat screenHeight = [[UIScreen mainScreen] bounds].size.height;
+    CGFloat screenHeight = ({
+        // consider landscape orientation status
+        UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
+        BOOL isLandscape = (orientation == UIDeviceOrientationLandscapeLeft || orientation == UIDeviceOrientationLandscapeRight);
+        CGFloat screenHeight = [[UIScreen mainScreen] bounds].size.height;
+        CGFloat screenWidth = [[UIScreen mainScreen] bounds].size.width;
+        screenHeight = isLandscape ? screenWidth : screenHeight;
+    });
     if (screenHeight == 480)
         return iPhone35inch;
     else if(screenHeight == 568)