From 7d63c726e3ae3d1897a69e3f91acf90b28cc3707 Mon Sep 17 00:00:00 2001 From: Mathieu Dussart Date: Thu, 31 Aug 2023 19:18:29 +0200 Subject: [PATCH] quick fix iOS build --- .gitignore | 1 - ios/Classes/BarcodeScannerController.swift | 7 +++---- ios/Classes/Constants.swift | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c773c77..e063496 100644 --- a/.gitignore +++ b/.gitignore @@ -28,7 +28,6 @@ .packages build/ -/example/pubspec.lock /android/local.properties /android/.gradle/ /android/gradlew diff --git a/ios/Classes/BarcodeScannerController.swift b/ios/Classes/BarcodeScannerController.swift index 00dbb38..1f37e47 100644 --- a/ios/Classes/BarcodeScannerController.swift +++ b/ios/Classes/BarcodeScannerController.swift @@ -11,7 +11,6 @@ class BarcodeScannerController: UIViewController, AVCaptureMetadataOutputObjects AVMetadataObject.ObjectType.ean8, AVMetadataObject.ObjectType.ean13, AVMetadataObject.ObjectType.itf14, - AVMetadataObject.ObjectType.codabar, AVMetadataObject.ObjectType.dataMatrix, AVMetadataObject.ObjectType.qr, AVMetadataObject.ObjectType.upce] @@ -68,7 +67,7 @@ class BarcodeScannerController: UIViewController, AVCaptureMetadataOutputObjects let deviceDiscoverySession = AVCaptureDevice.DiscoverySession(deviceTypes: [.builtInWideAngleCamera], mediaType: AVMediaType.video, position: .back) // Get the back-facing camera for capturing videos guard let captureDevice = deviceDiscoverySession.devices.first else { - barcodeStream?(FlutterError(code: "native_scanner_failed", message: "Failed to get the camera device", details: nil) + barcodeStream?(FlutterError(code: "native_scanner_failed", message: "Failed to get the camera device", details: nil)) return } @@ -113,7 +112,7 @@ class BarcodeScannerController: UIViewController, AVCaptureMetadataOutputObjects // Check if the metadataObjects array is not nil and it contains at least one object. if metadataObjects.count == 0 { - barcodeStream?(FlutterError(code: "native_scanner_failed", message: "metadataObjects array is nil or doesn't contains any object", details: nil) + barcodeStream?(FlutterError(code: "native_scanner_failed", message: "metadataObjects array is nil or doesn't contains any object", details: nil)) return } @@ -124,7 +123,7 @@ class BarcodeScannerController: UIViewController, AVCaptureMetadataOutputObjects barcodeStream?(["barcode": metadataObj.stringValue!, "format": convertBarcodeType(type: metadataObj.type)]) } } else { - barcodeStream?(FlutterError(code: "native_scanner_failed", message: "unsupported barcode type", details: "barcode type : \(metadataObj.type)") + barcodeStream?(FlutterError(code: "native_scanner_failed", message: "unsupported barcode type", details: "barcode type : \(metadataObj.type)")) barcodeStream?(["barcode": "", "format": -1]) } } diff --git a/ios/Classes/Constants.swift b/ios/Classes/Constants.swift index 97c1166..c7469fe 100644 --- a/ios/Classes/Constants.swift +++ b/ios/Classes/Constants.swift @@ -16,7 +16,6 @@ struct BarcodeFormats { static let EAN_8: Int = 3 static let EAN_13: Int = 4 static let ITF: Int = 5 - static let CODABAR: Int = 6 static let DATAMATRIX: Int = 7 static let QR_CODE: Int = 8 static let UPC_E: Int = 10