Skip to content

Add iPad mini 2G & iPad Air #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EchoLiao wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add iPad mini 2G & iPad Air #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee18948
Add iPad mini 2G & iPad Air
EchoLiao Jun 2, 2014
b11a9ad
Add method for return model's label
EchoLiao Jun 2, 2014
e727b58
Fix, sytax error
EchoLiao Jun 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions UIDevice+HardwareModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,13 @@ typedef enum __UIHardwareModel
UIHardwareModeliPhone5cGlobal = 29,

UIHardwareModeliPhone5s = 30,
UIHardwareModeliPhone5sGlobal = 31

UIHardwareModeliPhone5sGlobal = 31,

UIHardwareModeliPadAirWiFi = 32,
UIHardwareModeliPadAirCellular = 33,

UIHardwareModeliPadMini2GWifi = 34,
UIHardwareModeliPadMini2GCelluar = 35,
} UIHardwareModel;

@interface UIDevice (HardwareModel)
Expand All @@ -60,6 +65,11 @@ typedef enum __UIHardwareModel
*/
- (NSString *)hardwareName;

/**
* Returns hardware label of device instance
*/
- (NSString *)hardwareLabel;

/**
* Returns hardware id of device instance
*/
Expand Down
55 changes: 45 additions & 10 deletions UIDevice+HardwareModel.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,18 @@ - (NSString *)hardwareName
case UIHardwareModeliPodTouch5G:
name = @"iPod 5G";
break;
case UIHardwareModeliPadAirWiFi:
name = @"iPad Air Wifi";
break;
case UIHardwareModeliPadAirCellular:
name = @"iPad Air Cellular";
break;
case UIHardwareModeliPadMini2GWifi:
name = @"iPad mini 2G Wifi";
break;
case UIHardwareModeliPadMini2GCelluar:
name = @"iPad mini 2G Celluar";
break;
case UIHardwareModelSimulator:
name = @"Simulator";
break;
Expand All @@ -116,22 +128,33 @@ - (NSString *)hardwareName
return name;
}

-(UIHardwareModel)hardwareModel
- (NSString *)hardwareLabel
{
static UIHardwareModel _hardwareModel;

if(!_hardwareModel)
{
static NSString *_label;

if (!_label) {
size_t size;
char *model;

sysctlbyname("hw.machine", NULL, &size, NULL, 0);
model = malloc(size);
sysctlbyname("hw.machine", model, &size, NULL, 0);
NSString *hwString = [NSString stringWithCString: model encoding: NSUTF8StringEncoding];

_label = [NSString stringWithCString: model encoding: NSUTF8StringEncoding];
free(model);

}

return _label;
}

-(UIHardwareModel)hardwareModel
{
static UIHardwareModel _hardwareModel;

if(!_hardwareModel)
{
NSString *hwString = [self hardwareLabel];

if([hwString isEqualToString: @"i386"] || [hwString isEqualToString:@"x86_64"])
_hardwareModel = UIHardwareModelSimulator;

Expand Down Expand Up @@ -227,8 +250,20 @@ -(UIHardwareModel)hardwareModel

if([hwString isEqualToString: @"iPad3,6"])
_hardwareModel = UIHardwareModeliPad4CDMA;

if([hwString isEqualToString: @"iPad4,1"])
_hardwareModel = UIHardwareModeliPadAirWiFi;

if([hwString isEqualToString: @"iPad4,2"])
_hardwareModel = UIHardwareModeliPadAirCellular;

if([hwString isEqualToString: @"iPad4,4"])
_hardwareModel = UIHardwareModeliPadMini2GWifi;

if([hwString isEqualToString: @"iPad4,5"])
_hardwareModel = UIHardwareModeliPadMini2GCelluar;
}

return _hardwareModel;
}

Expand Down