Merge pull request #5 from mindsnacks/add_iphone_12_and_iphone_13_sizes

Add support for iPhone 12 and 13, Pro, Mini and Max
mindsnacks · Oct 24, 2021 · 219054e · 219054e
2 parents 5ea240b + 32a11f0
commit 219054e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/UIScaler/UIScaler/MSUIScaler.swift b/UIScaler/UIScaler/MSUIScaler.swift
@@ -164,33 +164,41 @@ import UIKit
 @objc public extension MSUIScalerConstants {
 
     var w320: CGFloat { Self.w320 } // iPhone 5/s/c, SE
-    var w375: CGFloat { Self.w375 } // iPhone 6/s, 7, 8, X, XS, 11 Pro
+    var w375: CGFloat { Self.w375 } // iPhone 6/s, 7, 8, X, XS, 11 Pro, 12 Mini, 13 Mini
+    var w390: CGFloat { Self.w390 } // iPhone 12/Pro, iPhone 13/Pro
     var w414: CGFloat { Self.w414 } // iPhone 6+/s+, 7+, 8+, Xr, Xs Max, 11/Pro Max
+    var w428: CGFloat { Self.w428 } // iPhone 12 Pro Max, iPhone 13 Pro Max
     var w768: CGFloat { Self.w768 } // iPad 7.9", 9.7"
     var w834: CGFloat { Self.w834 } // iPad 10.5"
     var w1024: CGFloat { Self.w1024 } // iPad 12.9"
 
     var h568: CGFloat { Self.h568 } // iPhone 5/s/c, SE
     var h667: CGFloat { Self.h667 } // iPhone 6/s, 7, 8
     var h736: CGFloat { Self.h736 } // iPhone 6+/s+, 7+, 8+
-    var h812: CGFloat { Self.h812 } // iPhone X/s, 11 Pro
+    var h812: CGFloat { Self.h812 } // iPhone X/s, 11 Pro, 12 Mini, 13 Mini
+    var h844: CGFloat { Self.h844 } // iPhone 12/Pro, iPhone 13/Pro
     var h896: CGFloat { Self.h896 } // iPhone Xr, Xs Max, 11/Pro Max
+    var h926: CGFloat { Self.h926 } // iPhone 12 Pro Max, iPhone 13 Pro Max
     var h1024: CGFloat { Self.h1024 } // iPad 7.9", 9.7"
     var h1112: CGFloat { Self.h1112 } // iPad 10.5"
     var h1366: CGFloat { Self.h1366 } // iPad 12.9"
 
     static var w320: CGFloat { 320 } // iPhone 5/s/c, SE
-    static var w375: CGFloat { 375 } // iPhone 6/s, 7, 8, X, XS, 11 Pro
+    static var w375: CGFloat { 375 } // iPhone 6/s, 7, 8, X, XS, 11 Pro, 12 Mini, 13 Mini
+    static var w390: CGFloat { 390 } // iPhone 12/Pro, iPhone 13/Pro
     static var w414: CGFloat { 414 } // iPhone 6+/s+, 7+, 8+, Xr, Xs Max, 11/Pro Max
+    static var w428: CGFloat { 428 } // iPhone 12 Pro Max, iPhone 13 Pro Max
     static var w768: CGFloat { 768 } // iPad 7.9", 9.7"
     static var w834: CGFloat { 834 } // iPad 10.5"
     static var w1024: CGFloat { 1024 } // iPad 12.9"
 
     static var h568: CGFloat { 568 } // iPhone 5/s/c, SE
     static var h667: CGFloat { 667 } // iPhone 6/s, 7, 8
     static var h736: CGFloat { 736 } // iPhone 6+/s+, 7+, 8+
-    static var h812: CGFloat { 812 } // iPhone X/s, 11 Pro
+    static var h812: CGFloat { 812 } // iPhone X/s, 11 Pro, 12 Mini, 13 Mini
+    static var h844: CGFloat { 844 } // iPhone 12/Pro, iPhone 13/Pro
     static var h896: CGFloat { 896 } // iPhone Xr, Xs Max, 11/Pro Max
+    static var h926: CGFloat { 926 } // iPhone 12 Pro Max, iPhone 13 Pro Max
     static var h1024: CGFloat { 1024 } // iPad 7.9", 9.7"
     static var h1112: CGFloat { 1112 } // iPad 10.5"
     static var h1366: CGFloat { 1366 } // iPad 12.9"

diff --git a/UIScaler/UIScaler/UIScaler.swift b/UIScaler/UIScaler/UIScaler.swift
@@ -116,17 +116,21 @@ public extension UIScaler {
         public init(integerLiteral value: Int) { self = .val(Double(value)) }
 
         case w320 // iPhone 5/s/c, SE
-        case w375 // iPhone 6/s, 7, 8, X, XS, 11
+        case w375 // iPhone 6/s, 7, 8, X, XS, 11, 12 Mini, 13 Mini
+        case w390 // iPhone 12/Pro, iPhone 13/Pro
         case w414 // iPhone 6+/s+, 7+, 8+, Xr, Xs Max, 11/Pro Max
+        case w428 // iPhone 12 Pro Max, iPhone 13 Pro Max
         case w768 // iPad 7.9", 9.7"
         case w834 // iPad 10.5"
         case w1024 // iPad 12.9"
 
         case h568 // iPhone 5/s/c, SE
         case h667 // iPhone 6/s, 7, 8
         case h736 // iPhone 6+/s+, 7+, 8+
-        case h812 // iPhone X/s, 11 Pro
+        case h812 // iPhone X/s, 11 Pro, 12 Mini, 13 Mini
+        case h844 // iPhone 12/Pro, iPhone 13/Pro
         case h896 // iPhone Xr, Xs Max, 11, 11 Pro Max
+        case h926 // iPhone 12 Pro Max, iPhone 13 Pro Max
         case h1024 // iPad 7.9", 9.7"
         case h1112 // iPad 10.5"
         case h1366 // iPad 12.9"
@@ -137,7 +141,9 @@ public extension UIScaler {
             switch self {
             case .w320: return 320
             case .w375: return 375
+            case .w390: return 390
             case .w414: return 414
+            case .w428: return 428
             case .w768: return 768
             case .w834: return 834
             case .w1024: return 1024
@@ -146,7 +152,9 @@ public extension UIScaler {
             case .h667: return 667
             case .h736: return 736
             case .h812: return 812
+            case .h844: return 844
             case .h896: return 896
+            case .h926: return 926
             case .h1024: return 1024
             case .h1112: return 1112
             case .h1366: return 1366