Skip to content

Commit e205a1b

Browse files
Add new ipads and iphones
1 parent 1c84df4 commit e205a1b

File tree

4 files changed

+28
-0
lines changed

4 files changed

+28
-0
lines changed

Source/DeviceIdentifier.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ internal struct DeviceIdentifier {
3333
case "iPhone10,1", "iPhone10,4": return .iPhone8
3434
case "iPhone10,2", "iPhone10,5": return .iPhone8Plus
3535
case "iPhone10,3", "iPhone10,6": return .iPhoneX
36+
case "iPhone11,8": return .iPhoneXR
37+
case "iPhone11,2": return .iPhoneXS
38+
case "iPhone11,6": return .iPhoneXSMax
3639

3740
case "iPod1,1": return .iPodTouch1G
3841
case "iPod2,1": return .iPodTouch2G
@@ -55,8 +58,12 @@ internal struct DeviceIdentifier {
5558

5659
case "iPad6,3", "iPad6,4": return .iPadPro9d7inch1G
5760
case "iPad7,3", "iPad7,4": return .iPadPro10d5inch1G
61+
case "iPad8,1", "iPad8,2": return .iPadPro11inch1G
62+
case "iPad8,3", "iPad8,4": return .iPadPro11inch1G
5863
case "iPad6,7", "iPad6,8": return .iPadPro12d9inch1G
5964
case "iPad7,1", "iPad7,2": return .iPadPro12d9inch2G
65+
case "iPad8,5", "iPad8,6": return .iPadPro12d9inch3G
66+
case "iPad8,7", "iPad8,8": return .iPadPro12d9inch3G
6067

6168
case "iPad6,11", "iPad6,12": return .iPad5G
6269
case "iPad7,5", "iPad7,6": return .iPad6G

Source/DeviceModel+Name.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ public extension DeviceModel {
2121
case .iPhone8: return "iPhone 8"
2222
case .iPhone8Plus: return "iPhone 8 Plus"
2323
case .iPhoneX: return "iPhone X"
24+
case .iPhoneXR: return "iPhone XR"
25+
case .iPhoneXS: return "iPhone XS"
26+
case .iPhoneXSMax: return "iPhone XS Max"
2427

2528
case .iPodTouch1G: return "iPod touch 1G"
2629
case .iPodTouch2G: return "iPod touch 2G"
@@ -42,8 +45,10 @@ public extension DeviceModel {
4245

4346
case .iPadPro9d7inch1G: return "iPad Pro 9.7-Inch 1G"
4447
case .iPadPro10d5inch1G: return "iPad Pro 10.5-Inch 1G"
48+
case .iPadPro11inch1G: return "iPad Pro 11-Inch 1G"
4549
case .iPadPro12d9inch1G: return "iPad Pro 12.9-Inch 1G"
4650
case .iPadPro12d9inch2G: return "iPad Pro 12.9-Inch 2G"
51+
case .iPadPro12d9inch3G: return "iPad Pro 12.9-Inch 3G"
4752

4853
case .iPad5G: return "iPad 5G"
4954
case .iPad6G: return "iPad 6G"

Source/DeviceModel.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ public enum DeviceModel: Equatable {
2020
case iPhone8
2121
case iPhone8Plus
2222
case iPhoneX
23+
case iPhoneXR
24+
case iPhoneXS
25+
case iPhoneXSMax
2326

2427
case iPodTouch1G
2528
case iPodTouch2G
@@ -43,6 +46,8 @@ public enum DeviceModel: Equatable {
4346
case iPadPro10d5inch1G
4447
case iPadPro12d9inch1G
4548
case iPadPro12d9inch2G
49+
case iPadPro12d9inch3G
50+
case iPadPro11inch1G
4651

4752
case iPad5G
4853
case iPad6G

Tests/DeviceIdentifierTests.swift

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ public class DeviceIdentifierTests: XCTestCase {
4242
XCTAssertEqual(DeviceIdentifier("iPhone10,5").model, .iPhone8Plus)
4343
XCTAssertEqual(DeviceIdentifier("iPhone10,3").model, .iPhoneX)
4444
XCTAssertEqual(DeviceIdentifier("iPhone10,6").model, .iPhoneX)
45+
XCTAssertEqual(DeviceIdentifier("iPhone11,8").model, .iPhoneXR)
46+
XCTAssertEqual(DeviceIdentifier("iPhone11,2").model, .iPhoneXS)
47+
XCTAssertEqual(DeviceIdentifier("iPhone11,6").model, .iPhoneXSMax)
4548
}
4649

4750
public func testTabletIdentificators() {
@@ -82,10 +85,18 @@ public class DeviceIdentifierTests: XCTestCase {
8285
XCTAssertEqual(DeviceIdentifier("iPad6,4").model, .iPadPro9d7inch1G)
8386
XCTAssertEqual(DeviceIdentifier("iPad7,3").model, .iPadPro10d5inch1G)
8487
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)
8592
XCTAssertEqual(DeviceIdentifier("iPad6,7").model, .iPadPro12d9inch1G)
8693
XCTAssertEqual(DeviceIdentifier("iPad6,8").model, .iPadPro12d9inch1G)
8794
XCTAssertEqual(DeviceIdentifier("iPad7,1").model, .iPadPro12d9inch2G)
8895
XCTAssertEqual(DeviceIdentifier("iPad7,2").model, .iPadPro12d9inch2G)
96+
XCTAssertEqual(DeviceIdentifier("iPad8,5").model, .iPadPro12d9inch3G)
97+
XCTAssertEqual(DeviceIdentifier("iPad8,6").model, .iPadPro12d9inch3G)
98+
XCTAssertEqual(DeviceIdentifier("iPad8,7").model, .iPadPro12d9inch3G)
99+
XCTAssertEqual(DeviceIdentifier("iPad8,8").model, .iPadPro12d9inch3G)
89100

90101
XCTAssertEqual(DeviceIdentifier("iPad6,11").model, .iPad5G)
91102
XCTAssertEqual(DeviceIdentifier("iPad6,12").model, .iPad5G)

0 commit comments

Comments
 (0)