Skip to content

Commit 7e67858

Browse files
Zandor300denisenepraunig
authored andcommitted
Fix the isZoomed() function. (devicekit#198)
Credits to @vvit.
1 parent 1d00d84 commit 7e67858

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

Source/Device.generated.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -624,11 +624,9 @@ public enum Device {
624624

625625
public var isZoomed: Bool? {
626626
guard isCurrent else { return nil }
627-
// TODO: Longterm we need a better solution for this!
628-
guard self != .iPhoneX && self != .iPhoneXS else { return false }
629627
if Int(UIScreen.main.scale.rounded()) == 3 {
630628
// Plus-sized
631-
return UIScreen.main.nativeScale > 2.7
629+
return UIScreen.main.nativeScale > 2.7 && UIScreen.main.nativeScale < 3
632630
} else {
633631
return UIScreen.main.nativeScale > UIScreen.main.scale
634632
}

Source/Device.swift.gyb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -455,11 +455,9 @@ public enum Device {
455455

456456
public var isZoomed: Bool? {
457457
guard isCurrent else { return nil }
458-
// TODO: Longterm we need a better solution for this!
459-
guard self != .iPhoneX && self != .iPhoneXS else { return false }
460458
if Int(UIScreen.main.scale.rounded()) == 3 {
461459
// Plus-sized
462-
return UIScreen.main.nativeScale > 2.7
460+
return UIScreen.main.nativeScale > 2.7 && UIScreen.main.nativeScale < 3
463461
} else {
464462
return UIScreen.main.nativeScale > UIScreen.main.scale
465463
}

0 commit comments

Comments
 (0)