Merge branch 'development'

Author: alexgerardojacinto

example-app/android/capacitor.settings.gradle

@@ -1,18 +1,18 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
-project(':capacitor-android').projectDir = new File('../../node_modules/.pnpm/@[email protected]alpha.2_@[email protected]alpha.2/node_modules/@capacitor/android/capacitor')
+project(':capacitor-android').projectDir = new File('../../node_modules/.pnpm/@[email protected]rc.0_@[email protected]rc.0/node_modules/@capacitor/android/capacitor')
 
 include ':capacitor-app'
-project(':capacitor-app').projectDir = new File('../../node_modules/.pnpm/@capacitor+app@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/app/android')
+project(':capacitor-app').projectDir = new File('../../node_modules/.pnpm/@capacitor+app@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/app/android')
 
 include ':capacitor-barcode-scanner'
 project(':capacitor-barcode-scanner').projectDir = new File('../../plugin/android')
 
 include ':capacitor-haptics'
-project(':capacitor-haptics').projectDir = new File('../../node_modules/.pnpm/@capacitor+haptics@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/haptics/android')
+project(':capacitor-haptics').projectDir = new File('../../node_modules/.pnpm/@capacitor+haptics@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/haptics/android')
 
 include ':capacitor-keyboard'
-project(':capacitor-keyboard').projectDir = new File('../../node_modules/.pnpm/@capacitor+keyboard@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/keyboard/android')
+project(':capacitor-keyboard').projectDir = new File('../../node_modules/.pnpm/@capacitor+keyboard@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/keyboard/android')
 
 include ':capacitor-status-bar'
-project(':capacitor-status-bar').projectDir = new File('../../node_modules/.pnpm/@capacitor+status-bar@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/status-bar/android')
+project(':capacitor-status-bar').projectDir = new File('../../node_modules/.pnpm/@capacitor+status-bar@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/status-bar/android')

example-app/ios/App/Podfile

@@ -1,4 +1,4 @@
-require_relative '../../../node_modules/.pnpm/@[email protected]alpha.2_@[email protected]alpha.2/node_modules/@capacitor/ios/scripts/pods_helpers'
+require_relative '../../../node_modules/.pnpm/@[email protected]rc.0_@[email protected]rc.0/node_modules/@capacitor/ios/scripts/pods_helpers'
 
 platform :ios, '14.0'
 use_frameworks!
@@ -9,13 +9,13 @@ use_frameworks!
 install! 'cocoapods', :disable_input_output_paths => true
 
 def capacitor_pods
-  pod 'Capacitor', :path => '../../../node_modules/.pnpm/@[email protected]alpha.2_@[email protected]alpha.2/node_modules/@capacitor/ios'
-  pod 'CapacitorCordova', :path => '../../../node_modules/.pnpm/@[email protected]alpha.2_@[email protected]alpha.2/node_modules/@capacitor/ios'
-  pod 'CapacitorApp', :path => '../../../node_modules/.pnpm/@capacitor+app@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/app'
+  pod 'Capacitor', :path => '../../../node_modules/.pnpm/@[email protected]rc.0_@[email protected]rc.0/node_modules/@capacitor/ios'
+  pod 'CapacitorCordova', :path => '../../../node_modules/.pnpm/@[email protected]rc.0_@[email protected]rc.0/node_modules/@capacitor/ios'
+  pod 'CapacitorApp', :path => '../../../node_modules/.pnpm/@capacitor+app@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/app'
   pod 'CapacitorBarcodeScanner', :path => '../../../plugin'
-  pod 'CapacitorHaptics', :path => '../../../node_modules/.pnpm/@capacitor+haptics@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/haptics'
-  pod 'CapacitorKeyboard', :path => '../../../node_modules/.pnpm/@capacitor+keyboard@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/keyboard'
-  pod 'CapacitorStatusBar', :path => '../../../node_modules/.pnpm/@capacitor+status-bar@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/status-bar'
+  pod 'CapacitorHaptics', :path => '../../../node_modules/.pnpm/@capacitor+haptics@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/haptics'
+  pod 'CapacitorKeyboard', :path => '../../../node_modules/.pnpm/@capacitor+keyboard@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/keyboard'
+  pod 'CapacitorStatusBar', :path => '../../../node_modules/.pnpm/@capacitor+status-bar@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/status-bar'
 end
 
 target 'App' do

example-app/ios/App/Podfile.lock

@@ -1,59 +1,59 @@
 PODS:
-  - Capacitor (7.0.0-alpha.2):
+  - Capacitor (7.0.0-rc.0):
     - CapacitorCordova
-  - CapacitorApp (6.0.0-rc.1):
+  - CapacitorApp (7.0.0-rc.0):
     - Capacitor
-  - CapacitorBarcodeScanner (2.0.0):
+  - CapacitorBarcodeScanner (2.0.1):
     - Capacitor
-    - OSBarcodeLib (~> 1.1.0)
-  - CapacitorCordova (7.0.0-alpha.2)
-  - CapacitorHaptics (6.0.0-rc.1):
+    - OSBarcodeLib (~> 1.1.3)
+  - CapacitorCordova (7.0.0-rc.0)
+  - CapacitorHaptics (7.0.0-rc.0):
     - Capacitor
-  - CapacitorKeyboard (6.0.0-rc.1):
+  - CapacitorKeyboard (7.0.0-rc.0):
     - Capacitor
-  - CapacitorStatusBar (6.0.0-rc.1):
+  - CapacitorStatusBar (7.0.0-rc.0):
     - Capacitor
-  - OSBarcodeLib (1.1.0)
+  - OSBarcodeLib (1.1.3)
 
 DEPENDENCIES:
-  - "Capacitor (from `../../../node_modules/.pnpm/@[email protected]alpha.2_@[email protected]alpha.2/node_modules/@capacitor/ios`)"
-  - "CapacitorApp (from `../../../node_modules/.pnpm/@capacitor+app@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/app`)"
+  - "Capacitor (from `../../../node_modules/.pnpm/@[email protected]rc.0_@[email protected]rc.0/node_modules/@capacitor/ios`)"
+  - "CapacitorApp (from `../../../node_modules/.pnpm/@capacitor+app@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/app`)"
   - CapacitorBarcodeScanner (from `../../../plugin`)
-  - "CapacitorCordova (from `../../../node_modules/.pnpm/@[email protected]alpha.2_@[email protected]alpha.2/node_modules/@capacitor/ios`)"
-  - "CapacitorHaptics (from `../../../node_modules/.pnpm/@capacitor+haptics@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/haptics`)"
-  - "CapacitorKeyboard (from `../../../node_modules/.pnpm/@capacitor+keyboard@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/keyboard`)"
-  - "CapacitorStatusBar (from `../../../node_modules/.pnpm/@capacitor+status-bar@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/status-bar`)"
+  - "CapacitorCordova (from `../../../node_modules/.pnpm/@[email protected]rc.0_@[email protected]rc.0/node_modules/@capacitor/ios`)"
+  - "CapacitorHaptics (from `../../../node_modules/.pnpm/@capacitor+haptics@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/haptics`)"
+  - "CapacitorKeyboard (from `../../../node_modules/.pnpm/@capacitor+keyboard@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/keyboard`)"
+  - "CapacitorStatusBar (from `../../../node_modules/.pnpm/@capacitor+status-bar@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/status-bar`)"
 
 SPEC REPOS:
   trunk:
     - OSBarcodeLib
 
 EXTERNAL SOURCES:
   Capacitor:
-    :path: "../../../node_modules/.pnpm/@[email protected]alpha.2_@[email protected]alpha.2/node_modules/@capacitor/ios"
+    :path: "../../../node_modules/.pnpm/@[email protected]rc.0_@[email protected]rc.0/node_modules/@capacitor/ios"
   CapacitorApp:
-    :path: "../../../node_modules/.pnpm/@capacitor+app@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/app"
+    :path: "../../../node_modules/.pnpm/@capacitor+app@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/app"
   CapacitorBarcodeScanner:
     :path: "../../../plugin"
   CapacitorCordova:
-    :path: "../../../node_modules/.pnpm/@[email protected]alpha.2_@[email protected]alpha.2/node_modules/@capacitor/ios"
+    :path: "../../../node_modules/.pnpm/@[email protected]rc.0_@[email protected]rc.0/node_modules/@capacitor/ios"
   CapacitorHaptics:
-    :path: "../../../node_modules/.pnpm/@capacitor+haptics@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/haptics"
+    :path: "../../../node_modules/.pnpm/@capacitor+haptics@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/haptics"
   CapacitorKeyboard:
-    :path: "../../../node_modules/.pnpm/@capacitor+keyboard@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/keyboard"
+    :path: "../../../node_modules/.pnpm/@capacitor+keyboard@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/keyboard"
   CapacitorStatusBar:
-    :path: "../../../node_modules/.pnpm/@capacitor+status-bar@6.0.0-rc.1_@[email protected]alpha.2/node_modules/@capacitor/status-bar"
+    :path: "../../../node_modules/.pnpm/@capacitor+status-bar@7.0.0-rc.0_@[email protected]rc.0/node_modules/@capacitor/status-bar"
 
 SPEC CHECKSUMS:
-  Capacitor: 58fbb66cfc0c3f37ed647b4e4f0fcdb94997db86
-  CapacitorApp: 649eca1980ddb28d43177bc78b252123e243b848
-  CapacitorBarcodeScanner: ab47851bc95b78003606089d18dd43467b2e70f6
-  CapacitorCordova: c5fa9fad682ebccd4d5f457ef7901427ee9471b1
-  CapacitorHaptics: b004f0eb5b1cbef124889ccf745679f3aa9568ef
-  CapacitorKeyboard: 683563ad6b13c1a46bfc710d49b4621570feef48
-  CapacitorStatusBar: 31febfff4331f2e800847abdac79d64f04eb4206
-  OSBarcodeLib: ced133bc1ec073636e18c6a0553d0a5c4b90cf17
+  Capacitor: e79eb426d47f13ee0e2fdaff9ef0e9990db34a48
+  CapacitorApp: a50750608d62c0ff1fe7f33d38365dd915bb0f31
+  CapacitorBarcodeScanner: 67bdccc07abc05c3993e83da0196fedef7f5d508
+  CapacitorCordova: 8f4f6826f0b40f7b506eb13b832039b7140a88b4
+  CapacitorHaptics: 51c7ca77b24d5448bd716db4f6d5b47302ab9566
+  CapacitorKeyboard: 342c56b26934429f58ec25fdbe9d4b6553969f8d
+  CapacitorStatusBar: 89f0dc71f6544cef1dd250dfdb347a25547532b4
+  OSBarcodeLib: f2e981270a64faf476cb790864262b29ab8cd68a
 
-PODFILE CHECKSUM: 4a39645c1d85edfd261058f6704cdf9dc05d2bb8
+PODFILE CHECKSUM: 7bd915a9b237ee006f510f6135ab6eb2a3e55593
 
 COCOAPODS: 1.16.2

example-app/src/pages/Home.tsx

@@ -1,16 +1,32 @@
 import { IonButton, IonContent, IonHeader, IonInput, IonPage, IonTitle, IonToolbar } from '@ionic/react';
 import './Home.css';
 import { useState } from 'react';
-import { CapacitorBarcodeScanner, CapacitorBarcodeScannerTypeHint } from '@capacitor/barcode-scanner';
+import { CapacitorBarcodeScanner, CapacitorBarcodeScannerAndroidScanningLibrary, CapacitorBarcodeScannerCameraDirection, CapacitorBarcodeScannerScanOrientation, CapacitorBarcodeScannerTypeHint } from '@capacitor/barcode-scanner';
 
 const Home: React.FC = () => {
   const [scannerResult, setScannerResult] = useState<string>('No Data...');
 
   const scanBarcode = async () => {
-    const result = await CapacitorBarcodeScanner.scanBarcode({
-      hint: CapacitorBarcodeScannerTypeHint.ALL
-    });
-    setScannerResult(result.ScanResult);
+    try {
+      const result = await CapacitorBarcodeScanner.scanBarcode({
+        hint: CapacitorBarcodeScannerTypeHint.ALL,
+        scanInstructions: "Please scan a barcode",
+        scanButton: true,
+        scanText: "Scan",
+        cameraDirection: CapacitorBarcodeScannerCameraDirection.BACK,
+        scanOrientation: CapacitorBarcodeScannerScanOrientation.ADAPTIVE,
+        android: {
+          scanningLibrary: CapacitorBarcodeScannerAndroidScanningLibrary.ZXING
+        }
+      });
+      setScannerResult(result.ScanResult);
+    } catch (error) {
+      if (error instanceof Error) {
+        setScannerResult("Error: " + error.message);
+      } else {
+        setScannerResult("Error: Unknown error");
+      }
+    }
   };
 
   return (

plugin/CapacitorBarcodeScanner.podspec

@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '14.0'
   s.dependency 'Capacitor'
-  s.dependency 'OSBarcodeLib', '~> 1.1.0'
+  s.dependency 'OSBarcodeLib', '~> 1.1.3'
   s.swift_version = '5.1'
 end

plugin/android/src/main/java/com/capacitorjs/barcodescanner/OSBarcodePlugin.kt

@@ -30,21 +30,18 @@ class CapacitorBarcodeScannerPlugin : Plugin() {
     fun scanBarcode(call: PluginCall) {
         val hint = call.getInt("hint")
         val scanInstructions = call.getString("scanInstructions")
-        val scanButton = call.getBoolean("scanButton", false)
-        val scanText = call.getString("scanText", "")
+        val scanButton = call.getBoolean("scanButton", false) ?: false
+        val scanText = call.getString("scanText", "") ?: ""
         val cameraDirection = call.getInt("cameraDirection")
-
-        val nativeOptions = call.getObject("native")
-
-        val scanOrientation = nativeOptions?.getInteger("scanOrientation")
-        val androidScanningLibrary = nativeOptions?.getJSObject("android")?.getString("scanningLibrary")
+        val scanOrientation = call.getInt("scanOrientation")
+        val androidScanningLibrary = call.getObject("android")?.getString("scanningLibrary")
 
         val parameters = OSBARCScanParameters(
                 scanInstructions = scanInstructions,
                 cameraDirection = cameraDirection,
                 scanOrientation = scanOrientation,
-                scanButton = scanButton!!,
-                scanText = scanText!!,
+                scanButton = scanButton,
+                scanText = scanText,
                 hint = hint,
                 androidScanningLibrary = androidScanningLibrary
         )

plugin/ios/Plugin/CapacitorBarcodeScannerPlugin.swift

@@ -22,13 +22,13 @@ public class CapacitorBarcodeScannerPlugin: CAPPlugin {
         }
 
         guard let manager = self.manager else {
-            call.reject("Capacitor bridge or viewController is not initialized.")
+            call.sendError(with: OSBarcodeError.bridgeNotInitialized)
             return
         }
 
         guard let argumentsData = try? JSONSerialization.data(withJSONObject: call.jsObjectRepresentation),
               let scanArguments = try? JSONDecoder().decode(OSBarcodeScanArgumentsModel.self, from: argumentsData) else {
-            call.reject("Error decoding scan arguments")
+            call.sendError(with: OSBarcodeError.scanInputArgumentsIssue)
             return
         }
 
@@ -37,12 +37,20 @@ public class CapacitorBarcodeScannerPlugin: CAPPlugin {
                 let scannedBarcode = try await manager.scanBarcode(with: scanArguments.scanInstructions, scanArguments.scanButtonText, scanArguments.cameraDirection, and: scanArguments.scanOrientation)
                 call.resolve(["ScanResult": scannedBarcode])
             } catch OSBARCManagerError.cameraAccessDenied {
-                call.reject("Camera access denied")
+                call.sendError(with: OSBarcodeError.cameraAccessDenied)
             } catch OSBARCManagerError.scanningCancelled {
-                call.reject("Scanning cancelled")
+                call.sendError(with: OSBarcodeError.scanningCancelled)
             } catch {
-                call.reject("An unexpected error occurred: \(error.localizedDescription)")
+                call.sendError(with: OSBarcodeError.scanningError)
             }
         }
     }
 }
+
+extension CAPPluginCall {
+    
+    func sendError(with error: OSBarcodeError) {
+        self.reject(error.errorDescription, error.errorCode)
+    }
+    
+}

plugin/ios/Plugin/OSBarcodeError.swift

@@ -11,20 +11,20 @@ enum OSBarcodeError: Int, CustomNSError, LocalizedError {
     case scanningCancelled = 6
     case cameraAccessDenied = 7
     case scanInputArgumentsIssue = 8
+    case bridgeNotInitialized = 13
 
-    var errorDescription: String? {
+    var errorDescription: String {
         switch self {
         case .scanningError: return "Error while trying to scan code."
         case .scanningCancelled: return "Couldn’t scan because the process was cancelled."
         case .cameraAccessDenied: return "Couldn’t scan because camera access wasn’t provided. Check your camera permissions and try again."
         case .scanInputArgumentsIssue: return "Scanning parameters are invalid."
+        case .bridgeNotInitialized: return "Capacitor bridge or viewController is not initialized."
         }
     }
-
-    var errorDictionary: [String: String] {
-        [
-            OSBarcodeErrorLabels.code: "\(OSBarcodeErrorLabels.codeFormat)\(String(format: "%04d", self.rawValue))",
-            OSBarcodeErrorLabels.message: self.errorDescription ?? ""
-        ]
+    
+    var errorCode: String {
+        return "\(OSBarcodeErrorLabels.codeFormat)\(String(format: "%04d", self.rawValue))"
     }
+
 }