Fix 'deprecated' compiler warnings

DimaRU · Jan 12, 2024 · ce79840 · ce79840
1 parent 85d72ba
commit ce79840
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/TridentCockpitiOS/DashboardViewController/BackgroundWatch.swift b/TridentCockpitiOS/DashboardViewController/BackgroundWatch.swift
@@ -6,7 +6,7 @@
 
 import UIKit
 
-protocol BackgroundWatchProtocol: class {
+protocol BackgroundWatchProtocol: AnyObject {
     func didEnterBackground()
     func willEnterForeground()
 }

diff --git a/TridentCockpitiOS/DashboardViewController/DashboardViewController.swift b/TridentCockpitiOS/DashboardViewController/DashboardViewController.swift
@@ -117,8 +117,8 @@ class DashboardViewController: UIViewController, RTPSConnectionMonitorProtocol,
         backgroundWatch = BackgroundWatch(delegate: self)
         addCircularProgressView(to: view)
         connectTrident()
-        if CLLocationManager.authorizationStatus() == .notDetermined {
-            locationManager = CLLocationManager()
+        locationManager = CLLocationManager()
+        if locationManager?.authorizationStatus == .notDetermined {
             locationManager?.requestWhenInUseAuthorization()
         }
     }

diff --git a/TridentCockpitiOS/DiveViewController/DiveViewController.swift b/TridentCockpitiOS/DiveViewController/DiveViewController.swift
@@ -104,17 +104,13 @@ class DiveViewController: UIViewController {
         throttleJoystickView.isHidden = true
         yawPitchJoystickView.isHidden = true
         #else
-        if let window: UIWindow = {
-            if #available(iOS 13, *) {
-                return UIApplication.shared.windows.first{ $0.isKeyWindow }
-            } else {
-                return UIApplication.shared.keyWindow
-            }
-            }() {
+        if let window = view.window?.windowScene?.keyWindow {
             let bounds = window.bounds
             let offset: CGFloat = UITraitCollection.current.verticalSizeClass == .compact ? 185 : 250
             throttleJoystickView.center = CGPoint(x: bounds.minX + offset, y: bounds.maxY - offset)
             yawPitchJoystickView.center = CGPoint(x: bounds.maxX - offset, y: bounds.maxY - offset)
+        } else {
+            print("Window not found!")
         }
 
         #endif

diff --git a/TridentCockpitiOS/Etc/Alerts.swift b/TridentCockpitiOS/Etc/Alerts.swift
@@ -9,7 +9,7 @@ import Alamofire
 
 extension UIAlertController {
     func presentOntop() {
-        let window = UIApplication.shared.windows.first{ $0.isKeyWindow }
+        let window = view.window?.windowScene?.keyWindow
         var controller = window?.rootViewController
         if let navController = controller as? UINavigationController {
             controller = navController.presentedViewController ?? navController.viewControllers.first

diff --git a/TridentCockpitiOS/PastDivesViewController/DiveCollectionViewCell.swift b/TridentCockpitiOS/PastDivesViewController/DiveCollectionViewCell.swift
@@ -6,7 +6,7 @@
 
 import UIKit
 
-protocol DiveCollectionViewCellDelegate: class {
+protocol DiveCollectionViewCellDelegate: AnyObject {
     func playButtonAction(cell: DiveCollectionViewCell)
     func downloadButtonAction(cell: DiveCollectionViewCell)
 }