Refactor QR code scanner to UIKit

Author: codebymini

LoopFollow/Helpers/Views/SimpleQRCodeScannerView.swift

@@ -3,88 +3,125 @@
 
 import AVFoundation
 import SwiftUI
+import UIKit
 
 struct SimpleQRCodeScannerView: UIViewControllerRepresentable {
     @Environment(\.presentationMode) var presentationMode
     var completion: (Result<String, Error>) -> Void
 
-    // MARK: - Coordinator
+    func makeUIViewController(context _: Context) -> UINavigationController {
+        let scannerVC = SimpleQRCodeScannerViewController { result in
+            completion(result)
+        }
 
-    class Coordinator: NSObject, AVCaptureMetadataOutputObjectsDelegate {
-        var parent: SimpleQRCodeScannerView
-        var session: AVCaptureSession?
+        let navController = UINavigationController(rootViewController: scannerVC)
 
-        init(parent: SimpleQRCodeScannerView) {
-            self.parent = parent
+        // Apply dark mode if needed
+        if Storage.shared.forceDarkMode.value {
+            scannerVC.overrideUserInterfaceStyle = .dark
+            navController.overrideUserInterfaceStyle = .dark
         }
 
-        func metadataOutput(_: AVCaptureMetadataOutput, didOutput metadataObjects: [AVMetadataObject], from _: AVCaptureConnection) {
-            if let session, session.isRunning {
-                if let metadataObject = metadataObjects.first as? AVMetadataMachineReadableCodeObject,
-                   metadataObject.type == .qr,
-                   let stringValue = metadataObject.stringValue
-                {
-                    DispatchQueue.global(qos: .userInitiated).async {
-                        session.stopRunning()
-                    }
-                    parent.completion(.success(stringValue))
-                }
-            }
-        }
+        return navController
+    }
+
+    func updateUIViewController(_: UINavigationController, context _: Context) {}
+}
+
+class SimpleQRCodeScannerViewController: UIViewController {
+    private var session: AVCaptureSession?
+    private var completion: (Result<String, Error>) -> Void
+
+    init(completion: @escaping (Result<String, Error>) -> Void) {
+        self.completion = completion
+        super.init(nibName: nil, bundle: nil)
     }
 
-    // MARK: - UIViewControllerRepresentable Methods
+    @available(*, unavailable)
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Add cancel button
+        navigationItem.rightBarButtonItem = UIBarButtonItem(
+            barButtonSystemItem: .cancel,
+            target: self,
+            action: #selector(cancelTapped)
+        )
+        navigationItem.title = "Scan QR Code"
 
-    func makeCoordinator() -> Coordinator {
-        Coordinator(parent: self)
+        setupCamera()
     }
 
-    func makeUIViewController(context: Context) -> UIViewController {
-        let controller = UIViewController()
+    private func setupCamera() {
         let session = AVCaptureSession()
-        context.coordinator.session = session // Assign session to coordinator
+        self.session = session
 
         guard let videoCaptureDevice = AVCaptureDevice.default(for: .video),
               let videoInput = try? AVCaptureDeviceInput(device: videoCaptureDevice),
               session.canAddInput(videoInput)
         else {
             let error = NSError(domain: "QRCodeScannerError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Failed to set up camera input."])
             completion(.failure(error))
-            return controller
+            return
         }
 
         session.addInput(videoInput)
 
         let metadataOutput = AVCaptureMetadataOutput()
         if session.canAddOutput(metadataOutput) {
             session.addOutput(metadataOutput)
-            metadataOutput.setMetadataObjectsDelegate(context.coordinator, queue: DispatchQueue.main)
+            metadataOutput.setMetadataObjectsDelegate(self, queue: DispatchQueue.main)
             metadataOutput.metadataObjectTypes = [.qr]
         } else {
             let error = NSError(domain: "QRCodeScannerError", code: 2, userInfo: [NSLocalizedDescriptionKey: "Failed to set up metadata output."])
             completion(.failure(error))
-            return controller
+            return
         }
 
         let previewLayer = AVCaptureVideoPreviewLayer(session: session)
-        previewLayer.frame = controller.view.layer.bounds
+        previewLayer.frame = view.layer.bounds
         previewLayer.videoGravity = .resizeAspectFill
-        controller.view.layer.addSublayer(previewLayer)
+        view.layer.addSublayer(previewLayer)
 
         DispatchQueue.global(qos: .userInitiated).async {
             session.startRunning()
         }
-
-        return controller
     }
 
-    func updateUIViewController(_: UIViewController, context _: Context) {}
-
-    func dismantleUIViewController(_: UIViewController, coordinator: Coordinator) {
+    @objc private func cancelTapped() {
         DispatchQueue.global(qos: .userInitiated).async {
-            if let session = coordinator.session, session.isRunning {
+            if let session = self.session, session.isRunning {
                 session.stopRunning()
             }
         }
+        let error = NSError(domain: "QRCodeScannerError", code: 0, userInfo: [NSLocalizedDescriptionKey: "Scanning cancelled by user."])
+        completion(.failure(error))
+    }
+
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+        if let previewLayer = view.layer.sublayers?.first as? AVCaptureVideoPreviewLayer {
+            previewLayer.frame = view.layer.bounds
+        }
+    }
+}
+
+extension SimpleQRCodeScannerViewController: AVCaptureMetadataOutputObjectsDelegate {
+    func metadataOutput(_: AVCaptureMetadataOutput, didOutput metadataObjects: [AVMetadataObject], from _: AVCaptureConnection) {
+        if let session, session.isRunning {
+            if let metadataObject = metadataObjects.first as? AVMetadataMachineReadableCodeObject,
+               metadataObject.type == .qr,
+               let stringValue = metadataObject.stringValue
+            {
+                DispatchQueue.global(qos: .userInitiated).async {
+                    session.stopRunning()
+                }
+                completion(.success(stringValue))
+            }
+        }
     }
 }

LoopFollow/Remote/Settings/RemoteSettingsView.swift

@@ -1,8 +1,10 @@
 // LoopFollow
 // RemoteSettingsView.swift
 
+import AVFoundation
 import HealthKit
 import SwiftUI
+import UIKit
 
 struct RemoteSettingsView: View {
     @ObservedObject var viewModel: RemoteSettingsViewModel

LoopFollow/Settings/ImportExport/ImportExportSettingsView.swift

@@ -1,7 +1,9 @@
 // LoopFollow
 // ImportExportSettingsView.swift
 
+import AVFoundation
 import SwiftUI
+import UIKit
 
 struct ImportExportSettingsView: View {
     @StateObject private var viewModel = ImportExportSettingsViewModel()