Skip to content

Commit 4861d8e

Browse files
Zandor300denisenepraunig
authored andcommitted
Add support for iPad (7th generation). (devicekit#206)
1 parent bb93940 commit 4861d8e

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

Source/Device.generated.swift

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ public enum Device {
176176
///
177177
/// ![Image](https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP787/ipad-air-2019.jpg)
178178
case iPadAir3
179+
/// Device is an [iPad (7th generation)](https://support.apple.com/kb/SP807)
180+
///
181+
/// ![Image](https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP807/sp807-ipad-7th-gen_2x.png)
182+
case iPad7
179183
/// Device is an [iPad Mini](https://support.apple.com/kb/SP661)
180184
///
181185
/// ![Image](https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP661/sp661_ipad_mini_color.jpg)
@@ -352,6 +356,7 @@ public enum Device {
352356
case "iPad6,11", "iPad6,12": return iPad5
353357
case "iPad7,5", "iPad7,6": return iPad6
354358
case "iPad11,3", "iPad11,4": return iPadAir3
359+
case "iPad7,11", "iPad7,12": return iPad7
355360
case "iPad2,5", "iPad2,6", "iPad2,7": return iPadMini
356361
case "iPad4,4", "iPad4,5", "iPad4,6": return iPadMini2
357362
case "iPad4,7", "iPad4,8", "iPad4,9": return iPadMini3
@@ -446,6 +451,7 @@ public enum Device {
446451
case .iPad5: return 9.7
447452
case .iPad6: return 9.7
448453
case .iPadAir3: return 10.5
454+
case .iPad7: return 10.2
449455
case .iPadMini: return 7.9
450456
case .iPadMini2: return 7.9
451457
case .iPadMini3: return 7.9
@@ -518,6 +524,7 @@ public enum Device {
518524
case .iPad5: return (width: 3, height: 4)
519525
case .iPad6: return (width: 3, height: 4)
520526
case .iPadAir3: return (width: 3, height: 4)
527+
case .iPad7: return (width: 3, height: 4)
521528
case .iPadMini: return (width: 3, height: 4)
522529
case .iPadMini2: return (width: 3, height: 4)
523530
case .iPadMini3: return (width: 3, height: 4)
@@ -568,7 +575,7 @@ public enum Device {
568575

569576
/// All iPads
570577
public static var allPads: [Device] {
571-
return [.iPad2, .iPad3, .iPad4, .iPadAir, .iPadAir2, .iPad5, .iPad6, .iPadAir3, .iPadMini, .iPadMini2, .iPadMini3, .iPadMini4, .iPadMini5, .iPadPro9Inch, .iPadPro12Inch, .iPadPro12Inch2, .iPadPro10Inch, .iPadPro11Inch, .iPadPro12Inch3]
578+
return [.iPad2, .iPad3, .iPad4, .iPadAir, .iPadAir2, .iPad5, .iPad6, .iPadAir3, .iPad7, .iPadMini, .iPadMini2, .iPadMini3, .iPadMini4, .iPadMini5, .iPadPro9Inch, .iPadPro12Inch, .iPadPro12Inch2, .iPadPro10Inch, .iPadPro11Inch, .iPadPro12Inch3]
572579
}
573580

574581
/// All X-Series Devices
@@ -669,7 +676,7 @@ public enum Device {
669676

670677
/// All Touch ID Capable Devices
671678
public static var allTouchIDCapableDevices: [Device] {
672-
return [.iPhone5s, .iPhone6, .iPhone6Plus, .iPhone6s, .iPhone6sPlus, .iPhone7, .iPhone7Plus, .iPhoneSE, .iPhone8, .iPhone8Plus, .iPadAir2, .iPad5, .iPad6, .iPadAir3, .iPadMini3, .iPadMini4, .iPadMini5, .iPadPro9Inch, .iPadPro12Inch, .iPadPro12Inch2, .iPadPro10Inch]
679+
return [.iPhone5s, .iPhone6, .iPhone6Plus, .iPhone6s, .iPhone6sPlus, .iPhone7, .iPhone7Plus, .iPhoneSE, .iPhone8, .iPhone8Plus, .iPadAir2, .iPad5, .iPad6, .iPadAir3, .iPad7, .iPadMini3, .iPadMini4, .iPadMini5, .iPadPro9Inch, .iPadPro12Inch, .iPadPro12Inch2, .iPadPro10Inch]
673680
}
674681

675682
/// All Face ID Capable Devices
@@ -893,6 +900,7 @@ public enum Device {
893900
case .iPad5: return 264
894901
case .iPad6: return 264
895902
case .iPadAir3: return 264
903+
case .iPad7: return 264
896904
case .iPadMini: return 163
897905
case .iPadMini2: return 326
898906
case .iPadMini3: return 326
@@ -992,6 +1000,7 @@ extension Device: CustomStringConvertible {
9921000
case .iPad5: return "iPad (5th generation)"
9931001
case .iPad6: return "iPad (6th generation)"
9941002
case .iPadAir3: return "iPad Air (3rd generation)"
1003+
case .iPad7: return "iPad (7th generation)"
9951004
case .iPadMini: return "iPad Mini"
9961005
case .iPadMini2: return "iPad Mini 2"
9971006
case .iPadMini3: return "iPad Mini 3"
@@ -1286,14 +1295,15 @@ extension Device {
12861295

12871296
/// All Apple Pencil Capable Devices
12881297
public static var allApplePencilCapableDevices: [Device] {
1289-
return [.iPad6, .iPadAir3, .iPadMini5, .iPadPro9Inch, .iPadPro12Inch, .iPadPro12Inch2, .iPadPro10Inch, .iPadPro11Inch, .iPadPro12Inch3]
1298+
return [.iPad6, .iPadAir3, .iPad7, .iPadMini5, .iPadPro9Inch, .iPadPro12Inch, .iPadPro12Inch2, .iPadPro10Inch, .iPadPro11Inch, .iPadPro12Inch3]
12901299
}
12911300

12921301
/// Returns supported version of the Apple Pencil
12931302
public var applePencilSupport: ApplePencilSupport {
12941303
switch self {
12951304
case .iPad6: return .firstGeneration
12961305
case .iPadAir3: return .firstGeneration
1306+
case .iPad7: return .firstGeneration
12971307
case .iPadMini5: return .firstGeneration
12981308
case .iPadPro9Inch: return .firstGeneration
12991309
case .iPadPro12Inch: return .firstGeneration
@@ -1344,6 +1354,7 @@ extension Device {
13441354
case .iPad5: return [.normal]
13451355
case .iPad6: return [.normal]
13461356
case .iPadAir3: return [.normal]
1357+
case .iPad7: return [.normal]
13471358
case .iPadMini: return [.normal]
13481359
case .iPadMini2: return [.normal]
13491360
case .iPadMini3: return [.normal]
@@ -1369,12 +1380,12 @@ extension Device {
13691380

13701381
/// All devices that feature a camera
13711382
public static var allDevicesWithCamera: [Device] {
1372-
return [.iPodTouch5, .iPodTouch6, .iPodTouch7, .iPhone4, .iPhone4s, .iPhone5, .iPhone5c, .iPhone5s, .iPhone6, .iPhone6Plus, .iPhone6s, .iPhone6sPlus, .iPhone7, .iPhone7Plus, .iPhoneSE, .iPhone8, .iPhone8Plus, .iPhoneX, .iPhoneXS, .iPhoneXSMax, .iPhoneXR, .iPhone11, .iPhone11Pro, .iPhone11ProMax, .iPad2, .iPad3, .iPad4, .iPadAir, .iPadAir2, .iPad5, .iPad6, .iPadAir3, .iPadMini, .iPadMini2, .iPadMini3, .iPadMini4, .iPadMini5, .iPadPro9Inch, .iPadPro12Inch, .iPadPro12Inch2, .iPadPro10Inch, .iPadPro11Inch, .iPadPro12Inch3]
1383+
return [.iPodTouch5, .iPodTouch6, .iPodTouch7, .iPhone4, .iPhone4s, .iPhone5, .iPhone5c, .iPhone5s, .iPhone6, .iPhone6Plus, .iPhone6s, .iPhone6sPlus, .iPhone7, .iPhone7Plus, .iPhoneSE, .iPhone8, .iPhone8Plus, .iPhoneX, .iPhoneXS, .iPhoneXSMax, .iPhoneXR, .iPhone11, .iPhone11Pro, .iPhone11ProMax, .iPad2, .iPad3, .iPad4, .iPadAir, .iPadAir2, .iPad5, .iPad6, .iPadAir3, .iPad7, .iPadMini, .iPadMini2, .iPadMini3, .iPadMini4, .iPadMini5, .iPadPro9Inch, .iPadPro12Inch, .iPadPro12Inch2, .iPadPro10Inch, .iPadPro11Inch, .iPadPro12Inch3]
13731384
}
13741385

13751386
/// All devices that feature a normal camera
13761387
public static var allDevicesWithNormalCamera: [Device] {
1377-
return [.iPodTouch5, .iPodTouch6, .iPodTouch7, .iPhone4, .iPhone4s, .iPhone5, .iPhone5c, .iPhone5s, .iPhone6, .iPhone6Plus, .iPhone6s, .iPhone6sPlus, .iPhone7, .iPhone7Plus, .iPhoneSE, .iPhone8, .iPhone8Plus, .iPhoneX, .iPhoneXS, .iPhoneXSMax, .iPhoneXR, .iPhone11, .iPhone11Pro, .iPhone11ProMax, .iPad2, .iPad3, .iPad4, .iPadAir, .iPadAir2, .iPad5, .iPad6, .iPadAir3, .iPadMini, .iPadMini2, .iPadMini3, .iPadMini4, .iPadMini5, .iPadPro9Inch, .iPadPro12Inch, .iPadPro12Inch2, .iPadPro10Inch, .iPadPro11Inch, .iPadPro12Inch3]
1388+
return [.iPodTouch5, .iPodTouch6, .iPodTouch7, .iPhone4, .iPhone4s, .iPhone5, .iPhone5c, .iPhone5s, .iPhone6, .iPhone6Plus, .iPhone6s, .iPhone6sPlus, .iPhone7, .iPhone7Plus, .iPhoneSE, .iPhone8, .iPhone8Plus, .iPhoneX, .iPhoneXS, .iPhoneXSMax, .iPhoneXR, .iPhone11, .iPhone11Pro, .iPhone11ProMax, .iPad2, .iPad3, .iPad4, .iPadAir, .iPadAir2, .iPad5, .iPad6, .iPadAir3, .iPad7, .iPadMini, .iPadMini2, .iPadMini3, .iPadMini4, .iPadMini5, .iPadPro9Inch, .iPadPro12Inch, .iPadPro12Inch2, .iPadPro10Inch, .iPadPro11Inch, .iPadPro12Inch3]
13781389
}
13791390

13801391
/// All devices that feature a telephoto camera

Source/Device.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ iPads = [
7373
Device("iPad5", "Device is an [iPad (5th generation)](https://support.apple.com/kb/SP751)", "https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP751/ipad_5th_generation.png", ["iPad6,11", "iPad6,12"], 9.7, (3, 4), "iPad (5th generation)", 264, False, False, False, False, True, False, False, False, 0, False, 1),
7474
Device("iPad6", "Device is an [iPad (6th generation)](https://support.apple.com/kb/SP774)", "https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP774/sp774-ipad-6-gen_2x.png", ["iPad7,5", "iPad7,6"], 9.7, (3, 4), "iPad (6th generation)", 264, False, False, False, False, True, False, False, False, 1, False, 1),
7575
Device("iPadAir3", "Device is an [iPad Air (3rd generation)](https://support.apple.com/kb/SP787)", "https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP787/ipad-air-2019.jpg", ["iPad11,3", "iPad11,4"], 10.5, (3, 4), "iPad Air (3rd generation)", 264, False, False, False, False, True, False, False, False, 1, False, 1),
76-
# Device("iPad7", "Device is an [iPad (7th generation)](TODO)", "TODO", ["iPadTODO"], 10.2, (3, 4), "iPad (7th generation)", 264, False, False, False, False, True, False, False, False, 1, False, 1),
76+
Device("iPad7", "Device is an [iPad (7th generation)](https://support.apple.com/kb/SP807)", "https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP807/sp807-ipad-7th-gen_2x.png", ["iPad7,11", "iPad7,12"], 10.2, (3, 4), "iPad (7th generation)", 264, False, False, False, False, True, False, False, False, 1, False, 1),
7777
Device("iPadMini", "Device is an [iPad Mini](https://support.apple.com/kb/SP661)", "https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP661/sp661_ipad_mini_color.jpg", ["iPad2,5", "iPad2,6", "iPad2,7"], 7.9, (3, 4), "iPad Mini", 163, False, True, False, False, False, False, False, False, 0, False, 1),
7878
Device("iPadMini2", "Device is an [iPad Mini 2](https://support.apple.com/kb/SP693)", "https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP693/SP693-specs_color-mul.png", ["iPad4,4", "iPad4,5", "iPad4,6"], 7.9, (3, 4), "iPad Mini 2", 326, False, True, False, False, False, False, False, False, 0, False, 1),
7979
Device("iPadMini3", "Device is an [iPad Mini 3](https://support.apple.com/kb/SP709)", "https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP709/SP709-space_gray.jpeg", ["iPad4,7", "iPad4,8", "iPad4,9"], 7.9, (3, 4), "iPad Mini 3", 326, False, True, False, False, True, False, False, False, 0, False, 1),

0 commit comments

Comments
 (0)