GitHub/DeviceKit
1
0
Fork 0
mirror of https://github.com/devicekit/DeviceKit.git synced 2026-06-16 10:24:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

make it compile again after resolving merge conflicts

Browse Source
This commit is contained in:
Dennis Weissmann
2016-08-12 22:11:32 +02:00
committed by Dennis Weissmann
parent 12ee8d50c5
commit f47f71a690
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Device.swift
+8 -6
View File
@@ -156,7 +156,8 @@ public enum Device {
/// Device is an [iPad Pro](http://www.apple.com/ipad-pro/)
///
/// ![Image](http://images.apple.com/v/ipad-pro/c/images/shared/buystrip/ipad_pro_large_2x.png)
case iPadPro
case iPadPro9Inch
case iPadPro12Inch
#elseif os(tvOS)
/// Device is an [Apple TV](http://www.apple.com/tv/)
@@ -181,8 +182,7 @@ public enum Device {
// I know that reduce is O(n^2) (see http://airspeedvelocity.net/2015/08/03/arrays-linked-lists-and-performance/) but it's *so* nice ❤️ and since we are working with very short strings it shouldn't matter.
let identifier = mirror.children.reduce("") { identifier, element in
guard let value = element.value as? Int8,
value != 0 else { return identifier }
guard let value = element.value as? Int8, value != 0 else { return identifier }
return identifier + String(UnicodeScalar(UInt8(value)))
}
@@ -210,7 +210,8 @@ public enum Device {
case "iPad4,4", "iPad4,5", "iPad4,6": return .iPadMini2
case "iPad4,7", "iPad4,8", "iPad4,9": return .iPadMini3
case "iPad5,1", "iPad5,2": return .iPadMini4
case "iPad6,3", "iPad6,4", "iPad6,7", "iPad6,8":return .iPadPro
case "iPad6,3", "iPad6,4": return .iPadPro9Inch
case "iPad6,7", "iPad6,8": return .iPadPro12Inch
case "i386", "x86_64": return .simulator(mapIdentifierToDevice(String(validatingUTF8:
getenv("SIMULATOR_MODEL_IDENTIFIER"))!))
default: return .unknown(identifier)
@@ -239,7 +240,7 @@ public enum Device {
/// All iPads
public static var allPads: [Device] {
return [.iPad2, .iPad3, .iPad4, .iPadAir, .iPadAir2, .iPadMini, .iPadMini2, .iPadMini3, .iPadMini4, .iPadPro]
return [.iPad2, .iPad3, .iPad4, .iPadAir, .iPadAir2, .iPadMini, .iPadMini2, .iPadMini3, .iPadMini4, .iPadPro9Inch, .iPadPro12Inch]
}
/// All simulator iPods
@@ -423,7 +424,8 @@ extension Device: CustomStringConvertible {
case .iPadMini2: return "iPad Mini 2"
case .iPadMini3: return "iPad Mini 3"
case .iPadMini4: return "iPad Mini 4"
case .iPadPro: return "iPad Pro"
case .iPadPro9Inch: return "9.7-inch iPad Pro"
case .iPadPro12Inch: return "12.9-inch iPad Pro"
case .simulator(let model): return "Simulator (\(model))"
case .unknown(let identifier): return identifier
}