fix barcode scanner not showing progress

Author: MrCyjaneK

lib/view_model/barcode_scanner_view_model.dart

@@ -11,6 +11,7 @@ class BarcodeScannerViewModel = BarcodeScannerViewModelBase with _$BarcodeScanne
 
 abstract class BarcodeScannerViewModelBase with ViewModel, Store {
   BarcodeScannerViewModelBase({required this.wallet});
+
   @override
   String get screenName => L.scan;
 
@@ -23,38 +24,31 @@ abstract class BarcodeScannerViewModelBase with ViewModel, Store {
   @observable
   List<String> urCodes = [];
 
-  URQRData get ur => URQRData.parse(urCodes);
-
   final CoinWallet wallet;
 
   final MobileScannerController mobileScannerCtrl = MobileScannerController();
 
-  URQrProgress get urQrProgress => URQrProgress(
-        expectedPartCount: ur.count - 1,
-        processedPartsCount: ur.inputs.length,
-        receivedPartIndexes: urParts(),
-        percentage: ur.progress,
-      );
-
+  @action
   Future<void> handleUR() async {
     await callThrowable(
       () async {
-        await wallet.handleUR(c!, ur);
+        await wallet.handleUR(c!, URQRData.parse(urCodes));
       },
       L.error_handling_urqr_scan,
     );
   }
 
+  @action
   Future<void> handleBarcode(final BarcodeCapture barcodes) async {
     for (final barcode in barcodes.barcodes) {
       if (barcode.rawValue!.startsWith("ur:")) {
-        if (ur.progress == 1 && !popped) {
+        if (URQRData.parse(urCodes).progress == 1 && !popped) {
           popped = true;
           await handleUR();
           return;
         }
         if (urCodes.contains(barcode.rawValue)) return;
-        urCodes.add(barcode.rawValue!);
+        urCodes = [...urCodes, barcode.rawValue!];
       }
     }
     if (urCodes.isNotEmpty) return;
@@ -66,9 +60,10 @@ abstract class BarcodeScannerViewModelBase with ViewModel, Store {
     }
   }
 
+  @action
   List<int> urParts() {
     final List<int> l = [];
-    for (final inp in ur.inputs) {
+    for (final inp in URQRData.parse(urCodes).inputs) {
       try {
         l.add(int.parse(inp.split("/")[1].split("-")[0]));
       } catch (e) {

lib/views/barcode_scanner.dart

@@ -1,9 +1,11 @@
 import 'package:cupcake/coins/abstract/wallet.dart';
+import 'package:cupcake/utils/urqr.dart';
 import 'package:cupcake/view_model/barcode_scanner_view_model.dart';
 import 'package:cupcake/views/abstract.dart';
 import 'package:cupcake/views/widgets/barcode_scanner/progress_painter.dart';
 import 'package:cupcake/views/widgets/barcode_scanner/switch_camera.dart';
 import 'package:cupcake/views/widgets/barcode_scanner/toggle_flashlight_button.dart';
+import 'package:cupcake/views/widgets/barcode_scanner/urqr_progress.dart';
 import 'package:fast_scanner/fast_scanner.dart';
 import 'package:flutter/material.dart';
 
@@ -20,16 +22,17 @@ class BarcodeScanner extends AbstractView {
 
   @override
   Widget? body(final BuildContext context) {
+    final ur = URQRData.parse(viewModel.urCodes);
     return Stack(
       children: [
         MobileScanner(
           onDetect: (final BarcodeCapture bc) => viewModel.handleBarcode(bc),
           controller: viewModel.mobileScannerCtrl,
         ),
-        if (viewModel.ur.inputs.isNotEmpty)
+        if (ur.inputs.isNotEmpty)
           Center(
             child: Text(
-              "${viewModel.ur.inputs.length}/${viewModel.ur.count}",
+              "${ur.inputs.length}/${ur.count}",
               style: Theme.of(context).textTheme.displayLarge?.copyWith(color: Colors.white),
             ),
           ),
@@ -40,7 +43,7 @@ class BarcodeScanner extends AbstractView {
               height: 250,
               child: CustomPaint(
                 painter: ProgressPainter(
-                  urQrProgress: viewModel.urQrProgress,
+                  urQrProgress: URQrProgress.fromURQRData(ur),
                 ),
               ),
             ),

lib/views/widgets/barcode_scanner/urqr_progress.dart

@@ -1,3 +1,5 @@
+import 'package:cupcake/utils/urqr.dart';
+
 class URQrProgress {
   URQrProgress({
     required this.expectedPartCount,
@@ -16,4 +18,13 @@ class URQrProgress {
     }
     return processedPartsCount == progress.processedPartsCount;
   }
+
+  static URQrProgress fromURQRData(final URQRData ur) {
+    return URQrProgress(
+      expectedPartCount: ur.count,
+      processedPartsCount: ur.inputs.length,
+      receivedPartIndexes: ur.inputs.map((final e) => int.tryParse(e.split("/")[1].split("-")[0]) ?? 0).toList(),
+      percentage: ur.progress,
+    );
+  }
 }