Implement camera switching

CONTRIBUTING.md

@@ -1,3 +1,3 @@
-Contributing to fast_barcode_scanner
+Contributing to icapps_fast_barcode_scanner
 
 Contributions are welcome by submitting a PR for to be reviewed. 

README.md

@@ -2,7 +2,7 @@
 
 ## Packages
 
-### fast_barcode_scanner:
+### icapps_fast_barcode_scanner:
 code for the cross-platform facing plugin, used to display a camera view within Flutter applications
 
 [![pub package](https://img.shields.io/pub/v/fast_barcode_scanner.svg)](https://pub.dartlang.org/packages/fast_barcode_scanner)

fast_barcode_scanner/CHANGELOG.md

@@ -1,3 +1,25 @@
+
+## 1.5.1
+
+- Fix crashes on android
+
+## 1.5.0
+
+- Updated to be 16KB compatible
+
+## 1.4.1
+
+- Added namespace for android
+
+## 1.4.0
+
+- Further rename to icapps_fast_barcode_scanner
+
+## 1.3.0
+
+- Forked to icapps_fast_barcode_scanner
+- fix 'Type mismatch: inferred type is Activity? but Context was expected'
+
 ## 1.1.4
 
 - Fixes `pauseDetector` on iOS

fast_barcode_scanner/README.md

@@ -11,7 +11,7 @@ A fast barcode scanner using **MLKit** (and **CameraX**) on Android and **AVFoun
 ## Installation
 Add the following line to your **pubspec.yaml**:
 ```yaml
-fast_barcode_scanner: ^1.1.0
+icapps_fast_barcode_scanner: ^1.1.0
 ```
 ### iOS
 Add the `NSCameraUsageDescription` key to your `ios/Runner/Info.plist`, like so:
@@ -30,7 +30,7 @@ minSdkVersion 21
 The barcode scanner consists of two main classes `CameraController` and `BarcodeCamera`.
 A full example looks like this:
 ```dart
-import 'package:fast_barcode_scanner/fast_barcode_scanner.dart';
+import 'package:icapps_fast_barcode_scanner/icapps_fast_barcode_scanner.dart';
 
 class MyScannerScreen extends StatelessWidget {
     @override

fast_barcode_scanner/android/build.gradle

@@ -1,15 +1,15 @@
-group 'com.jhoogstraat.fast_barcode_scanner'
+group 'com.icapps.icapps_fast_barcode_scanner'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.9.24'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:8.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,7 +25,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    namespace 'com.icapps.icapps_fast_barcode_scanner'
+    compileSdkVersion 34
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -53,8 +54,8 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    def camerax_version = "1.1.0-alpha10"
-    def mlkit_version = "17.0.0"
+    def camerax_version = "1.4.0"
+    def mlkit_version = "17.3.0"
     implementation "androidx.camera:camera-camera2:$camerax_version"
     implementation "androidx.camera:camera-lifecycle:$camerax_version"
 

fast_barcode_scanner/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

fast_barcode_scanner/android/settings.gradle

@@ -1 +1 @@
-rootProject.name = 'fast_barcode_scanner'
+rootProject.name = 'icapps_fast_barcode_scanner'

fast_barcode_scanner/android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.jhoogstraat.fast_barcode_scanner">
+  package="com.icapps.icapps_fast_barcode_scanner">
     <uses-feature android:name="android.hardware.camera.any" />
     <uses-permission android:name="android.permission.CAMERA"/>
 </manifest>

fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/BarcodeReader.kt → fast_barcode_scanner/android/src/main/kotlin/com/icapps/icapps_fast_barcode_scanner/BarcodeReader.kt

@@ -1,4 +1,4 @@
-package com.jhoogstraat.fast_barcode_scanner
+package com.icapps.icapps_fast_barcode_scanner
 
 import android.Manifest
 import android.app.Activity
@@ -13,7 +13,7 @@ import androidx.core.util.Consumer
 import androidx.lifecycle.LifecycleOwner
 import com.google.android.gms.tasks.OnFailureListener
 import com.google.android.gms.tasks.OnSuccessListener
-import com.google.mlkit.vision.barcode.Barcode
+import com.google.mlkit.vision.barcode.common.Barcode
 import com.google.mlkit.vision.barcode.BarcodeScannerOptions
 
 import io.flutter.plugin.common.MethodChannel.Result
@@ -23,7 +23,7 @@ import java.util.ArrayList
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 
-data class CameraConfig(val formats: IntArray, val mode: DetectionMode, val resolution: Resolution, val framerate: Framerate, val position: CameraPosition)
+data class CameraConfig(val formats: IntArray, val mode: DetectionMode, val resolution: Resolution, val framerate: Framerate, var position: CameraPosition)
 
 class BarcodeReader(private val flutterTextureEntry: TextureRegistry.SurfaceTextureEntry, private val listener: (List<Barcode>) -> Unit) : RequestPermissionsResultListener {
     /* Android Lifecycle */
@@ -100,10 +100,32 @@ class BarcodeReader(private val flutterTextureEntry: TextureRegistry.SurfaceText
     }
 
     fun toggleTorch(result: Result) {
-        if (!isInitialized) return
+        if (!isInitialized || activity == null) return
         camera.cameraControl.enableTorch(camera.cameraInfo.torchState.value != TorchState.ON).addListener(Runnable {
             result.success(camera.cameraInfo.torchState.value == TorchState.ON)
-        }, ContextCompat.getMainExecutor(activity))
+        }, ContextCompat.getMainExecutor(activity!!))
+    }
+
+    fun canChangeCamera(result: Result) {
+        try {
+            val cameraProviderFuture = ProcessCameraProvider.getInstance(activity!!)
+            cameraProviderFuture.addListener(Runnable {
+                val cameraProviderForChangeCamera = cameraProviderFuture.get()    
+                val hasFrontCamera = cameraProviderForChangeCamera.hasCamera(CameraSelector.DEFAULT_FRONT_CAMERA)
+                val hasBackCamera = cameraProviderForChangeCamera.hasCamera(CameraSelector.DEFAULT_BACK_CAMERA)
+                result.success(hasFrontCamera && hasBackCamera)
+            }, ContextCompat.getMainExecutor(activity!!))
+        } catch (exc: Exception) {
+            result.success(false)
+        }
+    }
+
+    fun changeCamera(position: String, result: Result) {
+        cameraConfig.position = when (position) {
+            "front" -> CameraPosition.front
+            else -> CameraPosition.back
+        }
+        initCamera()
     }
 
     private fun allPermissionsGranted() = REQUIRED_PERMISSIONS.all {
@@ -148,12 +170,8 @@ class BarcodeReader(private val flutterTextureEntry: TextureRegistry.SurfaceText
         // Select camera
         val selectorBuilder = CameraSelector.Builder()
         when (cameraConfig.position) {
-            CameraPosition.front -> {
-                selectorBuilder.requireLensFacing(CameraSelector.LENS_FACING_FRONT)
-            }
-            CameraPosition.back -> {
-                selectorBuilder.requireLensFacing(CameraSelector.LENS_FACING_BACK)
-            }
+            CameraPosition.front -> selectorBuilder.requireLensFacing(CameraSelector.LENS_FACING_FRONT)
+            CameraPosition.back -> selectorBuilder.requireLensFacing(CameraSelector.LENS_FACING_BACK)
         }
         cameraSelector = selectorBuilder.build()
 
@@ -211,7 +229,7 @@ class BarcodeReader(private val flutterTextureEntry: TextureRegistry.SurfaceText
     }
 
     companion object {
-        private const val TAG = "fast_barcode_scanner"
+        private const val TAG = "icapps_fast_barcode_scanner"
         private const val REQUEST_CODE_PERMISSIONS = 10
         private val REQUIRED_PERMISSIONS = arrayOf(Manifest.permission.CAMERA)
     }

fast_barcode_scanner/android/src/main/kotlin/com/icapps/icapps_fast_barcode_scanner/FastBarcodeScannerPlugin.kt

@@ -0,0 +1,127 @@
+package com.icapps.icapps_fast_barcode_scanner
+
+
+import androidx.annotation.NonNull
+import android.app.Activity
+import androidx.camera.core.CameraSelector
+import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.core.content.ContextCompat
+
+import io.flutter.embedding.engine.plugins.FlutterPlugin
+import io.flutter.embedding.engine.plugins.activity.ActivityAware
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
+
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler
+import io.flutter.plugin.common.MethodChannel.Result
+import io.flutter.plugin.common.PluginRegistry
+
+/** FastBarcodeScannerPlugin */
+class FastBarcodeScannerPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, PluginRegistry.RequestPermissionsResultListener {
+  private lateinit var channel : MethodChannel
+  private var reader: BarcodeReader? = null
+
+  private var pluginBinding: FlutterPlugin.FlutterPluginBinding? = null
+  private var activity: Activity? = null
+
+
+  override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+    this.pluginBinding = flutterPluginBinding
+    channel = MethodChannel(flutterPluginBinding.binaryMessenger, "com.icapps/icapps_fast_barcode_scanner")
+  }
+
+  override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) {
+    this.pluginBinding = null
+  }
+
+  // https://flutter.dev/docs/development/packages-and-plugins/plugin-api-migration#uiactivity-plugin
+  // https://github.com/flutter/plugins/blob/master/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+  override fun onAttachedToActivity(binding: ActivityPluginBinding) {
+      this.activity = binding.activity
+      binding.addRequestPermissionsResultListener(this)
+      channel.setMethodCallHandler(this)
+  }
+
+  override fun onDetachedFromActivity() {
+      channel.setMethodCallHandler(null)
+      reader?.detachFromActivity()
+      this.activity = null
+  }
+
+  override fun onDetachedFromActivityForConfigChanges() {
+    onDetachedFromActivity()
+  }
+
+  override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
+    onAttachedToActivity(binding)
+  }
+
+  override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ): Boolean {
+        return reader?.onRequestPermissionsResult(requestCode, permissions, grantResults) ?: false
+    }
+
+  override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
+    @Suppress("UNCHECKED_CAST")
+    when (call.method) {
+      "start" -> {
+          if (activity == null) {
+              result.error("0", "Activity not connected!", null)
+              return
+          }
+
+          pluginBinding?.let { binding ->
+              if (reader == null) {
+                  reader =
+                      BarcodeReader(binding.textureRegistry.createSurfaceTexture()) { barcodes ->
+                          barcodes.firstOrNull()?.also { barcode ->
+                              channel.invokeMethod(
+                                  "read",
+                                  listOf(barcodeStringMap[barcode.format], barcode.rawValue)
+                              )
+                          }
+                      }
+                  reader!!.attachToActivity(activity!!)
+              }
+
+              // Start the reader *inside* the null-safe block
+              reader!!.start(call.arguments as HashMap<String, Any>, result)
+
+          } ?: run {
+              // This runs if pluginBinding is null
+              result.error("1", "Plugin not attached to an engine.", null)
+          }
+          reader!!.start(call.arguments as HashMap<String, Any>, result)
+      }
+      "stop" -> reader?.stop(result)
+      "pause" -> reader?.stop(result)
+      "resume" -> reader?.resume(result)
+      "toggleTorch" -> reader?.toggleTorch(result)
+      "canChangeCamera" -> {
+          if (activity == null) {
+              result.error("0", "Activity not connected!", null)
+              return
+          }
+          try {
+              val cameraProviderFuture = ProcessCameraProvider.getInstance(activity!!)
+              cameraProviderFuture.addListener({
+                  val cameraProviderForChangeCamera = cameraProviderFuture.get()
+                  val hasFrontCamera =
+                      cameraProviderForChangeCamera.hasCamera(CameraSelector.DEFAULT_FRONT_CAMERA)
+                  val hasBackCamera =
+                      cameraProviderForChangeCamera.hasCamera(CameraSelector.DEFAULT_BACK_CAMERA)
+                  result.success(hasFrontCamera && hasBackCamera)
+              }, ContextCompat.getMainExecutor(activity!!))
+          } catch (exc: Exception) {
+              result.success(false)
+          }
+      }
+      "changeCamera" -> reader?.changeCamera(call.arguments as String, result)
+      else -> result.notImplemented()
+    }
+  }
+}

fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/MLKitBarcodeDetector.kt → fast_barcode_scanner/android/src/main/kotlin/com/icapps/icapps_fast_barcode_scanner/MLKitBarcodeDetector.kt

@@ -1,11 +1,11 @@
-package com.jhoogstraat.fast_barcode_scanner
+package com.icapps.icapps_fast_barcode_scanner
 
 import androidx.camera.core.ExperimentalGetImage
 import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageProxy
 import com.google.android.gms.tasks.OnFailureListener
 import com.google.android.gms.tasks.OnSuccessListener
-import com.google.mlkit.vision.barcode.Barcode
+import com.google.mlkit.vision.barcode.common.Barcode
 import com.google.mlkit.vision.barcode.BarcodeScannerOptions
 import com.google.mlkit.vision.barcode.BarcodeScanning
 import com.google.mlkit.vision.common.InputImage

fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/Types.kt → fast_barcode_scanner/android/src/main/kotlin/com/icapps/icapps_fast_barcode_scanner/Types.kt

@@ -1,7 +1,7 @@
-package com.jhoogstraat.fast_barcode_scanner
+package com.icapps.icapps_fast_barcode_scanner
 
 import android.util.Size
-import com.google.mlkit.vision.barcode.Barcode
+import com.google.mlkit.vision.barcode.common.Barcode
 
 enum class Framerate {
     fps30, fps60, fps120, fps240;