Merge branch 'develop' into flutter_view_barcode_corners

Author: navaronbracke

.github/workflows/code-coverage.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       # Checkout the Repository
       - name: 📥 Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       # Setup Flutter SDK with Cache
       - name: ⚡ Set Up Flutter

.github/workflows/code-quality.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: 📥 Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: ⚡ Set Up Flutter
         uses: subosito/flutter-action@v2
@@ -50,7 +50,7 @@ jobs:
 
     steps:
       - name: 📥 Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: ⚡ Set Up Flutter
         uses: subosito/flutter-action@v2

.github/workflows/release-please.yml

@@ -7,7 +7,7 @@
    release-please:
      runs-on: ubuntu-latest
      steps:
-       - uses: GoogleCloudPlatform/release-please-action@v4.2.0
+       - uses: GoogleCloudPlatform/release-please-action@v4.3.0
          with:
            token: ${{ secrets.GITHUB_TOKEN }}
            release-type: simple

.github/workflows/semantic-pr.yml

@@ -12,6 +12,6 @@ jobs:
     name: Validate PR title
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v5
+      - uses: amannn/action-semantic-pull-request@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,18 @@
-## 7.0.2
+## NEXT
 
+**BREAKING CHANGES**
+
+* [iOS] Increased minimum iOS level to 13 due to Flutter requirements.
+
+**Highlights**
+
+* [Apple & Android] Added tap to focus functionality. You can enable it in the `MobileScanner` widget.
+* [Apple & Android] You can now set the initial zoom factor using the `initialZoom` parameter in the `startOptions`.
+
+**Bug Fixes and Improvements**
+
+* [Android] Update to Java 17, and update other dependencies.
+* [Apple] Improved fallback for when camera is not found.
 * Added a `Barcode.scaleCorners()` method.
 
 ## 7.0.1
@@ -10,7 +23,7 @@
 
 This version finalizes all changes from the beta and release candidate cycles and introduces major improvements, bug fixes, and breaking changes.
 
-**BREAKING CHANGES:**
+**BREAKING CHANGES**
 
 * Requires Flutter 3.29.0 or higher.
 * The initial camera facing direction in `MobileScannerState` is now `CameraFacing.unknown`.

android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.10.1'
+        classpath 'com.android.tools.build:gradle:8.13.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -29,15 +29,15 @@ android {
         namespace 'dev.steenbakker.mobile_scanner'
     }
 
-    compileSdk 35
+    compileSdk 36
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     sourceSets {
@@ -73,10 +73,10 @@ dependencies {
         implementation 'com.google.mlkit:barcode-scanning:17.3.0'
     }
 
-    implementation 'androidx.camera:camera-lifecycle:1.4.2'
-    implementation 'androidx.camera:camera-camera2:1.4.2'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+    implementation 'androidx.camera:camera-lifecycle:1.5.0'
+    implementation 'androidx.camera:camera-camera2:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2'
 
     testImplementation 'org.jetbrains.kotlin:kotlin-test'
-    testImplementation 'org.mockito:mockito-core:5.18.0'
+    testImplementation 'org.mockito:mockito-core:5.19.0'
 }

android/src/main/kotlin/dev/steenbakker/mobile_scanner/MobileScanner.kt

@@ -23,9 +23,13 @@ import androidx.camera.core.CameraSelector
 import androidx.camera.core.CameraXConfig
 import androidx.camera.core.ExperimentalGetImage
 import androidx.camera.core.ExperimentalLensFacing
+import androidx.camera.core.FocusMeteringAction
 import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageProxy
+import androidx.camera.core.MeteringPoint
+import androidx.camera.core.MeteringPointFactory
 import androidx.camera.core.Preview
+import androidx.camera.core.SurfaceOrientedMeteringPointFactory
 import androidx.camera.core.SurfaceRequest
 import androidx.camera.core.TorchState
 import androidx.camera.core.resolutionselector.ResolutionSelector
@@ -343,6 +347,7 @@ class MobileScanner(
         detectionTimeout: Long,
         cameraResolutionWanted: Size?,
         invertImage: Boolean,
+        initialZoom: Double,
     ) {
         this.detectionSpeed = detectionSpeed
         this.detectionTimeout = detectionTimeout
@@ -471,6 +476,18 @@ class MobileScanner(
                 if (it.cameraInfo.hasFlashUnit()) {
                     it.cameraControl.enableTorch(torch)
                 }
+
+                try {
+                    if (initialZoom in 0.0..1.0) {
+                        it.cameraControl.setLinearZoom(initialZoom.toFloat())
+                    } else {
+                        it.cameraControl.setZoomRatio(initialZoom.toFloat())
+                    }
+                } catch (e: Exception) {
+                    mobileScannerErrorCallback(ZoomNotInRange())
+
+                    return@addListener
+                }
             }
 
             val resolution = analysis.resolutionInfo!!.resolution
@@ -701,6 +718,23 @@ class MobileScanner(
         camera?.cameraControl?.setZoomRatio(1f)
     }
 
+    fun setFocus(x: Float, y: Float) {
+        val cam = camera ?: throw ZoomWhenStopped()
+
+        // Ensure x,y are normalized (0f..1f)
+        if (x !in 0f..1f || y !in 0f..1f) {
+            throw IllegalArgumentException("Focus coordinates must be between 0.0 and 1.0")
+        }
+
+        val factory: MeteringPointFactory = SurfaceOrientedMeteringPointFactory(1f, 1f)
+        val afPoint: MeteringPoint = factory.createPoint(x, y)
+
+        val action = FocusMeteringAction.Builder(afPoint, FocusMeteringAction.FLAG_AF)
+            .build()
+
+        cam.cameraControl.startFocusAndMetering(action)
+    }
+
     /**
      * Dispose of this scanner instance.
      */

android/src/main/kotlin/dev/steenbakker/mobile_scanner/MobileScannerHandler.kt

@@ -151,6 +151,7 @@ class MobileScannerHandler(
             "setScale" -> setScale(call, result)
             "resetScale" -> resetScale(result)
             "updateScanWindow" -> updateScanWindow(call, result)
+            "setFocus" -> setFocus(call, result)
             else -> result.notImplemented()
         }
     }
@@ -172,6 +173,7 @@ class MobileScannerHandler(
             null
         }
         val invertImage: Boolean = call.argument<Boolean>("invertImage") ?: false
+        val initialZoom: Double = call.argument<Double>("initialZoom") ?: 1.0
 
         val barcodeScannerOptions: BarcodeScannerOptions? = buildBarcodeScannerOptions(formats, autoZoom)
 
@@ -243,6 +245,7 @@ class MobileScannerHandler(
             timeout.toLong(),
             cameraResolution,
             invertImage,
+            initialZoom
         )
     }
 
@@ -327,7 +330,7 @@ class MobileScannerHandler(
     private fun buildBarcodeScannerOptions(formats: List<Int>?, autoZoom: Boolean): BarcodeScannerOptions? {
         val builder : BarcodeScannerOptions.Builder?
         if (formats == null) {
-           builder = BarcodeScannerOptions.Builder()
+            builder = BarcodeScannerOptions.Builder()
         } else {
             val formatsList: MutableList<Int> = mutableListOf()
 
@@ -374,4 +377,36 @@ class MobileScannerHandler(
         }
         return maxZoom
     }
+
+    private fun setFocus(call: MethodCall, result: MethodChannel.Result) {
+        val dx = call.argument<Double>("dx")?.toFloat()
+        val dy = call.argument<Double>("dy")?.toFloat()
+
+        if (dx == null || dy == null || dx !in 0f..1f || dy !in 0f..1f) {
+            result.error(
+                MobileScannerErrorCodes.INVALID_FOCUS_POINT,
+                MobileScannerErrorCodes.INVALID_FOCUS_POINT_MESSAGE,
+                null
+            )
+            return
+        }
+
+        try {
+            mobileScanner?.setFocus(dx, dy)
+            result.success(null)
+        } catch (e: ZoomWhenStopped) {
+            result.error(
+                MobileScannerErrorCodes.GENERIC_ERROR,
+                "Cannot set focus when camera is stopped.",
+                null
+            )
+        } catch (e: Exception) {
+            result.error(
+                MobileScannerErrorCodes.GENERIC_ERROR,
+                MobileScannerErrorCodes.GENERIC_ERROR_MESSAGE,
+                e.localizedMessage
+            )
+        }
+    }
+
 }

android/src/main/kotlin/dev/steenbakker/mobile_scanner/objects/MobileScannerErrorCodes.kt

@@ -23,5 +23,7 @@ class MobileScannerErrorCodes {
         const val SET_SCALE_WHEN_STOPPED_ERROR = "MOBILE_SCANNER_SET_SCALE_WHEN_STOPPED_ERROR"
         const val SET_SCALE_WHEN_STOPPED_ERROR_MESSAGE = "The zoom scale cannot be changed when the camera is stopped."
         const val UNSUPPORTED_OPERATION_ERROR = "MOBILE_SCANNER_UNSUPPORTED_OPERATION" // Reserved for future use.
+        const val INVALID_FOCUS_POINT = "MOBILE_SCANNER_INVALID_FOCUS_POINT"
+        const val INVALID_FOCUS_POINT_MESSAGE = "The focus coordinates are not valid."
     }
 }

darwin/mobile_scanner/Sources/mobile_scanner/MobileScannerErrorCodes.swift

@@ -24,6 +24,8 @@ struct MobileScannerErrorCodes {
     static let GENERIC_ERROR_MESSAGE = "An unknown error occurred."
     // This message is used with the 'GENERIC_ERROR' error code.
     static let INVALID_ZOOM_SCALE_ERROR_MESSAGE = "The zoom scale should be between 0 and 1 (both inclusive)"
+    static let INVALID_FOCUS_POINT = "MOBILE_SCANNER_INVALID_FOCUS_POINT"
+    static let INVALID_FOCUS_POINT_MESSAGE = "The focus coordinates are not valid."
     static let NO_CAMERA_ERROR = "MOBILE_SCANNER_NO_CAMERA_ERROR"
     static let NO_CAMERA_ERROR_MESSAGE = "No cameras available."
     static let SET_SCALE_WHEN_STOPPED_ERROR = "MOBILE_SCANNER_SET_SCALE_WHEN_STOPPED_ERROR"