From a10a371cbbbe2166687c9f05633d64c98866f07b Mon Sep 17 00:00:00 2001
From: Talwinder Kaur <talwinder.kaur@gendigital.com>
Date: Wed, 6 Nov 2024 01:38:37 -0500
Subject: [PATCH] chore(app): Update to latest gradle and java version. Replace
 qr scanning library

Signed-off-by: Talwinder Kaur <talwinder.kaur@gendigital.com>
---
 .github/workflows/build.yml                   |   6 +-
 demo/app/android/app/build.gradle             |  15 +-
 .../android/app/src/debug/AndroidManifest.xml |   3 +-
 .../android/app/src/main/AndroidManifest.xml  |   3 +-
 .../app/src/profile/AndroidManifest.xml       |   3 +-
 demo/app/android/build.gradle                 |  13 +-
 demo/app/android/gradle.properties            |   6 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 demo/app/ios/Podfile.lock                     |  90 ----------
 demo/app/ios/Runner/Info.plist                |   4 +-
 demo/app/lib/views/credential_details.dart    |   2 +-
 demo/app/lib/views/credential_shared.dart     |   1 +
 demo/app/lib/views/scanner.dart               |  46 ++---
 demo/app/lib/widgets/common_title_appbar.dart |   3 +-
 demo/app/pubspec.lock                         | 158 ++++++++++++------
 demo/app/pubspec.yaml                         |  19 ++-
 16 files changed, 172 insertions(+), 202 deletions(-)
 delete mode 100644 demo/app/ios/Podfile.lock

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9f8ae54a..a324402d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -239,7 +239,7 @@ jobs:
         uses: flutter-actions/setup-flutter@v2
         with:
           channel: stable
-          version: 3.10.6
+          version: 3.19.5
       - name: Install flutter app dependencies
         run: make install-flutter-dependencies
       - name: Run iOS Simulator
@@ -320,12 +320,12 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
       - name: Setup Flutter SDK
         uses: flutter-actions/setup-flutter@v2
         with:
           channel: stable
-          version: 3.10.6
+          version: 3.19.5
       - name: Install flutter app dependencies
         run: make install-flutter-dependencies
       - name: Build APK in Debug mode
diff --git a/demo/app/android/app/build.gradle b/demo/app/android/app/build.gradle
index 5714417a..086e8465 100644
--- a/demo/app/android/app/build.gradle
+++ b/demo/app/android/app/build.gradle
@@ -36,9 +36,10 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 34
-    ndkVersion flutter.ndkVersion
+    ndkVersion "25.1.8937393"
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -56,11 +57,10 @@ android {
         applicationId "dev.trustbloc.wallet"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
-        minSdkVersion 22
+        minSdkVersion 24
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -71,12 +71,20 @@ android {
             signingConfig signingConfigs.debug
         }
 
+        debug {
+            // fix Failed to transform firebase-auth-22.3.1.aar
+            minifyEnabled false
+            multiDexEnabled true
+            signingConfig signingConfigs.debug
+        }
+
         buildTypes.each {
             it.buildConfigField 'String', 'INITIATE_ISSUANCE_URL', '"' + INITIATE_ISSUANCE_URL + '"'
             it.buildConfigField 'String', 'INITIATE_VERIFICATION_URL', '"' + INITIATE_VERIFICATION_URL + '"'
             it.buildConfigField 'String', 'INITIATE_ISSUANCE_URLS_AUTH_CODE_FLOW', '"' + INITIATE_ISSUANCE_URLS_AUTH_CODE_FLOW + '"'
         }
     }
+    namespace 'dev.trustbloc.wallet'
 }
 
 flutter {
@@ -101,4 +109,5 @@ dependencies {
     androidTestImplementation "androidx.test:runner:1.2.0"
     androidTestUtil "androidx.test:orchestrator:1.4.2"
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.0'
 }
diff --git a/demo/app/android/app/src/debug/AndroidManifest.xml b/demo/app/android/app/src/debug/AndroidManifest.xml
index ab8ccc67..07a02050 100644
--- a/demo/app/android/app/src/debug/AndroidManifest.xml
+++ b/demo/app/android/app/src/debug/AndroidManifest.xml
@@ -5,7 +5,8 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.trustbloc.wallet">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://schemas.android.com/apk/res/android ">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/demo/app/android/app/src/main/AndroidManifest.xml b/demo/app/android/app/src/main/AndroidManifest.xml
index cab53618..f436ffb7 100644
--- a/demo/app/android/app/src/main/AndroidManifest.xml
+++ b/demo/app/android/app/src/main/AndroidManifest.xml
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.trustbloc.wallet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <application
         android:label="TrustBloc"
         android:name="${applicationName}"
diff --git a/demo/app/android/app/src/profile/AndroidManifest.xml b/demo/app/android/app/src/profile/AndroidManifest.xml
index ab8ccc67..af6d5a43 100644
--- a/demo/app/android/app/src/profile/AndroidManifest.xml
+++ b/demo/app/android/app/src/profile/AndroidManifest.xml
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.trustbloc.wallet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/demo/app/android/build.gradle b/demo/app/android/build.gradle
index 0b097461..906ad976 100644
--- a/demo/app/android/build.gradle
+++ b/demo/app/android/build.gradle
@@ -33,7 +33,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:8.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         if (walletSdkPkgUsr != null) {
             classpath "dev.trustbloc:vc-wallet-sdk:$walletSdkPkgVer"
@@ -74,6 +74,17 @@ allprojects {
 }
 
 rootProject.buildDir = '../build'
+subprojects {
+    afterEvaluate { project ->
+        if (project.hasProperty('android')) {
+            project.android {
+                if (namespace == null) {
+                    namespace project.group
+                }
+            }
+        }
+    }
+}
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
diff --git a/demo/app/android/gradle.properties b/demo/app/android/gradle.properties
index 9b5cc01e..fd1de859 100644
--- a/demo/app/android/gradle.properties
+++ b/demo/app/android/gradle.properties
@@ -2,9 +2,13 @@
 ;
 ; SPDX-License-Identifier: Apache-2.0
 
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4608m
 android.useAndroidX=true
 android.enableJetifier=true
 INITIATE_ISSUANCE_URL=
 INITIATE_VERIFICATION_URL=
 INITIATE_ISSUANCE_URLS_AUTH_CODE_FLOW=
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
+android.enableR8=true
diff --git a/demo/app/android/gradle/wrapper/gradle-wrapper.properties b/demo/app/android/gradle/wrapper/gradle-wrapper.properties
index ff71aeb9..30342d3d 100644
--- a/demo/app/android/gradle/wrapper/gradle-wrapper.properties
+++ b/demo/app/android/gradle/wrapper/gradle-wrapper.properties
@@ -6,4 +6,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
diff --git a/demo/app/ios/Podfile.lock b/demo/app/ios/Podfile.lock
deleted file mode 100644
index 3af68a8f..00000000
--- a/demo/app/ios/Podfile.lock
+++ /dev/null
@@ -1,90 +0,0 @@
-PODS:
-  - DTTJailbreakDetection (0.4.0)
-  - Flutter (1.0.0)
-  - flutter_secure_storage (6.0.0):
-    - Flutter
-  - integration_test (0.0.1):
-    - Flutter
-  - MTBBarcodeScanner (5.0.11)
-  - path_provider_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - permission_handler_apple (9.1.1):
-    - Flutter
-  - qr_code_scanner (0.2.0):
-    - Flutter
-    - MTBBarcodeScanner
-  - safe_device (1.0.0):
-    - DTTJailbreakDetection
-    - Flutter
-  - shared_preferences_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - sqflite (0.0.3):
-    - Flutter
-    - FlutterMacOS
-  - uni_links (0.0.1):
-    - Flutter
-  - url_launcher_ios (0.0.1):
-    - Flutter
-
-DEPENDENCIES:
-  - Flutter (from `Flutter`)
-  - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
-  - integration_test (from `.symlinks/plugins/integration_test/ios`)
-  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
-  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
-  - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
-  - safe_device (from `.symlinks/plugins/safe_device/ios`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
-  - uni_links (from `.symlinks/plugins/uni_links/ios`)
-  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-
-SPEC REPOS:
-  trunk:
-    - DTTJailbreakDetection
-    - MTBBarcodeScanner
-
-EXTERNAL SOURCES:
-  Flutter:
-    :path: Flutter
-  flutter_secure_storage:
-    :path: ".symlinks/plugins/flutter_secure_storage/ios"
-  integration_test:
-    :path: ".symlinks/plugins/integration_test/ios"
-  path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_foundation/darwin"
-  permission_handler_apple:
-    :path: ".symlinks/plugins/permission_handler_apple/ios"
-  qr_code_scanner:
-    :path: ".symlinks/plugins/qr_code_scanner/ios"
-  safe_device:
-    :path: ".symlinks/plugins/safe_device/ios"
-  shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  sqflite:
-    :path: ".symlinks/plugins/sqflite/darwin"
-  uni_links:
-    :path: ".symlinks/plugins/uni_links/ios"
-  url_launcher_ios:
-    :path: ".symlinks/plugins/url_launcher_ios/ios"
-
-SPEC CHECKSUMS:
-  DTTJailbreakDetection: 5e356c5badc17995f65a83ed9483f787a0057b71
-  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  integration_test: 13825b8a9334a850581300559b8839134b124670
-  MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
-  qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
-  safe_device: 4539eb6bdbeb4b61a763a51c4e73e6b37dea4e3d
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
-  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-
-PODFILE CHECKSUM: 3320f6149474f3df566b99ab7a7d7d9e043aec65
-
-COCOAPODS: 1.15.2
diff --git a/demo/app/ios/Runner/Info.plist b/demo/app/ios/Runner/Info.plist
index 4ba63541..6120c4ba 100644
--- a/demo/app/ios/Runner/Info.plist
+++ b/demo/app/ios/Runner/Info.plist
@@ -39,6 +39,8 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>
@@ -66,7 +68,5 @@
 	<false/>
 	<key>io.flutter.embedded_views_preview</key>
 	<true/>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
 </dict>
 </plist>
diff --git a/demo/app/lib/views/credential_details.dart b/demo/app/lib/views/credential_details.dart
index ccccb833..d876932b 100644
--- a/demo/app/lib/views/credential_details.dart
+++ b/demo/app/lib/views/credential_details.dart
@@ -93,7 +93,7 @@ class CredentialDetailsState extends State<CredentialDetails> {
         title: const Text('Credential Details',
             textAlign: TextAlign.center,
             style: TextStyle(
-                fontSize: 18, fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, fontFamily: 'SF Pro')),
+                fontSize: 18, fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, fontFamily: 'SF Pro', color: Colors.white)),
         backgroundColor: const Color(0xff261131),
       ),
       body: SingleChildScrollView(
diff --git a/demo/app/lib/views/credential_shared.dart b/demo/app/lib/views/credential_shared.dart
index 7aad4d68..5ee0cf6c 100644
--- a/demo/app/lib/views/credential_shared.dart
+++ b/demo/app/lib/views/credential_shared.dart
@@ -34,6 +34,7 @@ class CredentialSharedState extends State<CredentialShared> {
               _navigateToDashboard();
             },
             icon: const Icon(Icons.close),
+            color: Colors.white,
           ),
         ],
         flexibleSpace: Container(
diff --git a/demo/app/lib/views/scanner.dart b/demo/app/lib/views/scanner.dart
index de26ab15..2dd718a0 100644
--- a/demo/app/lib/views/scanner.dart
+++ b/demo/app/lib/views/scanner.dart
@@ -4,12 +4,13 @@ Copyright Gen Digital Inc. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
+import 'dart:async';
 import 'dart:developer';
 import 'package:app/scenarios/handle_openid_url.dart';
 import 'package:app/widgets/common_title_appbar.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:qr_code_scanner/qr_code_scanner.dart';
+import 'package:mobile_scanner/mobile_scanner.dart';
 import 'package:safe_device/safe_device.dart';
 
 import 'package:app/widgets/primary_button.dart';
@@ -24,11 +25,15 @@ class QRScanner extends StatefulWidget {
 }
 
 class QRScannerState extends State<QRScanner> {
-  QRViewController? controller;
   final GlobalKey qrKey = GlobalKey(debugLabel: 'QR');
   final textController = TextEditingController();
   bool isRealDevice = false;
 
+  final MobileScannerController controller = MobileScannerController(
+      detectionSpeed: DetectionSpeed.noDuplicates,
+      returnImage: true
+  );
+
   @override
   void initState() {
     super.initState();
@@ -51,18 +56,15 @@ class QRScannerState extends State<QRScanner> {
               addCloseIcon: true,
               height: 50,
             ),
-            body: QRView(
-              key: qrKey,
-              onQRViewCreated: _onQRViewCreated,
-              overlay: QrScannerOverlayShape(
-                borderColor: const Color(0xffE74577),
-                borderRadius: 24,
-                borderLength: 30,
-                borderWidth: 10,
-                cutOutSize: 256,
-              ),
-              onPermissionSet: (ctrl, p) => _onPermissionSet(context, ctrl, p),
-            ),
+            body: MobileScanner(
+                controller: controller,
+                onDetect: (capture) {
+                  final List<Barcode> barcodes = capture.barcodes;
+                  for (final barcode in barcodes) {
+                    handleOpenIDUrl(context, barcode.rawValue ?? 'No Data found in QR');
+                  }
+                  controller.dispose();
+                }),
           )
         : Scaffold(
             appBar: const CustomTitleAppBar(
@@ -107,20 +109,4 @@ class QRScannerState extends State<QRScanner> {
             ));
   }
 
-  void _onQRViewCreated(QRViewController controller) {
-    this.controller = controller;
-    controller.scannedDataStream.listen((scanData) async {
-      controller.dispose();
-      handleOpenIDUrl(context, scanData.code!);
-    });
-  }
-
-  void _onPermissionSet(BuildContext context, QRViewController ctrl, bool p) {
-    log('${DateTime.now().toIso8601String()}_onPermissionSet $p');
-    if (!p) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(content: Text('no Permission')),
-      );
-    }
-  }
 }
diff --git a/demo/app/lib/widgets/common_title_appbar.dart b/demo/app/lib/widgets/common_title_appbar.dart
index 4ce6df71..df0b7658 100644
--- a/demo/app/lib/widgets/common_title_appbar.dart
+++ b/demo/app/lib/widgets/common_title_appbar.dart
@@ -21,7 +21,7 @@ class CustomTitleAppBar extends StatelessWidget implements PreferredSizeWidget {
         title: Text(pageTitle!,
             textAlign: TextAlign.center,
             style: const TextStyle(
-                fontSize: 18, fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, fontFamily: 'SF Pro')),
+                fontSize: 18, fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, fontFamily: 'SF Pro', color: Colors.white)),
         backgroundColor: const Color(0xffEEEAEE),
         actions: addCloseIcon == true
             ? [
@@ -29,6 +29,7 @@ class CustomTitleAppBar extends StatelessWidget implements PreferredSizeWidget {
                   onPressed: () =>
                       Navigator.of(context).push(MaterialPageRoute(builder: (context) => const Dashboard())),
                   icon: const Icon(Icons.close),
+                  color: Colors.white,
                 ),
               ]
             : [],
diff --git a/demo/app/pubspec.lock b/demo/app/pubspec.lock
index 1111bfb6..ef3c8a2c 100644
--- a/demo/app/pubspec.lock
+++ b/demo/app/pubspec.lock
@@ -37,26 +37,26 @@ packages:
     dependency: "direct main"
     description:
       name: cached_network_image
-      sha256: "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f"
+      sha256: "4a5d8d2c728b0f3d0245f69f921d7be90cae4c2fd5288f773088672c0893f819"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.1"
+    version: "3.4.0"
   cached_network_image_platform_interface:
     dependency: transitive
     description:
       name: cached_network_image_platform_interface
-      sha256: "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f"
+      sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.1.1"
   cached_network_image_web:
     dependency: transitive
     description:
       name: cached_network_image_web
-      sha256: "205d6a9f1862de34b93184f22b9d2d94586b2f05c581d546695e3d8f6a805cd7"
+      sha256: "6322dde7a5ad92202e64df659241104a43db20ed594c41ca18de1014598d7996"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   characters:
     dependency: transitive
     description:
@@ -137,6 +137,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.0"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -146,10 +154,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_cache_manager
-      sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba"
+      sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.1"
+    version: "3.4.1"
   flutter_driver:
     dependency: transitive
     description: flutter
@@ -159,26 +167,26 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_launcher_icons
-      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
+      sha256: "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.1"
+    version: "0.14.1"
   flutter_lints:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "4.0.0"
   flutter_secure_storage:
     dependency: "direct main"
     description:
       name: flutter_secure_storage
-      sha256: de957362e046bc68da8dcf6c1d922cb8bdad8dd4979ec69480cf1a3c481abe8e
+      sha256: "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "9.2.2"
   flutter_secure_storage_linux:
     dependency: transitive
     description:
@@ -191,10 +199,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage_macos
-      sha256: "388f76fd0f093e7415a39ec4c169ae7cceeee6d9f9ba529d788a13f2be4de7bd"
+      sha256: "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "3.1.2"
   flutter_secure_storage_platform_interface:
     dependency: transitive
     description:
@@ -215,18 +223,18 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage_windows
-      sha256: ca89c8059cf439985aa83c59619b3674c7ef6cc2e86943d169a7369d6a69cab5
+      sha256: b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.3"
+    version: "3.1.2"
   flutter_svg:
     dependency: "direct main"
     description:
       name: flutter_svg
-      sha256: d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c
+      sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.9"
+    version: "2.0.10+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -246,10 +254,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.6"
+    version: "1.2.2"
   http_parser:
     dependency: transitive
     description:
@@ -275,10 +283,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   js:
     dependency: "direct main"
     description:
@@ -331,10 +339,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "4.0.0"
   matcher:
     dependency: transitive
     description:
@@ -359,6 +367,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.11.0"
+  mobile_scanner:
+    dependency: "direct main"
+    description:
+      name: mobile_scanner
+      sha256: b8c0e9afcfd52534f85ec666f3d52156f560b5e6c25b1e3d4fe2087763607926
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.1"
   octo_image:
     dependency: transitive
     description:
@@ -379,10 +395,10 @@ packages:
     dependency: transitive
     description:
       name: path_parsing
-      sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
+      sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   path_provider:
     dependency: transitive
     description:
@@ -435,42 +451,50 @@ packages:
     dependency: "direct main"
     description:
       name: permission_handler
-      sha256: "5749ebeb7ec0c3865ea17e3eb337174b87747be816dab582c551e1aff6f6bbf3"
+      sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb"
       url: "https://pub.dev"
     source: hosted
-    version: "9.2.0"
+    version: "11.3.1"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: a512e0fa8abcb0659d938ec2df93a70eb1df1fdea5fdc6d79a866bfd858a28fc
+      sha256: "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1"
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.2+1"
+    version: "12.0.13"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5"
+      sha256: e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.4.5"
+  permission_handler_html:
+    dependency: transitive
+    description:
+      name: permission_handler_html
+      sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851
       url: "https://pub.dev"
     source: hosted
-    version: "9.1.4"
+    version: "0.1.3+2"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4"
+      sha256: e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9
       url: "https://pub.dev"
     source: hosted
-    version: "3.12.0"
+    version: "4.2.3"
   permission_handler_windows:
     dependency: transitive
     description:
       name: permission_handler_windows
-      sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098
+      sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.3"
+    version: "0.2.1"
   petitparser:
     dependency: transitive
     description:
@@ -503,22 +527,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.0.2"
-  qr_code_scanner:
+  qr:
+    dependency: transitive
+    description:
+      name: qr
+      sha256: "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
+  qr_flutter:
     dependency: "direct main"
     description:
-      name: qr_code_scanner
-      sha256: f23b68d893505a424f0bd2e324ebea71ed88465d572d26bb8d2e78a4749591fd
+      name: qr_flutter
+      sha256: "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "4.1.0"
   rxdart:
     dependency: transitive
     description:
       name: rxdart
-      sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
+      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
       url: "https://pub.dev"
     source: hosted
-    version: "0.27.7"
+    version: "0.28.0"
   safe_device:
     dependency: "direct main"
     description:
@@ -596,6 +628,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.0"
+  sprintf:
+    dependency: transitive
+    description:
+      name: sprintf
+      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
   sqflite:
     dependency: transitive
     description:
@@ -760,42 +800,42 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185"
+      sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.3"
   uuid:
     dependency: "direct main"
     description:
       name: uuid
-      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
+      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.7"
+    version: "4.5.1"
   vector_graphics:
     dependency: transitive
     description:
       name: vector_graphics
-      sha256: "4ac59808bbfca6da38c99f415ff2d3a5d7ca0a6b4809c71d9cf30fba5daf9752"
+      sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.10+1"
+    version: "1.1.11+1"
   vector_graphics_codec:
     dependency: transitive
     description:
       name: vector_graphics_codec
-      sha256: f3247e7ab0ec77dc759263e68394990edc608fb2b480b80db8aa86ed09279e33
+      sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.10+1"
+    version: "1.1.11+1"
   vector_graphics_compiler:
     dependency: transitive
     description:
       name: vector_graphics_compiler
-      sha256: "18489bdd8850de3dd7ca8a34e0c446f719ec63e2bab2e7a8cc66a9028dd76c5a"
+      sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.10+1"
+    version: "1.1.11+1"
   vector_math:
     dependency: transitive
     description:
@@ -828,6 +868,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.3"
+  win32:
+    dependency: transitive
+    description:
+      name: win32
+      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.5.0"
   xdg_directories:
     dependency: transitive
     description:
@@ -853,5 +901,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.3.0 <=3.3.3"
   flutter: ">=3.19.0"
diff --git a/demo/app/pubspec.yaml b/demo/app/pubspec.yaml
index 344968a8..974e8081 100644
--- a/demo/app/pubspec.yaml
+++ b/demo/app/pubspec.yaml
@@ -24,7 +24,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.18.2 <3.0.0'
+  sdk: '>=2.18.2 <=3.3.3'
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -36,21 +36,22 @@ dependencies:
   flutter:
     sdk: flutter
   plugin_platform_interface: ^2.0.2
-  qr_code_scanner: ^1.0.1
-  permission_handler: ^9.1.0
+  qr_flutter: ^4.1.0
+  permission_handler: ^11.3.1
   cupertino_icons: ^1.0.2
-  flutter_secure_storage: ^6.0.0
-  uuid: ^3.0.7
+  flutter_secure_storage: ^9.2.2
+  uuid: ^4.5.1
   shared_preferences: ^2.0.15
-  intl: ^0.18.0
+  intl: ^0.19.0
   uni_links: ^0.5.1
   safe_device: ^1.1.2
   cached_network_image: ^3.3.0
   jwt_decode: ^0.3.1
   url_launcher: ^6.1.11
-  http: ^0.13.4
+  http: ^1.2.2
   js: ^0.6.4
   flutter_svg: ^2.0.9
+  mobile_scanner: ^5.1.1
 
 dev_dependencies:
   integration_test:
@@ -63,8 +64,8 @@ dev_dependencies:
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
-  flutter_lints: ^2.0.3
-  flutter_launcher_icons: "^0.13.1"
+  flutter_lints: ^4.0.0
+  flutter_launcher_icons: ^0.14.1
 
 flutter_launcher_name:
   name: "TrustBloc"