mirror of https://github.com/oxen-io/session-ios
Attachements: Fixing UI issues
dtsbourg
11 years ago
committed by
Frederic Jacobs
parent
db74e17564
commit
f8db90014d
@ -0,0 +1,48 @@
|
||||
//
|
||||
// UIDevice+TSHardwareVersion.h
|
||||
// Signal
|
||||
//
|
||||
// Created by Dylan Bourgeois on 19/12/14.
|
||||
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
// Original Source :
|
||||
// Erica Sadun, http://ericasadun.com
|
||||
// iPhone Developer's Cookbook, 6.x Edition
|
||||
// BSD License, Use at your own risk
|
||||
//
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
typedef NS_ENUM(NSUInteger, UIDeviceFamily) {
|
||||
UIDeviceFamilyiPhone,
|
||||
UIDeviceFamilyiPod,
|
||||
UIDeviceFamilyiPad,
|
||||
UIDeviceFamilyAppleTV,
|
||||
UIDeviceFamilyUnknown,
|
||||
};
|
||||
|
||||
|
||||
@interface UIDevice (TSHardwareVersion)
|
||||
|
||||
/**
|
||||
Returns a machine-readable model name in the format of "iPhone4,1"
|
||||
*/
|
||||
- (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 family as a `UIDeviceFamily`
|
||||
*/
|
||||
- (UIDeviceFamily)deviceFamily;
|
||||
|
||||
/*
|
||||
* Returns true if device is iPhone 6 or 6+
|
||||
*/
|
||||
- (BOOL)isiPhoneVersionSixOrMore;
|
||||
|
||||
@end
|
||||
@ -0,0 +1,125 @@
|
||||
//
|
||||
// UIDevice+TSHardwareVersion.m
|
||||
// Signal
|
||||
//
|
||||
// Created by Dylan Bourgeois on 19/12/14.
|
||||
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
// Original Source :
|
||||
// Erica Sadun, http://ericasadun.com
|
||||
// iPhone Developer's Cookbook, 6.x Edition
|
||||
// BSD License, Use at your own risk
|
||||
//
|
||||
//
|
||||
|
||||
#import "UIDevice+TSHardwareVersion.h"
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
@implementation UIDevice (TSHardwareVersion)
|
||||
|
||||
- (NSString *)getSysInfoByName:(char *)typeSpecifier
|
||||
{
|
||||
size_t size;
|
||||
sysctlbyname(typeSpecifier, NULL, &size, NULL, 0);
|
||||
|
||||
char *answer = malloc(size);
|
||||
sysctlbyname(typeSpecifier, answer, &size, NULL, 0);
|
||||
|
||||
NSString *results = [NSString stringWithCString:answer encoding: NSUTF8StringEncoding];
|
||||
|
||||
free(answer);
|
||||
return results;
|
||||
}
|
||||
|
||||
- (NSString *)modelIdentifier
|
||||
{
|
||||
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";
|
||||
|
||||
// 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,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";
|
||||
|
||||
// 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 modelIdentifier];
|
||||
if ([modelIdentifier hasPrefix:@"iPhone"]) return UIDeviceFamilyiPhone;
|
||||
if ([modelIdentifier hasPrefix:@"iPod"]) return UIDeviceFamilyiPod;
|
||||
if ([modelIdentifier hasPrefix:@"iPad"]) return UIDeviceFamilyiPad;
|
||||
return UIDeviceFamilyUnknown;
|
||||
}
|
||||
|
||||
-(BOOL)isiPhoneVersionSixOrMore
|
||||
{
|
||||
return [[self modelIdentifier] isEqualToString:@"iPhone7,1"] || [[self modelIdentifier] isEqualToString:@"iPhone7,2"];
|
||||
}
|
||||
@end
|
||||
Loading…
Reference in New Issue