Migrate view models to MobX for state management

Note that this is a initial implementation, and mobx may be used inneficiently at the moment
cake-tech · Feb 25, 2025 · a7c007d · a7c007d
1 parent de9b265
commit a7c007d
Show file tree

Hide file tree

Showing 35 changed files with 510 additions and 597 deletions.
diff --git a/.env b/.env
@@ -1,2 +1,2 @@
-MONERO_C_TAG=v0.18.3.4-RC12
+MONERO_C_TAG=v0.18.4.0-RC1
 COIN=monero 
diff --git a/build.yaml b/build.yaml
diff --git a/docs/README.md b/docs/README.md
diff --git a/lib/coins/monero/creation/common.dart b/lib/coins/monero/creation/common.dart
@@ -161,10 +161,6 @@ class MoneroWalletCreation extends WalletCreation {
       }
     }
 
-    print(await walletAddress.value);
-    print(await secretSpendKey.value);
-    print(await secretViewKey.value);
-
     return RestoreFromKeysMoneroWalletCreationMethod(
       L,
       walletPath: coin.getPathForWallet(walletName),

diff --git a/lib/coins/monero/wallet.dart b/lib/coins/monero/wallet.dart
@@ -89,7 +89,6 @@ class MoneroWallet implements CoinWallet {
 
   @override
   Future<void> handleUR(final BuildContext context, final URQRData ur) async {
-    print("handling: ${ur.tag}");
     switch (ur.tag) {
       case "xmr-keyimage" || "xmr-txsigned":
         throw Exception("Unable to handle ${ur.tag}. This is a offline wallet");

diff --git a/lib/dev/generate_rebuild.dart b/lib/dev/generate_rebuild.dart
diff --git a/lib/dev/rebuild_generator.dart b/lib/dev/rebuild_generator.dart
diff --git a/lib/utils/get_signing_key.dart b/lib/utils/get_signing_key.dart
diff --git a/lib/view_model/abstract.dart b/lib/view_model/abstract.dart
@@ -6,7 +6,7 @@ import 'package:cupcake/l10n/app_localizations.dart';
 import 'package:cupcake/utils/alerts/basic.dart';
 import 'package:flutter/material.dart';
 
-class ViewModel {
+mixin ViewModel {
   bool canPop = true;
   String get screenName => "screenName";
 
@@ -38,13 +38,6 @@ class ViewModel {
     return c?.mounted ?? false;
   }
 
-  void markNeedsBuild() {
-    if (c == null) {
-      throw Exception("c is null, did you forget to register(context)?");
-    }
-    (c as Element).markNeedsBuild();
-  }
-
   Future<void> errorHandler(final Object e) => callThrowable(() => throw e, L.create_wallet);
 
   Future<bool> callThrowable(final Future<void> Function() function, final String title) async {

diff --git a/lib/view_model/barcode_scanner_view_model.dart b/lib/view_model/barcode_scanner_view_model.dart
@@ -1,26 +1,27 @@
 import 'package:cupcake/coins/abstract/wallet.dart';
-import 'package:cupcake/dev/generate_rebuild.dart';
 import 'package:cupcake/utils/urqr.dart';
 import 'package:cupcake/view_model/abstract.dart';
 import 'package:cupcake/views/widgets/barcode_scanner/urqr_progress.dart';
 import 'package:fast_scanner/fast_scanner.dart';
+import 'package:mobx/mobx.dart';
 
 part 'barcode_scanner_view_model.g.dart';
 
-@GenerateRebuild()
-class BarcodeScannerViewModel extends ViewModel {
-  BarcodeScannerViewModel({required this.wallet});
+class BarcodeScannerViewModel = BarcodeScannerViewModelBase with _$BarcodeScannerViewModel;
+
+abstract class BarcodeScannerViewModelBase with ViewModel, Store {
+  BarcodeScannerViewModelBase({required this.wallet});
   @override
   String get screenName => L.scan;
 
-  @RebuildOnChange()
-  Barcode? $barcode;
+  @observable
+  Barcode? barcode;
 
-  @RebuildOnChange()
-  bool $popped = false;
+  @observable
+  bool popped = false;
 
-  @RebuildOnChange()
-  List<String> $urCodes = [];
+  @observable
+  List<String> urCodes = [];
 
   URQRData get ur => URQRData.parse(urCodes);
 
@@ -35,9 +36,13 @@ class BarcodeScannerViewModel extends ViewModel {
         percentage: ur.progress,
       );
 
-  @ThrowOnUI(L: "error_handling_urqr_scan")
-  Future<void> $handleUR() async {
-    await wallet.handleUR(c!, ur);
+  Future<void> handleUR() async {
+    await callThrowable(
+      () async {
+        await wallet.handleUR(c!, ur);
+      },
+      L.error_handling_urqr_scan,
+    );
   }
 
   Future<void> handleBarcode(final BarcodeCapture barcodes) async {