diff --git a/Sources/DeviceModel.swift b/Sources/DeviceModel.swift index df8ff61..dee545e 100644 --- a/Sources/DeviceModel.swift +++ b/Sources/DeviceModel.swift @@ -44,12 +44,13 @@ public enum DeviceModel: CaseIterable { case iPhone14Pro, iPhone14ProMax case iPhone15, iPhone15Plus case iPhone15Pro, iPhone15ProMax + case iPhone16e case iPhone16, iPhone16Plus case iPhone16Pro, iPhone16ProMax - case iPhone16e - case iPhoneAir case iPhone17 + case iPhone17e case iPhone17Pro, iPhone17ProMax + case iPhoneAir case iPadFirstGen, iPadSecondGen, iPadThirdGen, iPadFourthGen, iPadFifthGen, iPadSixthGen, iPadSeventhGen, iPadEighthGen, iPadNinthGen, iPadTenthGen case iPadA16 @@ -194,13 +195,13 @@ extension DeviceModel { case (17, 2): return .iPhone16ProMax case (17, 3): return .iPhone16 case (17, 4): return .iPhone16Plus - case (17, 5): return .iPhone16e - + + case (18, 3): return .iPhone17 case (18, 1): return .iPhone17Pro case (18, 2): return .iPhone17ProMax - case (18, 3): return .iPhone17 case (18, 4): return .iPhoneAir + case (18, 5): return .iPhone17e default: return .unknown } @@ -230,7 +231,7 @@ extension DeviceModel { case (12, 1), (12, 2): return .iPadNinthGen case (13, 18), (13, 19): return .iPadTenthGen case (15, 7), (15, 8): return .iPadA16 - + case (4, 1), (4, 2), (4, 3): return .iPadAir case (5, 3), (5, 4): return .iPadAir2 case (11, 3), (11, 4): return .iPadAir3 @@ -248,7 +249,7 @@ extension DeviceModel { case (11, 1), (11, 2): return .iPadMini5 case (14, 1), (14, 2): return .iPadMini6 case (16, 1), (16, 2): return .iPadMiniA17Pro - + case (6, 3), (6, 4): return .iPadPro9_7Inch case (7, 3), (7, 4): return .iPadPro10_5Inch case (8, 1), (8, 2), (8, 3), (8, 4): return .iPadPro11Inch @@ -351,6 +352,9 @@ extension DeviceModel { return true case .iPhone16e: return true + case .iPhone17e: + return true + default: return false } @@ -364,7 +368,7 @@ extension DeviceModel { return true case .iPhone16, .iPhone16Plus, .iPhone16Pro, .iPhone16ProMax: return true - case .iPhone17, .iPhoneAir, .iPhone17Pro, .iPhone17ProMax: + case .iPhoneAir, .iPhone17, .iPhone17Pro, .iPhone17ProMax: return true default: return false @@ -372,3 +376,4 @@ extension DeviceModel { } } #endif + diff --git a/Sources/Identifier.swift b/Sources/Identifier.swift index d0c8fcc..511fc5d 100644 --- a/Sources/Identifier.swift +++ b/Sources/Identifier.swift @@ -189,7 +189,9 @@ extension Identifier: CustomStringConvertible { return "iPhone 15 Pro" case (16, 2): return "iPhone 15 Pro Max" - + + case (17, 5): + return "iPhone 16e" case (17, 3): return "iPhone 16" case (17, 4): @@ -198,10 +200,7 @@ extension Identifier: CustomStringConvertible { return "iPhone 16 Pro" case (17, 2): return "iPhone 16 Pro Max" - - case (17, 5): - return "iPhone 16e" - + case (18, 3): return "iPhone 17" case (18, 4): @@ -210,6 +209,9 @@ extension Identifier: CustomStringConvertible { return "iPhone 17 Pro" case (18, 2): return "iPhone 17 Pro Max" + case (18, 5): + return "iPhone 17e" + default: return "unknown" @@ -447,8 +449,6 @@ extension Identifier: CustomStringConvertible { case (15, 7): return "iPad Air M3 (13 inch, Wi-Fi+5G)" - - default: return "unknown" } @@ -575,3 +575,4 @@ extension Identifier: CustomStringConvertible { } } } + diff --git a/Sources/Screen.swift b/Sources/Screen.swift index 44b0915..a4162d8 100644 --- a/Sources/Screen.swift +++ b/Sources/Screen.swift @@ -158,3 +158,4 @@ extension Screen { } } #endif + diff --git a/Sources/System.swift b/Sources/System.swift index b8b9c19..4dd7787 100644 --- a/Sources/System.swift +++ b/Sources/System.swift @@ -39,3 +39,4 @@ class System { return identifier } } + diff --git a/Sources/UIDeviceComplete.swift b/Sources/UIDeviceComplete.swift index f95503f..9f5b0d6 100644 --- a/Sources/UIDeviceComplete.swift +++ b/Sources/UIDeviceComplete.swift @@ -51,3 +51,4 @@ extension UIDevice: UIDeviceCompleteCompatible { } #elseif os(watchOS) extension WKInterfaceDevice: UIDeviceCompleteCompatible { } #endif + diff --git a/Sources/UIDeviceExtensions.swift b/Sources/UIDeviceExtensions.swift index b510521..3975830 100644 --- a/Sources/UIDeviceExtensions.swift +++ b/Sources/UIDeviceExtensions.swift @@ -91,3 +91,4 @@ public extension UIDeviceComplete where Base == WKInterfaceDevice { } } #endif +