Merge branch 'master' into feature/resize-mode

.github/workflows/build.yml

@@ -1,8 +1,13 @@
 name: Build
+run-name: ⚙️ Build examples on ${{ github.event_name == 'pull_request' && 'PR' || '🌱' }} ${{ github.event_name == 'pull_request' && github.event.number || github.ref_name }}
+
 on:
-  pull_request:
-    types: [opened, reopened]
   push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize, reopened]
+
 jobs:
   build-example-ios:
     name: build-example-ios

.github/workflows/linter.yml

@@ -1,8 +1,13 @@
 name: Linter
+run-name: 🩺 Code checks on ${{ github.event_name == 'pull_request' && 'PR' || '🌱' }} ${{ github.event_name == 'pull_request' && github.event.number || github.ref_name }}
+
 on:
-  pull_request:
-    types: [opened, reopened]
   push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize, reopened]
+
 jobs:
   eslint:
     name: ESLint
@@ -16,3 +21,29 @@ jobs:
         run: yarn bootstrap-linux
       - name: Lint
         run: yarn lint
+
+  ios:
+    name: Lint iOS
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Install dependencies
+        run: brew bundle
+      - name: Run swiftlint
+        run: |
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            updatedFiles=$(git --no-pager diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} -- '*.swift')
+
+            if [[ -z "$updatedFiles" ]]; then
+              echo "No Swift files changed, skipping linting"
+              exit 0
+            fi
+
+            swiftlint --reporter github-actions-logging -- $updatedFiles
+          else
+            swiftlint
+          fi

.swiftlint.yml

@@ -0,0 +1,21 @@
+included:
+  - ios
+  - example/ios
+
+excluded:
+  - ios/Pods
+  - example/ios/Pods
+
+disabled_rules:
+  - todo
+
+line_length: 160
+type_body_length: 400
+function_body_length: 50
+
+identifier_name:
+  excluded:
+    - on
+    - x
+    - y
+    - at

Brewfile

@@ -0,0 +1,2 @@
+brew 'swiftlint'
+

Brewfile.lock.json

@@ -0,0 +1,62 @@
+{
+  "entries": {
+    "brew": {
+      "swiftlint": {
+        "version": "0.53.0",
+        "bottle": {
+          "rebuild": 0,
+          "root_url": "https://ghcr.io/v2/homebrew/core",
+          "files": {
+            "arm64_sonoma": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:240ccda9de55d948d0c635798079074099bfcb73ffda41428900fdc748aeea7b",
+              "sha256": "240ccda9de55d948d0c635798079074099bfcb73ffda41428900fdc748aeea7b"
+            },
+            "arm64_ventura": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:7b7ceb7896c6833965cc4eac9001255d8adde6c5432045d5a8ab6aea8a9e81d9",
+              "sha256": "7b7ceb7896c6833965cc4eac9001255d8adde6c5432045d5a8ab6aea8a9e81d9"
+            },
+            "arm64_monterey": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:78c2a4c3f4a2f6847b484527b0f0f916da71e3ee29e49890fd44b63fe7b38e26",
+              "sha256": "78c2a4c3f4a2f6847b484527b0f0f916da71e3ee29e49890fd44b63fe7b38e26"
+            },
+            "sonoma": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:abdca78dd8a8bd268053b3be195fe891bb74aef5502ab3a6b871ae0c6bb04540",
+              "sha256": "abdca78dd8a8bd268053b3be195fe891bb74aef5502ab3a6b871ae0c6bb04540"
+            },
+            "ventura": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:be711c707bf3b49fa0dd6e2ae576b309aad620f9b56a2c6e7b1ac5cf35cf652a",
+              "sha256": "be711c707bf3b49fa0dd6e2ae576b309aad620f9b56a2c6e7b1ac5cf35cf652a"
+            },
+            "monterey": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:13487d68a971dbe035019364e19d70641af2a18c06e52925d238685b384a7979",
+              "sha256": "13487d68a971dbe035019364e19d70641af2a18c06e52925d238685b384a7979"
+            },
+            "x86_64_linux": {
+              "cellar": "/home/linuxbrew/.linuxbrew/Cellar",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:fbbc56fccfcfcd34564feb7325567e2ff3638d3c609396a5c4aa13311c7b26e0",
+              "sha256": "fbbc56fccfcfcd34564feb7325567e2ff3638d3c609396a5c4aa13311c7b26e0"
+            }
+          }
+        }
+      }
+    }
+  },
+  "system": {
+    "macos": {
+      "sonoma": {
+        "HOMEBREW_VERSION": "4.2.0-54-g0b804d4",
+        "HOMEBREW_PREFIX": "/opt/homebrew",
+        "Homebrew/homebrew-core": "api",
+        "CLT": "15.1.0.0.1.1700200546",
+        "Xcode": "15.0",
+        "macOS": "14.1"
+      }
+    }
+  }
+}

android/build.gradle

@@ -2,6 +2,11 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+    if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
+      namespace "com.rncamerakit"
+    }
+
     compileSdkVersion 31
     defaultConfig {
         minSdkVersion 24

android/src/main/java/com/rncamerakit/CKCamera.kt

@@ -41,6 +41,7 @@ import kotlin.math.min
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.RectF
+import com.google.mlkit.vision.barcode.common.Barcode
 
 class RectOverlay constructor(context: Context) :
         View(context) {
@@ -457,9 +458,11 @@ class CKCamera(context: ThemedReactContext) : FrameLayout(context), LifecycleObs
         rectOverlay.drawRectBounds(focusRects)
     }
 
-    private fun onBarcodeRead(barcodes: List<String>) {
+    private fun onBarcodeRead(barcodes: List<Barcode>) {
         val event: WritableMap = Arguments.createMap()
-        event.putString("codeStringValue", barcodes.first())
+        event.putString("codeStringValue", barcodes.first().rawValue)
+        val codeFormat = CodeFormat.fromBarcodeType(barcodes.first().format);
+        event.putString("codeFormat",codeFormat.code );
         currentContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(
                 id,
                 "onReadCode",

android/src/main/java/com/rncamerakit/CKCameraManager.kt

@@ -47,7 +47,8 @@ class CKCameraManager : SimpleViewManager<CKCamera>() {
                 "onOrientationChange", MapBuilder.of("registrationName", "onOrientationChange"),
                 "onReadCode", MapBuilder.of("registrationName", "onReadCode"),
                 "onPictureTaken", MapBuilder.of("registrationName", "onPictureTaken"),
-                "onZoom", MapBuilder.of("registrationName", "onZoom")
+                "onZoom", MapBuilder.of("registrationName", "onZoom"),
+                "onError", MapBuilder.of("registrationName", "onError")
         )
     }
 

android/src/main/java/com/rncamerakit/CodeFormat.kt

@@ -0,0 +1,56 @@
+package com.rncamerakit
+
+import com.google.mlkit.vision.barcode.common.Barcode
+
+enum class CodeFormat(val code: String) {
+    CODE_128("code-128"),
+    CODE_39("code-39"),
+    CODE_93("code-93"),
+    CODABAR("codabar"),
+    EAN_13("ean-13"),
+    EAN_8("ean-8"),
+    ITF("itf"),
+    UPC_E("upc-e"),
+    QR("qr"),
+    PDF_417("pdf-417"),
+    AZTEC("aztec"),
+    DATA_MATRIX("data-matrix"),
+    UNKNOWN("unknown");
+
+    fun toBarcodeType(): Int {
+        return when (this) {
+            CODE_128 -> Barcode.FORMAT_CODE_128
+            CODE_39 -> Barcode.FORMAT_CODE_39
+            CODE_93 -> Barcode.FORMAT_CODE_93
+            CODABAR -> Barcode.FORMAT_CODABAR
+            EAN_13 -> Barcode.FORMAT_EAN_13
+            EAN_8 -> Barcode.FORMAT_EAN_8
+            ITF -> Barcode.FORMAT_ITF
+            UPC_E -> Barcode.FORMAT_UPC_E
+            QR -> Barcode.FORMAT_QR_CODE
+            PDF_417 -> Barcode.FORMAT_PDF417
+            AZTEC -> Barcode.FORMAT_AZTEC
+            DATA_MATRIX -> Barcode.FORMAT_DATA_MATRIX
+            UNKNOWN -> -1 // Or any other default value you prefer
+        }
+    }
+
+    companion object {
+        fun fromBarcodeType(@Barcode.BarcodeFormat barcodeType: Int): CodeFormat =
+            when (barcodeType) {
+                Barcode.FORMAT_CODE_128 -> CODE_128
+                Barcode.FORMAT_CODE_39 -> CODE_39
+                Barcode.FORMAT_CODE_93 -> CODE_93
+                Barcode.FORMAT_CODABAR -> CODABAR
+                Barcode.FORMAT_EAN_13 -> EAN_13
+                Barcode.FORMAT_EAN_8 -> EAN_8
+                Barcode.FORMAT_ITF -> ITF
+                Barcode.FORMAT_UPC_E -> UPC_E
+                Barcode.FORMAT_QR_CODE -> QR
+                Barcode.FORMAT_PDF417 -> PDF_417
+                Barcode.FORMAT_AZTEC -> AZTEC
+                Barcode.FORMAT_DATA_MATRIX -> DATA_MATRIX
+                else -> UNKNOWN
+            }
+    }
+}

android/src/main/java/com/rncamerakit/QRCodeAnalyzer.kt

@@ -5,10 +5,11 @@ import androidx.camera.core.ExperimentalGetImage
 import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageProxy
 import com.google.mlkit.vision.barcode.BarcodeScanning
+import com.google.mlkit.vision.barcode.common.Barcode
 import com.google.mlkit.vision.common.InputImage
 
 class QRCodeAnalyzer (
-    private val onQRCodesDetected: (qrCodes: List<String>) -> Unit
+    private val onQRCodesDetected: (qrCodes: List<Barcode>) -> Unit
 ) : ImageAnalysis.Analyzer {
     @SuppressLint("UnsafeExperimentalUsageError")
     @ExperimentalGetImage
@@ -18,9 +19,9 @@ class QRCodeAnalyzer (
         val scanner = BarcodeScanning.getClient()
         scanner.process(inputImage)
             .addOnSuccessListener { barcodes ->
-                val strBarcodes = mutableListOf<String>()
+                val strBarcodes = mutableListOf<Barcode>()
                 barcodes.forEach { barcode ->
-                    strBarcodes.add(barcode.rawValue ?: return@forEach)
+                    strBarcodes.add(barcode ?: return@forEach)
                 }
                 onQRCodesDetected(strBarcodes)
             }

example/src/BarcodeScreenExample.tsx

@@ -94,16 +94,17 @@ const BarcodeExample = ({ onBack }: { onBack: () => void }) => {
       <SafeAreaView style={styles.topButtons}>
         {flashData.image && (
           <TouchableOpacity style={styles.topButton} onPress={onSetFlash}>
-            <Image source={flashData.image} resizeMode="contain" />
+            <Image style={styles.topButtonImg} source={flashData.image} resizeMode="contain" />
           </TouchableOpacity>
         )}
 
         <TouchableOpacity style={styles.topButton} onPress={onSwitchCameraPressed}>
-          <Image source={require('../images/cameraFlipIcon.png')} resizeMode="contain" />
+          <Image style={styles.topButtonImg} source={require('../images/cameraFlipIcon.png')} resizeMode="contain" />
         </TouchableOpacity>
 
         <TouchableOpacity style={styles.topButton} onPress={onSetTorch}>
           <Image
+            style={styles.topButtonImg}
             source={torchMode ? require('../images/torchOn.png') : require('../images/torchOff.png')}
             resizeMode="contain"
           />
@@ -150,6 +151,8 @@ const BarcodeExample = ({ onBack }: { onBack: () => void }) => {
             Vibration.vibrate(100);
             setBarcode(event.nativeEvent.codeStringValue);
             console.log('barcode', event.nativeEvent.codeStringValue);
+            console.log('codeFormat', event.nativeEvent.codeFormat);
+
           }}
         />
       </View>
@@ -199,7 +202,17 @@ const styles = StyleSheet.create({
     justifyContent: 'space-between',
   },
   topButton: {
-    padding: 10,
+    backgroundColor: '#222',
+    width: 44,
+    height: 44,
+    borderRadius: 22,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  topButtonImg: {
+    margin: 10,
+    width: 24,
+    height: 24,
   },
 
   cameraContainer: {