优化Screen, 增加不同UIScreen支持, 增加iPhone 16系列支持.

Author: lixiang1994

Demo/Demo.xcodeproj/project.pbxproj

@@ -411,7 +411,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 8G74YECJ4Z;
 				INFOPLIST_FILE = Demo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -431,7 +431,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 8G74YECJ4Z;
 				INFOPLIST_FILE = Demo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

Demo/Demo/ViewController.swift

@@ -15,33 +15,39 @@ class ViewController: UITableViewController {
         super.viewDidLoad()
         // Do any additional setup after loading the view, typically from a nib.
 
-        print(
-            "this is " +
-                "default".screen
-                .width(._320, is: "宽度 320")
-                .width(._375, is: "宽度 375")
-                .height(._844, is: "高度 844")
-                .height(._812, is: "高度 812")
-                .inch(._4_7, is: "4.7 英寸")
-                .inch(._5_8, is: "5.8 英寸")
-                .inch(._6_5, is: "6.5 英寸")
-                .level(.compact, is: "屏幕级别 紧凑屏")
-                .level(.regular, is: "屏幕级别 常规屏")
-                .level(.full, is: "屏幕级别 全面屏")
-                .value
+        print("this is " + "default".screen
+            .width(equalTo: 375, is: "宽度 等于 375")
+            .width(lessThan: 414, is: "宽度 小于 414")
+            .width(greaterThan: 414, is: "宽度 大于 414")
+            .height(equalTo: 700, is: "高度 等于 375")
+            .height(lessThan: 844, is: "高度 小于 844")
+            .height(greaterThan: 844, is: "高度 大于 844")
+            .inch(._4_7, is: "4.7 英寸")
+            .inch(._5_8, is: "5.8 英寸")
+            .inch(._6_5, is: "6.5 英寸")
+            .level(.compact, is: "屏幕级别 紧凑屏 (4:3)")
+            .level(.regular, is: "屏幕级别 常规屏 (16:9)")
+            .level(.full, is: "屏幕级别 全面屏 (19.5:9)")
+            .value
         )
 
+        // Range用法: 默认值0, 当宽度小于等于375 返回1
+        print(0.screen.width(...375, is: 1).value)
+        // Range用法: 默认值0, 当宽度为375至414范围时 返回1
+        print(0.screen.width(375...414, is: 1).value)
+        // Range用法: 默认值0, 当屏幕小于5.5英寸时 返回1
+        print(0.screen.inch(..<5.5, is: 1).value)
 
         // 默认值 0 在3.5英寸的屏幕时返回1, 在4.0英寸的屏幕时返回2
         print(0.screen.inch(._3_5, is: 1).inch(._4_0, is: 2).value)
         // 默认值 0 在全面屏时返回1, 在6.1英寸的屏幕时返回2
         print(0.screen.level(.full, is: 1).inch(._6_1, is: 2).value)
         // 默认值 100 在宽度为375级别的屏幕时 正常返回120, 如果为缩放模式则返回110
-        print(100.screen.width(._375, is: 120, zoomed: 110).value)
+        print(100.screen.width(equalTo: 375, is: 120, zoomed: 110).value)
 
-        print("当前屏幕级别: \(UIAdapter.Screen.Level.current)")
-        print("是否为全面屏: \(UIAdapter.Screen.isFull)")
-        print("是否为缩放模式: \(UIAdapter.Screen.isZoomedMode)")
+        print("当前屏幕级别: \(UIAdapter.Screen.main.level)")
+        print("是否为全面屏: \(UIAdapter.Screen.main.level.isFull)")
+        print("是否为缩放模式: \(UIAdapter.Screen.main.isZoomedMode)")
     }
 
     override var preferredStatusBarStyle: UIStatusBarStyle {

Demo/Podfile

@@ -1,4 +1,4 @@
-platform :ios, '10.0'
+platform :ios, '15.6'
 inhibit_all_warnings!
 
 target 'Demo' do

Demo/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
-  - UIAdapter (1.3.0):
-    - UIAdapter/Privacy (= 1.3.0)
-  - UIAdapter/Privacy (1.3.0)
+  - UIAdapter (1.4.0):
+    - UIAdapter/Privacy (= 1.4.0)
+  - UIAdapter/Privacy (1.4.0)
 
 DEPENDENCIES:
   - UIAdapter (from `../`)
@@ -11,8 +11,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  UIAdapter: 2c0c81c68b308e3ce8b4363d4f66b0ced8c1812f
+  UIAdapter: 81dd1efbab6c0d092ac0d02e12a3c6b84e3c3c99
 
-PODFILE CHECKSUM: 0793a3778780a57cf83a43faa9039eedb0b67f7a
+PODFILE CHECKSUM: 6c30ea2512eacb7800929df401f020c67f5b94ec
 
 COCOAPODS: 1.15.2

Demo/Pods/Local Podspecs/UIAdapter.podspec.json

@@ -133,24 +133,25 @@ label.numberOfLines = 0.screen.inch(._3_5, is: 1).inch(._4_0, is: 2).value
 ```swift
 // default other screen numberOfLines = 0
 // width 320 screen numberOfLines = 1
-// width 375 inches screen numberOfLines = 2
-label.numberOfLines = 0.screen.width(._320, is: 1).width(._375, is: 2).value
+// width 375 screen numberOfLines = 2
+label.numberOfLines = 0.screen.width(equalTo: 375, is: 1).width(equalTo: 375, is: 2).value
 ```
 
 
 ```swift
-print("this is " +
-    "default".screen
-    .width(._320, is: "width 320")
-    .width(._375, is: "width 375")
-    .height(._844, is: "height 844")
-    .height(._812, is: "height 812")
-    .inch(._4_7, is: "4.7 inches")
-    .inch(._5_8, is: "5.8 inches")
-    .inch(._6_5, is: "6.5 inches")
-    .level(.compact, is: "screen 3: 2")
-    .level(.regular, is: "screen 16: 9")
-    .level(.full, is: "screen 19.5: 9")
+print("this is " + "default".screen
+    .width(equalTo: 375, is: "width equal to 375")
+    .width(lessThan: 414, is: "width less than 414")
+    .width(greaterThan: 414, is: "width greater than 414")
+    .height(equalTo: 700, is: "height equal to 375")
+    .height(lessThan: 844, is: "height less than 844")
+    .height(greaterThan: 844, is: "height greater than 844")
+    .inch(._4_7, is: "4.7-inch")
+    .inch(._5_8, is: "5.8-inch")
+    .inch(._6_5, is: "6.5-inch")
+    .level(.compact, is: "screen (4:3)")
+    .level(.regular, is: "screen (16:9)")
+    .level(.full, is: "screen (19.5:9)")
     .value
 )
 ```

Demo/Pods/Manifest.lock

@@ -130,24 +130,25 @@ label.numberOfLines = 0.screen.inch(._3_5, is: 1).inch(._4_0, is: 2).value
 ```swift
 // default other screen numberOfLines = 0
 // width 320 screen numberOfLines = 1
-// width 375 inches screen numberOfLines = 2
-label.numberOfLines = 0.screen.width(._320, is: 1).width(._375, is: 2).value
+// width 375 screen numberOfLines = 2
+label.numberOfLines = 0.screen.width(equalTo: 320, is: 1).width(equalTo: 375, is: 2).value
 ```
 
 
 ```swift
-print("this is " +
-    "default".screen
-    .width(._320, is: "宽度 320")
-    .width(._375, is: "宽度 375")
-    .height(._844, is: "高度 844")
-    .height(._812, is: "高度 812")
+print("this is " + "default".screen
+    .width(equalTo: 375, is: "宽度 等于 375")
+    .width(lessThan: 414, is: "宽度 小于 414")
+    .width(greaterThan: 414, is: "宽度 大于 414")
+    .height(equalTo: 700, is: "高度 等于 375")
+    .height(lessThan: 844, is: "高度 小于 844")
+    .height(greaterThan: 844, is: "高度 大于 844")
     .inch(._4_7, is: "4.7 英寸")
     .inch(._5_8, is: "5.8 英寸")
     .inch(._6_5, is: "6.5 英寸")
-    .level(.compact, is: "屏幕级别 紧凑屏")
-    .level(.regular, is: "屏幕级别 常规屏")
-    .level(.full, is: "屏幕级别 全面屏")
+    .level(.compact, is: "屏幕级别 紧凑屏 (4:3)")
+    .level(.regular, is: "屏幕级别 常规屏 (16:9)")
+    .level(.full, is: "屏幕级别 全面屏 (19.5:9)")
     .value
 )
 ```

Demo/Pods/Pods.xcodeproj/project.pbxproj

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name         = "UIAdapter"
-s.version      = "1.3.1"
+s.version      = "1.4.0"
 s.summary      = "iOS屏幕适配工具"
 
 s.homepage     = "https://github.com/lixiang1994/UIAdapter"
@@ -18,7 +18,7 @@ s.source_files  = "Sources/**/*.swift"
 
 s.requires_arc = true
 
-s.swift_version = '5.3'
+s.swift_version = '5.5'
 
 s.cocoapods_version = '>= 1.4.0'