Merge pull request #2 from Foundation-Devices/port_changes_from_qr_plus

Port changes from qr plus

Author: InvertedX

CHANGELOG.md

@@ -1,16 +1,32 @@
+## 2.0.14
+
+- Updated android compile and target SDK to 36
+- Updated android targets to java 17
+- Fixed android build for example app
+
+## 2.0.13
+
+Fix:
+
+- Correctly parse all iOS versions to reliably apply the UI Hanging fix from version 2.0.12
+
 ## 2.0.12
-- For iOS 18 or newer, call `pauseCamera` on dispose instead of `stopCamera`
+
+- For iOS 18 or newer, call `pauseCamera` on dispose instead of `stopCamera` to avoid UI hang
+
+**L.e. The iOS version detection was not correctly parsed, causing this fix to not apply for hotfix iOS versions (such as 26.0.1)**
 
 ## 2.0.11
 
 FIX for iOS 26:
+
 - For iOS 26 or newer, call `pauseCamera` on dispose instead of `stopCamera`
 
 Note: Calling stopCamera on dispose was causing UI to hang for 1-3 seconds
 
 ## 2.0.10+1
 
-- Increased android compile SDK to 35 and removed android test deps 
+- Increased android compile SDK to 35 and removed android test deps
 
 ## 2.0.10
 

android/build.gradle

@@ -25,29 +25,29 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 34
+    compileSdk 36
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
     defaultConfig {
         // minSdkVersion is determined by Native View.
         minSdkVersion 20
-        targetSdkVersion 34
+        targetSdkVersion 36
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
 
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 
     compileOptions {
         // Flag to enable support for the new language APIs
         // // // coreLibraryDesugaringEnabled true
-        // Sets Java compatibility to Java 11
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        // Sets Java compatibility to Java 17
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     if (project.android.hasProperty('namespace')) {
         namespace 'net.touchcapture.qr.flutterqrplus'

example/android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -21,12 +27,8 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdk 35
+    compileSdk 36
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -35,7 +37,7 @@ android {
     defaultConfig {
         applicationId "net.touchcapture.qr.flutterqrexample"
         minSdkVersion flutter.minSdkVersion
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

example/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.9.0'
+    ext.kotlin_version = '2.2.20'
     repositories {
         google()
         mavenCentral()

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Aug 08 21:31:11 CEST 2023
+#Thu Sep 18 11:28:23 EEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

example/android/settings.gradle

@@ -1,11 +1,33 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+
+    // https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
+    // AGP (gradle plugin)
+    id "com.android.application" version '8.13.0' apply false
+
+    // Kotlin Version
+    // https://plugins.gradle.org/plugin/org.jetbrains.kotlin.android
+    id "org.jetbrains.kotlin.android" version "2.2.20" apply false
+
+    
+}
+
+include ":app"

lib/src/qr_code_scanner.dart

@@ -26,6 +26,8 @@ import 'platform/platform_info_stub.dart'
 typedef QRViewCreatedCallback = void Function(QRViewController);
 typedef PermissionSetCallback = void Function(QRViewController, bool);
 
+const _defaultIOSMajorVersionOnUnknown = 18;
+
 /// The [QRView] is the view where the camera
 /// and the barcode scanner gets displayed.
 class QRView extends StatefulWidget {
@@ -308,17 +310,24 @@ class QRViewController {
       try {
         final osVersionSplit = osVersion.split(' ');
 
-        final iOSVersion =
-            osVersionSplit.length > 1 ? osVersionSplit[1] : 'Unknown';
-        final iOSVersionDouble = double.tryParse(iOSVersion) ?? 0;
+        // iOS version is sth like 26.0 or 26.0.1, etc.
+        // We cannot assume it would parse as a double, so we need to handle that.
+        final iOSVersion = osVersionSplit.length > 1
+            ? osVersionSplit[1]
+            : "$_defaultIOSMajorVersionOnUnknown.0";
+
+        final iOSMajorVersion = int.tryParse(
+                iOSVersion.split('.').firstOrNull ??
+                    '$_defaultIOSMajorVersionOnUnknown') ??
+            _defaultIOSMajorVersionOnUnknown;
+        final isAtLeastIOS18 = iOSMajorVersion >= 18;
 
-        // print('iOSVersionDouble $iOSVersionDouble');
-        if (iOSVersionDouble < 18.0) {
-          // Don't call stopCamera on iOS 18 or higher
+        if (isAtLeastIOS18) {
+          // Don't call stopCamera on iOS 18+
           // -- it causes UI to hang for a few seconds, especially on iOS 26+
-          await _channel.invokeMethod('stopCamera');
-        } else {
           await _channel.invokeMethod('pauseCamera');
+        } else {
+          await _channel.invokeMethod('stopCamera');
         }
       } on PlatformException catch (e) {
         throw CameraException(e.code, e.message);

pubspec.yaml

@@ -1,6 +1,6 @@
 name: qr_code_scanner_plus
 description: QR code scanner that can be embedded inside flutter. It uses zxing in Android and MTBBarcode scanner in iOS.
-version: 2.0.12
+version: 2.0.14
 homepage: https://vespr.xyz
 repository: https://github.com/vespr-wallet/qr_code_scanner_plus