diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index eb474c4..bf232ac 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -2,6 +2,8 @@ + NSCameraUsageDescription + Camera permission is required for barcode scanning. CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleExecutable diff --git a/lib/providers/wallets_profiles.dart b/lib/providers/wallets_profiles.dart index 1323554..267f364 100644 --- a/lib/providers/wallets_profiles.dart +++ b/lib/providers/wallets_profiles.dart @@ -6,7 +6,8 @@ import 'package:gecko/screens/wallet_view.dart'; import 'package:graphql_flutter/graphql_flutter.dart'; import 'package:jdenticon_dart/jdenticon_dart.dart'; import 'package:permission_handler/permission_handler.dart'; -import 'package:qrscan/qrscan.dart' as scanner; +// import 'package:qrscan/qrscan.dart' as scanner; +import 'package:barcode_scan2/barcode_scan2.dart'; import 'dart:math'; import 'package:intl/intl.dart'; @@ -31,24 +32,24 @@ class WalletsProfilesProvider with ChangeNotifier { if (Platform.isAndroid || Platform.isIOS) { await Permission.camera.request(); } - String? barcode; + ScanResult? barcode; try { - barcode = await scanner.scan(); + barcode = await BarcodeScanner.scan(); } catch (e) { log.e(e); return 'false'; } - if (barcode != null && isAddress(barcode)) { + if (isAddress(barcode.rawContent)) { Navigator.push( context, MaterialPageRoute(builder: (context) { - return WalletViewScreen(pubkey: barcode!); + return WalletViewScreen(pubkey: barcode!.rawContent); }), ); } else { return 'false'; } - return barcode; + return barcode.rawContent; } // Future pay(BuildContext context, {int? derivation}) async { diff --git a/pubspec.lock b/pubspec.lock index d883a31..7b133b5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -57,6 +57,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.2.1" + barcode_scan2: + dependency: "direct main" + description: + name: barcode_scan2 + url: "https://pub.dartlang.org" + source: hosted + version: "4.2.1" bip32_ed25519: dependency: transitive description: @@ -999,6 +1006,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "4.2.4" + protobuf: + dependency: transitive + description: + name: protobuf + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" provider: dependency: "direct main" description: @@ -1043,15 +1057,6 @@ packages: url: "https://github.com/insinfo/qr.flutter.git" source: git version: "4.0.0" - qrscan: - dependency: "direct main" - description: - path: "." - ref: master - resolved-ref: "1fb6b45541965190d16ac214fa6d8b632d1f711e" - url: "https://github.com/leyan95/qrcode_scanner.git" - source: git - version: "0.3.3" responsive_builder: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 3aaea2d..f014ccb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -44,11 +44,7 @@ dependencies: pin_code_fields: ^7.3.0 printing: ^5.9.1 provider: ^6.0.1 - qrscan: #^0.3.2 - git: - url: https://github.com/leyan95/qrcode_scanner.git - ref: master # branch name - # qr_code_scanner: ^0.6.1 + barcode_scan2: ^4.2.1 qr_flutter: #^4.0.0 git: url: https://github.com/insinfo/qr.flutter.git