From 562a7c45829918825b00f0c75e991361878b892e Mon Sep 17 00:00:00 2001 From: Giuseppe Nucifora Date: Mon, 18 Jan 2016 15:51:43 +0100 Subject: [PATCH] - Fix da completare --- Pod/Classes/UIDevice-Hardware.m | 34 +++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/Pod/Classes/UIDevice-Hardware.m b/Pod/Classes/UIDevice-Hardware.m index d473f02..ca9bede 100755 --- a/Pod/Classes/UIDevice-Hardware.m +++ b/Pod/Classes/UIDevice-Hardware.m @@ -171,6 +171,8 @@ if ([modelIdentifier isEqualToString:@"iPad4,2"]) return UIDeviceGenerationModeliPadAir; if ([modelIdentifier isEqualToString:@"iPad5,3"]) return UIDeviceGenerationModeliPadAir2; if ([modelIdentifier isEqualToString:@"iPad5,4"]) return UIDeviceGenerationModeliPadAir2; + if ([modelIdentifier isEqualToString:@"iPad6,7"]) return UIDeviceGenerationModeliPadPro; + if ([modelIdentifier isEqualToString:@"iPad6,8"]) return UIDeviceGenerationModeliPadPro; // iPad Mini http://theiphonewiki.com/wiki/IPad_mini @@ -203,8 +205,14 @@ if ([modelIdentifier hasSuffix:@"86"] || [modelIdentifier isEqual:@"x86_64"]) { - BOOL smallerScreen = ([[UIScreen mainScreen] bounds].size.width < 768.0); - return (smallerScreen ? UIDeviceGenerationModeliPhoneSimulator : UIDeviceGenerationModeliPadSimulator); + BOOL iPhoneScreen = ([[UIScreen mainScreen] bounds].size.width < 768.0); + BOOL iPadScreen = !iPhoneScreen; + if (iPadScreen) { + return UIDeviceGenerationModeliPadSimulator; + } + else { + return UIDeviceGenerationModeliPhoneSimulator; + } } return UIDeviceGenerationModelUnknown; } @@ -250,6 +258,9 @@ if ([modelIdentifier isEqualToString:@"iPad5,3"]) return @"iPad Air 2 (Wi-Fi)"; if ([modelIdentifier isEqualToString:@"iPad5,4"]) return @"iPad Air 2 (Cellular)"; + if ([modelIdentifier isEqualToString:@"iPad6,7"]) return @"iPad Pro (Wi-Fi)"; + if ([modelIdentifier isEqualToString:@"iPad6,8"]) return @"iPad Pro (Cellular)"; + // iPad Mini http://theiphonewiki.com/wiki/IPad_mini if ([modelIdentifier isEqualToString:@"iPad2,5"]) return @"iPad mini 1G (Wi-Fi)"; @@ -335,6 +346,25 @@ case UIDeviceGenerationModeliPadPro:{ return UIDeviceModelInches129; } + case UIDeviceGenerationModeliPadSimulator:{ + + } + break; + case UIDeviceGenerationModeliPhoneSimulator:{ + CGRect screenRect = [[UIScreen mainScreen] bounds]; + NSInteger screenWidth = (NSInteger)screenRect.size.width; + NSInteger screenHeight = (NSInteger)screenRect.size.height; + + switch (screenHeight) { + case 480: + + break; + case <#expression#>: + default: + break; + } + } + break; default: break; }