Upgrade pkg dependencies

hhanh00 · Apr 8, 2022 · 0aceb11 · 0aceb11
1 parent 8120c72
commit 0aceb11
Show file tree

Hide file tree

Showing 12 changed files with 101 additions and 103 deletions.
diff --git a/lib/about.dart b/lib/about.dart
@@ -14,12 +14,10 @@ Future<void> showAbout(BuildContext context) async {
   final template = Template(contentTemplate);
   var content = template.renderString({'APP': APP_NAME});
   String? versionString;
-  if (isMobile()) {
-    PackageInfo packageInfo = await PackageInfo.fromPlatform();
-    String version = packageInfo.version;
-    String code = packageInfo.buildNumber;
-    versionString = "${s.version}: $version+$code";
-  }
+  PackageInfo packageInfo = await PackageInfo.fromPlatform();
+  String version = packageInfo.version;
+  String code = packageInfo.buildNumber;
+  versionString = "${s.version}: $version+$code";
   final mq = MediaQuery.of(context);
   showDialog(
       context: context,

diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
@@ -117,6 +117,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "backupWarning": MessageLookupByLibrary.simpleMessage(
             "No one can recover your secret keys. If you don\'t have a backup and your phone breaks down, you WILL LOSE YOUR MONEY. You can reach this page by the app menu then Backup"),
         "balance": MessageLookupByLibrary.simpleMessage("Balance"),
+        "barcodeScannerIsNotAvailableOnDesktop":
+            MessageLookupByLibrary.simpleMessage(
+                "Barcode scanner is not available on desktop"),
         "blue": MessageLookupByLibrary.simpleMessage("Blue"),
         "broadcast": MessageLookupByLibrary.simpleMessage("Broadcast"),
         "budget": MessageLookupByLibrary.simpleMessage("Budget"),

diff --git a/lib/generated/intl/messages_es.dart b/lib/generated/intl/messages_es.dart
@@ -116,6 +116,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "backupWarning": MessageLookupByLibrary.simpleMessage(
             "Nadie puede recuperar sus claves secretas. Si no tiene una copia de seguridad, PERDERÁ SU DINERO si su teléfono se avería. Puede acceder a esta página mediante el menú de la aplicación y luego \'Copia de Seguridad\'"),
         "balance": MessageLookupByLibrary.simpleMessage("Saldo"),
+        "barcodeScannerIsNotAvailableOnDesktop":
+            MessageLookupByLibrary.simpleMessage(
+                "El escáner de código de barras no está disponible en el escritorio"),
         "blue": MessageLookupByLibrary.simpleMessage("Azul"),
         "broadcast": MessageLookupByLibrary.simpleMessage("Transmisión"),
         "budget": MessageLookupByLibrary.simpleMessage("Presupuesto"),
@@ -200,7 +203,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "memo": MessageLookupByLibrary.simpleMessage("Nota"),
         "mm": MessageLookupByLibrary.simpleMessage("M/M"),
         "mobileCharges": MessageLookupByLibrary.simpleMessage(
-            "On Mobile Data, scanning may incur additional charges. Do you want to proceed?"),
+            "En datos móviles, el escaneo puede incurrir en cargos adicionales. Quieres proceder?"),
         "mode": MessageLookupByLibrary.simpleMessage("Modo"),
         "multiPay": MessageLookupByLibrary.simpleMessage("Multi Pagos"),
         "multipay": MessageLookupByLibrary.simpleMessage("MultiPagos"),

diff --git a/lib/generated/intl/messages_fr.dart b/lib/generated/intl/messages_fr.dart
@@ -118,6 +118,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "backupWarning": MessageLookupByLibrary.simpleMessage(
             "Vos clés ne sont pas récupérables. Si vous n\'avez pas de sauvegarde, vous pouvez PERDREZ VOTRE ARGENT. Cette page est accessible par Menu ... / Sauvegarde"),
         "balance": MessageLookupByLibrary.simpleMessage("Solde"),
+        "barcodeScannerIsNotAvailableOnDesktop":
+            MessageLookupByLibrary.simpleMessage(
+                "Le Barcode scanner est seulement disponible sur mobile"),
         "blue": MessageLookupByLibrary.simpleMessage("Bleu"),
         "broadcast": MessageLookupByLibrary.simpleMessage("Diffusion"),
         "budget": MessageLookupByLibrary.simpleMessage("Budget"),

diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -203,5 +203,6 @@
   "disconnected": "Disconnected",
   "ledger": "Ledger",
   "mobileCharges": "On Mobile Data, scanning may incur additional charges. Do you want to proceed?",
-  "iHaveMadeABackup": "I have made a backup"
+  "iHaveMadeABackup": "I have made a backup",
+  "barcodeScannerIsNotAvailableOnDesktop": "Barcode scanner is not available on desktop"
 }
diff --git a/lib/l10n/intl_es.arb b/lib/l10n/intl_es.arb
@@ -200,6 +200,7 @@
   "pleaseRestartNow": "Please Restart now",
   "disconnected": "Disconnected",
   "ledger": "Ledger",
-  "mobileCharges": "On Mobile Data, scanning may incur additional charges. Do you want to proceed?",
-  "iHaveMadeABackup": "He hecho una copia de seguridad"
+  "mobileCharges": "En datos móviles, el escaneo puede incurrir en cargos adicionales. Quieres proceder?",
+  "iHaveMadeABackup": "He hecho una copia de seguridad",
+  "barcodeScannerIsNotAvailableOnDesktop": "El escáner de código de barras no está disponible en el escritorio"
 }
diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb
@@ -201,5 +201,6 @@
   "disconnected": "Déconnecté",
   "ledger": "Ledger",
   "mobileCharges": "Sans Wi-fi, les frais peuvent être élevés. Voulez vous continuer?",
-  "iHaveMadeABackup": "J'ai fait une sauvegarde"
+  "iHaveMadeABackup": "J'ai fait une sauvegarde",
+  "barcodeScannerIsNotAvailableOnDesktop": "Le Barcode scanner est seulement disponible sur mobile"
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -517,7 +517,7 @@ double parseNumber(String? s) {
 
 int stringToAmount(String? s) {
   final a = parseNumber(s);
-  return (Decimal.parse(a.toString()) * ZECUNIT_DECIMAL).toInt();
+  return (Decimal.parse(a.toString()) * ZECUNIT_DECIMAL).toBigInt().toInt();
 }
 
 bool checkNumber(String s) {
@@ -533,11 +533,17 @@ bool checkNumber(String s) {
 int precision(bool? mZEC) => (mZEC == null || mZEC) ? 3 : 8;
 
 Future<String?> scanCode(BuildContext context) async {
-  final code = await FlutterBarcodeScanner.scanBarcode('#FF0000', S
-      .of(context)
-      .cancel, true, ScanMode.QR);
-  if (code == "-1") return null;
-  return code;
+  if (!isMobile()) {
+    showSnackBar(S.of(context).barcodeScannerIsNotAvailableOnDesktop);
+    return null;
+  }
+  else {
+    final code = await FlutterBarcodeScanner.scanBarcode('#FF0000', S
+        .of(context)
+        .cancel, true, ScanMode.QR);
+    if (code == "-1") return null;
+    return code;
+  }
 }
 
 String addressLeftTrim(String address) =>

diff --git a/lib/send.dart b/lib/send.dart
@@ -318,7 +318,7 @@ class SendState extends State<SendPage> {
                       context, () => Navigator.of(context).pop(true),
                       okLabel: s.approve, cancelValue: false)));
       if (approved) {
-        int maxAmountPerNote = (_maxAmountPerNote * ZECUNIT_DECIMAL).toInt();
+        int maxAmountPerNote = (_maxAmountPerNote * ZECUNIT_DECIMAL).toBigInt().toInt();
         final memo = _memoController.text;
         final address = unwrapUA(_address);
         final recipient = Recipient(
@@ -338,7 +338,7 @@ class SendState extends State<SendPage> {
   }
 
 
-  int amountInZAT(Decimal v) => (v * ZECUNIT_DECIMAL).toInt();
+  int amountInZAT(Decimal v) => (v * ZECUNIT_DECIMAL).toBigInt().toInt();
 
   String amountFromZAT(int v) =>
       (Decimal.fromInt(v) / ZECUNIT_DECIMAL).toString();