Remove references to FlutterActivity

Author: jhoogstraat

fast_barcode_scanner/CHANGELOG.md

@@ -1,29 +1,34 @@
+## 1.1.3
+
+- Remove references to FlutterActivity (required by local_auth package)
+
 ## 1.1.2
 
-* Fixed a bug where the app would crash when denying permissions on iOS.
-* Smaller code cleanups
-* Updated CameraX and ML Kit to latest versions.
+- Fixed a bug where the app would crash when denying permissions on iOS.
+- Smaller code cleanups
+- Updated CameraX and ML Kit to latest versions.
 
 ## 1.1.1
 
-* Camera position now taken into account on Android.
-* Fix DetectionMode.pauseDetection on Android.
-* Updated CameraX to v1.1.0-alpha05
+- Camera position now taken into account on Android.
+- Fix DetectionMode.pauseDetection on Android.
+- Updated CameraX to v1.1.0-alpha05
 
 ## 1.1.0
-* Relaxed kotlin version to 1.3.50
-* Updated MLKit version (16.1.2)
-* The camera state now contains the torch state (on/off)
-* Fixed toggling the torch in the example project
+
+- Relaxed kotlin version to 1.3.50
+- Updated MLKit version (16.1.2)
+- The camera state now contains the torch state (on/off)
+- Fixed toggling the torch in the example project
 
 ## 1.0.2
 
-* Even more documentation.
+- Even more documentation.
 
 ## 1.0.1
 
-* Updated documentation.
+- Updated documentation.
 
 ## 1.0.0
 
-* Initial pre-release.
+- Initial pre-release.

fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/BarcodeReader.kt

@@ -1,18 +1,20 @@
 package com.jhoogstraat.fast_barcode_scanner
 
 import android.Manifest
+import android.app.Activity
 import android.content.pm.PackageManager
 import android.util.Log
 import android.view.Surface
 import androidx.camera.core.*
 import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 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.BarcodeScannerOptions
-import io.flutter.embedding.android.FlutterActivity
 
 import io.flutter.plugin.common.MethodChannel.Result
 import io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener
@@ -25,7 +27,7 @@ data class CameraConfig(val formats: IntArray, val mode: DetectionMode, val reso
 
 class BarcodeReader(private val flutterTextureEntry: TextureRegistry.SurfaceTextureEntry, private val listener: (List<Barcode>) -> Unit) : RequestPermissionsResultListener {
     /* Android Lifecycle */
-    private var activity: FlutterActivity? = null
+    private var activity: Activity? = null
 
     /* Camera */
     private lateinit var camera: Camera
@@ -42,7 +44,7 @@ class BarcodeReader(private val flutterTextureEntry: TextureRegistry.SurfaceText
     private var isInitialized = false
     private var pauseDetection = false
 
-    fun attachToActivity(activity: FlutterActivity) {
+    fun attachToActivity(activity: Activity) {
         this.activity = activity
     }
 
@@ -74,7 +76,11 @@ class BarcodeReader(private val flutterTextureEntry: TextureRegistry.SurfaceText
         if (allPermissionsGranted()) {
             initCamera()
         } else {
-            activity?.requestPermissions(REQUIRED_PERMISSIONS, REQUEST_CODE_PERMISSIONS)
+            ActivityCompat.requestPermissions(
+                activity!!,
+                REQUIRED_PERMISSIONS,
+                REQUEST_CODE_PERMISSIONS
+            )
         }
 
         result.success(hashMapOf("textureId" to flutterTextureEntry.id(), "surfaceOrientation" to 0, "surfaceHeight" to 1280, "surfaceWidth" to 720))
@@ -192,7 +198,7 @@ class BarcodeReader(private val flutterTextureEntry: TextureRegistry.SurfaceText
         preview.setSurfaceProvider(cameraExecutor, cameraSurfaceProvider)
 
         // Bind camera to Lifecycle
-        camera = cameraProvider.bindToLifecycle(activity!!, cameraSelector, preview, imageAnalyzer)
+        camera = cameraProvider.bindToLifecycle(activity!! as LifecycleOwner, cameraSelector, preview, imageAnalyzer)
 
         // Make sure detections are allowed
         pauseDetection = false

fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/FastBarcodeScannerPlugin.kt

@@ -2,7 +2,6 @@ package com.jhoogstraat.fast_barcode_scanner
 
 
 import androidx.annotation.NonNull
-import io.flutter.embedding.android.FlutterActivity
 
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.embedding.engine.plugins.activity.ActivityAware
@@ -33,7 +32,7 @@ class FastBarcodeScannerPlugin: FlutterPlugin, MethodCallHandler, ActivityAware
   // 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) {
-    reader.attachToActivity(binding.activity as FlutterActivity)
+    reader.attachToActivity(binding.activity)
     binding.addRequestPermissionsResultListener(reader)
     channel.setMethodCallHandler(this)
   }

fast_barcode_scanner/pubspec.yaml

@@ -1,11 +1,11 @@
 name: fast_barcode_scanner
 description: A fast barcode scanner using MLKit on Android and AVFoundation on iOS.
-version: 1.1.2 
+version: 1.1.3
 homepage: https://github.com/jhoogstraat/fast_barcode_scanner
 repository: https://github.com/jhoogstraat/fast_barcode_scanner
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: ">=2.12.0 <3.0.0"
   flutter: ">=2.0.0"
 
 dependencies:
@@ -25,4 +25,4 @@ flutter:
         package: com.jhoogstraat.fast_barcode_scanner
         pluginClass: FastBarcodeScannerPlugin
       ios:
-        pluginClass: FastBarcodeScannerPlugin
+        pluginClass: FastBarcodeScannerPlugin