         case Inches_5_5 = 736
     }
     
-    public static func isSize(height: Heights) -> Bool {
+    public static func isSize(height: Heights) -> Bool
+    {
         return currentDeviceHeight == height.rawValue
     }
     
-    public static func isSizeOrLarger(height: Heights) -> Bool {
+    public static func isSizeOrLarger(height: Heights) -> Bool
+    {
         return currentDeviceHeight >= height.rawValue
     }
     
-    public static func isSizeOrSmaller(height: Heights) -> Bool {
+    public static func isSizeOrSmaller(height: Heights) -> Bool
+    {
         return currentDeviceHeight <= height.rawValue
     }
     
     // MARK: Retina Check
     
-    public static func IS_RETINA() -> Bool {
+    public static func isRetina() -> Bool
+    {
         return UIScreen.mainScreen().respondsToSelector("scale")
     }
-    
-    // MARK: 3.5 Inch Checks
-    
-    public static func IS_3_5_INCHES() -> Bool {
-        return isPhone() && isSize(.Inches_3_5)
-    }
-    
-    public static func IS_3_5_INCHES_OR_LARGER() -> Bool {
-        return isPhone() && isSizeOrLarger(.Inches_3_5)
-    }
-    
-    public static func IS_3_5_INCHES_OR_SMALLER() -> Bool {
-        return isPhone() && isSizeOrSmaller(.Inches_3_5)
-    }
-    
-    // MARK: 4 Inch Checks
-    
-    public static func IS_4_INCHES() -> Bool {
-        return isPhone() && isSize(.Inches_4)
-    }
-    
-    public static func IS_4_INCHES_OR_LARGER() -> Bool {
-        return isPhone() && isSizeOrLarger(.Inches_4)
-    }
-    
-    public static func IS_4_INCHES_OR_SMALLER() -> Bool {
-        return isPhone() && isSizeOrSmaller(.Inches_4)
-    }
-    
-    // MARK: 4.7 Inch Checks
-    
-    public static func IS_4_7_INCHES() -> Bool {
-        return isPhone() && isSize(.Inches_4_7)
-    }
-    
-    public static func IS_4_7_INCHES_OR_LARGER() -> Bool {
-        return isPhone() && isSizeOrLarger(.Inches_4_7)
-    }
-    
-    public static func IS_4_7_INCHES_OR_SMALLER() -> Bool {
-        return isPhone() && isSizeOrLarger(.Inches_4_7)
-    }
-    
-    // MARK: 5.5 Inch Checks
-    
-    public static func IS_5_5_INCHES() -> Bool {
-        return isPhone() && isSize(.Inches_5_5)
-    }
-    
-    public static func IS_5_5_INCHES_OR_LARGER() -> Bool {
-        return isPhone() && isSizeOrLarger(.Inches_5_5)
-    }
-    
-    public static func IS_5_5_INCHES_OR_SMALLER() -> Bool {
-        return isPhone() && isSizeOrLarger(.Inches_5_5)
-    }
-}+}

//
//  Device.swift
//  Swiftility
//
//  Created by Allan Barbato on 10/16/15.

import UIKit

// MARK: - Device Structure
public struct DeviceInfo
{
    
    // MARK: - Singletons
    
    public static var currentDevice: UIDevice {
        return UIDevice.currentDevice()
    }
    
    public static var currentDeviceVersion: Float {
        return (UIDevice.currentDevice().systemVersion as NSString).floatValue
    }
    
    public static var currentDeviceHeight: CGFloat {
        return UIScreen.mainScreen().bounds.size.height
    }
    
    // MARK: - Device Idiom Checks
    
    public static func isPhone() -> Bool
    {
        return currentDevice.userInterfaceIdiom == .Phone
    }
    
    public static func isPad() -> Bool
    {
        return currentDevice.userInterfaceIdiom == .Pad
    }
    
    // MARK: - Device Version Checks
    
    public static func isVersion(version: Float) -> Bool
    {
        return currentDeviceVersion >= version && currentDeviceVersion < (version + 1.0)
    }
    
    public static func isVersionOrLater(version: Float) -> Bool
    {
        return currentDeviceVersion >= version
    }
    
    public static func isVersionOrEarlier(version: Float) -> Bool
    {
        return currentDeviceVersion < (version + 1.0)
    }
    
    // MARK: - Device Size Checks
