GitHub/DeviceKit
1
0
Fork 0
mirror of https://github.com/devicekit/DeviceKit.git synced 2026-05-17 10:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug: Incorrect values being returned on simulator. (#227)

Browse Source
This commit is contained in:
Zandor Smith
2019-12-28 16:25:32 +01:00
committed by Denise Nepraunig
parent 00eb8fdc26
commit 529dfe802c
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Device.generated.swift
+8 -7
View File
@@ -686,12 +686,12 @@ public enum Device {
/// Returns whether or not the device has Touch ID
public var isTouchIDCapable: Bool {
return isOneOf(Device.allTouchIDCapableDevices)
return isOneOf(Device.allTouchIDCapableDevices) || isOneOf(Device.allTouchIDCapableDevices.map(Device.simulator))
}
/// Returns whether or not the device has Face ID
public var isFaceIDCapable: Bool {
return isOneOf(Device.allFaceIDCapableDevices)
return isOneOf(Device.allFaceIDCapableDevices) || isOneOf(Device.allFaceIDCapableDevices.map(Device.simulator))
}
/// Returns whether or not the device has any biometric sensor (i.e. Touch ID or Face ID)
@@ -706,7 +706,7 @@ public enum Device {
/// Returns whether or not the device has a sensor housing
public var hasSensorHousing: Bool {
return isOneOf(Device.allDevicesWithSensorHousing)
return isOneOf(Device.allDevicesWithSensorHousing) || isOneOf(Device.allDevicesWithSensorHousing.map(Device.simulator))
}
/// All devices that feature a screen with rounded corners.
@@ -716,7 +716,7 @@ public enum Device {
/// Returns whether or not the device has a screen with rounded corners.
public var hasRoundedDisplayCorners: Bool {
return isOneOf(Device.allDevicesWithRoundedDisplayCorners)
return isOneOf(Device.allDevicesWithRoundedDisplayCorners) || isOneOf(Device.allDevicesWithRoundedDisplayCorners.map(Device.simulator))
}
/// All devices that have 3D Touch support.
@@ -726,7 +726,7 @@ public enum Device {
/// Returns whether or not the device has 3D Touch support.
public var has3dTouchSupport: Bool {
return isOneOf(Device.allDevicesWith3dTouchSupport)
return isOneOf(Device.allDevicesWith3dTouchSupport) || isOneOf(Device.allDevicesWith3dTouchSupport.map(Device.simulator))
}
/// All devices that support wireless charging.
@@ -736,7 +736,7 @@ public enum Device {
/// Returns whether or not the device supports wireless charging
public var supportsWirelessCharging: Bool {
return isOneOf(Device.allDevicesWithWirelessChargingSupport)
return isOneOf(Device.allDevicesWithWirelessChargingSupport) || isOneOf(Device.allDevicesWithWirelessChargingSupport.map(Device.simulator))
}
#elseif os(tvOS)
/// All TVs
@@ -766,7 +766,7 @@ public enum Device {
/// Returns whether or not the device has Force Touch support.
public var hasForceTouchSupport: Bool {
return isOneOf(Device.allWatchesWithForceTouchSupport)
return isOneOf(Device.allWatchesWithForceTouchSupport) || isOneOf(Device.allWatchesWithForceTouchSupport.map(Device.simulator))
}
#endif
@@ -1321,6 +1321,7 @@ extension Device {
case .iPadPro10Inch: return .firstGeneration
case .iPadPro11Inch: return .secondGeneration
case .iPadPro12Inch3: return .secondGeneration
case .simulator(let model): return model.applePencilSupport
default: return []
}
}
Source/Device.swift.gyb
+8 -7
View File
@@ -482,12 +482,12 @@ public enum Device {
/// Returns whether or not the device has Touch ID
public var isTouchIDCapable: Bool {
return isOneOf(Device.allTouchIDCapableDevices)
return isOneOf(Device.allTouchIDCapableDevices) || isOneOf(Device.allTouchIDCapableDevices.map(Device.simulator))
}
/// Returns whether or not the device has Face ID
public var isFaceIDCapable: Bool {
return isOneOf(Device.allFaceIDCapableDevices)
return isOneOf(Device.allFaceIDCapableDevices) || isOneOf(Device.allFaceIDCapableDevices.map(Device.simulator))
}
/// Returns whether or not the device has any biometric sensor (i.e. Touch ID or Face ID)
@@ -502,7 +502,7 @@ public enum Device {
/// Returns whether or not the device has a sensor housing
public var hasSensorHousing: Bool {
return isOneOf(Device.allDevicesWithSensorHousing)
return isOneOf(Device.allDevicesWithSensorHousing) || isOneOf(Device.allDevicesWithSensorHousing.map(Device.simulator))
}
/// All devices that feature a screen with rounded corners.
@@ -512,7 +512,7 @@ public enum Device {
/// Returns whether or not the device has a screen with rounded corners.
public var hasRoundedDisplayCorners: Bool {
return isOneOf(Device.allDevicesWithRoundedDisplayCorners)
return isOneOf(Device.allDevicesWithRoundedDisplayCorners) || isOneOf(Device.allDevicesWithRoundedDisplayCorners.map(Device.simulator))
}
/// All devices that have 3D Touch support.
@@ -522,7 +522,7 @@ public enum Device {
/// Returns whether or not the device has 3D Touch support.
public var has3dTouchSupport: Bool {
return isOneOf(Device.allDevicesWith3dTouchSupport)
return isOneOf(Device.allDevicesWith3dTouchSupport) || isOneOf(Device.allDevicesWith3dTouchSupport.map(Device.simulator))
}
/// All devices that support wireless charging.
@@ -532,7 +532,7 @@ public enum Device {
/// Returns whether or not the device supports wireless charging
public var supportsWirelessCharging: Bool {
return isOneOf(Device.allDevicesWithWirelessChargingSupport)
return isOneOf(Device.allDevicesWithWirelessChargingSupport) || isOneOf(Device.allDevicesWithWirelessChargingSupport.map(Device.simulator))
}
#elseif os(tvOS)
/// All TVs
@@ -562,7 +562,7 @@ public enum Device {
/// Returns whether or not the device has Force Touch support.
public var hasForceTouchSupport: Bool {
return isOneOf(Device.allWatchesWithForceTouchSupport)
return isOneOf(Device.allWatchesWithForceTouchSupport) || isOneOf(Device.allWatchesWithForceTouchSupport.map(Device.simulator))
}
#endif
@@ -1012,6 +1012,7 @@ extension Device {
% for device in list(filter(lambda device: device.applePencilSupport == 2, iOSDevices)):
case .${device.caseName}: return .secondGeneration
% end
case .simulator(let model): return model.applePencilSupport
default: return []
}
}