Skip to content

Add rounded-display-corner support for affected Apple Watch models #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Add rounded-display-corner support for affected Apple Watch models #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2360ce8
Initial plan
Copilot May 22, 2026
348121f
Add rounded-corner support for Apple Watch models
Copilot May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Source/Device.generated.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1335,6 +1335,16 @@ public enum Device {
return allWatches.map(Device.simulator)
}

/// All watches that feature a screen with rounded corners.
public static var allDevicesWithRoundedDisplayCorners: [Device] {
return [.appleWatchSeries4_40mm, .appleWatchSeries4_44mm, .appleWatchSeries5_40mm, .appleWatchSeries5_44mm, .appleWatchSeries6_40mm, .appleWatchSeries6_44mm, .appleWatchSeries7_41mm, .appleWatchSeries7_45mm, .appleWatchSeries8_41mm, .appleWatchSeries8_45mm, .appleWatchSE2_40mm, .appleWatchSE2_44mm, .appleWatchUltra, .appleWatchSeries9_41mm, .appleWatchSeries9_45mm, .appleWatchUltra2, .appleWatchSeries10_42mm, .appleWatchSeries10_46mm, .appleWatchUltra3, .appleWatchSeries11_42mm, .appleWatchSeries11_46mm]
}

/// Returns whether or not the watch has a screen with rounded corners.
public var hasRoundedDisplayCorners: Bool {
return isOneOf(Device.allDevicesWithRoundedDisplayCorners) || isOneOf(Device.allDevicesWithRoundedDisplayCorners.map(Device.simulator))
}

/// All watches that have Force Touch support.
public static var allWatchesWithForceTouchSupport: [Device] {
return [.appleWatchSeries0_38mm, .appleWatchSeries0_42mm, .appleWatchSeries1_38mm, .appleWatchSeries1_42mm, .appleWatchSeries2_38mm, .appleWatchSeries2_42mm, .appleWatchSeries3_38mm, .appleWatchSeries3_42mm, .appleWatchSeries4_40mm, .appleWatchSeries4_44mm, .appleWatchSeries5_40mm, .appleWatchSeries5_44mm]
Expand Down
52 changes: 31 additions & 21 deletions Source/Device.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,37 +210,37 @@ watches = [
"appleWatchSeries4_40mm",
"Device is an [Apple Watch Series 4](https://support.apple.com/kb/SP778)",
"https://km.support.apple.com/resources/sites/APPLE/content/live/IMAGES/0/IM911/en_US/aw-series4-nike-240.png",
["Watch4,1", "Watch4,3"], 1.8, (4,5), "Apple Watch Series 4 40mm", "Apple Watch Series 4 40mm", 326, False, False, False, False, False, False, False, True, False, False, 0, True, 0, False, "s4", False, False),
["Watch4,1", "Watch4,3"], 1.8, (4,5), "Apple Watch Series 4 40mm", "Apple Watch Series 4 40mm", 326, False, False, False, False, False, False, False, True, True, False, 0, True, 0, False, "s4", False, False),

Device(
"appleWatchSeries4_44mm",
"Device is an [Apple Watch Series 4](https://support.apple.com/kb/SP778)",
"https://km.support.apple.com/resources/sites/APPLE/content/live/IMAGES/0/IM911/en_US/aw-series4-nike-240.png",
["Watch4,2", "Watch4,4"], 2.0, (4,5), "Apple Watch Series 4 44mm", "Apple Watch Series 4 44mm", 326, False, False, False, False, False, False, False, True, False, False, 0, True, 0, False, "s4", False, False),
["Watch4,2", "Watch4,4"], 2.0, (4,5), "Apple Watch Series 4 44mm", "Apple Watch Series 4 44mm", 326, False, False, False, False, False, False, False, True, True, False, 0, True, 0, False, "s4", False, False),

Device(
"appleWatchSeries5_40mm",
"Device is an [Apple Watch Series 5](https://support.apple.com/kb/SP808)",
"https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP808/sp808-apple-watch-series-5_2x.png",
["Watch5,1", "Watch5,3"], 1.8, (4,5), "Apple Watch Series 5 40mm", "Apple Watch Series 5 40mm", 326, False, False, False, False, False, False, False, True, False, False, 0, True, 0, False, "s5", False, False),
["Watch5,1", "Watch5,3"], 1.8, (4,5), "Apple Watch Series 5 40mm", "Apple Watch Series 5 40mm", 326, False, False, False, False, False, False, False, True, True, False, 0, True, 0, False, "s5", False, False),

Device(
"appleWatchSeries5_44mm",
"Device is an [Apple Watch Series 5](https://support.apple.com/kb/SP808)",
"https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP808/sp808-apple-watch-series-5_2x.png",
["Watch5,2", "Watch5,4"], 2.0, (4,5), "Apple Watch Series 5 44mm", "Apple Watch Series 5 44mm", 326, False, False, False, False, False, False, False, True, False, False, 0, True, 0, False, "s5", False, False),
["Watch5,2", "Watch5,4"], 2.0, (4,5), "Apple Watch Series 5 44mm", "Apple Watch Series 5 44mm", 326, False, False, False, False, False, False, False, True, True, False, 0, True, 0, False, "s5", False, False),

Device(
"appleWatchSeries6_40mm",
"Device is an [Apple Watch Series 6](https://support.apple.com/kb/SP826)",
"https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP826/sp826-apple-watch-series6-580_2x.png",
["Watch6,1", "Watch6,3"], 1.8, (4,5), "Apple Watch Series 6 40mm", "Apple Watch Series 6 40mm", 326, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s6", False, False),
["Watch6,1", "Watch6,3"], 1.8, (4,5), "Apple Watch Series 6 40mm", "Apple Watch Series 6 40mm", 326, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s6", False, False),

Device(
"appleWatchSeries6_44mm",
"Device is an [Apple Watch Series 6](https://support.apple.com/kb/SP826)",
"https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP826/sp826-apple-watch-series6-580_2x.png",
["Watch6,2", "Watch6,4"], 2.0, (4,5), "Apple Watch Series 6 44mm", "Apple Watch Series 6 44mm", 326, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s6", False, False),
["Watch6,2", "Watch6,4"], 2.0, (4,5), "Apple Watch Series 6 44mm", "Apple Watch Series 6 44mm", 326, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s6", False, False),

Device(
"appleWatchSE_40mm",
Expand All @@ -258,61 +258,61 @@ watches = [
"appleWatchSeries7_41mm",
"Device is an [Apple Watch Series 7](https://support.apple.com/kb/SP860)",
"https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP860/series7-480_2x.png",
["Watch6,6", "Watch6,8"], 1.8, (4,5), "Apple Watch Series 7 41mm", "Apple Watch Series 7 41mm", 326, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s7", False, False),
["Watch6,6", "Watch6,8"], 1.8, (4,5), "Apple Watch Series 7 41mm", "Apple Watch Series 7 41mm", 326, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s7", False, False),

Device(
"appleWatchSeries7_45mm",
"Device is an [Apple Watch Series 7](https://support.apple.com/kb/SP860)",
"https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP860/series7-480_2x.png",
["Watch6,7", "Watch6,9"], 2.0, (4,5), "Apple Watch Series 7 45mm", "Apple Watch Series 7 45mm", 326, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s7", False, False),
["Watch6,7", "Watch6,9"], 2.0, (4,5), "Apple Watch Series 7 45mm", "Apple Watch Series 7 45mm", 326, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s7", False, False),

Device(
"appleWatchSeries8_41mm",
"Device is an [Apple Watch Series 8](https://support.apple.com/kb/SP878)",
"https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP878/apple-watch-series8_2x.png",
["Watch6,14", "Watch6,16"], 1.8, (4,5), "Apple Watch Series 8 41mm", "Apple Watch Series 8 41mm", 326, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s8", False, False),
["Watch6,14", "Watch6,16"], 1.8, (4,5), "Apple Watch Series 8 41mm", "Apple Watch Series 8 41mm", 326, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s8", False, False),

Device(
"appleWatchSeries8_45mm",
"Device is an [Apple Watch Series 8](https://support.apple.com/kb/SP878)",
"https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP878/apple-watch-series8_2x.png",
["Watch6,15", "Watch6,17"], 2.0, (4,5), "Apple Watch Series 8 45mm", "Apple Watch Series 8 45mm", 326, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s8", False, False),
["Watch6,15", "Watch6,17"], 2.0, (4,5), "Apple Watch Series 8 45mm", "Apple Watch Series 8 45mm", 326, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s8", False, False),

Device(
"appleWatchSE2_40mm",
"Device is an [Apple Watch SE (2nd generation)](https://support.apple.com/kb/SP877)",
"https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP877/apple-watch-se-2nd-gen_2x.png",
["Watch6,10", "Watch6,12"], 1.8, (4,5), "Apple Watch SE (2nd generation) 40mm", "Apple Watch SE (2nd generation) 40mm", 326, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s8", False, False),
["Watch6,10", "Watch6,12"], 1.8, (4,5), "Apple Watch SE (2nd generation) 40mm", "Apple Watch SE (2nd generation) 40mm", 326, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s8", False, False),

Device(
"appleWatchSE2_44mm",
"Device is an [Apple Watch SE (2nd generation)](https://support.apple.com/kb/SP877)",
"https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP877/apple-watch-se-2nd-gen_2x.png",
["Watch6,11", "Watch6,13"], 2.0, (4,5), "Apple Watch SE (2nd generation) 44mm", "Apple Watch SE (2nd generation) 44mm", 326, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s8", False, False),
["Watch6,11", "Watch6,13"], 2.0, (4,5), "Apple Watch SE (2nd generation) 44mm", "Apple Watch SE (2nd generation) 44mm", 326, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s8", False, False),

Device(
"appleWatchUltra",
"Device is an [Apple Watch Ultra](https://support.apple.com/kb/SP879)",
"https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP879/apple-watch-ultra_2x.png",
["Watch6,18"], 2.2, (4,5), "Apple Watch Ultra", "Apple Watch Ultra", 338, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s8", False, False),
["Watch6,18"], 2.2, (4,5), "Apple Watch Ultra", "Apple Watch Ultra", 338, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s8", False, False),

Device(
"appleWatchSeries9_41mm",
"Device is an [Apple Watch Series 9](https://support.apple.com/kb/SP905)",
"",
["Watch7,1", "Watch7,3"], 1.9, (4,5), "Apple Watch Series 9 41mm", "Apple Watch Series 9 41mm", 326, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s9", False, False),
["Watch7,1", "Watch7,3"], 1.9, (4,5), "Apple Watch Series 9 41mm", "Apple Watch Series 9 41mm", 326, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s9", False, False),

Device(
"appleWatchSeries9_45mm",
"Device is an [Apple Watch Series 9](https://support.apple.com/kb/SP905)",
"",
["Watch7,2", "Watch7,4"], 2.0, (4,5), "Apple Watch Series 9 45mm", "Apple Watch Series 9 45mm", 326, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s9", False, False),
["Watch7,2", "Watch7,4"], 2.0, (4,5), "Apple Watch Series 9 45mm", "Apple Watch Series 9 45mm", 326, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s9", False, False),

Device(
"appleWatchUltra2",
"Device is an [Apple Watch Ultra2]()",
"",
["Watch7,5"], 2.2, (4,5), "Apple Watch Ultra2", "Apple Watch Ultra2", 338, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s9", False, False),
["Watch7,5"], 2.2, (4,5), "Apple Watch Ultra2", "Apple Watch Ultra2", 338, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s9", False, False),

Device(
"appleWatchSE3_40mm",
Expand All @@ -330,31 +330,31 @@ watches = [
"appleWatchSeries10_42mm",
"Device is an [Apple Watch Series 10]()",
"",
["Watch7,8", "Watch7,10"], 1.9, (374,446), "Apple Watch Series 10 42mm", "Apple Watch Series 10 42mm", 326, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s10", False, False),
["Watch7,8", "Watch7,10"], 1.9, (374,446), "Apple Watch Series 10 42mm", "Apple Watch Series 10 42mm", 326, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s10", False, False),

Device(
"appleWatchSeries10_46mm",
"Device is an [Apple Watch Series 10]()",
"",
["Watch7,9", "Watch7,11"], 2.0, (416,496), "Apple Watch Series 10 46mm", "Apple Watch Series 10 46mm", 326, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s10", False, False),
["Watch7,9", "Watch7,11"], 2.0, (416,496), "Apple Watch Series 10 46mm", "Apple Watch Series 10 46mm", 326, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s10", False, False),

Device(
"appleWatchUltra3",
"Device is an [Apple Watch Ultra 3]()",
"",
["Watch7,12"], 2.2, (4,5), "Apple Watch Ultra 3", "Apple Watch Ultra 3", 338, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s10", False, False),
["Watch7,12"], 2.2, (4,5), "Apple Watch Ultra 3", "Apple Watch Ultra 3", 338, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s10", False, False),

Device(
"appleWatchSeries11_42mm",
"Device is an [Apple Watch Series 11]()",
"",
["Watch7,17", "Watch7,19"], 1.9, (374,446), "Apple Watch Series 11 42mm", "Apple Watch Series 11 42mm", 326, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s10", False, False),
["Watch7,17", "Watch7,19"], 1.9, (374,446), "Apple Watch Series 11 42mm", "Apple Watch Series 11 42mm", 326, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s10", False, False),

Device(
"appleWatchSeries11_46mm",
"Device is an [Apple Watch Series 11]()",
"",
["Watch7,18", "Watch7,20"], 2.0, (416,496), "Apple Watch Series 11 46mm", "Apple Watch Series 11 46mm", 326, False, False, False, False, False, False, False, True, False, False, 0, False, 0, False, "s10", False, False),
["Watch7,18", "Watch7,20"], 2.0, (416,496), "Apple Watch Series 11 46mm", "Apple Watch Series 11 46mm", 326, False, False, False, False, False, False, False, True, True, False, 0, False, 0, False, "s10", False, False),

]

Expand Down Expand Up @@ -797,6 +797,16 @@ public enum Device {
return allWatches.map(Device.simulator)
}

/// All watches that feature a screen with rounded corners.
public static var allDevicesWithRoundedDisplayCorners: [Device] {
return [${', '.join(list(map(lambda device: "." + device.caseName, list(filter(lambda device: device.hasRoundedDisplayCorners == True, watchOSDevices)))))}]
}

/// Returns whether or not the watch has a screen with rounded corners.
public var hasRoundedDisplayCorners: Bool {
return isOneOf(Device.allDevicesWithRoundedDisplayCorners) || isOneOf(Device.allDevicesWithRoundedDisplayCorners.map(Device.simulator))
}

/// All watches that have Force Touch support.
public static var allWatchesWithForceTouchSupport: [Device] {
return [${', '.join(list(map(lambda device: "." + device.caseName, list(filter(lambda device: device.hasForce3dTouchSupport == True, watchOSDevices)))))}]
Expand Down
38 changes: 38 additions & 0 deletions Tests/Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,4 +819,42 @@ class DeviceKitTests: XCTestCase {

#endif

// MARK: - watchOS
#if os(watchOS)

func testHasRoundedDisplayCorners() {
let roundedDisplayCornerDevices: [Device] = [
.appleWatchSeries4_40mm,
.appleWatchSeries4_44mm,
.appleWatchSeries5_40mm,
.appleWatchSeries5_44mm,
.appleWatchSeries6_40mm,
.appleWatchSeries6_44mm,
.appleWatchSeries7_41mm,
.appleWatchSeries7_45mm,
.appleWatchSeries8_41mm,
.appleWatchSeries8_45mm,
.appleWatchSE2_40mm,
.appleWatchSE2_44mm,
.appleWatchUltra,
.appleWatchSeries9_41mm,
.appleWatchSeries9_45mm,
.appleWatchUltra2,
.appleWatchSeries10_42mm,
.appleWatchSeries10_46mm,
.appleWatchUltra3,
.appleWatchSeries11_42mm,
.appleWatchSeries11_46mm,
]
for device in Device.allRealDevices {
XCTAssertEqual(
device.hasRoundedDisplayCorners,
device.isOneOf(roundedDisplayCornerDevices),
"testHasRoundedDisplayCorners failed for \(device.description)"
)
}
}

#endif

}