Merge pull request #8 from codelathe/visionos_support

visionOS support

Author: rivera-ernesto

Example/ContainerControllerSwift.xcodeproj/project.pbxproj

@@ -1309,8 +1309,11 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = mrustaa.ContainerController;
 				PRODUCT_NAME = ContainerController;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2,7";
 			};
 			name = Debug;
 		};
@@ -1325,8 +1328,11 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = mrustaa.ContainerController;
 				PRODUCT_NAME = ContainerController;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2,7";
 			};
 			name = Release;
 		};

Example/ContainerControllerSwift/Framework/Utils/UIView+Positioning.swift

@@ -187,7 +187,11 @@ public extension UIView {
 
     // MARK: - Private Methods
     fileprivate func _pixelIntegral(_ pointValue: CGFloat) -> CGFloat {
+        #if os(iOS)
         let scale = UIScreen.main.scale
         return (round(pointValue * scale) / scale)
+        #else
+        return pointValue
+        #endif
     }
 }

Example/ContainerControllerSwift/Maps/MapManager/MapViewManager.swift

@@ -50,7 +50,9 @@ class MapViewManager: NSObject {
                     self.locationManager = CLLocationManager()
                     self.locationManager?.delegate = self
                     self.locationManager?.desiredAccuracy = kCLLocationAccuracyBest
+                    #if os(iOS)
                     self.locationManager?.requestAlwaysAuthorization()
+                    #endif
                     self.locationManager?.startUpdatingLocation()
                 }
             }

Example/ContainerControllerSwift/Maps/MapsViewController.swift

@@ -44,7 +44,9 @@ class MapsViewController: StoryboardController, MapsContainerControllerDelegate,
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        #if os(iOS)
         NotificationCenter.default.addObserver(self, selector: #selector(rotated), name: UIDevice.orientationDidChangeNotification, object: nil)
+        #endif
 
         updateMapManager()
 
@@ -61,7 +63,9 @@ class MapsViewController: StoryboardController, MapsContainerControllerDelegate,
 
         navigationController?.navigationBar.isTranslucent = false
 
+        #if os(iOS)
         setNeedsStatusBarAppearanceUpdate()
+        #endif
 
         navBar(hide: true)
         if !showOnce {
@@ -105,12 +109,14 @@ class MapsViewController: StoryboardController, MapsContainerControllerDelegate,
 
     // MARK: -  Rotation Callback
 
+    #if os(iOS)
     @objc func rotated() {
 
         if !UIDevice.current.orientation.isRotateAllowed { return }
 
         updateMapViewTopPadding()
     }
+    #endif
 
     func updateMapViewTopPadding() {
 
@@ -328,7 +334,9 @@ class MapsViewController: StoryboardController, MapsContainerControllerDelegate,
         let style: UIBlurEffect.Style = darkStyle ? .systemUltraThinMaterialDark : .regular
         statusBlur.effect = UIBlurEffect(style: style)
 
+        #if os(iOS)
         setNeedsStatusBarAppearanceUpdate()
+        #endif
     }
 
     // MARK: - Show Maps-Container

Example/ContainerControllerSwift/Maps/UI/View/Maps/HeaderSearchBarView/HeaderSearchBarView.swift

@@ -27,10 +27,12 @@ class HeaderSearchBarView: XibView {
         searchBar.placeholder = _L("LNG_MAPS_SEARCH_PLACE_ADDRESS")
 
         let textFieldInsideSearchBar = searchBar.value(forKey: "searchField") as? UITextField
-        let imageV = textFieldInsideSearchBar?.leftView as! UIImageView
-        imageV.image = imageV.image?.withRenderingMode(UIImage.RenderingMode.alwaysTemplate)
-//        imageV.image = imageV.image?.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate)
-        imageV.tintColor = Colors.rgb(128, 128, 128)
+        if let imageV = textFieldInsideSearchBar?.leftView as? UIImageView
+        {
+            imageV.image = imageV.image?.withRenderingMode(UIImage.RenderingMode.alwaysTemplate)
+//            imageV.image = imageV.image?.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate)
+            imageV.tintColor = Colors.rgb(128, 128, 128)
+        }
     }
 
     func set(darkStyle: Bool) {

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -183,7 +183,9 @@ open class ContainerController: NSObject {
         self.controller = controller
         set(layout: layout)
 
+        #if os(iOS)
         NotificationCenter.default.addObserver(self, selector: #selector(rotated), name: UIDevice.orientationDidChangeNotification, object: nil)
+        #endif
 
         createShadowButton()
         createContainerView()
@@ -214,6 +216,7 @@ open class ContainerController: NSObject {
 
     // MARK: - Rotated
 
+    #if os(iOS)
     @objc func rotated() {
 
         if !UIDevice.current.orientation.isRotateAllowed { return }
@@ -230,6 +233,7 @@ open class ContainerController: NSObject {
 
         move(type: moveType, from: .rotation)
     }
+    #endif
 
     // MARK: - Update Layout
 

Sources/ContainerController/ContainerController.swift

@@ -23,8 +23,20 @@ open class ContainerDevice {
 
     // MARK: - Size
 
-    class public var width:  CGFloat { UIScreen.main.bounds.size.width }
-    class public var height: CGFloat { UIScreen.main.bounds.size.height }
+    class public var width:  CGFloat {
+        #if os(iOS)
+        UIScreen.main.bounds.size.width
+        #else
+        UIApplication.shared.connectedScenes.compactMap { ($0 as? UIWindowScene)?.keyWindow }.last?.bounds.size.width ?? 0
+        #endif
+    }
+    class public var height: CGFloat {
+        #if os(iOS)
+        UIScreen.main.bounds.size.height
+        #else
+        UIApplication.shared.connectedScenes.compactMap { ($0 as? UIWindowScene)?.keyWindow }.last?.bounds.size.height ?? 0
+        #endif
+    }
 
     class public var frame: CGRect { CGRect(x: 0, y: 0, width: width, height: height) }
 
@@ -37,7 +49,13 @@ open class ContainerDevice {
 
     static public let isIpad   = UIDevice.current.userInterfaceIdiom == .pad
     static public let isIphone = UIDevice.current.userInterfaceIdiom == .phone
-    static public let isRetina = UIScreen.main.scale >= 2.0
+    static public let isRetina = {
+        #if os(iOS)
+        UIScreen.main.scale >= 2.0
+        #else
+        true
+        #endif
+    }
 
     class public var isIphone4:   Bool { (isIphone && screenMax <  568.0) }
     class public var isIphone5:   Bool { (isIphone && screenMax == 568.0) } // SE
@@ -75,6 +93,7 @@ open class ContainerDevice {
 
         var portrait: Bool = false
 
+        #if os(iOS)
         let size: CGSize = UIScreen.main.bounds.size
         if size.width / size.height > 1 {
             portrait = false
@@ -89,6 +108,7 @@ open class ContainerDevice {
             portrait = true
         default: break
         }
+        #endif
 
         return portrait
     }