Updated code format to case Iterable and changed supportedBarcodeType…

… to code format cases
teslamotors · Feb 22, 2024 · 369dbd7 · 369dbd7
1 parent 6579ce3
commit 369dbd7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/ios/ReactNativeCameraKit/CameraView.swift b/ios/ReactNativeCameraKit/CameraView.swift
@@ -20,10 +20,10 @@ class CameraView: UIView {
     // scanner
     private var lastBarcodeDetectedTime: TimeInterval = 0
     private var scannerInterfaceView: ScannerInterfaceView
-    private var supportedBarcodeType: [AVMetadataObject.ObjectType] = [.upce, .code39, .code39Mod43,
-                                                                       .ean13, .ean8, .code93,
-                                                                       .code128, .pdf417, .qr,
-                                                                       .aztec, .dataMatrix, .interleaved2of5]
+    private var supportedBarcodeType: [CodeFormat] = {
+        return CodeFormat.allCases
+    }()
+
     // camera
     private var ratioOverlayView: RatioOverlayView?
 
@@ -69,12 +69,10 @@ class CameraView: UIView {
             setupCamera()
         }
     }
-
     private func setupCamera() {
         if (hasPropBeenSetup && hasPermissionBeenGranted && !hasCameraBeenSetup) {
             hasCameraBeenSetup = true
-            let supportedFormats = supportedBarcodeType.map { CodeFormat.fromAVMetadataObjectType($0) }
-            camera.setup(cameraType: cameraType, supportedBarcodeType: scanBarcode && onReadCode != nil ? supportedFormats : [])
+            camera.setup(cameraType: cameraType, supportedBarcodeType: scanBarcode && onReadCode != nil ? supportedBarcodeType : [])
         }
     }
 
@@ -186,9 +184,8 @@ class CameraView: UIView {
 
         // Scanner
         if changedProps.contains("scanBarcode") || changedProps.contains("onReadCode") {
-            let supportedFormats = supportedBarcodeType.map { CodeFormat.fromAVMetadataObjectType($0) }
             camera.isBarcodeScannerEnabled(scanBarcode,
-                                           supportedBarcodeTypes: supportedFormats,
+                                           supportedBarcodeTypes: supportedBarcodeType,
                                            onBarcodeRead: { [weak self] (barcode, codeFormat) in
                                                self?.onBarcodeRead(barcode: barcode, codeFormat: codeFormat)
                                            })

diff --git a/ios/ReactNativeCameraKit/CodeFormat.swift b/ios/ReactNativeCameraKit/CodeFormat.swift
@@ -8,7 +8,7 @@
 import Foundation
 import AVFoundation
 
-enum CodeFormat: String {
+enum CodeFormat: String, CaseIterable {
     case code128 = "code-128"
     case code39 = "code-39"
     case code93 = "code-93"

diff --git a/ios/ReactNativeCameraKit/RealCamera.swift b/ios/ReactNativeCameraKit/RealCamera.swift
@@ -485,9 +485,11 @@ 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.toAVMetadataObjectType()) }
+            let filteredTypes = supportedBarcodeType
+              .map { $0.toAVMetadataObjectType() }
+              .filter { availableTypes.contains($0) }
 
-            metadataOutput.metadataObjectTypes = filteredTypes.map { $0.toAVMetadataObjectType() }
+            metadataOutput.metadataObjectTypes = filteredTypes
         }
 
         session.commitConfiguration()