From 969892e2f1825a2c8016b89b202cfa883bf09d4c Mon Sep 17 00:00:00 2001 From: Jeff Kelley Date: Thu, 13 Nov 2014 16:48:06 -0500 Subject: [PATCH 1/7] Add missing iPhone variants. --- .../SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m index 8a6a941..c0e8827 100644 --- a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m +++ b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m @@ -18,8 +18,11 @@ +(NSDictionary*)deviceNamesByCode { deviceNamesByCode = @{ //iPhones @"iPhone3,1" :[NSNumber numberWithInteger:iPhone4], + @"iPhone3,2" :[NSNumber numberWithInteger:iPhone4], @"iPhone3,3" :[NSNumber numberWithInteger:iPhone4], @"iPhone4,1" :[NSNumber numberWithInteger:iPhone4S], + @"iPhone4,2" :[NSNumber numberWithInteger:iPhone4S], + @"iPhone4,3" :[NSNumber numberWithInteger:iPhone4S], @"iPhone5,1" :[NSNumber numberWithInteger:iPhone5], @"iPhone5,2" :[NSNumber numberWithInteger:iPhone5], @"iPhone5,3" :[NSNumber numberWithInteger:iPhone5C], From d8c4d381ea8eaa9e5137cccb3fdb69e03993a854 Mon Sep 17 00:00:00 2001 From: Jeff Kelley Date: Thu, 13 Nov 2014 16:48:19 -0500 Subject: [PATCH 2/7] Add missing iPad Air variant. --- .../SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m | 1 + 1 file changed, 1 insertion(+) diff --git a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m index c0e8827..01570c6 100644 --- a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m +++ b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m @@ -52,6 +52,7 @@ +(NSDictionary*)deviceNamesByCode { @"iPad3,6" :[NSNumber numberWithInteger:iPad4], @"iPad4,1" :[NSNumber numberWithInteger:iPadAir], @"iPad4,2" :[NSNumber numberWithInteger:iPadAir], + @"iPad4,3" :[NSNumber numberWithInteger:iPadAir], @"iPad4,4" :[NSNumber numberWithInteger:iPadMiniRetina], @"iPad4,5" :[NSNumber numberWithInteger:iPadMiniRetina] From dd0e5cf560b4ca3062c7de3631d7d9d9a77bec69 Mon Sep 17 00:00:00 2001 From: Jeff Kelley Date: Thu, 13 Nov 2014 16:48:37 -0500 Subject: [PATCH 3/7] Add missing iPad Mini Retina variants. --- .../SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m index 01570c6..b456226 100644 --- a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m +++ b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m @@ -54,7 +54,8 @@ +(NSDictionary*)deviceNamesByCode { @"iPad4,2" :[NSNumber numberWithInteger:iPadAir], @"iPad4,3" :[NSNumber numberWithInteger:iPadAir], @"iPad4,4" :[NSNumber numberWithInteger:iPadMiniRetina], - @"iPad4,5" :[NSNumber numberWithInteger:iPadMiniRetina] + @"iPad4,5" :[NSNumber numberWithInteger:iPadMiniRetina], + @"iPad4,6" :[NSNumber numberWithInteger:iPadMiniRetina], }; From 7a39744d4ddcd65029360ba2e9bf4717b005b6dc Mon Sep 17 00:00:00 2001 From: Jeff Kelley Date: Thu, 13 Nov 2014 16:48:54 -0500 Subject: [PATCH 4/7] Correct iPad 2 variants marked as iPad 1. --- .../SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m index b456226..c4379e7 100644 --- a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m +++ b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m @@ -37,10 +37,10 @@ +(NSDictionary*)deviceNamesByCode { //iPads @"iPad1,1" :[NSNumber numberWithInteger:iPad1], - @"iPad2,1" :[NSNumber numberWithInteger:iPad1], - @"iPad2,2" :[NSNumber numberWithInteger:iPad1], - @"iPad2,3" :[NSNumber numberWithInteger:iPad1], - @"iPad2,4" :[NSNumber numberWithInteger:iPad1], + @"iPad2,1" :[NSNumber numberWithInteger:iPad2], + @"iPad2,2" :[NSNumber numberWithInteger:iPad2], + @"iPad2,3" :[NSNumber numberWithInteger:iPad2], + @"iPad2,4" :[NSNumber numberWithInteger:iPad2], @"iPad2,5" :[NSNumber numberWithInteger:iPadMini], @"iPad2,6" :[NSNumber numberWithInteger:iPadMini], @"iPad2,7" :[NSNumber numberWithInteger:iPadMini], From 34faad0efa88f6cfc86e94eefb884363a7e085cc Mon Sep 17 00:00:00 2001 From: Jeff Kelley Date: Thu, 13 Nov 2014 16:49:18 -0500 Subject: [PATCH 5/7] Add iPad Air 2. --- .../SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h | 1 + .../SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m | 2 ++ 2 files changed, 3 insertions(+) diff --git a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h index 7833c89..48f109a 100644 --- a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h +++ b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h @@ -35,6 +35,7 @@ typedef NS_ENUM(NSInteger, DeviceVersion){ iPad4 = 14, iPadAir = 15, iPadMiniRetina = 16, + iPadAir2 = 17, Simulator = 0 }; diff --git a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m index c4379e7..b67608a 100644 --- a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m +++ b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m @@ -56,6 +56,8 @@ +(NSDictionary*)deviceNamesByCode { @"iPad4,4" :[NSNumber numberWithInteger:iPadMiniRetina], @"iPad4,5" :[NSNumber numberWithInteger:iPadMiniRetina], @"iPad4,6" :[NSNumber numberWithInteger:iPadMiniRetina], + @"iPad5,3" :[NSNumber numberWithInteger:iPadAir2], + @"iPad5,4" :[NSNumber numberWithInteger:iPadAir2], }; From 5c775aba87f774386ed733e3c043fa2470953515 Mon Sep 17 00:00:00 2001 From: Jeff Kelley Date: Thu, 13 Nov 2014 16:49:27 -0500 Subject: [PATCH 6/7] Add iPad mini 3. --- .../SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h | 1 + .../SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m | 3 +++ 2 files changed, 4 insertions(+) diff --git a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h index 48f109a..5af6dca 100644 --- a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h +++ b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h @@ -36,6 +36,7 @@ typedef NS_ENUM(NSInteger, DeviceVersion){ iPadAir = 15, iPadMiniRetina = 16, iPadAir2 = 17, + iPadMini3 = 18, Simulator = 0 }; diff --git a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m index b67608a..b8530ef 100644 --- a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m +++ b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m @@ -56,6 +56,9 @@ +(NSDictionary*)deviceNamesByCode { @"iPad4,4" :[NSNumber numberWithInteger:iPadMiniRetina], @"iPad4,5" :[NSNumber numberWithInteger:iPadMiniRetina], @"iPad4,6" :[NSNumber numberWithInteger:iPadMiniRetina], + @"iPad4,7" :[NSNumber numberWithInteger:iPadMini3], + @"iPad4,8" :[NSNumber numberWithInteger:iPadMini3], + @"iPad4,9" :[NSNumber numberWithInteger:iPadMini3], @"iPad5,3" :[NSNumber numberWithInteger:iPadAir2], @"iPad5,4" :[NSNumber numberWithInteger:iPadAir2], From 58983225813a77c15abca9c8b43c44dc5c627acd Mon Sep 17 00:00:00 2001 From: Jeff Kelley Date: Thu, 13 Nov 2014 16:50:14 -0500 Subject: [PATCH 7/7] =?UTF-8?q?Rename=20=E2=80=9CiPad=20Mini=20Retina?= =?UTF-8?q?=E2=80=9D=20to=20=E2=80=9CiPad=20Mini=202=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h | 2 +- .../SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h index 5af6dca..8dceb76 100644 --- a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h +++ b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.h @@ -34,7 +34,7 @@ typedef NS_ENUM(NSInteger, DeviceVersion){ iPad3 = 13, iPad4 = 14, iPadAir = 15, - iPadMiniRetina = 16, + iPadMini2 = 16, iPadAir2 = 17, iPadMini3 = 18, Simulator = 0 diff --git a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m index b8530ef..96770ae 100644 --- a/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m +++ b/SDiPhoneVersion-Demo/SDiPhoneVersion/SDiPhoneVersion/SDiPhoneVersion.m @@ -53,9 +53,9 @@ +(NSDictionary*)deviceNamesByCode { @"iPad4,1" :[NSNumber numberWithInteger:iPadAir], @"iPad4,2" :[NSNumber numberWithInteger:iPadAir], @"iPad4,3" :[NSNumber numberWithInteger:iPadAir], - @"iPad4,4" :[NSNumber numberWithInteger:iPadMiniRetina], - @"iPad4,5" :[NSNumber numberWithInteger:iPadMiniRetina], - @"iPad4,6" :[NSNumber numberWithInteger:iPadMiniRetina], + @"iPad4,4" :[NSNumber numberWithInteger:iPadMini2], + @"iPad4,5" :[NSNumber numberWithInteger:iPadMini2], + @"iPad4,6" :[NSNumber numberWithInteger:iPadMini2], @"iPad4,7" :[NSNumber numberWithInteger:iPadMini3], @"iPad4,8" :[NSNumber numberWithInteger:iPadMini3], @"iPad4,9" :[NSNumber numberWithInteger:iPadMini3],