From 4f1a2e3bad4c8d65507d3a24aa3ed2e87c98b0c3 Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Mon, 22 Jul 2024 13:17:07 +0200
Subject: [PATCH] added flavor to android, changed and cloned qr reader, added
 flavors to schemes

---
 .gitignore                                    |  2 +
 example/dapp/android/app/build.gradle         | 14 +++
 .../android/app/src/main/AndroidManifest.xml  |  8 +-
 example/dapp/ios/Runner/Info-internal.plist   |  4 +-
 example/dapp/ios/Runner/Info.plist            |  4 +-
 example/dapp/lib/main.dart                    |  3 +-
 example/dapp/lib/pages/connect_page.dart      | 11 ++-
 example/wallet/.gitignore                     |  4 +-
 example/wallet/android/app/build.gradle       | 14 +++
 .../android/app/src/main/AndroidManifest.xml  |  8 +-
 example/wallet/ios/Podfile.lock               | 19 +++++
 example/wallet/ios/Runner/Info-internal.plist |  2 +-
 example/wallet/ios/Runner/Info.plist          |  2 +-
 .../lib/dependencies/web3wallet_service.dart  |  3 +-
 example/wallet/lib/pages/apps_page.dart       | 23 ++---
 example/wallet/lib/pages/settings_page.dart   |  3 +
 example/wallet/lib/widgets/qr_scan_sheet.dart | 85 -------------------
 example/wallet/pubspec.yaml                   |  4 +-
 18 files changed, 100 insertions(+), 113 deletions(-)
 delete mode 100644 example/wallet/lib/widgets/qr_scan_sheet.dart

diff --git a/.gitignore b/.gitignore
index c68c1976..a5675c3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,5 @@ app.*.map.json
 # Run scripts
 *.sh
 *.env.secret
+
+example/wallet/packages/
\ No newline at end of file
diff --git a/example/dapp/android/app/build.gradle b/example/dapp/android/app/build.gradle
index c3c083b9..f49bfe40 100644
--- a/example/dapp/android/app/build.gradle
+++ b/example/dapp/android/app/build.gradle
@@ -53,6 +53,19 @@ android {
         versionName flutterVersionName
     }
 
+    // Specifies one flavor dimension.
+    flavorDimensions = ["version"]
+
+    productFlavors {
+        internal {
+            dimension "version"
+            applicationIdSuffix ".internal"
+        }
+        production {
+            dimension "version"
+        }
+    }
+
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
@@ -60,6 +73,7 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+
     namespace 'com.walletconnect.flutterdapp'
 }
 
diff --git a/example/dapp/android/app/src/main/AndroidManifest.xml b/example/dapp/android/app/src/main/AndroidManifest.xml
index aad3033b..4efd0752 100644
--- a/example/dapp/android/app/src/main/AndroidManifest.xml
+++ b/example/dapp/android/app/src/main/AndroidManifest.xml
@@ -28,7 +28,13 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="wcflutterdapp" />
+                <data android:scheme="wcflutterdapp-internal" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="wcflutterdapp-production" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/example/dapp/ios/Runner/Info-internal.plist b/example/dapp/ios/Runner/Info-internal.plist
index 1bac7588..35b2acd3 100644
--- a/example/dapp/ios/Runner/Info-internal.plist
+++ b/example/dapp/ios/Runner/Info-internal.plist
@@ -31,7 +31,7 @@
 			<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>wcflutterdappinternal</string>
+				<string>wcflutterdapp-internal</string>
 			</array>
 		</dict>
 	</array>
@@ -41,7 +41,7 @@
 	<string></string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
-		<string>wcflutterwalletinternal</string>
+		<string>wcflutterwallet-internal</string>
 		<string>walletapp</string>
 	</array>
 	<key>ITSAppUsesNonExemptEncryption</key>
diff --git a/example/dapp/ios/Runner/Info.plist b/example/dapp/ios/Runner/Info.plist
index f8759e1b..220aa9a1 100644
--- a/example/dapp/ios/Runner/Info.plist
+++ b/example/dapp/ios/Runner/Info.plist
@@ -31,7 +31,7 @@
 			<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>wcflutterdapp</string>
+				<string>wcflutterdapp-production</string>
 			</array>
 		</dict>
 	</array>
@@ -43,7 +43,7 @@
 	<string></string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
-		<string>wcflutterwallet</string>
+		<string>wcflutterwallet-production</string>
 		<string>walletapp</string>
 	</array>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/example/dapp/lib/main.dart b/example/dapp/lib/main.dart
index 5270e9d3..29b1c375 100644
--- a/example/dapp/lib/main.dart
+++ b/example/dapp/lib/main.dart
@@ -58,6 +58,7 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   Future<void> initialize() async {
+    const flavor = String.fromEnvironment('FLUTTER_APP_FLAVOR');
     _web3App = Web3App(
       core: Core(
         projectId: DartDefines.projectId,
@@ -70,7 +71,7 @@ class _MyHomePageState extends State<MyHomePage> {
           'https://images.prismic.io/wallet-connect/65785a56531ac2845a260732_WalletConnect-App-Logo-1024X1024.png'
         ],
         redirect: Redirect(
-          native: 'wcflutterdapp://',
+          native: 'wcflutterdapp-$flavor://',
           universal: 'https://walletconnect.com',
         ),
       ),
diff --git a/example/dapp/lib/pages/connect_page.dart b/example/dapp/lib/pages/connect_page.dart
index 1691d385..a6516c7e 100644
--- a/example/dapp/lib/pages/connect_page.dart
+++ b/example/dapp/lib/pages/connect_page.dart
@@ -294,7 +294,8 @@ class ConnectPageState extends State<ConnectPage> {
     );
 
     final encodedUri = Uri.encodeComponent(connectResponse.uri.toString());
-    final uri = 'wcflutterwallet://wc?uri=$encodedUri';
+    const flavor = String.fromEnvironment('FLUTTER_APP_FLAVOR');
+    final uri = 'wcflutterwallet-$flavor://wc?uri=$encodedUri';
     // final uri = 'metamask://wc?uri=$encodedUri';
     if (await canLaunchUrlString(uri)) {
       final openApp = await showDialog(
@@ -422,8 +423,9 @@ class ConnectPageState extends State<ConnectPage> {
       );
 
       final scheme = event?.session.peer.metadata.redirect?.native;
+      const flavor = String.fromEnvironment('FLUTTER_APP_FLAVOR');
       launchUrlString(
-        scheme ?? 'wcflutterwallet://',
+        scheme ?? 'wcflutterwallet-$flavor://',
         mode: LaunchMode.externalApplication,
       );
 
@@ -446,10 +448,11 @@ class ConnectPageState extends State<ConnectPage> {
     Function(String message)? showToast,
   }) async {
     final methods = optionalNamespaces['eip155']?.methods ?? [];
+    const flavor = String.fromEnvironment('FLUTTER_APP_FLAVOR');
     final authResponse = await widget.web3App.authenticate(
       params: SessionAuthRequestParams(
         chains: _selectedChains.map((e) => e.chainId).toList(),
-        domain: 'wcflutterdapp://',
+        domain: 'wcflutterdapp-$flavor://',
         nonce: AuthUtils.generateNonce(),
         uri: Constants.aud,
         statement: 'Welcome to example flutter app',
@@ -458,7 +461,7 @@ class ConnectPageState extends State<ConnectPage> {
     );
 
     final encodedUri = Uri.encodeComponent(authResponse.uri.toString());
-    final uri = 'wcflutterwallet://wc?uri=$encodedUri';
+    final uri = 'wcflutterwallet-$flavor://wc?uri=$encodedUri';
 
     if (await canLaunchUrlString(uri)) {
       final openApp = await showDialog(
diff --git a/example/wallet/.gitignore b/example/wallet/.gitignore
index 0bf5b9a8..0ad2af4f 100644
--- a/example/wallet/.gitignore
+++ b/example/wallet/.gitignore
@@ -44,4 +44,6 @@ app.*.map.json
 /android/app/release
 
 # Run scripts
-*.sh
\ No newline at end of file
+*.sh
+
+packages/
\ No newline at end of file
diff --git a/example/wallet/android/app/build.gradle b/example/wallet/android/app/build.gradle
index 185b5606..75e2ca1e 100644
--- a/example/wallet/android/app/build.gradle
+++ b/example/wallet/android/app/build.gradle
@@ -26,6 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
+    namespace "com.walletconnect.flutterwallet"
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
@@ -53,6 +54,19 @@ android {
         versionName flutterVersionName
     }
 
+    // Specifies one flavor dimension.
+    flavorDimensions = ["version"]
+
+    productFlavors {
+        internal {
+            dimension "version"
+            applicationIdSuffix ".internal"
+        }
+        production {
+            dimension "version"
+        }
+    }
+
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
diff --git a/example/wallet/android/app/src/main/AndroidManifest.xml b/example/wallet/android/app/src/main/AndroidManifest.xml
index ba4854aa..6157d923 100644
--- a/example/wallet/android/app/src/main/AndroidManifest.xml
+++ b/example/wallet/android/app/src/main/AndroidManifest.xml
@@ -28,7 +28,13 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="wcflutterwallet" />
+                <data android:scheme="wcflutterwallet-production" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="wcflutterwallet-internal" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/example/wallet/ios/Podfile.lock b/example/wallet/ios/Podfile.lock
index 1e98c531..43430323 100644
--- a/example/wallet/ios/Podfile.lock
+++ b/example/wallet/ios/Podfile.lock
@@ -1,7 +1,13 @@
 PODS:
   - Flutter (1.0.0)
+  - MTBBarcodeScanner (5.0.11)
   - package_info_plus (0.4.5):
     - Flutter
+  - qr_bar_code_scanner_dialog (0.0.1):
+    - Flutter
+  - qr_code_scanner (0.2.0):
+    - Flutter
+    - MTBBarcodeScanner
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -11,14 +17,24 @@ PODS:
 DEPENDENCIES:
   - Flutter (from `Flutter`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+  - qr_bar_code_scanner_dialog (from `.symlinks/plugins/qr_bar_code_scanner_dialog/ios`)
+  - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
+SPEC REPOS:
+  trunk:
+    - MTBBarcodeScanner
+
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
+  qr_bar_code_scanner_dialog:
+    :path: ".symlinks/plugins/qr_bar_code_scanner_dialog/ios"
+  qr_code_scanner:
+    :path: ".symlinks/plugins/qr_code_scanner/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   url_launcher_ios:
@@ -26,7 +42,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
+  qr_bar_code_scanner_dialog: d59c27f37c96ef8649711e6eee8033a69191f907
+  qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
 
diff --git a/example/wallet/ios/Runner/Info-internal.plist b/example/wallet/ios/Runner/Info-internal.plist
index 5094ca5d..24398bea 100644
--- a/example/wallet/ios/Runner/Info-internal.plist
+++ b/example/wallet/ios/Runner/Info-internal.plist
@@ -31,7 +31,7 @@
             <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
             <key>CFBundleURLSchemes</key>
             <array>
-                <string>wcflutterwalletinternal</string>
+                <string>wcflutterwallet-internal</string>
             </array>
         </dict>
     </array>
diff --git a/example/wallet/ios/Runner/Info.plist b/example/wallet/ios/Runner/Info.plist
index 985ddebc..4346cf71 100644
--- a/example/wallet/ios/Runner/Info.plist
+++ b/example/wallet/ios/Runner/Info.plist
@@ -31,7 +31,7 @@
 			<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>wcflutterwallet</string>
+				<string>wcflutterwallet-production</string>
 			</array>
 		</dict>
 	</array>
diff --git a/example/wallet/lib/dependencies/web3wallet_service.dart b/example/wallet/lib/dependencies/web3wallet_service.dart
index f3f186ab..792dd27c 100644
--- a/example/wallet/lib/dependencies/web3wallet_service.dart
+++ b/example/wallet/lib/dependencies/web3wallet_service.dart
@@ -27,6 +27,7 @@ class Web3WalletService extends IWeb3WalletService {
   @override
   Future<void> create() async {
     // Create the web3wallet
+    const flavor = String.fromEnvironment('FLUTTER_APP_FLAVOR');
     _web3Wallet = Web3Wallet(
       core: Core(
         projectId: DartDefines.projectId,
@@ -39,7 +40,7 @@ class Web3WalletService extends IWeb3WalletService {
           'https://docs.walletconnect.com/assets/images/web3walletLogo-54d3b546146931ceaf47a3500868a73a.png'
         ],
         redirect: Redirect(
-          native: 'wcflutterwallet://',
+          native: 'wcflutterwallet-$flavor://',
           universal: 'https://walletconnect.com',
         ),
       ),
diff --git a/example/wallet/lib/pages/apps_page.dart b/example/wallet/lib/pages/apps_page.dart
index 71f151de..d46770cf 100644
--- a/example/wallet/lib/pages/apps_page.dart
+++ b/example/wallet/lib/pages/apps_page.dart
@@ -2,6 +2,7 @@ import 'package:fl_toast/fl_toast.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:get_it_mixin/get_it_mixin.dart';
+import 'package:qr_bar_code_scanner_dialog/qr_bar_code_scanner_dialog.dart';
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/bottom_sheet/i_bottom_sheet_service.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/deep_link_handler.dart';
@@ -11,7 +12,6 @@ import 'package:walletconnect_flutter_v2_wallet/utils/constants.dart';
 import 'package:walletconnect_flutter_v2_wallet/utils/eth_utils.dart';
 import 'package:walletconnect_flutter_v2_wallet/utils/string_constants.dart';
 import 'package:walletconnect_flutter_v2_wallet/widgets/pairing_item.dart';
-import 'package:walletconnect_flutter_v2_wallet/widgets/qr_scan_sheet.dart';
 import 'package:walletconnect_flutter_v2_wallet/widgets/uri_input_popup.dart';
 
 class AppsPage extends StatefulWidget with GetItStatefulWidgetMixin {
@@ -196,16 +196,17 @@ class AppsPageState extends State<AppsPage> with GetItStateMixin {
   }
 
   Future _onScanQrCode() async {
-    final scannedValue = await showModalBottomSheet<String>(
-      context: context,
-      builder: (BuildContext modalContext) {
-        return QRScanSheet(
-          title: StringConstants.scanPairing,
-        );
-      },
-    );
-
-    _onFoundUri(scannedValue);
+    try {
+      QrBarCodeScannerDialog().getScannedQrBarCode(
+        context: context,
+        onCode: (value) {
+          if (!mounted) return;
+          _onFoundUri(value);
+        },
+      );
+    } catch (e) {
+      debugPrint(e.toString());
+    }
   }
 
   Future<void> _onFoundUri(String? uri) async {
diff --git a/example/wallet/lib/pages/settings_page.dart b/example/wallet/lib/pages/settings_page.dart
index c8f07c86..64e0e6eb 100644
--- a/example/wallet/lib/pages/settings_page.dart
+++ b/example/wallet/lib/pages/settings_page.dart
@@ -26,12 +26,15 @@ class _SettingsPageState extends State<SettingsPage> {
   @override
   void initState() {
     super.initState();
+    // TODO
     // PackageInfo.fromPlatform().then((info) {
     //   setState(() {
     //     version =
     //         '${info.version} (${info.buildNumber}) - SDK v$packageVersion';
     //   });
     // });
+
+    version = const String.fromEnvironment('FLUTTER_APP_FLAVOR');
   }
 
   @override
diff --git a/example/wallet/lib/widgets/qr_scan_sheet.dart b/example/wallet/lib/widgets/qr_scan_sheet.dart
deleted file mode 100644
index 7068ea0d..00000000
--- a/example/wallet/lib/widgets/qr_scan_sheet.dart
+++ /dev/null
@@ -1,85 +0,0 @@
-import 'package:flutter/material.dart';
-// import 'package:mobile_scanner/mobile_scanner.dart';
-import 'package:walletconnect_flutter_v2_wallet/utils/constants.dart';
-
-class QRScanSheet extends StatelessWidget {
-  const QRScanSheet({
-    required this.title,
-    Key? key,
-  }) : super(key: key);
-
-  final String title;
-  // final MobileScannerController controller = MobileScannerController(
-  //   detectionSpeed: DetectionSpeed.noDuplicates,
-  // );
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      height: MediaQuery.of(context).size.height * 0.8,
-      clipBehavior: Clip.antiAlias,
-      decoration: const BoxDecoration(
-        borderRadius: BorderRadius.only(
-          topLeft: Radius.circular(
-            StyleConstants.magic20,
-          ),
-          topRight: Radius.circular(
-            StyleConstants.magic20,
-          ),
-        ),
-      ),
-      child: Center(
-        child: Stack(
-          alignment: AlignmentDirectional.topCenter,
-          children: [
-            Positioned(
-              top: StyleConstants.magic40,
-              child: Text(
-                title,
-                style: StyleConstants.titleText,
-              ),
-            ),
-            Positioned(
-              top: StyleConstants.magic40,
-              right: StyleConstants.magic40,
-              child: Container(
-                width: StyleConstants.magic40,
-                height: StyleConstants.magic40,
-                decoration: const BoxDecoration(
-                  color: StyleConstants.layerColor0,
-                  borderRadius: BorderRadius.all(
-                    Radius.circular(
-                      StyleConstants.magic20,
-                    ),
-                  ),
-                ),
-                child: IconButton(
-                  icon: const Icon(
-                    Icons.close,
-                    color: StyleConstants.primaryColor,
-                  ),
-                  iconSize: StyleConstants.magic40,
-                  onPressed: () {
-                    Navigator.of(context).pop();
-                  },
-                ),
-              ),
-            ),
-            // Center(
-            //   child: MobileScanner(
-            //     controller: controller,
-            //     onDetect: (barcode) async {
-            //       // If the barcode has a value, return it and pop the sheet
-            //       if (barcode.barcodes.isNotEmpty &&
-            //           barcode.barcodes.first.rawValue != null) {
-            //         Navigator.of(context).pop(barcode.barcodes.first.rawValue);
-            //       }
-            //     },
-            //   ),
-            // ),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/example/wallet/pubspec.yaml b/example/wallet/pubspec.yaml
index db80c331..938173b0 100644
--- a/example/wallet/pubspec.yaml
+++ b/example/wallet/pubspec.yaml
@@ -13,10 +13,10 @@ dependencies:
     sdk: flutter
 
   cupertino_icons: ^1.0.2
-  # qr_flutter: ^4.0.0
   json_annotation: ^4.8.1
   fl_toast: ^3.1.0
-  # mobile_scanner: ^3.0.0
+  qr_bar_code_scanner_dialog:
+    path: packages/qr-bar-code-scanner-dialog
   get_it: ^7.2.0
   eth_sig_util: ^0.0.9
   get_it_mixin: ^4.0.0