Merge branch 'release/1.1.6'

superjohan · Dec 10, 2014 · af7df2c · af7df2c
2 parents cf255ef + 38d2759
commit af7df2c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/deko/DekoFunctions.m b/deko/DekoFunctions.m
@@ -15,22 +15,18 @@ DekoDeviceType DekoGetCurrentDeviceType()
 		return DekoDeviceTypeiPad;
 	}
 
-	CGRect screenBounds = [[UIScreen mainScreen] nativeBounds];
-	CGFloat width = MIN(screenBounds.size.width, screenBounds.size.height);
+	CGRect screenBounds = [[UIScreen mainScreen] bounds];
 	CGFloat height = MAX(screenBounds.size.width, screenBounds.size.height);
 
-	if (width > 639.0 && width < 743.0)
+	if (height < 481.0)
 	{
-		if (height < 1135.0)
-		{
-			return DekoDeviceTypeiPhone;
-		}
-		else
-		{
-			return DekoDeviceTypeiPhone5;
-		}
+		return DekoDeviceTypeiPhone;
 	}
-	else if (width > 743.0 && width < 1079.0)
+	else if (height < 569.0)
+	{
+		return DekoDeviceTypeiPhone5;
+	}
+	else if (height < 668.0)
 	{
 		return DekoDeviceTypeiPhone6;
 	}

diff --git a/deko/deko-Info.plist b/deko/deko-Info.plist
@@ -21,11 +21,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.5</string>
+	<string>1.1.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>8</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIAppFonts</key>