Move dynamic island check to enum

Rename hasDynamicIsland to isAvailable and move it to the DynamicIsland enum

Author: theblixguy

README.md

@@ -8,7 +8,7 @@ I will be adding more utilities to this package in the near future.
 
 ## DynamicIsland
 
-A type that provides the size, origin and rect for the Dynamic Island. For example, you can do:
+A type that provides the size, origin, rect and some other information related to the Dynamic Island. For example, you can do:
 
 ```swift
 let size = DynamicIsland.size
@@ -50,10 +50,10 @@ doSomeWorkThatMayFinishLater { result in
 }
 ```
 
-In order to call this method, you need to check `hasDynamicIsland` (this is enforced at runtime), which also allows you to provide fallback logic:
+In order to access this property, you need to check `DynamicIsland.isAvailable` (this is enforced at runtime), which also nudges you to provide fallback logic:
 
 ```swift
-if hasDynamicIsland {
+if DynamicIsland.isAvailable {
   // Show a cool progress indicator around the Dynamic Island
   dynamicIslandProgressIndicatorConfiguration.showIndeterminateProgressAnimation()
 } else {

Sources/DynamicIslandUtilities/DynamicIsland.swift

@@ -7,8 +7,8 @@
 
 import UIKit
 
-/// A type that provides the size, origin and rect for the Dynamic Island.
-/// - Note: This only provides the values for a static island, not one that is expanded (while a live activity is running for example)
+/// A type that provides the size, origin, rect and some other information related to the Dynamic Island.
+/// - Note: This only provides the values for a static island, not one that is expanded (while a live activity is running for example).
 public enum DynamicIsland {
 
     /// The size of the Dynamic Island cutout.
@@ -30,4 +30,26 @@ public enum DynamicIsland {
     public static let cornerRadius: Double = {
         return size.width / 2
     }()
+    
+    /// Returns whether this device supports the Dynamic Island.
+    /// This returns `true` for iPhone 14 Pro and iPhone Pro Max, otherwise returns `false`.
+    public static let isAvailable: Bool = {
+        if #unavailable(iOS 16) {
+            return false
+        }
+        
+        #if targetEnvironment(simulator)
+          let identifier = ProcessInfo().environment["SIMULATOR_MODEL_IDENTIFIER"]!
+        #else
+          var systemInfo = utsname()
+          uname(&systemInfo)
+          let machineMirror = Mirror(reflecting: systemInfo.machine)
+          let identifier = machineMirror.children.reduce("") { identifier, element in
+              guard let value = element.value as? Int8, value != 0 else { return identifier }
+              return identifier + String(UnicodeScalar(UInt8(value)))
+          }
+        #endif
+        
+        return identifier == "iPhone15,2" || identifier == "iPhone15,3"
+    }()
 }

Sources/DynamicIslandUtilities/DynamicIslandProgressIndicatorViewController.swift

@@ -54,38 +54,17 @@ open class DynamicIslandProgressIndicatorViewController: UIViewController {
         return .init(controller: self)
     }()
 
-    /// Returns whether this device supports the Dynamic Island.
-    /// This returns `true` for iPhone 14 Pro and iPhone Pro Max, otherwise returns `false`.
-    public var hasDynamicIsland: Bool {
-        if #unavailable(iOS 16) {
-            return false
-        }
-        
-        #if targetEnvironment(simulator)
-          let identifier = ProcessInfo().environment["SIMULATOR_MODEL_IDENTIFIER"]!
-        #else
-          var systemInfo = utsname()
-          uname(&systemInfo)
-          let machineMirror = Mirror(reflecting: systemInfo.machine)
-          let identifier = machineMirror.children.reduce("") { identifier, element in
-              guard let value = element.value as? Int8, value != 0 else { return identifier }
-              return identifier + String(UnicodeScalar(UInt8(value)))
-          }
-        #endif
-        
-        return identifier == "iPhone15,2" || identifier == "iPhone15,3"
-    }
-    
     open override func viewDidLoad() {
         super.viewDidLoad()
 
-        if hasDynamicIsland {
+        // TODO: Maybe do this somewhere else? Or enforce a super call.
+        if DynamicIsland.isAvailable {
             createAndAddDynamicIslandBorderLayers()
         }
     }
 
     private func requiresDynamicIsland() {
-        precondition(hasDynamicIsland,
+        precondition(DynamicIsland.isAvailable,
                      "Cannot show dynamic island progress animation on a device that does not support it!")
     }