add iPhone 7 support

leverdeterre · Oct 4, 2016 · 03fa129 · 03fa129
1 parent 3e867d7
commit 03fa129
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 3 deletions.
diff --git a/iAppInfos.podspec b/iAppInfos.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
         s.name         = 'iAppInfos'
-        s.version = '0.3'
+        s.version = '0.3.1'
         s.requires_arc = true
         s.author = {
                 'Morissard Jérome' => '[email protected]'
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
         s.homepage = 'https://github.com/leverdeterre/iAppInfos'
         s.source = {
         :git => 'https://github.com/leverdeterre/iAppInfos.git',
-        :tag => "0.3"
+        :tag => "0.3.1"
         }
         s.source_files = 'iAppInfos/iAppInfos/iAppInfos/*'
 	s.frameworks    = 'CoreTelephony', 'UIKit'

diff --git a/iAppInfos/iAppInfos.xcodeproj/project.xcworkspace/xcshareddata/iAppInfos.xcscmblueprint b/iAppInfos/iAppInfos.xcodeproj/project.xcworkspace/xcshareddata/iAppInfos.xcscmblueprint
@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "30ED34E3C184EFD29C9C0C1173F73792D60AECB7",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "30ED34E3C184EFD29C9C0C1173F73792D60AECB7" : 0,
+    "2DB8CCABDE7A93E3308B640CAAEDE3900BB85093" : 9223372036854775807
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "CBA42CAF-EF54-400E-80A7-7CD4D46CE682",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "30ED34E3C184EFD29C9C0C1173F73792D60AECB7" : "iAppInfos\/",
+    "2DB8CCABDE7A93E3308B640CAAEDE3900BB85093" : ""
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "iAppInfos",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "iAppInfos\/iAppInfos.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/leverdeterre\/xctool-log2junit.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "2DB8CCABDE7A93E3308B640CAAEDE3900BB85093"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/leverdeterre\/iAppInfos.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "30ED34E3C184EFD29C9C0C1173F73792D60AECB7"
+    }
+  ]
+}
diff --git a/...project.xcworkspace/xcuserdata/jeromemorissard.xcuserdatad/UserInterfaceState.xcuserstate b/...project.xcworkspace/xcuserdata/jeromemorissard.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/iAppInfos/iAppInfos/iAppInfos/UIApplication+iAppInfos.m b/iAppInfos/iAppInfos/iAppInfos/UIApplication+iAppInfos.m
@@ -13,7 +13,11 @@ @implementation UIApplication (iAppInfos)
 
 + (NSString *)jmo_iOSSDKVersion
 {
-#if defined(__IPHONE_8_0)
+#if defined(__IPHONE_10_0)
+    return @"SDK10.0 (Xcode8.0)";
+#elif defined(__IPHONE_9_0)
+    return @"SDK9.0 (Xcode7.0)";
+#elif defined(__IPHONE_8_0)
     return @"SDK8.0 (Xcode6.0)";
 #elif defined(__IPHONE_7_1)
     return @"SDK7.1 (Xcode5.1)";

diff --git a/iAppInfos/iAppInfos/iAppInfos/UIDevice+iAppInfos.m b/iAppInfos/iAppInfos/iAppInfos/UIDevice+iAppInfos.m
@@ -48,6 +48,10 @@ + (NSString *)jmo_modelName
     if ([systInfo isEqualToString:@"iPhone8,1"])    return @"iPhone 6s";
     if ([systInfo isEqualToString:@"iPhone8,2"])    return @"iPhone 6s+";
     if ([systInfo isEqualToString:@"iPhone8,4"])    return @"iPhone SE";
+    if ([systInfo isEqualToString:@"iPhone9,1"])    return @"iPhone 7";
+    if ([systInfo isEqualToString:@"iPhone9,3"])    return @"iPhone 7";
+    if ([systInfo isEqualToString:@"iPhone9,2"])    return @"iPhone 7+";
+    if ([systInfo isEqualToString:@"iPhone9,4"])    return @"iPhone 7+";
 
     if ([systInfo isEqualToString:@"iPod1,1"])      return @"iPod touch 1G";
     if ([systInfo isEqualToString:@"iPod2,1"])      return @"iPod touch 2G";
@@ -119,6 +123,10 @@ + (NSString *)jmo_familyModelName
     if ([systInfo isEqualToString:@"iPhone7,2"])    return @"iPhone 6";
     if ([systInfo isEqualToString:@"iPhone8,1"])    return @"iPhone 6s";
     if ([systInfo isEqualToString:@"iPhone8,2"])    return @"iPhone 6s+";
+    if ([systInfo isEqualToString:@"iPhone9,1"])    return @"iPhone 7";
+    if ([systInfo isEqualToString:@"iPhone9,3"])    return @"iPhone 7";
+    if ([systInfo isEqualToString:@"iPhone9,2"])    return @"iPhone 7+";
+    if ([systInfo isEqualToString:@"iPhone9,4"])    return @"iPhone 7+";
 
     if ([systInfo isEqualToString:@"iPod1,1"])      return @"iPod touch 1G";
     if ([systInfo isEqualToString:@"iPod2,1"])      return @"iPod touch 2G";