- aggiornamento libreria per supportare diversi client id e client secret
This commit is contained in:
giuseppenuc committed
1 parent
1f625585b9
commit
6c8cf96e65
87 files changed
+2459
-1776
No files matched your search
+15
-14
@@ -1,11 +1,3 @@
|
||||
/*
|
||||
Erica Sadun, http://ericasadun.com
|
||||
iPhone Developer's Cookbook, 6.x Edition
|
||||
BSD License, Use at your own risk
|
||||
|
||||
Modified by Eric Horacek for Monospace Ltd. on 2/4/13
|
||||
*/
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
#define IS_IPAD (UI_USER_INTERFACE_IDIOM()==UIUserInterfaceIdiomPad)
|
||||
@@ -26,6 +18,7 @@ typedef NS_ENUM(NSUInteger, UIDeviceFamily) {
|
||||
};
|
||||
|
||||
typedef NS_ENUM(NSUInteger, UIDeviceGenerationModel) {
|
||||
UIDeviceGenerationModeliPhone1G,
|
||||
UIDeviceGenerationModeliPhone3G,
|
||||
UIDeviceGenerationModeliPhone3GS,
|
||||
UIDeviceGenerationModeliPhone4,
|
||||
@@ -37,18 +30,27 @@ typedef NS_ENUM(NSUInteger, UIDeviceGenerationModel) {
|
||||
UIDeviceGenerationModeliPhone6Plus,
|
||||
UIDeviceGenerationModeliPhone6S,
|
||||
UIDeviceGenerationModeliPhone6SPlus,
|
||||
UIDeviceGenerationModeliPhoneSE,
|
||||
UIDeviceGenerationModeliPhone7,
|
||||
UIDeviceGenerationModeliPhone7Plus,
|
||||
UIDeviceGenerationModeliPhone8,
|
||||
UIDeviceGenerationModeliPhone8Plus,
|
||||
UIDeviceGenerationModeliPhoneX,
|
||||
UIDeviceGenerationModeliPhoneSimulator,
|
||||
UIDeviceGenerationModeliPad1,
|
||||
UIDeviceGenerationModeliPad2,
|
||||
UIDeviceGenerationModeliPad3,
|
||||
UIDeviceGenerationModeliPad4,
|
||||
UIDeviceGenerationModeliPad5,
|
||||
UIDeviceGenerationModeliPadAir,
|
||||
UIDeviceGenerationModeliPadAir2,
|
||||
UIDeviceGenerationModeliPadMini1,
|
||||
UIDeviceGenerationModeliPadMini2,
|
||||
UIDeviceGenerationModeliPadMini3,
|
||||
UIDeviceGenerationModeliPadMini4,
|
||||
UIDeviceGenerationModeliPadPro,
|
||||
UIDeviceGenerationModeliPadPro97,
|
||||
UIDeviceGenerationModeliPadPro105,
|
||||
UIDeviceGenerationModeliPadPro12,
|
||||
UIDeviceGenerationModeliPadSimulator,
|
||||
UIDeviceGenerationModeliPod1,
|
||||
UIDeviceGenerationModeliPod2,
|
||||
@@ -70,15 +72,19 @@ typedef NS_ENUM(NSUInteger, UIDeviceModelInches) {
|
||||
UIDeviceModelInches4,
|
||||
UIDeviceModelInches47,
|
||||
UIDeviceModelInches55,
|
||||
UIDeviceModelInches58,
|
||||
UIDeviceModelInches79,
|
||||
UIDeviceModelInches97,
|
||||
UIDeviceModelInches105,
|
||||
UIDeviceModelInches129,
|
||||
UIDeviceSimulatorModelInches35 = UIDeviceModelInches35,
|
||||
UIDeviceSimulatorModelInches4 = UIDeviceModelInches4,
|
||||
UIDeviceSimulatorModelInches47 = UIDeviceModelInches47,
|
||||
UIDeviceSimulatorModelInches55 = UIDeviceModelInches55,
|
||||
UIDeviceSimulatorModelInches58 = UIDeviceModelInches58,
|
||||
UIDeviceSimulatorModelInches79 = UIDeviceModelInches79,
|
||||
UIDeviceSimulatorModelInches97 = UIDeviceModelInches97,
|
||||
UIDeviceSimulatorModelInches105 = UIDeviceModelInches105,
|
||||
UIDeviceSimulatorModelInches129 = UIDeviceModelInches129,
|
||||
UIDeviceModelInchesUnKnown
|
||||
};
|
||||
@@ -91,11 +97,6 @@ typedef NS_ENUM(NSUInteger, UIDeviceModelInches) {
|
||||
*/
|
||||
- (NSString *)modelIdentifier;
|
||||
|
||||
/**
|
||||
Returns a human-readable model name in the format of "iPhone 4S". Fallback of the the `modelIdentifier` value.
|
||||
*/
|
||||
- (NSString *)modelName;
|
||||
|
||||
/**
|
||||
Returns the device generation model as a `UIDeviceGenerationModel`
|
||||
*/
|
||||
|
||||
+83
-108
@@ -1,11 +1,3 @@
|
||||
/*
|
||||
Erica Sadun, http://ericasadun.com
|
||||
iPhone Developer's Cookbook, 6.x Edition
|
||||
BSD License, Use at your own risk
|
||||
|
||||
Modified by Eric Horacek for Monospace Ltd. on 2/4/13
|
||||
*/
|
||||
|
||||
#include <sys/sysctl.h>
|
||||
#import "UIDevice-Hardware.h"
|
||||
|
||||
@@ -36,94 +28,9 @@
|
||||
return [self getSysInfoByName:"hw.machine"];
|
||||
}
|
||||
|
||||
- (NSString *)modelName
|
||||
{
|
||||
return [self modelNameForModelIdentifier:[self modelIdentifier]];
|
||||
}
|
||||
|
||||
- (NSString *)modelNameForModelIdentifier:(NSString *)modelIdentifier
|
||||
{
|
||||
// iPhone http://theiphonewiki.com/wiki/IPhone
|
||||
|
||||
if ([modelIdentifier isEqualToString:@"iPhone1,1"]) return @"iPhone 1G";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone1,2"]) return @"iPhone 3G";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone2,1"]) return @"iPhone 3GS";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone3,1"]) return @"iPhone 4 (GSM)";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone3,2"]) return @"iPhone 4 (GSM Rev A)";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone3,3"]) return @"iPhone 4 (CDMA)";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone4,1"]) return @"iPhone 4S";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone5,1"]) return @"iPhone 5 (GSM)";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone5,2"]) return @"iPhone 5 (Global)";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone5,3"]) return @"iPhone 5c (GSM)";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone5,4"]) return @"iPhone 5c (Global)";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone6,1"]) return @"iPhone 5s (GSM)";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone6,2"]) return @"iPhone 5s (Global)";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone7,1"]) return @"iPhone 6 Plus";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone7,2"]) return @"iPhone 6";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone8,1"]) return @"iPhone 6s";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone8,2"]) return @"iPhone 6s Plus";
|
||||
|
||||
// iPad http://theiphonewiki.com/wiki/IPad
|
||||
|
||||
if ([modelIdentifier isEqualToString:@"iPad1,1"]) return @"iPad 1G";
|
||||
if ([modelIdentifier isEqualToString:@"iPad2,1"]) return @"iPad 2 (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad2,2"]) return @"iPad 2 (GSM)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad2,3"]) return @"iPad 2 (CDMA)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad2,4"]) return @"iPad 2 (Rev A)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad3,1"]) return @"iPad 3 (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad3,2"]) return @"iPad 3 (GSM)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad3,3"]) return @"iPad 3 (Global)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad3,4"]) return @"iPad 4 (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad3,5"]) return @"iPad 4 (GSM)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad3,6"]) return @"iPad 4 (Global)";
|
||||
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,1"]) return @"iPad Air (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,2"]) return @"iPad Air (Cellular)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad5,3"]) return @"iPad Air 2 (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad5,4"]) return @"iPad Air 2 (Cellular)";
|
||||
|
||||
// iPad Mini http://theiphonewiki.com/wiki/IPad_mini
|
||||
|
||||
if ([modelIdentifier isEqualToString:@"iPad2,5"]) return @"iPad mini 1G (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad2,6"]) return @"iPad mini 1G (GSM)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad2,7"]) return @"iPad mini 1G (Global)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,4"]) return @"iPad mini 2G (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,5"]) return @"iPad mini 2G (Cellular)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,6"]) return @"iPad mini 2G (Cellular)"; // TD-LTE model see https://support.apple.com/en-us/HT201471#iPad-mini2
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,7"]) return @"iPad mini 3G (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,8"]) return @"iPad mini 3G (Cellular)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,9"]) return @"iPad mini 3G (Cellular)";
|
||||
|
||||
// iPod http://theiphonewiki.com/wiki/IPod
|
||||
|
||||
if ([modelIdentifier isEqualToString:@"iPod1,1"]) return @"iPod touch 1G";
|
||||
if ([modelIdentifier isEqualToString:@"iPod2,1"]) return @"iPod touch 2G";
|
||||
if ([modelIdentifier isEqualToString:@"iPod3,1"]) return @"iPod touch 3G";
|
||||
if ([modelIdentifier isEqualToString:@"iPod4,1"]) return @"iPod touch 4G";
|
||||
if ([modelIdentifier isEqualToString:@"iPod5,1"]) return @"iPod touch 5G";
|
||||
if ([modelIdentifier isEqualToString:@"iPod7,1"]) return @"iPod touch 6G"; // as 6,1 was never released 7,1 is actually 6th generation
|
||||
|
||||
// Apple TV https://www.theiphonewiki.com/wiki/Apple_TV
|
||||
|
||||
if ([modelIdentifier isEqualToString:@"AppleTV1,1"]) return @"Apple TV 1G";
|
||||
if ([modelIdentifier isEqualToString:@"AppleTV2,1"]) return @"Apple TV 2G";
|
||||
if ([modelIdentifier isEqualToString:@"AppleTV3,1"]) return @"Apple TV 3G";
|
||||
if ([modelIdentifier isEqualToString:@"AppleTV3,2"]) return @"Apple TV 3G"; // small, incremental update over 3,1
|
||||
if ([modelIdentifier isEqualToString:@"AppleTV5,3"]) return @"Apple TV 4G";
|
||||
|
||||
// Simulator
|
||||
if ([modelIdentifier hasSuffix:@"86"] || [modelIdentifier isEqual:@"x86_64"])
|
||||
{
|
||||
BOOL smallerScreen = ([[UIScreen mainScreen] bounds].size.width < 768.0);
|
||||
return (smallerScreen ? @"iPhone Simulator" : @"iPad Simulator");
|
||||
}
|
||||
|
||||
return modelIdentifier;
|
||||
}
|
||||
|
||||
- (UIDeviceFamily) deviceFamily
|
||||
{
|
||||
NSString *modelIdentifier = [self modelNameForModelIdentifier:[self modelIdentifier]];
|
||||
NSString *modelIdentifier = [self deviceGenerationModelString];
|
||||
if ([modelIdentifier hasPrefix:@"iPhone"]) return UIDeviceFamilyiPhone;
|
||||
if ([modelIdentifier hasPrefix:@"iPod"]) return UIDeviceFamilyiPod;
|
||||
if ([modelIdentifier hasPrefix:@"iPad"]) return UIDeviceFamilyiPad;
|
||||
@@ -135,7 +42,9 @@
|
||||
{
|
||||
NSString *modelIdentifier = [self modelIdentifier];
|
||||
|
||||
if ([modelIdentifier isEqualToString:@"iPhone1,1"]) return UIDeviceGenerationModeliPhone3G;
|
||||
// iPhone https://www.theiphonewiki.com/wiki/List_of_iPhones
|
||||
|
||||
if ([modelIdentifier isEqualToString:@"iPhone1,1"]) return UIDeviceGenerationModeliPhone1G;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone1,2"]) return UIDeviceGenerationModeliPhone3G;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone2,1"]) return UIDeviceGenerationModeliPhone3GS;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone3,1"]) return UIDeviceGenerationModeliPhone4;
|
||||
@@ -152,6 +61,17 @@
|
||||
if ([modelIdentifier isEqualToString:@"iPhone7,2"]) return UIDeviceGenerationModeliPhone6;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone8,1"]) return UIDeviceGenerationModeliPhone6S;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone8,2"]) return UIDeviceGenerationModeliPhone6SPlus;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone8,4"]) return UIDeviceGenerationModeliPhoneSE;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone9,1"]) return UIDeviceGenerationModeliPhone7;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone9,2"]) return UIDeviceGenerationModeliPhone7Plus;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone9,3"]) return UIDeviceGenerationModeliPhone7;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone9,4"]) return UIDeviceGenerationModeliPhone7Plus;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone10,1"]) return UIDeviceGenerationModeliPhone8;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone10,2"]) return UIDeviceGenerationModeliPhone8Plus;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone10,3"]) return UIDeviceGenerationModeliPhoneX;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone10,4"]) return UIDeviceGenerationModeliPhone8;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone10,5"]) return UIDeviceGenerationModeliPhone8Plus;
|
||||
if ([modelIdentifier isEqualToString:@"iPhone10,6"]) return UIDeviceGenerationModeliPhoneX;
|
||||
|
||||
// iPad http://theiphonewiki.com/wiki/IPad
|
||||
|
||||
@@ -166,13 +86,13 @@
|
||||
if ([modelIdentifier isEqualToString:@"iPad3,4"]) return UIDeviceGenerationModeliPad4;
|
||||
if ([modelIdentifier isEqualToString:@"iPad3,5"]) return UIDeviceGenerationModeliPad4;
|
||||
if ([modelIdentifier isEqualToString:@"iPad3,6"]) return UIDeviceGenerationModeliPad4;
|
||||
if ([modelIdentifier isEqualToString:@"iPad6,11"]) return UIDeviceGenerationModeliPad5;
|
||||
if ([modelIdentifier isEqualToString:@"iPad6,12"]) return UIDeviceGenerationModeliPad5;
|
||||
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,1"]) return UIDeviceGenerationModeliPadAir;
|
||||
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
|
||||
|
||||
@@ -185,6 +105,19 @@
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,7"]) return UIDeviceGenerationModeliPadMini3;
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,8"]) return UIDeviceGenerationModeliPadMini3;
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,9"]) return UIDeviceGenerationModeliPadMini3;
|
||||
if ([modelIdentifier isEqualToString:@"iPad5,1"]) return UIDeviceGenerationModeliPadMini4;
|
||||
if ([modelIdentifier isEqualToString:@"iPad5,2"]) return UIDeviceGenerationModeliPadMini4;
|
||||
|
||||
// iPad Pro https://www.theiphonewiki.com/wiki/IPad_Pro
|
||||
|
||||
if ([modelIdentifier isEqualToString:@"iPad6,3"]) return UIDeviceGenerationModeliPadPro97; // http://pdadb.net/index.php?m=specs&id=9938&c=apple_ipad_pro_9.7-inch_a1673_wifi_32gb_apple_ipad_6,3
|
||||
if ([modelIdentifier isEqualToString:@"iPad6,4"]) return UIDeviceGenerationModeliPadPro97; // http://pdadb.net/index.php?m=specs&id=9981&c=apple_ipad_pro_9.7-inch_a1675_td-lte_32gb_apple_ipad_6,4
|
||||
if ([modelIdentifier isEqualToString:@"iPad6,7"]) return UIDeviceGenerationModeliPadPro12; // http://pdadb.net/index.php?m=specs&id=8960&c=apple_ipad_pro_wifi_a1584_128gb
|
||||
if ([modelIdentifier isEqualToString:@"iPad6,8"]) return UIDeviceGenerationModeliPadPro12; // http://pdadb.net/index.php?m=specs&id=8965&c=apple_ipad_pro_td-lte_a1652_32gb_apple_ipad_6,8
|
||||
if ([modelIdentifier isEqualToString:@"iPad 7,1"]) return UIDeviceGenerationModeliPadPro12;
|
||||
if ([modelIdentifier isEqualToString:@"iPad 7,2"]) return UIDeviceGenerationModeliPadPro12;
|
||||
if ([modelIdentifier isEqualToString:@"iPad 7,3"]) return UIDeviceGenerationModeliPadPro105;
|
||||
if ([modelIdentifier isEqualToString:@"iPad 7,4"]) return UIDeviceGenerationModeliPadPro105;
|
||||
|
||||
// iPod http://theiphonewiki.com/wiki/IPod
|
||||
|
||||
@@ -238,6 +171,17 @@
|
||||
if ([modelIdentifier isEqualToString:@"iPhone7,2"]) return @"iPhone 6";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone8,1"]) return @"iPhone 6s";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone8,2"]) return @"iPhone 6s Plus";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone8,4"]) return @"iPhone SE";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone9,1"]) return @"iPhone 7";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone9,2"]) return @"iPhone 7 Plus";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone9,3"]) return @"iPhone 7";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone9,4"]) return @"iPhone 7 Plus";
|
||||
if ([modelIdentifier isEqualToString:@"iPhone10,1"]) return @"iPhone 8"; // US (Verizon), China, Japan
|
||||
if ([modelIdentifier isEqualToString:@"iPhone10,2"]) return @"iPhone 8 Plus"; // US (Verizon), China, Japan
|
||||
if ([modelIdentifier isEqualToString:@"iPhone10,3"]) return @"iPhone X"; // US (Verizon), China, Japan
|
||||
if ([modelIdentifier isEqualToString:@"iPhone10,4"]) return @"iPhone 8"; // AT&T, Global
|
||||
if ([modelIdentifier isEqualToString:@"iPhone10,5"]) return @"iPhone 8 Plus"; // AT&T, Global
|
||||
if ([modelIdentifier isEqualToString:@"iPhone10,6"]) return @"iPhone X"; // AT&T, Global
|
||||
|
||||
// iPad http://theiphonewiki.com/wiki/IPad
|
||||
|
||||
@@ -252,15 +196,14 @@
|
||||
if ([modelIdentifier isEqualToString:@"iPad3,4"]) return @"iPad 4 (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad3,5"]) return @"iPad 4 (GSM)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad3,6"]) return @"iPad 4 (Global)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad6,11"]) return @"iPad (5th gen) (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad6,12"]) return @"iPad (5th gen) (Cellular)";
|
||||
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,1"]) return @"iPad Air (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,2"]) return @"iPad Air (Cellular)";
|
||||
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)";
|
||||
@@ -272,6 +215,19 @@
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,7"]) return @"iPad mini 3G (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,8"]) return @"iPad mini 3G (Cellular)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad4,9"]) return @"iPad mini 3G (Cellular)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad5,1"]) return @"iPad mini 4G (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad5,2"]) return @"iPad mini 4G (Cellular)";
|
||||
|
||||
// iPad Pro https://www.theiphonewiki.com/wiki/IPad_Pro
|
||||
|
||||
if ([modelIdentifier isEqualToString:@"iPad6,3"]) return @"iPad Pro (9.7 inch) 1G (Wi-Fi)"; // http://pdadb.net/index.php?m=specs&id=9938&c=apple_ipad_pro_9.7-inch_a1673_wifi_32gb_apple_ipad_6,3
|
||||
if ([modelIdentifier isEqualToString:@"iPad6,4"]) return @"iPad Pro (9.7 inch) 1G (Cellular)"; // http://pdadb.net/index.php?m=specs&id=9981&c=apple_ipad_pro_9.7-inch_a1675_td-lte_32gb_apple_ipad_6,4
|
||||
if ([modelIdentifier isEqualToString:@"iPad6,7"]) return @"iPad Pro (12.9 inch) 1G (Wi-Fi)"; // http://pdadb.net/index.php?m=specs&id=8960&c=apple_ipad_pro_wifi_a1584_128gb
|
||||
if ([modelIdentifier isEqualToString:@"iPad6,8"]) return @"iPad Pro (12.9 inch) 1G (Cellular)"; // http://pdadb.net/index.php?m=specs&id=8965&c=apple_ipad_pro_td-lte_a1652_32gb_apple_ipad_6,8
|
||||
if ([modelIdentifier isEqualToString:@"iPad 7,1"]) return @"iPad Pro (12.9 inch) 2G (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad 7,2"]) return @"iPad Pro (12.9 inch) 2G (Cellular)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad 7,3"]) return @"iPad Pro (10.5 inch) 1G (Wi-Fi)";
|
||||
if ([modelIdentifier isEqualToString:@"iPad 7,4"]) return @"iPad Pro (10.5 inch) 1G (Cellular)";
|
||||
|
||||
// iPod http://theiphonewiki.com/wiki/IPod
|
||||
|
||||
@@ -311,26 +267,37 @@
|
||||
break;
|
||||
case UIDeviceGenerationModeliPhone5:
|
||||
case UIDeviceGenerationModeliPhone5C:
|
||||
case UIDeviceGenerationModeliPhone5S:{
|
||||
case UIDeviceGenerationModeliPhone5S:
|
||||
case UIDeviceGenerationModeliPhoneSE:{
|
||||
return UIDeviceModelInches4;
|
||||
}
|
||||
break;
|
||||
case UIDeviceGenerationModeliPhone6:
|
||||
case UIDeviceGenerationModeliPhone6S:{
|
||||
case UIDeviceGenerationModeliPhone6S:
|
||||
case UIDeviceGenerationModeliPhone7:
|
||||
case UIDeviceGenerationModeliPhone8:{
|
||||
return UIDeviceModelInches47;
|
||||
}
|
||||
break;
|
||||
case UIDeviceGenerationModeliPhone6Plus:
|
||||
case UIDeviceGenerationModeliPhone6SPlus:{
|
||||
case UIDeviceGenerationModeliPhone6SPlus:
|
||||
case UIDeviceGenerationModeliPhone7Plus:
|
||||
case UIDeviceGenerationModeliPhone8Plus:{
|
||||
return UIDeviceModelInches55;
|
||||
}
|
||||
break;
|
||||
case UIDeviceGenerationModeliPhoneX:{
|
||||
return UIDeviceModelInches58;
|
||||
}
|
||||
break;
|
||||
case UIDeviceGenerationModeliPad1:
|
||||
case UIDeviceGenerationModeliPad2:
|
||||
case UIDeviceGenerationModeliPad3:
|
||||
case UIDeviceGenerationModeliPad4:
|
||||
case UIDeviceGenerationModeliPad5:
|
||||
case UIDeviceGenerationModeliPadAir:
|
||||
case UIDeviceGenerationModeliPadAir2:{
|
||||
case UIDeviceGenerationModeliPadAir2:
|
||||
case UIDeviceGenerationModeliPadPro97:{
|
||||
return UIDeviceModelInches97;
|
||||
}
|
||||
break;
|
||||
@@ -341,16 +308,19 @@
|
||||
return UIDeviceModelInches79;
|
||||
}
|
||||
break;
|
||||
case UIDeviceGenerationModeliPadPro:{
|
||||
return UIDeviceModelInches129;
|
||||
break;
|
||||
case UIDeviceGenerationModeliPadPro105:{
|
||||
return UIDeviceModelInches105;
|
||||
}
|
||||
break;
|
||||
case UIDeviceGenerationModeliPadPro12:{
|
||||
return UIDeviceModelInches129;
|
||||
}
|
||||
break;
|
||||
case UIDeviceGenerationModeliPadSimulator:
|
||||
case UIDeviceGenerationModeliPhoneSimulator:{
|
||||
CGRect screenRect = [[UIScreen mainScreen] bounds];
|
||||
NSInteger screenHeight = ((NSInteger)screenRect.size.height > (NSInteger)screenRect.size.width) ? (NSInteger)screenRect.size.height : (NSInteger)screenRect.size.width;
|
||||
|
||||
|
||||
switch (screenHeight) {
|
||||
case 480:{
|
||||
return UIDeviceSimulatorModelInches35;
|
||||
@@ -368,6 +338,11 @@
|
||||
return UIDeviceSimulatorModelInches55;
|
||||
break;
|
||||
}
|
||||
case 812:{
|
||||
return UIDeviceSimulatorModelInches58;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 1024:{
|
||||
return UIDeviceModelInches97;
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user