Skip to content

Commit de5423c

Browse files
sebastianvarelasebastianvarela
committed
Update to latest devices
1 parent 98e98f0 commit de5423c

File tree

4 files changed

+35
-8
lines changed

4 files changed

+35
-8
lines changed

‎Source/DeviceIdentifier.swift‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ internal struct DeviceIdentifier {
3636
case "iPhone11,8": return .iPhoneXR
3737
case "iPhone11,2": return .iPhoneXS
3838
case "iPhone11,6": return .iPhoneXSMax
39+
case "iPhone12,1": return .iPhone11
40+
case "iPhone12,3": return .iPhone11Pro
41+
case "iPhone12,5": return .iPhone11ProMax
3942

4043
case "iPod1,1": return .iPodTouch1G
4144
case "iPod2,1": return .iPodTouch2G
@@ -53,21 +56,24 @@ internal struct DeviceIdentifier {
5356
case "iPad4,4", "iPad4,5", "iPad4,6": return .iPadMini2
5457
case "iPad4,7", "iPad4,8", "iPad4,9": return .iPadMini3
5558
case "iPad5,1", "iPad5,2": return .iPadMini4
59+
case "iPad11,1", "iPad11,2": return .iPadMini5
5660

5761
case "iPad4,1", "iPad4,2", "iPad4,3": return .iPadAir1G
5862
case "iPad5,3", "iPad5,4": return .iPadAir2G
63+
case "iPad11,3", "iPad11,4": return .iPadAir3G
5964

6065
case "iPad6,3", "iPad6,4": return .iPadPro9d7inch1G
6166
case "iPad7,3", "iPad7,4": return .iPadPro10d5inch1G
62-
case "iPad8,1", "iPad8,2": return .iPadPro11inch1G
63-
case "iPad8,3", "iPad8,4": return .iPadPro11inch1G
67+
case "iPad8,1", "iPad8,2": return .iPadPro11inch3G
68+
case "iPad8,3", "iPad8,4": return .iPadPro11inch3G
6469
case "iPad6,7", "iPad6,8": return .iPadPro12d9inch1G
6570
case "iPad7,1", "iPad7,2": return .iPadPro12d9inch2G
6671
case "iPad8,5", "iPad8,6": return .iPadPro12d9inch3G
6772
case "iPad8,7", "iPad8,8": return .iPadPro12d9inch3G
6873

6974
case "iPad6,11", "iPad6,12": return .iPad5G
7075
case "iPad7,5", "iPad7,6": return .iPad6G
76+
case "iPad7,11", "iPad7,12": return .iPad7G
7177

7278
case "AppleTV5,3": return .appleTV4G
7379
case "AppleTV6,2": return .appleTV4K

‎Source/DeviceModel+Name.swift‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ public extension DeviceModel {
2424
case .iPhoneXR: return "iPhone XR"
2525
case .iPhoneXS: return "iPhone XS"
2626
case .iPhoneXSMax: return "iPhone XS Max"
27+
case .iPhone11: return "iPhone 11"
28+
case .iPhone11Pro: return "iPhone 11 Pro"
29+
case .iPhone11ProMax: return "iPhone 11 Pro Max"
2730

2831
case .iPodTouch1G: return "iPod touch 1G"
2932
case .iPodTouch2G: return "iPod touch 2G"
@@ -41,18 +44,21 @@ public extension DeviceModel {
4144
case .iPadMini2: return "iPad Mini 2"
4245
case .iPadMini3: return "iPad Mini 3"
4346
case .iPadMini4: return "iPad Mini 4"
47+
case .iPadMini5: return "iPad Mini 5"
4448
case .iPadAir1G: return "iPad Air"
4549
case .iPadAir2G: return "iPad Air 2"
50+
case .iPadAir3G: return "iPad Air 3"
4651

4752
case .iPadPro9d7inch1G: return "iPad Pro 9.7-Inch 1G"
4853
case .iPadPro10d5inch1G: return "iPad Pro 10.5-Inch 1G"
49-
case .iPadPro11inch1G: return "iPad Pro 11-Inch 1G"
54+
case .iPadPro11inch3G: return "iPad Pro 11-Inch 3G"
5055
case .iPadPro12d9inch1G: return "iPad Pro 12.9-Inch 1G"
5156
case .iPadPro12d9inch2G: return "iPad Pro 12.9-Inch 2G"
5257
case .iPadPro12d9inch3G: return "iPad Pro 12.9-Inch 3G"
5358

5459
case .iPad5G: return "iPad 5G"
5560
case .iPad6G: return "iPad 6G"
61+
case .iPad7G: return "iPad 7G"
5662

5763
case .appleTV4G: return "Apple TV 4G"
5864
case .appleTV4K: return "Apple TV 4K"

‎Source/DeviceModel.swift‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ public enum DeviceModel: Equatable {
2323
case iPhoneXR
2424
case iPhoneXS
2525
case iPhoneXSMax
26+
case iPhone11
27+
case iPhone11Pro
28+
case iPhone11ProMax
2629

2730
case iPodTouch1G
2831
case iPodTouch2G
@@ -40,18 +43,21 @@ public enum DeviceModel: Equatable {
4043
case iPadMini2
4144
case iPadMini3
4245
case iPadMini4
46+
case iPadMini5
4347
case iPadAir1G
4448
case iPadAir2G
49+
case iPadAir3G
4550

4651
case iPadPro9d7inch1G
4752
case iPadPro10d5inch1G
4853
case iPadPro12d9inch1G
4954
case iPadPro12d9inch2G
5055
case iPadPro12d9inch3G
51-
case iPadPro11inch1G
56+
case iPadPro11inch3G
5257

5358
case iPad5G
5459
case iPad6G
60+
case iPad7G
5561

5662
case appleTV4G
5763
case appleTV4K

‎Tests/DeviceIdentifierTests.swift‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ public class DeviceIdentifierTests: XCTestCase {
4545
XCTAssertEqual(DeviceIdentifier("iPhone11,8").model, .iPhoneXR)
4646
XCTAssertEqual(DeviceIdentifier("iPhone11,2").model, .iPhoneXS)
4747
XCTAssertEqual(DeviceIdentifier("iPhone11,6").model, .iPhoneXSMax)
48+
XCTAssertEqual(DeviceIdentifier("iPhone12,1").model, .iPhone11)
49+
XCTAssertEqual(DeviceIdentifier("iPhone12,3").model, .iPhone11Pro)
50+
XCTAssertEqual(DeviceIdentifier("iPhone12,5").model, .iPhone11ProMax)
4851
}
4952

5053
public func testTabletIdentificators() {
@@ -72,23 +75,27 @@ public class DeviceIdentifierTests: XCTestCase {
7275
XCTAssertEqual(DeviceIdentifier("iPad4,9").model, .iPadMini3)
7376
XCTAssertEqual(DeviceIdentifier("iPad5,1").model, .iPadMini4)
7477
XCTAssertEqual(DeviceIdentifier("iPad5,2").model, .iPadMini4)
78+
XCTAssertEqual(DeviceIdentifier("iPad11,1").model, .iPadMini5)
79+
XCTAssertEqual(DeviceIdentifier("iPad11,2").model, .iPadMini5)
7580

7681
XCTAssertEqual(DeviceIdentifier("iPad4,1").model, .iPadAir1G)
7782
XCTAssertEqual(DeviceIdentifier("iPad4,2").model, .iPadAir1G)
7883
XCTAssertEqual(DeviceIdentifier("iPad4,3").model, .iPadAir1G)
7984
XCTAssertEqual(DeviceIdentifier("iPad5,3").model, .iPadAir2G)
8085
XCTAssertEqual(DeviceIdentifier("iPad5,4").model, .iPadAir2G)
86+
XCTAssertEqual(DeviceIdentifier("iPad11,3").model, .iPadAir3G)
87+
XCTAssertEqual(DeviceIdentifier("iPad11,4").model, .iPadAir3G)
8188
}
8289

8390
public func testProTabletIdentificators() {
8491
XCTAssertEqual(DeviceIdentifier("iPad6,3").model, .iPadPro9d7inch1G)
8592
XCTAssertEqual(DeviceIdentifier("iPad6,4").model, .iPadPro9d7inch1G)
8693
XCTAssertEqual(DeviceIdentifier("iPad7,3").model, .iPadPro10d5inch1G)
8794
XCTAssertEqual(DeviceIdentifier("iPad7,4").model, .iPadPro10d5inch1G)
88-
XCTAssertEqual(DeviceIdentifier("iPad8,1").model, .iPadPro11inch1G)
89-
XCTAssertEqual(DeviceIdentifier("iPad8,2").model, .iPadPro11inch1G)
90-
XCTAssertEqual(DeviceIdentifier("iPad8,3").model, .iPadPro11inch1G)
91-
XCTAssertEqual(DeviceIdentifier("iPad8,4").model, .iPadPro11inch1G)
95+
XCTAssertEqual(DeviceIdentifier("iPad8,1").model, .iPadPro11inch3G)
96+
XCTAssertEqual(DeviceIdentifier("iPad8,2").model, .iPadPro11inch3G)
97+
XCTAssertEqual(DeviceIdentifier("iPad8,3").model, .iPadPro11inch3G)
98+
XCTAssertEqual(DeviceIdentifier("iPad8,4").model, .iPadPro11inch3G)
9299
XCTAssertEqual(DeviceIdentifier("iPad6,7").model, .iPadPro12d9inch1G)
93100
XCTAssertEqual(DeviceIdentifier("iPad6,8").model, .iPadPro12d9inch1G)
94101
XCTAssertEqual(DeviceIdentifier("iPad7,1").model, .iPadPro12d9inch2G)
@@ -102,6 +109,8 @@ public class DeviceIdentifierTests: XCTestCase {
102109
XCTAssertEqual(DeviceIdentifier("iPad6,12").model, .iPad5G)
103110
XCTAssertEqual(DeviceIdentifier("iPad7,5").model, .iPad6G)
104111
XCTAssertEqual(DeviceIdentifier("iPad7,6").model, .iPad6G)
112+
XCTAssertEqual(DeviceIdentifier("iPad7,11").model, .iPad7G)
113+
XCTAssertEqual(DeviceIdentifier("iPad7,12").model, .iPad7G)
105114
}
106115

107116
public func testIPodIdentificators() {

0 commit comments

Comments
 (0)