Skip to content

Commit

Permalink
Merge branch 'release/1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
@bojan
bojan committed Nov 1, 2017
2 parents ad9cb71 + 7c2622f commit 8a3154b
Show file tree
Hide file tree
Showing 8 changed files with 160 additions and 84 deletions.
2 changes: 1 addition & 1 deletion .xcode-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.3
8.3.3
200 changes: 130 additions & 70 deletions Sources/Device.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,18 @@ public enum Device {
case iPhone6s
/// - iPhone6sPlus: All iPhone 6s Plus variants.
case iPhone6sPlus
/// - iPhoneSE: iPhone SE.
/// - iPhoneSE: All iPhone SE variants.
case iPhoneSE
/// - iPhone7: All iPhone 7 variants.
case iPhone7
/// - iPhone7Plus: All iPhone 7 Plus variants.
case iPhone7Plus

/// - iPhone8: All iPhone 8 variants.
case iPhone8
/// - iPhone8Plus: All iPhone 8 Plus variants.
case iPhone8Plus
/// - iPhoneX: All iPhone X variants.
case iPhoneX

/// - iPad2: All iPad 2 variants.
case iPad2
Expand Down Expand Up @@ -94,12 +99,17 @@ public enum Device {
/// - appleTV4: Apple TV 4.
case appleTV4

/// - appleTV4K: Apple TV 4K.
case appleTV4K

/// - watch: The original Apple Watch.
case watch
/// - watchSeries1: Apple Watch Series 1.
case watchSeries1
/// - watchSeries2: Apple Watch Series 2.
case watchSeries2
/// - watchSeries3: Apple Watch Series 3.
case watchSeries3

/// - simulator: A simulator for the associated device model.
indirect case simulator(Device)
Expand All @@ -109,44 +119,48 @@ public enum Device {

/// All real-device values.
public static let allValues: [Device] = [
.iPhone4S,
.iPhone5,
.iPhone5c,
.iPhone5s,
.iPhone6,
.iPhone6Plus,
.iPhone6s,
.iPhone6sPlus,
.iPhoneSE,
.iPhone7,
.iPhone7Plus,
.iPodTouch5G,
.iPodTouch6G,
.appleTV4,
.watch,
.watchSeries1,
.watchSeries2,
.iPad2,
.iPad3,
.iPad4,
.iPad5,
.iPadAir,
.iPadAir2,
.iPadPro12Inch,
.iPadPro9Inch,
.iPadPro12Inch2G,
.iPadPro10Inch,
.iPadMini,
.iPadMini2,
.iPadMini3,
.iPadMini4,
.iPhone4S,
.iPhone5,
.iPhone5c,
.iPhone5s,
.iPhone6,
.iPhone6Plus,
.iPhone6s,
.iPhone6sPlus,
.iPhoneSE,
.iPhone7,
.iPhone7Plus,
.iPhone8,
.iPhone8Plus,
.iPhoneX,
.iPodTouch5G,
.iPodTouch6G,
.appleTV4,
.appleTV4K,
.watch,
.watchSeries1,
.watchSeries2,
.watchSeries3,
.iPad2,
.iPad3,
.iPad4,
.iPad5,
.iPadAir,
.iPadAir2,
.iPadPro12Inch,
.iPadPro9Inch,
.iPadPro12Inch2G,
.iPadPro10Inch,
.iPadMini,
.iPadMini2,
.iPadMini3,
.iPadMini4,
]

}

public extension Device {


/// Inspects the current device.
public init() {
self = RawDevice(identifier: nil).device!
Expand All @@ -158,14 +172,12 @@ public extension Device {
///
/// - Parameter identifier: A device identifier, e.g. "iPhone9,2", "iPad6,11.", "AppleTV5,3".
public init?(identifier: String? = nil) {
guard let thingy = RawDevice(identifier: identifier).device
guard let device = RawDevice(identifier: identifier).device
else {
return nil
}

self = thingy
self = device
}

}

// MARK: - Errors
Expand Down Expand Up @@ -194,19 +206,24 @@ public extension Device {
.iPhone6sPlus,
.iPhoneSE,
.iPhone7,
.iPhone7Plus:
.iPhone7Plus,
.iPhone8,
.iPhone8Plus,
.iPhoneX:
return .phone

case .iPodTouch5G,
.iPodTouch6G:
return .pod

case .appleTV4:
case .appleTV4,
.appleTV4K:
return .tv

case .watch,
.watchSeries1,
.watchSeries2:
.watchSeries2,
.watchSeries3:
return .watch

case .iPad2,
Expand Down Expand Up @@ -267,6 +284,12 @@ internal extension Device {
return [9.1, 9.3]
case .iPhone7Plus:
return [9.2, 9.4]
case .iPhone8:
return [10.1, 10.4]
case .iPhone8Plus:
return [10.2, 10.5]
case .iPhoneX:
return [10.3, 10.6]

case .iPodTouch5G:
return [5.1]
Expand All @@ -275,13 +298,17 @@ internal extension Device {

case .appleTV4:
return [5.3]
case .appleTV4K:
return [6.2]

case .watch:
return [1.1, 1.2]
case .watchSeries1:
return [2.6, 2.7]
case .watchSeries2:
return [2.3, 2.4]
case .watchSeries3:
return [3.1, 3.2, 3.3, 3.4]

case .iPad2:
return [2.1, 2.2, 2.3, 2.4]
Expand Down Expand Up @@ -393,6 +420,12 @@ extension Device: MarketingProtocol {
return "iPhone 7"
case .iPhone7Plus:
return "iPhone 7 Plus"
case .iPhone8:
return "iPhone 8"
case .iPhone8Plus:
return "iPhone 8 Plus"
case .iPhoneX:
return "iPhone X"

case .iPad2:
return "iPad 2"
Expand All @@ -415,28 +448,32 @@ extension Device: MarketingProtocol {
case .iPadAir2:
return "iPad Air 2"
case .iPadPro12Inch:
return "iPad Pro (12.9 inch)"
return "12.9-inch iPad Pro"
case .iPadPro9Inch:
return "iPad Pro (9.7 inch)"
return "9.7-inch iPad Pro"
case .iPadPro12Inch2G:
return "iPad Pro (12.9 inch) (2nd generation)"
return "12.9-inch iPad Pro (2nd generation)"
case .iPadPro10Inch:
return "iPad Pro (10.5 inch)"
return "10.5-inch iPad Pro"

case .iPodTouch5G:
return "iPod touch (5th generation)"
case .iPodTouch6G:
return "iPod touch (6th generation)"

case .appleTV4:
return "Apple TV 4"
return "Apple TV"
case .appleTV4K:
return "Apple TV 4K"

case .watch:
return "Apple Watch"
case .watchSeries1:
return "Apple Watch Series 1"
case .watchSeries2:
return "Apple Watch Series 2"
case .watchSeries3:
return "Apple Watch Series 3"

case let .simulator(model):
return NSLocalizedString("Simulator (\(model.marketingName))", comment: "Simulator (\(model.marketingName))")
Expand All @@ -453,7 +490,6 @@ extension Device: MarketingProtocol {

public extension Device {


/// Returns the display size in inches.
public var displaySize: Display.Size {
return display.size
Expand All @@ -463,60 +499,85 @@ public extension Device {
public var display: Display {
switch self {
case .iPhone4S:
return Display(size: .screen3_5Inch, resolution: CGSize(width: 320, height: 480), physicalResolution: CGSize(width: 640, height: 960), renderedResolution: CGSize(width: 640, height: 960), scale: 2.0, density: 326)
return Display(size: .screen3_5Inch, resolution: CGSize(width: 320, height: 480), physicalResolution: CGSize(width: 640, height: 960), renderedResolution: CGSize(width: 640, height: 960), scale: 2.0, density: 326, hasTrueTone: false, colorSpace: .sRGB)

case .iPhone5,
.iPhone5c,
.iPhone5s,
.iPhoneSE,
.iPodTouch5G,
.iPodTouch6G:
return Display(size: .screen4Inch, resolution: CGSize(width: 320, height: 568), physicalResolution: CGSize(width: 640, height: 1136), renderedResolution: CGSize(width: 640, height: 1136), scale: 2.0, density: 326)
return Display(size: .screen4Inch, resolution: CGSize(width: 320, height: 568), physicalResolution: CGSize(width: 640, height: 1136), renderedResolution: CGSize(width: 640, height: 1136), scale: 2.0, density: 326, hasTrueTone: false, colorSpace: .sRGB)

case .iPhone6,
.iPhone6s,
.iPhone7:
return Display(size: .screen4_7Inch, resolution: CGSize(width: 375, height: 667), physicalResolution: CGSize(width: 750, height: 1334), renderedResolution: CGSize(width: 750, height: 1334), scale: 2.0, density: 326)
.iPhone6s:
return Display(size: .screen4_7Inch, resolution: CGSize(width: 375, height: 667), physicalResolution: CGSize(width: 750, height: 1334), renderedResolution: CGSize(width: 750, height: 1334), scale: 2.0, density: 326, hasTrueTone: false, colorSpace: .sRGB)

case .iPhone7:
return Display(size: .screen4_7Inch, resolution: CGSize(width: 375, height: 667), physicalResolution: CGSize(width: 750, height: 1334), renderedResolution: CGSize(width: 750, height: 1334), scale: 2.0, density: 326, hasTrueTone: false, colorSpace: .p3)

case .iPhone8:
return Display(size: .screen4_7Inch, resolution: CGSize(width: 375, height: 667), physicalResolution: CGSize(width: 750, height: 1334), renderedResolution: CGSize(width: 750, height: 1334), scale: 2.0, density: 326, hasTrueTone: true, colorSpace: .p3)

case .iPhone6Plus,
.iPhone6sPlus,
.iPhone7Plus:
return Display(size: .screen5_5Inch, resolution: CGSize(width: 414, height: 736), physicalResolution: CGSize(width: 1080, height: 1920), renderedResolution: CGSize(width: 1242, height: 2208), scale: 3.0, density: 401)
.iPhone6sPlus:
return Display(size: .screen5_5Inch, resolution: CGSize(width: 414, height: 736), physicalResolution: CGSize(width: 1080, height: 1920), renderedResolution: CGSize(width: 1242, height: 2208), scale: 3.0, density: 401, hasTrueTone: false, colorSpace: .sRGB)

case .iPhone7Plus:
return Display(size: .screen5_5Inch, resolution: CGSize(width: 414, height: 736), physicalResolution: CGSize(width: 1080, height: 1920), renderedResolution: CGSize(width: 1242, height: 2208), scale: 3.0, density: 401, hasTrueTone: false, colorSpace: .p3)

case .iPhone8Plus:
return Display(size: .screen5_5Inch, resolution: CGSize(width: 414, height: 736), physicalResolution: CGSize(width: 1080, height: 1920), renderedResolution: CGSize(width: 1242, height: 2208), scale: 3.0, density: 401, hasTrueTone: true, colorSpace: .p3)

case .iPhoneX:
return Display(size: .screen5_8Inch, resolution: CGSize(width: 375, height: 812), physicalResolution: CGSize(width: 2436, height: 1125), renderedResolution: CGSize(width: 1242, height: 2208), scale: 3.0, density: 458, hasTrueTone: true, colorSpace: .p3)

case .appleTV4:
return Display(size: .notApplicable, resolution: CGSize(width: 1920, height: 1080), physicalResolution: CGSize(width: 1920, height: 1080), renderedResolution: CGSize(width: 1920, height: 1080), scale: 1.0, density: 0)
return Display(size: .notApplicable, resolution: CGSize(width: 1920, height: 1080), physicalResolution: CGSize(width: 1920, height: 1080), renderedResolution: CGSize(width: 1920, height: 1080), scale: 1.0, density: 0, hasTrueTone: false, colorSpace: .sRGB)

case .appleTV4K:
return Display(size: .notApplicable, resolution: CGSize(width: 3840, height: 2160), physicalResolution: CGSize(width: 3840, height: 2160), renderedResolution: CGSize(width: 3840, height: 2160), scale: 1.0, density: 0, hasTrueTone: false, colorSpace: .sRGB)

case .iPad2:
return Display(size: .screen9_7Inch, resolution: CGSize(width: 1024, height: 768), physicalResolution: CGSize(width: 1024, height: 768), renderedResolution: CGSize(width: 1024, height: 768), scale: 1.0, density: 132)
return Display(size: .screen9_7Inch, resolution: CGSize(width: 1024, height: 768), physicalResolution: CGSize(width: 1024, height: 768), renderedResolution: CGSize(width: 1024, height: 768), scale: 1.0, density: 132, hasTrueTone: false, colorSpace: .sRGB)

case .iPad3,
.iPad4,
.iPad5,
.iPadAir,
.iPadAir2,
.iPadPro9Inch:
return Display(size: .screen9_7Inch, resolution: CGSize(width: 1024, height: 768), physicalResolution: CGSize(width: 2048, height: 1536), renderedResolution: CGSize(width: 2048, height: 1536), scale: 2.0, density: 264)
case .iPadPro12Inch,
.iPadPro12Inch2G:
return Display(size: .screen12_9Inch, resolution: CGSize(width: 1366, height: 1024), physicalResolution: CGSize(width: 2732, height: 2048), renderedResolution: CGSize(width: 2732, height: 2048), scale: 2.0, density: 264)
.iPadAir2:
return Display(size: .screen9_7Inch, resolution: CGSize(width: 1024, height: 768), physicalResolution: CGSize(width: 2048, height: 1536), renderedResolution: CGSize(width: 2048, height: 1536), scale: 2.0, density: 264, hasTrueTone: false, colorSpace: .sRGB)

case .iPadPro12Inch:
return Display(size: .screen12_9Inch, resolution: CGSize(width: 1366, height: 1024), physicalResolution: CGSize(width: 2732, height: 2048), renderedResolution: CGSize(width: 2732, height: 2048), scale: 2.0, density: 264, hasTrueTone: false, colorSpace: .sRGB)

case .iPadPro9Inch:
return Display(size: .screen9_7Inch, resolution: CGSize(width: 1024, height: 768), physicalResolution: CGSize(width: 2048, height: 1536), renderedResolution: CGSize(width: 2048, height: 1536), scale: 2.0, density: 264, hasTrueTone: true, colorSpace: .p3)

case .iPadPro12Inch2G:
return Display(size: .screen12_9Inch, resolution: CGSize(width: 1366, height: 1024), physicalResolution: CGSize(width: 2732, height: 2048), renderedResolution: CGSize(width: 2732, height: 2048), scale: 2.0, density: 264, hasTrueTone: true, colorSpace: .p3)

case .iPadPro10Inch:
return Display(size: .screen12_9Inch, resolution: CGSize(width: 1112, height: 834), physicalResolution: CGSize(width: 2224, height: 1668), renderedResolution: CGSize(width: 2224, height: 1668), scale: 2.0, density: 264)
return Display(size: .screen12_9Inch, resolution: CGSize(width: 1112, height: 834), physicalResolution: CGSize(width: 2224, height: 1668), renderedResolution: CGSize(width: 2224, height: 1668), scale: 2.0, density: 264, hasTrueTone: true, colorSpace: .p3)

case .iPadMini:
return Display(size: .screen7_9Inch, resolution: CGSize(width: 1024, height: 768), physicalResolution: CGSize(width: 1024, height: 768), renderedResolution: CGSize(width: 1024, height: 768), scale: 1.0, density: 163)
return Display(size: .screen7_9Inch, resolution: CGSize(width: 1024, height: 768), physicalResolution: CGSize(width: 1024, height: 768), renderedResolution: CGSize(width: 1024, height: 768), scale: 1.0, density: 163, hasTrueTone: false, colorSpace: .sRGB)

case .iPadMini2,
.iPadMini3,
.iPadMini4:
return Display(size: .screen7_9Inch, resolution: CGSize(width: 1024, height: 768), physicalResolution: CGSize(width: 2048, height: 1536), renderedResolution: CGSize(width: 2048, height: 1536), scale: 2.0, density: 326)
return Display(size: .screen7_9Inch, resolution: CGSize(width: 1024, height: 768), physicalResolution: CGSize(width: 2048, height: 1536), renderedResolution: CGSize(width: 2048, height: 1536), scale: 2.0, density: 326, hasTrueTone: false, colorSpace: .sRGB)

case let .simulator(model):
return model.display

// FIXME: Add a way to inspect the Apple Watch displays.
// FIXME: Add a way to inspect the Apple Watch displays.
case .unknown(_),
.watch,
.watchSeries1,
.watchSeries2:
return Display(size: .notApplicable, resolution: CGSize.zero, physicalResolution: CGSize.zero, renderedResolution: CGSize.zero, scale: 0, density: 0)
.watchSeries2,
.watchSeries3:
return Display(size: .notApplicable, resolution: CGSize.zero, physicalResolution: CGSize.zero, renderedResolution: CGSize.zero, scale: 0, density: 0, hasTrueTone: false, colorSpace: .sRGB)
}
}

Expand All @@ -526,7 +587,6 @@ public extension Device {

public extension Device {


/// Checks if the current device is the same as the compared model.
///
/// - Parameter to: A model to compare the current device against.
Expand Down
Loading

0 comments on commit 8a3154b

Please sign in to comment.