Skip to content

Commit ee6239c

Browse files
authored
Rename iPad Mini to iPad mini for Apple naming consistency (#478)
* Initial plan * Rename iPad Mini to iPad mini in strings and comments * Add changelog entry for iPad mini naming fix
1 parent 5314fea commit ee6239c

File tree

4 files changed

+39
-38
lines changed

4 files changed

+39
-38
lines changed

CHANGELOG.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@
2020

2121
### Bug fixes
2222

23-
- Fixed iPhone Air incorrectly marked as having ultra-wide camera. ([#463](https://github.com/devicekit/DeviceKit/pull/463))
23+
- Fixed iPhone Air incorrectly marked as having ultra-wide camera. ([#463](https://github.com/devicekit/DeviceKit/issues/463))
2424
- Fixed Apple Pencil compatibility for M4 iPad Pro, M2/M3 iPad Air, iPad (10th gen), and iPad (A16) models. ([#474](https://github.com/devicekit/DeviceKit/pull/474))
2525
- Fixed `ApplePencilSupport` OptionSet raw values so that `.firstGenerationUsbC` no longer incorrectly overlaps with `.firstGeneration` and `.secondGeneration`. ([#474](https://github.com/devicekit/DeviceKit/pull/474))
26+
- Fixed naming of iPad mini devices to match Apple's official naming (lowercase "mini"). ([#458](https://github.com/devicekit/DeviceKit/issues/458))
2627
- Exclude unhandled files (`Info.plist`, `Device.swift.gyb`) to suppress SPM warnings. ([#484](https://github.com/devicekit/DeviceKit/pull/484))
2728

2829
## Version 5.7.0
@@ -51,7 +52,7 @@ This version adds support for the iPhone 17 series, Apple Watch Ultra 3 and Appl
5152

5253
- Missing device identifiers for Apple Watch Series 9 were added.
5354
- Docs for Apple Watch Series 9 was updated to include specs links
54-
- Fixed Apple Pencil support for iPad Mini (A17 Pro).
55+
- Fixed Apple Pencil support for iPad mini (A17 Pro).
5556

5657
Thanks to all the contributers of this release!
5758
- [Jager-yoo](https://github.com/Jager-yoo)
@@ -71,7 +72,7 @@ This version adds support for the devices announced in October 2024: ([#429](htt
7172

7273
| Device | Case value |
7374
| --- | --- |
74-
| iPad Mini (A17 Pro) | `Device.iPadMiniA17Pro` |
75+
| iPad mini (A17 Pro) | `Device.iPadMiniA17Pro` |
7576

7677
### New February 2025 devices
7778

@@ -738,8 +739,8 @@ pod 'DeviceKit', '~> 1.13'
738739
```
739740

740741
### New iPads
741-
Added new iPad Mini (5th generation) and iPad Air (3rd generation)
742+
Added new iPad mini (5th generation) and iPad Air (3rd generation)
742743
```swift
743-
Device.iPadMini5 // iPad Mini (5th generation)
744+
Device.iPadMini5 // iPad mini (5th generation)
744745
Device.iPadAir3 // iPad Air (3rd generation)
745746
```

Source/Device.generated.swift

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -342,31 +342,31 @@ public enum Device {
342342
///
343343
/// ![Image]()
344344
case iPadAir13M4
345-
/// Device is an [iPad Mini](https://support.apple.com/kb/SP661)
345+
/// Device is an [iPad mini](https://support.apple.com/kb/SP661)
346346
///
347347
/// ![Image](https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP661/sp661_ipad_mini_color.jpg)
348348
case iPadMini
349-
/// Device is an [iPad Mini 2](https://support.apple.com/kb/SP693)
349+
/// Device is an [iPad mini 2](https://support.apple.com/kb/SP693)
350350
///
351351
/// ![Image](https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP693/SP693-specs_color-mul.png)
352352
case iPadMini2
353-
/// Device is an [iPad Mini 3](https://support.apple.com/kb/SP709)
353+
/// Device is an [iPad mini 3](https://support.apple.com/kb/SP709)
354354
///
355355
/// ![Image](https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP709/SP709-space_gray.jpeg)
356356
case iPadMini3
357-
/// Device is an [iPad Mini 4](https://support.apple.com/kb/SP725)
357+
/// Device is an [iPad mini 4](https://support.apple.com/kb/SP725)
358358
///
359359
/// ![Image](https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP725/SP725ipad-mini-4.png)
360360
case iPadMini4
361-
/// Device is an [iPad Mini (5th generation)](https://support.apple.com/kb/SP788)
361+
/// Device is an [iPad mini (5th generation)](https://support.apple.com/kb/SP788)
362362
///
363363
/// ![Image](https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP788/ipad-mini-2019.jpg)
364364
case iPadMini5
365-
/// Device is an [iPad Mini (6th generation)](https://support.apple.com/kb/SP850)
365+
/// Device is an [iPad mini (6th generation)](https://support.apple.com/kb/SP850)
366366
///
367367
/// ![Image](https://km.support.apple.com/resources/sites/APPLE/content/live/IMAGES/1000/IM1097/en_US/ipad-mini-6gen-240.png)
368368
case iPadMini6
369-
/// Device is an [iPad Mini (A17 Pro)](https://support.apple.com/en-us/121456)
369+
/// Device is an [iPad mini (A17 Pro)](https://support.apple.com/en-us/121456)
370370
///
371371
/// ![Image](https://cdsassets.apple.com/live/7WUAS350/images/tech-specs/iPad_mini_A17_Pro_Wi-Fi_Lineup_Print__USEN.png)
372372
case iPadMiniA17Pro
@@ -1746,13 +1746,13 @@ extension Device: CustomStringConvertible {
17461746
case .iPadAir13M3: return "iPad Air (13-inch) (M3)"
17471747
case .iPadAir11M4: return "iPad Air (11-inch) (M4)"
17481748
case .iPadAir13M4: return "iPad Air (13-inch) (M4)"
1749-
case .iPadMini: return "iPad Mini"
1750-
case .iPadMini2: return "iPad Mini 2"
1751-
case .iPadMini3: return "iPad Mini 3"
1752-
case .iPadMini4: return "iPad Mini 4"
1753-
case .iPadMini5: return "iPad Mini (5th generation)"
1754-
case .iPadMini6: return "iPad Mini (6th generation)"
1755-
case .iPadMiniA17Pro: return "iPad Mini (A17 Pro)"
1749+
case .iPadMini: return "iPad mini"
1750+
case .iPadMini2: return "iPad mini 2"
1751+
case .iPadMini3: return "iPad mini 3"
1752+
case .iPadMini4: return "iPad mini 4"
1753+
case .iPadMini5: return "iPad mini (5th generation)"
1754+
case .iPadMini6: return "iPad mini (6th generation)"
1755+
case .iPadMiniA17Pro: return "iPad mini (A17 Pro)"
17561756
case .iPadPro9Inch: return "iPad Pro (9.7-inch)"
17571757
case .iPadPro12Inch: return "iPad Pro (12.9-inch)"
17581758
case .iPadPro12Inch2: return "iPad Pro (12.9-inch) (2nd generation)"
@@ -1911,13 +1911,13 @@ extension Device: CustomStringConvertible {
19111911
case .iPadAir13M3: return "iPad Air (13-inch) (M3)"
19121912
case .iPadAir11M4: return "iPad Air (11-inch) (M4)"
19131913
case .iPadAir13M4: return "iPad Air (13-inch) (M4)"
1914-
case .iPadMini: return "iPad Mini"
1915-
case .iPadMini2: return "iPad Mini 2"
1916-
case .iPadMini3: return "iPad Mini 3"
1917-
case .iPadMini4: return "iPad Mini 4"
1918-
case .iPadMini5: return "iPad Mini (5th generation)"
1919-
case .iPadMini6: return "iPad Mini (6th generation)"
1920-
case .iPadMiniA17Pro: return "iPad Mini (A17 Pro)"
1914+
case .iPadMini: return "iPad mini"
1915+
case .iPadMini2: return "iPad mini 2"
1916+
case .iPadMini3: return "iPad mini 3"
1917+
case .iPadMini4: return "iPad mini 4"
1918+
case .iPadMini5: return "iPad mini (5th generation)"
1919+
case .iPadMini6: return "iPad mini (6th generation)"
1920+
case .iPadMiniA17Pro: return "iPad mini (A17 Pro)"
19211921
case .iPadPro9Inch: return "iPad Pro (9.7-inch)"
19221922
case .iPadPro12Inch: return "iPad Pro (12.9-inch)"
19231923
case .iPadPro12Inch2: return "iPad Pro (12.9-inch) (2nd generation)"

Source/Device.swift.gyb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ iPads = [
120120
Device("iPadAir13M3", "Device is an [iPad Air 13-inch (M3)]()", "https://cdsassets.apple.com/content/services/pub/image?productid=301029&size=240x240", ["iPad15,5", "iPad15,6"], 12.9, (683, 512), "iPad Air (13-inch) (M3)", "iPad Air (13-inch) (M3)", 264, False, False, False, False, True, False, False, False, True, False, 34, False, 1, False, "m3", True, True),
121121
Device("iPadAir11M4", "Device is an [iPad Air 11-inch (M4)]()", "", ["iPad16,8", "iPad16,9"], 10.9, (59, 41), "iPad Air (11-inch) (M4)", "iPad Air (11-inch) (M4)", 264, False, False, False, False, True, False, False, False, True, False, 34, False, 1, False, "m4", True, True),
122122
Device("iPadAir13M4", "Device is an [iPad Air 13-inch (M4)]()", "", ["iPad16,10", "iPad16,11"], 12.9, (683, 512), "iPad Air (13-inch) (M4)", "iPad Air (13-inch) (M4)", 264, False, False, False, False, True, False, False, False, True, False, 34, False, 1, False, "m4", True, True),
123-
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", "iPad Mini", 163, False, True, False, False, False, False, False, False, False, False, 0, False, 1, False, "a5", False, False),
124-
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", "iPad Mini 2", 326, False, True, False, False, False, False, False, False, False, False, 0, False, 1, False, "a7", False, False),
125-
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", "iPad Mini 3", 326, False, True, False, False, True, False, False, False, False, False, 0, False, 1, False, "a7", False, False),
126-
Device("iPadMini4", "Device is an [iPad Mini 4](https://support.apple.com/kb/SP725)", "https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP725/SP725ipad-mini-4.png", ["iPad5,1", "iPad5,2"], 7.9, (3, 4), "iPad Mini 4", "iPad Mini 4", 326, False, True, False, False, True, False, False, False, False, False, 0, False, 1, False, "a8", False, False),
127-
Device("iPadMini5", "Device is an [iPad Mini (5th generation)](https://support.apple.com/kb/SP788)", "https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP788/ipad-mini-2019.jpg", ["iPad11,1", "iPad11,2"], 7.9, (3, 4), "iPad Mini (5th generation)", "iPad Mini (5th generation)", 326, False, True, False, False, True, False, False, False, False, False, 1, False, 1, False, "a12Bionic", False, False),
128-
Device("iPadMini6", "Device is an [iPad Mini (6th generation)](https://support.apple.com/kb/SP850)", "https://km.support.apple.com/resources/sites/APPLE/content/live/IMAGES/1000/IM1097/en_US/ipad-mini-6gen-240.png", ["iPad14,1", "iPad14,2"], 8.3, (744, 1133), "iPad Mini (6th generation)", "iPad Mini (6th generation)", 326, False, True, False, False, True, False, False, False, True, False, 23, False, 1, False, "a15Bionic", True, True),
129-
Device("iPadMiniA17Pro", "Device is an [iPad Mini (A17 Pro)](https://support.apple.com/en-us/121456)", "https://cdsassets.apple.com/live/7WUAS350/images/tech-specs/iPad_mini_A17_Pro_Wi-Fi_Lineup_Print__USEN.png", ["iPad16,1", "iPad16,2"], 8.3, (744, 1133), "iPad Mini (A17 Pro)", "iPad Mini (A17 Pro)", 326, False, True, False, False, True, False, False, False, True, False, 34, False, 1, False, "a17Pro", True, True),
123+
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", "iPad mini", 163, False, True, False, False, False, False, False, False, False, False, 0, False, 1, False, "a5", False, False),
124+
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", "iPad mini 2", 326, False, True, False, False, False, False, False, False, False, False, 0, False, 1, False, "a7", False, False),
125+
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", "iPad mini 3", 326, False, True, False, False, True, False, False, False, False, False, 0, False, 1, False, "a7", False, False),
126+
Device("iPadMini4", "Device is an [iPad mini 4](https://support.apple.com/kb/SP725)", "https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP725/SP725ipad-mini-4.png", ["iPad5,1", "iPad5,2"], 7.9, (3, 4), "iPad mini 4", "iPad mini 4", 326, False, True, False, False, True, False, False, False, False, False, 0, False, 1, False, "a8", False, False),
127+
Device("iPadMini5", "Device is an [iPad mini (5th generation)](https://support.apple.com/kb/SP788)", "https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP788/ipad-mini-2019.jpg", ["iPad11,1", "iPad11,2"], 7.9, (3, 4), "iPad mini (5th generation)", "iPad mini (5th generation)", 326, False, True, False, False, True, False, False, False, False, False, 1, False, 1, False, "a12Bionic", False, False),
128+
Device("iPadMini6", "Device is an [iPad mini (6th generation)](https://support.apple.com/kb/SP850)", "https://km.support.apple.com/resources/sites/APPLE/content/live/IMAGES/1000/IM1097/en_US/ipad-mini-6gen-240.png", ["iPad14,1", "iPad14,2"], 8.3, (744, 1133), "iPad mini (6th generation)", "iPad mini (6th generation)", 326, False, True, False, False, True, False, False, False, True, False, 23, False, 1, False, "a15Bionic", True, True),
129+
Device("iPadMiniA17Pro", "Device is an [iPad mini (A17 Pro)](https://support.apple.com/en-us/121456)", "https://cdsassets.apple.com/live/7WUAS350/images/tech-specs/iPad_mini_A17_Pro_Wi-Fi_Lineup_Print__USEN.png", ["iPad16,1", "iPad16,2"], 8.3, (744, 1133), "iPad mini (A17 Pro)", "iPad mini (A17 Pro)", 326, False, True, False, False, True, False, False, False, True, False, 34, False, 1, False, "a17Pro", True, True),
130130
Device("iPadPro9Inch", "Device is an [iPad Pro 9.7-inch](https://support.apple.com/kb/SP739)", "https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP739/SP739.png", ["iPad6,3", "iPad6,4"], 9.7, (3, 4), "iPad Pro (9.7-inch)", "iPad Pro (9.7-inch)", 264, False, False, True, False, True, False, False, False, False, False, 1, False, 1, False, "a9X", False, False),
131131
Device("iPadPro12Inch", "Device is an [iPad Pro 12-inch](https://support.apple.com/kb/SP723)", "https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP723/SP723-iPad_Pro_2x.png", ["iPad6,7", "iPad6,8"], 12.9, (3, 4), "iPad Pro (12.9-inch)", "iPad Pro (12.9-inch)", 264, False, False, True, False, True, False, False, False, False, False, 1, False, 1, False, "a9X", False, False),
132132
Device("iPadPro12Inch2", "Device is an [iPad Pro 12-inch (2nd generation)](https://support.apple.com/kb/SP761)", "https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP761/ipad-pro-12in-hero-201706.png", ["iPad7,1", "iPad7,2"], 12.9, (3, 4), "iPad Pro (12.9-inch) (2nd generation)", "iPad Pro (12.9-inch) (2nd generation)", 264, False, False, True, False, True, False, False, False, False, False, 1, False, 1, False, "a10XFusion", False, False),

Tests/Tests.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -369,11 +369,11 @@ class DeviceKitTests: XCTestCase {
369369
XCTAssertEqual(Device.iPad5.description, "iPad (5th generation)")
370370
XCTAssertEqual(Device.iPad6.description, "iPad (6th generation)")
371371
XCTAssertEqual(Device.iPadAir3.description, "iPad Air (3rd generation)")
372-
XCTAssertEqual(Device.iPadMini.description, "iPad Mini")
373-
XCTAssertEqual(Device.iPadMini2.description, "iPad Mini 2")
374-
XCTAssertEqual(Device.iPadMini3.description, "iPad Mini 3")
375-
XCTAssertEqual(Device.iPadMini4.description, "iPad Mini 4")
376-
XCTAssertEqual(Device.iPadMini5.description, "iPad Mini (5th generation)")
372+
XCTAssertEqual(Device.iPadMini.description, "iPad mini")
373+
XCTAssertEqual(Device.iPadMini2.description, "iPad mini 2")
374+
XCTAssertEqual(Device.iPadMini3.description, "iPad mini 3")
375+
XCTAssertEqual(Device.iPadMini4.description, "iPad mini 4")
376+
XCTAssertEqual(Device.iPadMini5.description, "iPad mini (5th generation)")
377377
XCTAssertEqual(Device.iPadPro9Inch.description, "iPad Pro (9.7-inch)")
378378
XCTAssertEqual(Device.iPadPro12Inch.description, "iPad Pro (12.9-inch)")
379379
XCTAssertEqual(Device.iPadPro12Inch2.description, "iPad Pro (12.9-inch) (2nd generation)")

0 commit comments

Comments
 (0)