Polish app theming and toolbar badge behavior

2026-04-18 10:03:18 +02:00
parent b5cf3d9e01
commit 243029c798
3 changed files with 187 additions and 26 deletions
@@ -282,9 +282,23 @@ private final class QRScannerViewModel: NSObject, ObservableObject, AVCaptureMet
                    continuation.resume()
                }

-                guard let device = AVCaptureDevice.default(for: .video),
-                      let input = try? AVCaptureDeviceInput(device: device),
-                      self.captureSession.canAddInput(input) else {
+                guard let device = AVCaptureDevice.default(for: .video) else {
+                    DispatchQueue.main.async {
+                        self.isPreviewAvailable = false
+                        self.statusMessage = "No compatible camera was found. Use the fallback payload below."
+                    }
+                    return
+                }
+
+                guard let input = try? AVCaptureDeviceInput(device: device) else {
+                    DispatchQueue.main.async {
+                        self.isPreviewAvailable = false
+                        self.statusMessage = "No compatible camera was found. Use the fallback payload below."
+                    }
+                    return
+                }
+
+                guard self.captureSession.canAddInput(input) else {
                    DispatchQueue.main.async {
                        self.isPreviewAvailable = false
                        self.statusMessage = "No compatible camera was found. Use the fallback payload below."
@@ -296,6 +310,7 @@ private final class QRScannerViewModel: NSObject, ObservableObject, AVCaptureMet

                let output = AVCaptureMetadataOutput()
                guard self.captureSession.canAddOutput(output) else {
+                    self.captureSession.removeInput(input)
                    DispatchQueue.main.async {
                        self.isPreviewAvailable = false
                        self.statusMessage = "Unable to configure QR metadata scanning on this device."
@@ -305,6 +320,18 @@ private final class QRScannerViewModel: NSObject, ObservableObject, AVCaptureMet

                self.captureSession.addOutput(output)
                output.setMetadataObjectsDelegate(self, queue: DispatchQueue.main)
+
+                let supportedTypes = output.availableMetadataObjectTypes
+                guard supportedTypes.contains(.qr) else {
+                    self.captureSession.removeOutput(output)
+                    self.captureSession.removeInput(input)
+                    DispatchQueue.main.async {
+                        self.isPreviewAvailable = false
+                        self.statusMessage = "This camera does not support QR metadata scanning. Use the fallback payload below."
+                    }
+                    return
+                }
+
                output.metadataObjectTypes = [.qr]
                self.isConfigured = true