Merge branch 'master' into master-play-services

# Conflicts:
#	CHANGELOG.md
#	pubspec.yaml

+## 1.1.2
+This version is the last version that will run on Flutter 2.x
+
+Bugfixes:
+* Changed onDetect to be mandatory.
+
 ## 1.1.1-play-services
 ## 1.1.1-play-services
 This version uses the MLKit play-services model on Android in order to save space.
 This version uses the MLKit play-services model on Android in order to save space.
 With the example app, this version reduces the release version from 14.9MB to 7MB.
 With the example app, this version reduces the release version from 14.9MB to 7MB.

@@ -9,7 +9,7 @@ buildscript {
     }
     }
 
 
     dependencies {
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
     }
     }
 }
 }
 
 
@@ -24,7 +24,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android'
 
 
 android {
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
 
 
     compileOptions {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         sourceCompatibility JavaVersion.VERSION_1_8

@@ -6,7 +6,7 @@ buildscript {
     }
     }
 
 
     dependencies {
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
     }
 }
 }

-#Tue Feb 15 22:11:04 CET 2022
+#Tue May 31 10:34:01 CEST 2022
 distributionBase=GRADLE_USER_HOME
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStoreBase=GRADLE_USER_HOME

@@ -355,7 +355,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 3K8Q7WKS3W;
+				DEVELOPMENT_TEAM = 75Y2P2WSQQ;
 				ENABLE_BITCODE = NO;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -484,7 +484,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 3K8Q7WKS3W;
+				DEVELOPMENT_TEAM = 75Y2P2WSQQ;
 				ENABLE_BITCODE = NO;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -507,7 +507,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 3K8Q7WKS3W;
+				DEVELOPMENT_TEAM = 75Y2P2WSQQ;
 				ENABLE_BITCODE = NO;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 				LD_RUNPATH_SEARCH_PATHS = (

@@ -47,5 +47,7 @@
 	</array>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 </dict>
 </dict>
 </plist>
 </plist>

@@ -13,7 +13,7 @@ class MobileScanner extends StatefulWidget {
   ///
   ///
   /// [barcode] The barcode object with all information about the scanned code.
   /// [barcode] The barcode object with all information about the scanned code.
   /// [args] Information about the state of the MobileScanner widget
   /// [args] Information about the state of the MobileScanner widget
-  final Function(Barcode barcode, MobileScannerArguments? args)? onDetect;
+  final Function(Barcode barcode, MobileScannerArguments? args) onDetect;
 
 
   /// TODO: Function that gets called when the Widget is initialized. Can be usefull
   /// TODO: Function that gets called when the Widget is initialized. Can be usefull
   /// to check wether the device has a torch(flash) or not.
   /// to check wether the device has a torch(flash) or not.
@@ -30,7 +30,7 @@ class MobileScanner extends StatefulWidget {
   /// Create a [MobileScanner] with a [controller], the [controller] must has been initialized.
   /// Create a [MobileScanner] with a [controller], the [controller] must has been initialized.
   const MobileScanner({
   const MobileScanner({
     Key? key,
     Key? key,
-    this.onDetect,
+    required this.onDetect,
     this.controller,
     this.controller,
     this.fit = BoxFit.cover,
     this.fit = BoxFit.cover,
     this.allowDuplicates = false,
     this.allowDuplicates = false,
@@ -47,7 +47,7 @@ class _MobileScannerState extends State<MobileScanner>
   @override
   @override
   void initState() {
   void initState() {
     super.initState();
     super.initState();
-    WidgetsBinding.instance.addObserver(this);
+    WidgetsBinding.instance?.addObserver(this);
     controller = widget.controller ?? MobileScannerController();
     controller = widget.controller ?? MobileScannerController();
   }
   }
 
 
@@ -82,10 +82,10 @@ class _MobileScannerState extends State<MobileScanner>
                 if (!widget.allowDuplicates) {
                 if (!widget.allowDuplicates) {
                   if (lastScanned != barcode.rawValue) {
                   if (lastScanned != barcode.rawValue) {
                     lastScanned = barcode.rawValue;
                     lastScanned = barcode.rawValue;
-                    widget.onDetect!(barcode, value! as MobileScannerArguments);
+                    widget.onDetect(barcode, value! as MobileScannerArguments);
                   }
                   }
                 } else {
                 } else {
-                  widget.onDetect!(barcode, value! as MobileScannerArguments);
+                  widget.onDetect(barcode, value! as MobileScannerArguments);
                 }
                 }
               });
               });
               return ClipRect(
               return ClipRect(
@@ -131,7 +131,7 @@ class _MobileScannerState extends State<MobileScanner>
   @override
   @override
   void dispose() {
   void dispose() {
     controller.dispose();
     controller.dispose();
-    WidgetsBinding.instance.removeObserver(this);
+    WidgetsBinding.instance?.removeObserver(this);
     super.dispose();
     super.dispose();
   }
   }
 }
 }

 name: mobile_scanner
 name: mobile_scanner
 description: A universal barcode and QR code scanner for Flutter based on MLKit. Uses CameraX on Android, AVFoundation on iOS and Apple Vision & AVFoundation on macOS.
 description: A universal barcode and QR code scanner for Flutter based on MLKit. Uses CameraX on Android, AVFoundation on iOS and Apple Vision & AVFoundation on macOS.
-version: 1.1.1-play-services
+version: 1.1.2
 repository: https://github.com/juliansteenbakker/mobile_scanner
 repository: https://github.com/juliansteenbakker/mobile_scanner
 
 
 environment:
 environment: