Cleanup

atacand1920 · atacand1920 · commit bc28145cb3b5 · 2024-12-06T15:13:08.000+01:00
diff --git a/ClassicComponentsExample/Data Detectors/BarcodeScannerDemo/ScanAndCountResultsViewController.swift b/ClassicComponentsExample/Data Detectors/BarcodeScannerDemo/ScanAndCountResultsViewController.swift
@@ -27,11 +27,7 @@ class ScanAndCountResultsViewController: UIViewController {
             let destination = segue.destination as? BarcodeResultDetailsViewController,
             let selectedBarcode = self.selectedBarcode {
             destination.barcodeImage = selectedBarcode.sourceImage?.toUIImage()
-<<<<<<< HEAD
             destination.barcodeText = selectedBarcode.displayText
-=======
-            destination.barcodeText = selectedBarcode.textWithExtension
->>>>>>> afe7b88 (Update examples)
         }
     }
 }
diff --git a/DataCaptureRTUUIExample/Usecases/Data Detect Usecases/UsecaseScanLicensePlate.swift b/DataCaptureRTUUIExample/Usecases/Data Detect Usecases/UsecaseScanLicensePlate.swift
@@ -27,7 +27,7 @@ class UsecaseScanLicensePlate: Usecase, SBSDKUILicensePlateScannerViewController
     }
 
     func licensePlateScanner(_ controller: SBSDKUILicensePlateScannerViewController,
-                             didRecognizeLicensePlate result: SBSDKLicensePlateScannerResult) {
+                             didScanLicensePlate result: SBSDKLicensePlateScannerResult) {
         guard result.validationSuccessful else {
             return
         }

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,7 @@ class ScanAndCountResultsViewController: UIViewController {`
`27`	`27`	`let destination = segue.destination as? BarcodeResultDetailsViewController,`
`28`	`28`	`let selectedBarcode = self.selectedBarcode {`
`29`	`29`	`destination.barcodeImage = selectedBarcode.sourceImage?.toUIImage()`
`30`		`-<<<<<<< HEAD`
`31`	`30`	`destination.barcodeText = selectedBarcode.displayText`
`32`		`-=======`
`33`		`- destination.barcodeText = selectedBarcode.textWithExtension`
`34`		`->>>>>>> afe7b88 (Update examples)`
`35`	`31`	`}`
`36`	`32`	`}`
`37`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class UsecaseScanLicensePlate: Usecase, SBSDKUILicensePlateScannerViewController`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`func licensePlateScanner(_ controller: SBSDKUILicensePlateScannerViewController,`
`30`		`- didRecognizeLicensePlate result: SBSDKLicensePlateScannerResult) {`
	`30`	`+ didScanLicensePlate result: SBSDKLicensePlateScannerResult) {`
`31`	`31`	`guard result.validationSuccessful else {`
`32`	`32`	`return`
`33`	`33`	`}`