Replaced AVMetadataObject with CodeFormat in all files

teslamotors · Feb 22, 2024 · 6579ce3 · 6579ce3
1 parent 4af9bac
commit 6579ce3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/ios/ReactNativeCameraKit/CameraProtocol.swift b/ios/ReactNativeCameraKit/CameraProtocol.swift
@@ -8,7 +8,7 @@ import AVFoundation
 protocol CameraProtocol: AnyObject, FocusInterfaceViewDelegate {
     var previewView: UIView { get }
 
-    func setup(cameraType: CameraType, supportedBarcodeType: [AVMetadataObject.ObjectType])
+    func setup(cameraType: CameraType, supportedBarcodeType: [CodeFormat])
     func cameraRemovedFromSuperview()
 
     func update(torchMode: TorchMode)
@@ -23,7 +23,7 @@ protocol CameraProtocol: AnyObject, FocusInterfaceViewDelegate {
     func zoomPinchChange(pinchScale: CGFloat)
 
     func isBarcodeScannerEnabled(_ isEnabled: Bool,
-                                 supportedBarcodeTypes: [AVMetadataObject.ObjectType],
+                                 supportedBarcodeTypes: [CodeFormat],
                                  onBarcodeRead: ((_ barcode: String, _ codeFormat: CodeFormat) -> Void)?)
 
     func update(scannerFrameSize: CGRect?)

diff --git a/ios/ReactNativeCameraKit/CameraView.swift b/ios/ReactNativeCameraKit/CameraView.swift
@@ -73,10 +73,12 @@ class CameraView: UIView {
     private func setupCamera() {
         if (hasPropBeenSetup && hasPermissionBeenGranted && !hasCameraBeenSetup) {
             hasCameraBeenSetup = true
-            camera.setup(cameraType: cameraType, supportedBarcodeType: scanBarcode && onReadCode != nil ? supportedBarcodeType : [])
+            let supportedFormats = supportedBarcodeType.map { CodeFormat.fromAVMetadataObjectType($0) }
+            camera.setup(cameraType: cameraType, supportedBarcodeType: scanBarcode && onReadCode != nil ? supportedFormats : [])
         }
     }
 
+
     // MARK: Lifecycle
 
     @available(*, unavailable)
@@ -184,14 +186,16 @@ class CameraView: UIView {
 
         // Scanner
         if changedProps.contains("scanBarcode") || changedProps.contains("onReadCode") {
+            let supportedFormats = supportedBarcodeType.map { CodeFormat.fromAVMetadataObjectType($0) }
             camera.isBarcodeScannerEnabled(scanBarcode,
-                                           supportedBarcodeTypes: supportedBarcodeType,
+                                           supportedBarcodeTypes: supportedFormats,
                                            onBarcodeRead: { [weak self] (barcode, codeFormat) in
                                                self?.onBarcodeRead(barcode: barcode, codeFormat: codeFormat)
                                            })
         }
 
 
+
         if changedProps.contains("showFrame") || changedProps.contains("scanBarcode") {
             DispatchQueue.main.async {
                 self.scannerInterfaceView.isHidden = !self.showFrame

diff --git a/ios/ReactNativeCameraKit/RealCamera.swift b/ios/ReactNativeCameraKit/RealCamera.swift
@@ -89,7 +89,7 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
 
     // MARK: - Public
 
-    func setup(cameraType: CameraType, supportedBarcodeType: [AVMetadataObject.ObjectType]) {
+    func setup(cameraType: CameraType, supportedBarcodeType: [CodeFormat]) {
         DispatchQueue.main.async {
             self.cameraPreview.session = self.session
             self.cameraPreview.previewLayer.videoGravity = .resizeAspect
@@ -335,14 +335,15 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
     }
 
     func isBarcodeScannerEnabled(_ isEnabled: Bool,
-                                 supportedBarcodeTypes supportedBarcodeType: [AVMetadataObject.ObjectType],
+                                 supportedBarcodeTypes supportedBarcodeType: [CodeFormat],
                                  onBarcodeRead: ((_ barcode: String,_ codeFormat:CodeFormat) -> Void)?) {
         sessionQueue.async {
             self.onBarcodeRead = onBarcodeRead
             let newTypes: [AVMetadataObject.ObjectType]
             if isEnabled && onBarcodeRead != nil {
                 let availableTypes = self.metadataOutput.availableMetadataObjectTypes
-                newTypes = supportedBarcodeType.filter { type in availableTypes.contains(type) }
+                newTypes = supportedBarcodeType.map { $0.toAVMetadataObjectType() }
+                                                        .filter { availableTypes.contains($0) }
             } else {
                 newTypes = []
             }
@@ -447,7 +448,7 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
     }
 
     private func setupCaptureSession(cameraType: CameraType,
-                                     supportedBarcodeType: [AVMetadataObject.ObjectType]) -> SetupResult {
+                                     supportedBarcodeType: [CodeFormat]) -> SetupResult {
         guard let videoDevice = self.getBestDevice(for: cameraType),
               let videoDeviceInput = try? AVCaptureDeviceInput(device: videoDevice) else {
             return .sessionConfigurationFailed
@@ -484,8 +485,9 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
             metadataOutput.setMetadataObjectsDelegate(self, queue: DispatchQueue.main)
 
             let availableTypes = self.metadataOutput.availableMetadataObjectTypes
-            let filteredTypes = supportedBarcodeType.filter { type in availableTypes.contains(type) }
-            metadataOutput.metadataObjectTypes = filteredTypes
+            let filteredTypes = supportedBarcodeType.filter { type in availableTypes.contains(type.toAVMetadataObjectType()) }
+
+            metadataOutput.metadataObjectTypes = filteredTypes.map { $0.toAVMetadataObjectType() }
         }
 
         session.commitConfiguration()

diff --git a/ios/ReactNativeCameraKit/SimulatorCamera.swift b/ios/ReactNativeCameraKit/SimulatorCamera.swift
@@ -27,7 +27,7 @@ class SimulatorCamera: CameraProtocol {
 
     // MARK: - Public
 
-    func setup(cameraType: CameraType, supportedBarcodeType: [AVMetadataObject.ObjectType]) {
+    func setup(cameraType: CameraType, supportedBarcodeType: [CodeFormat]) {
         DispatchQueue.main.async {
             self.mockPreview.cameraTypeLabel.text = "Camera type: \(cameraType)"
         }