@woosmap/react-native-plugin-geofencing 0.11.0-beta.2 → 0.11.0-beta.3

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.11.0
+- Enhancement: Removed warning from iOS plugin code
+
 ## 0.10.0
 - Enhancement: Expose `openNow` within the POI class that represents the store's status.
 

package/ios/PluginGeofencing.swift

@@ -255,7 +255,7 @@ class PluginGeofencing: RCTEventEmitter {
         // https://developer.apple.com/documentation/corelocation/cllocationmanager/1620551-requestalwaysauthorization
         
         if let backgoundMode = command[0] as? Bool {
-            let status = CLLocationManager.authorizationStatus()
+            let status = CLLocationManager().authorizationStatus
             
             if backgoundMode {
                 if status == .notDetermined {
@@ -279,7 +279,7 @@ class PluginGeofencing: RCTEventEmitter {
                                 UIApplication.shared.open(settingsUrl, options: [:], completionHandler: nil)
                             }
                         }))
-                        var rootViewController = UIApplication.shared.keyWindow?.rootViewController
+                        var rootViewController = UIApplication.shared.topViewController //keyWindow?.rootViewController
                         if let navigationController = rootViewController as? UINavigationController {
                             rootViewController = navigationController.viewControllers.first
                         }
@@ -311,7 +311,7 @@ class PluginGeofencing: RCTEventEmitter {
                                 UIApplication.shared.open(settingsUrl, options: [:], completionHandler: nil)
                             }
                         }))
-                        var rootViewController = UIApplication.shared.keyWindow?.rootViewController
+                        var rootViewController = UIApplication.shared.topViewController// keyWindow?.rootViewController
                         if let navigationController = rootViewController as? UINavigationController {
                             rootViewController = navigationController.viewControllers.first
                         }
@@ -1202,3 +1202,34 @@ extension PluginGeofencing:CLLocationManagerDelegate{
     
 }
 
+private extension UIApplication {
+    /// Returns the top-most view controller in the app
+    var topViewController: UIViewController? {
+        // 1️⃣ Get key window
+        guard let windowScene = connectedScenes
+                .first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene,
+              let rootVC = windowScene.windows
+                .first(where: { $0.isKeyWindow })?.rootViewController
+        else {
+            return nil
+        }
+        // 2️⃣ Recursively find top presented VC
+        return topViewController(from: rootVC)
+    }
+    
+    private func topViewController(from root: UIViewController) -> UIViewController {
+        if let presented = root.presentedViewController {
+            // Presented modals
+            return topViewController(from: presented)
+        } else if let nav = root as? UINavigationController, let visible = nav.visibleViewController {
+            // Navigation controller
+            return topViewController(from: visible)
+        } else if let tab = root as? UITabBarController, let selected = tab.selectedViewController {
+            // Tab bar controller
+            return topViewController(from: selected)
+        } else {
+            return root
+        }
+    }
+}
+