@applicaster/quick-brick-native-apple 5.20.3 → 5.20.5

package/apple/QuickBrickApple.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "QuickBrickApple",
-  "version": "5.20.3",
+  "version": "5.20.5",
   "platforms": {
     "ios": "14.0",
     "tvos": "14.0"
@@ -16,7 +16,7 @@
   "authors": "Applicaster LTD.",
   "source": {
     "git": "https://github.com/applicaster/Zapp-Frameworks.git",
-    "tag": "@@applicaster/quick-brick-native-apple/5.20.3"
+    "tag": "@@applicaster/quick-brick-native-apple/5.20.5"
   },
   "requires_arc": true,
   "source_files": "universal/**/*.{m,swift}",
@@ -34,6 +34,7 @@
   "dependencies": {
     "ZappCore": [],
     "React": [],
+    "React-Core": [],
     "React-RCTLinking": [],
     "XrayLogger": []
   },

package/apple/ios/ReactNative/QuickBrickViewController.swift

@@ -17,7 +17,7 @@ class QuickBrickViewController: UIViewController, UILayerViewControllerProtocol
     }
 
     lazy var logger = Logger.getLogger(for: QuickBrickViewControllerLogs.subsystem)
-    var currentOrientation = UIDevice.current.orientation
+    var currentOrientation: UIDeviceOrientation = .unknown
 
     var orientationStack = [UIInterfaceOrientationMask.all]
     var orientationMask: UIInterfaceOrientationMask = QuickBrickViewController.initialOrientationMask
@@ -47,9 +47,45 @@ class QuickBrickViewController: UIViewController, UILayerViewControllerProtocol
         else {
             return false
         }
+
         return value.boolValue
     }
 
+    func getUIOrientation() -> UIInterfaceOrientation {
+        guard let interfaceOrientation = UIApplication.shared.windows.first?.windowScene?.interfaceOrientation else {
+            return .unknown
+        }
+        return interfaceOrientation
+    }
+
+    func getUIOrientationMappedToDeviceOrientation() -> UIDeviceOrientation {
+        let interfaceOrientation = getUIOrientation()
+
+        switch interfaceOrientation {
+        case .landscapeLeft:
+            return .landscapeLeft
+        case .landscapeRight:
+            return .landscapeRight
+        case .portrait:
+            return .portrait
+        case .portraitUpsideDown:
+            return .portraitUpsideDown
+        default:
+            return .unknown
+        }
+    }
+
+    func getDeviceOrientation() -> UIDeviceOrientation {
+        let deviceOrientation = UIDevice.current.orientation
+        if deviceOrientation == .landscapeLeft {
+            return .landscapeRight
+        } else if deviceOrientation == .landscapeRight {
+            return .landscapeLeft
+        }
+
+        return deviceOrientation
+    }
+
     /// Allow Orientation for specific screen
     ///
     /// - Parameters:
@@ -76,16 +112,55 @@ class QuickBrickViewController: UIViewController, UILayerViewControllerProtocol
         }
     }
 
-    override func viewWillTransition(to _: CGSize, with _: UIViewControllerTransitionCoordinator) {
-        ReactNativeEventEmitter.orientationChange(toOrientation: UIDevice.current.orientation, fromOrientation: currentOrientation)
-        currentOrientation = UIDevice.current.orientation
+    override func viewWillTransition(to _: CGSize,
+                                     with _: UIViewControllerTransitionCoordinator) {
+        let orientation = getUIOrientationMappedToDeviceOrientation()
+
+        ReactNativeEventEmitter.orientationChange(toOrientation: orientation,
+                                                  fromOrientation: currentOrientation)
+        logger?.debugLog(message: "viewWillTransition: ui orientation was change to: \(orientation.toString())",
+                         category: QuickBrickViewControllerLogs.forceOrientation.category)
     }
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        UIDevice.current.beginGeneratingDeviceOrientationNotifications()
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(deviceDidRotate(notification:)),
+                                               name: UIDevice.orientationDidChangeNotification,
+                                               object: nil)
+
+        // Initial device orientation
         currentOrientation = UIDevice.current.orientation
     }
 
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        NotificationCenter.default.removeObserver(self)
+        if UIDevice.current.isGeneratingDeviceOrientationNotifications {
+            UIDevice.current.endGeneratingDeviceOrientationNotifications()
+        }
+    }
+
+    @objc func deviceDidRotate(notification _: NSNotification) {
+        let deviceOrientation = getDeviceOrientation()
+
+        // In this cases we does not want to send notifications
+        if deviceOrientation == .unknown ||
+            deviceOrientation == .faceDown ||
+            deviceOrientation == .faceUp {
+            return
+        }
+
+        ReactNativeEventEmitter.orientationChange(toOrientation: deviceOrientation,
+                                                  fromOrientation: currentOrientation,
+                                                  physicalChange: true)
+        logger?.debugLog(message: "deviceDidRotate: UI oritation changed to: \(getUIOrientation().toString())",
+                         category: QuickBrickViewControllerLogs.forceOrientation.category)
+
+        currentOrientation = deviceOrientation
+    }
+
     private func mapOrientation(_ orientation: Int) -> UIInterfaceOrientationMask {
         let JS_PORTAIT = 0x0000_0001
         let JS_LANDSCAPE = 0x0000_0002 // landscapeRight: 2,
@@ -140,50 +215,46 @@ class QuickBrickViewController: UIViewController, UILayerViewControllerProtocol
     }
 
     private func forceOrientationIfNeeded(orientationMask: UIInterfaceOrientationMask) {
+        let interfaceOrientation = getUIOrientation()
         switch orientationMask {
         case UIInterfaceOrientationMask.portrait:
-            if !UIDevice.current.orientation.isPortrait {
-                forceOrientation(UIInterfaceOrientation.portrait)
-            }
+            forceOrientation(UIInterfaceOrientation.portrait)
         case UIInterfaceOrientationMask.landscape:
-            if !UIDevice.current.orientation.isLandscape {
-                let statusBarOrientation = UIApplication.shared.statusBarOrientation
-                if statusBarOrientation == UIInterfaceOrientation.landscapeLeft {
-                    forceOrientation(UIInterfaceOrientation.landscapeLeft)
-                } else {
-                    forceOrientation(UIInterfaceOrientation.landscapeRight)
-                }
-            }
-        case UIInterfaceOrientationMask.landscapeRight:
-            if UIDevice.current.orientation.rawValue != UIInterfaceOrientation.landscapeRight.rawValue {
+
+            if interfaceOrientation == .landscapeRight {
                 forceOrientation(UIInterfaceOrientation.landscapeRight)
-            }
-        case UIInterfaceOrientationMask.landscapeLeft:
-            if UIDevice.current.orientation.rawValue != UIInterfaceOrientation.landscapeLeft.rawValue {
+            } else {
                 forceOrientation(UIInterfaceOrientation.landscapeLeft)
             }
+
+        case UIInterfaceOrientationMask.landscapeRight:
+            forceOrientation(UIInterfaceOrientation.landscapeRight)
+
+        case UIInterfaceOrientationMask.landscapeLeft:
+            forceOrientation(UIInterfaceOrientation.landscapeLeft)
+
         case UIInterfaceOrientationMask.all:
             break
         case UIInterfaceOrientationMask.allButUpsideDown:
-            if !UIDevice.current.orientation.isLandscape, UIDevice.current.orientation.rawValue != UIInterfaceOrientation.portrait.rawValue {
-                forceOrientation(UIInterfaceOrientation.portrait)
-            }
+            forceOrientation(UIInterfaceOrientation.portrait)
+
         case UIInterfaceOrientationMask.portraitUpsideDown:
-            if UIDevice.current.orientation.rawValue != UIInterfaceOrientation.portraitUpsideDown.rawValue {
-                forceOrientation(UIInterfaceOrientation.portraitUpsideDown)
-            }
+            forceOrientation(UIInterfaceOrientation.portraitUpsideDown)
         default:
             break
         }
     }
 
     private func forceOrientation(_ orientation: UIInterfaceOrientation) {
-        logger?.debugLog(message: QuickBrickViewControllerLogs.forceOrientation.message,
-                         category: QuickBrickViewControllerLogs.forceOrientation.category,
-                         data: ["orientation": "\(orientation.rawValue)"])
-
-        UIDevice.current.setValue(orientation.rawValue, forKey: "orientation")
-        UIViewController.attemptRotationToDeviceOrientation()
+        if let newOrientation = UIDeviceOrientation(rawValue: orientation.rawValue) {
+            logger?.debugLog(message: "\(QuickBrickViewControllerLogs.forceOrientation.message) UI oritation to: \(orientation.toString())",
+                             category: QuickBrickViewControllerLogs.forceOrientation.category,
+                             data: ["newDeviceOrientation": newOrientation.toString(),
+                                    "newInterfaceOrientation": orientation.toString()])
+            UIDevice.current.setValue(newOrientation,
+                                      forKey: "orientation")
+            UIViewController.attemptRotationToDeviceOrientation()
+        }
     }
 
     override var prefersHomeIndicatorAutoHidden: Bool {

package/apple/ios/ReactNativeEventEmitter.swift

@@ -12,9 +12,13 @@ import React
 open class ReactNativeEventEmitter: RCTEventEmitter {
     public static var emitter: RCTEventEmitter!
 
-    public static func orientationChange(toOrientation: UIDeviceOrientation, fromOrientation: UIDeviceOrientation) {
+    public static func orientationChange(toOrientation: UIDeviceOrientation,
+                                         fromOrientation: UIDeviceOrientation,
+                                         physicalChange: Bool = false) {
         if toOrientation.rawValue > 0 {
-            emitter.sendEvent(withName: "orientationChange", body: ["toOrientation": toOrientation.mapOrientation(), "fromOrientation": fromOrientation.mapOrientation()])
+            emitter?.sendEvent(withName: "orientationChange", body: ["toOrientation": toOrientation.mapOrientation(),
+                                                                     "fromOrientation": fromOrientation.mapOrientation(),
+                                                                     "physicalChange": physicalChange])
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-native-apple",
-  "version": "5.20.3",
+  "version": "5.20.5",
   "description": "iOS and tvOS native code for QuickBrick applications. This package is used to provide native logic for QuickBrick",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"