Skip to content

Commit da8239b

Browse files
Add missing iPad models
1 parent f921c23 commit da8239b

4 files changed

Lines changed: 34 additions & 10 deletions

File tree

Source/DeviceIdentifier.swift

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,13 @@ internal struct DeviceIdentifier {
5353
case "iPad4,1", "iPad4,2", "iPad4,3": return .iPadAir1G
5454
case "iPad5,3", "iPad5,4": return .iPadAir2G
5555

56-
case "iPad6,3", "iPad6,4": return .iPadPro9inch1G
57-
case "iPad6,7", "iPad6,8": return .iPadPro12inch1G
56+
case "iPad6,3", "iPad6,4": return .iPadPro9d7inch1G
57+
case "iPad7,3", "iPad7,4": return .iPadPro10d5inch1G
58+
case "iPad6,7", "iPad6,8": return .iPadPro12d9inch1G
59+
case "iPad7,1", "iPad7,2": return .iPadPro12d9inch2G
60+
61+
case "iPad6,11", "iPad6,12": return .iPad5G
62+
case "iPad7,5", "iPad7,6": return .iPad6G
5863

5964
default: return nil
6065
}

Source/DeviceModel+Name.swift

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,13 @@ public extension DeviceModel {
4040
case .iPadAir1G: return "iPad Air"
4141
case .iPadAir2G: return "iPad Air 2"
4242

43-
case .iPadPro9inch1G: return "iPad Pro 9.7-Inch 1G"
44-
case .iPadPro12inch1G: return "iPad Pro 12.9-Inch 1G"
43+
case .iPadPro9d7inch1G: return "iPad Pro 9.7-Inch 1G"
44+
case .iPadPro10d5inch1G: return "iPad Pro 10.5-Inch 1G"
45+
case .iPadPro12d9inch1G: return "iPad Pro 12.9-Inch 1G"
46+
case .iPadPro12d9inch2G: return "iPad Pro 12.9-Inch 2G"
47+
48+
case .iPad5G: return "iPad 5G"
49+
case .iPad6G: return "iPad 6G"
4550

4651
case .iPadSimulator: return "iPad Simulator"
4752
case .iPhoneSimulator: return "iPhone Simulator"

Source/DeviceModel.swift

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,13 @@ public enum DeviceModel: Equatable {
3838
case iPadAir1G
3939
case iPadAir2G
4040

41-
case iPadPro9inch1G
42-
case iPadPro12inch1G
41+
case iPadPro9d7inch1G
42+
case iPadPro10d5inch1G
43+
case iPadPro12d9inch1G
44+
case iPadPro12d9inch2G
45+
46+
case iPad5G
47+
case iPad6G
4348

4449
case iPadSimulator
4550
case iPhoneSimulator

Tests/DeviceIdentifierTests.swift

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,19 @@ public class DeviceIdentifierTests: XCTestCase {
7878
}
7979

8080
public func testProTabletIdentificators() {
81-
XCTAssertEqual(DeviceIdentifier("iPad6,3").model, .iPadPro9inch1G)
82-
XCTAssertEqual(DeviceIdentifier("iPad6,4").model, .iPadPro9inch1G)
83-
XCTAssertEqual(DeviceIdentifier("iPad6,7").model, .iPadPro12inch1G)
84-
XCTAssertEqual(DeviceIdentifier("iPad6,8").model, .iPadPro12inch1G)
81+
XCTAssertEqual(DeviceIdentifier("iPad6,3").model, .iPadPro9d7inch1G)
82+
XCTAssertEqual(DeviceIdentifier("iPad6,4").model, .iPadPro9d7inch1G)
83+
XCTAssertEqual(DeviceIdentifier("iPad7,3").model, .iPadPro10d5inch1G)
84+
XCTAssertEqual(DeviceIdentifier("iPad7,4").model, .iPadPro10d5inch1G)
85+
XCTAssertEqual(DeviceIdentifier("iPad6,7").model, .iPadPro12d9inch1G)
86+
XCTAssertEqual(DeviceIdentifier("iPad6,8").model, .iPadPro12d9inch1G)
87+
XCTAssertEqual(DeviceIdentifier("iPad7,1").model, .iPadPro12d9inch2G)
88+
XCTAssertEqual(DeviceIdentifier("iPad7,2").model, .iPadPro12d9inch2G)
89+
90+
XCTAssertEqual(DeviceIdentifier("iPad6,11").model, .iPad5G)
91+
XCTAssertEqual(DeviceIdentifier("iPad6,12").model, .iPad5G)
92+
XCTAssertEqual(DeviceIdentifier("iPad7,5").model, .iPad6G)
93+
XCTAssertEqual(DeviceIdentifier("iPad7,6").model, .iPad6G)
8594
}
8695

8796
public func testIPodIdentificators() {

0 commit comments

Comments
 (0)