Refactor form builder and wallet creation components

- Move `showExtra` parameter from form builder view model to view
- Add wallet name collision check in Monero wallet info
- Improve MobX state management in create wallet view
- Fix screen titles not updating (or updating in wrong order)
- Drop FormBuilder dependency on AbstractView (it doesn't play well when nested with mobx)

Author: MrCyjaneK

lib/coins/monero/wallet_info.dart

@@ -77,6 +77,12 @@ class MoneroWalletInfo extends CoinWalletInfo {
     }
     Monero.wPtrList.clear();
     final basePath = p.dirname(walletName);
+    if (File(p.join(basePath, newName)).existsSync()) {
+      throw Exception(Coin.L.error_wallet_name_already_exists);
+    }
+    if (File(p.join(basePath, "$newName.keys")).existsSync()) {
+      throw Exception(Coin.L.error_wallet_name_already_exists);
+    }
     File(walletName).copySync(p.join(basePath, newName));
     File("$walletName.keys").copySync(p.join(basePath, "$newName.keys"));
     // Copy and delete later, if anything throws below we end up with copied walled,

lib/l10n/app_en.arb

@@ -39,6 +39,7 @@
   "error_ur_tag_unsupported": "Unable to handle {urTag}",
   "error_wallet_doesnt_exist": "Given wallet doesn't exist {walletName}",
   "error_wallet_is_null_no_indication_of_failure": "Wallet creation failed, and status indicated failure but message was empty",
+  "error_wallet_name_already_exists": "Wallet with this name already exists",
   "error_wallet_name_empty": "Wallet name is empty",
   "error_wallet_name_unchanged": "Wallet wasn't renamed because the name is not different",
   "export_key_images": "Export key images",

lib/view_model/create_wallet_view_model.dart

@@ -37,6 +37,7 @@ abstract class CreateWalletViewModelBase with ViewModel, Store {
   bool showExtra = false;
 
   @override
+  @observable
   late String screenName = screenNameOriginal;
 
   @computed
@@ -224,7 +225,6 @@ abstract class CreateWalletViewModelBase with ViewModel, Store {
   }
 
   Future<void> titleUpdate(final String? suggestedTitle) async {
-    await Future.delayed(Duration.zero); // don't do it on build();
     screenName = suggestedTitle ?? screenNameOriginal;
   }
 }

lib/view_model/form_builder_view_model.dart

@@ -14,7 +14,6 @@ abstract class FormBuilderViewModelBase with ViewModel, Store {
     final void Function(String? suggestedTitle)? onLabelChange,
     final void Function(bool val)? toggleIsPinSet,
     required final bool isPinSet,
-    required this.showExtra,
   })  : _onLabelChange = onLabelChange,
         _toggleIsPinSet = toggleIsPinSet,
         _isPinSet = isPinSet;
@@ -49,7 +48,4 @@ abstract class FormBuilderViewModelBase with ViewModel, Store {
     _isPinSet = val;
     toggleIsPinSet(val);
   }
-
-  @observable
-  bool showExtra;
 }

lib/views/create_wallet.dart

@@ -64,6 +64,7 @@ class CreateWallet extends AbstractView {
 
   @override
   Widget? body(final BuildContext context) {
+    final _ = viewModel.showExtra; // force rebuild in mobx
     if (viewModel.selectedCoin == null) {
       return _selectCoin(context);
     }
@@ -80,14 +81,14 @@ class CreateWallet extends AbstractView {
         Padding(
           padding: const EdgeInsets.symmetric(horizontal: 24),
           child: FormBuilder(
+            showExtra: viewModel.showExtra,
             viewModel: FormBuilderViewModel(
               formElements: viewModel.currentForm!,
               scaffoldContext: context,
               isPinSet: viewModel.isPinSet,
               toggleIsPinSet: (final bool val) {
                 viewModel.isPinSet = val;
               },
-              showExtra: viewModel.showExtra,
               onLabelChange: viewModel.titleUpdate,
             ),
           ),
@@ -99,6 +100,7 @@ class CreateWallet extends AbstractView {
   @override
   Widget? bottomNavigationBar(final BuildContext context) {
     if (!viewModel.isPinSet) return null;
+    final _ = viewModel.showExtra; // force rebuild in mobx
     return SafeArea(
       child: Column(
         mainAxisSize: MainAxisSize.min,
@@ -115,7 +117,7 @@ class CreateWallet extends AbstractView {
               text: L.advanced_options,
               icon: null,
               onPressed: () {
-                viewModel.showExtra = true;
+                viewModel.showExtra = !viewModel.showExtra;
               },
               backgroundColor: const WidgetStatePropertyAll(Colors.transparent),
             ),

lib/views/open_wallet.dart

@@ -22,13 +22,13 @@ class OpenWallet extends AbstractView {
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
         FormBuilder(
+          showExtra: false,
           viewModel: FormBuilderViewModel(
             formElements: [
               viewModel.walletPassword,
             ],
             scaffoldContext: context,
             isPinSet: false,
-            showExtra: false,
             toggleIsPinSet: (final bool val) {},
             onLabelChange: (final String? _) {},
           ),

lib/views/security_backup.dart

@@ -35,11 +35,11 @@ class SecurityBackup extends AbstractView {
   Widget? body(final BuildContext context) {
     if (viewModel.isLocked) {
       return FormBuilder(
+        showExtra: true,
         viewModel: FormBuilderViewModel(
           formElements: viewModel.form,
           scaffoldContext: context,
           isPinSet: !viewModel.isLocked,
-          showExtra: true,
           onLabelChange: null,
         ),
       );

lib/views/wallet_edit.dart

@@ -23,11 +23,11 @@ class WalletEdit extends AbstractView {
       children: [
         const Spacer(),
         FormBuilder(
+          showExtra: true,
           viewModel: FormBuilderViewModel(
             formElements: viewModel.form,
             scaffoldContext: context,
             isPinSet: false,
-            showExtra: true,
             onLabelChange: (final _) {},
           ),
         ),

lib/views/widgets/form_builder.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:cupcake/l10n/app_localizations.dart';
 import 'package:cupcake/utils/alerts/widget_minimal.dart';
 import 'package:cupcake/utils/config.dart';
 import 'package:cupcake/utils/form/pin_form_element.dart';
@@ -8,19 +9,21 @@ import 'package:cupcake/utils/form/string_form_element.dart';
 import 'package:cupcake/utils/random_name.dart';
 import 'package:cupcake/utils/secure_storage.dart';
 import 'package:cupcake/view_model/form_builder_view_model.dart';
-import 'package:cupcake/views/abstract.dart';
 import 'package:cupcake/views/widgets/buttons/long_primary.dart';
 import 'package:cupcake/views/widgets/numerical_keyboard/main.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:local_auth/local_auth.dart';
 
-class FormBuilder extends AbstractView {
-  FormBuilder({super.key, required this.viewModel});
+class FormBuilder extends StatelessWidget {
+  FormBuilder({super.key, required this.viewModel, required this.showExtra});
+
+  late AppLocalizations L;
 
-  @override
   final FormBuilderViewModel viewModel;
 
+  final bool showExtra;
+
   String? lastSuggestedTitle = DateTime.now().toIso8601String();
   void _onLabelChange(final String? suggestedTitle) {
     if (suggestedTitle == lastSuggestedTitle) return;
@@ -41,6 +44,7 @@ class FormBuilder extends AbstractView {
 
   @override
   Widget build(final BuildContext context) {
+    L = AppLocalizations.of(context)!;
     return Observer(
       builder: (final context) => _build(context),
     );
@@ -160,7 +164,6 @@ class FormBuilder extends AbstractView {
       );
     }
     _onLabelChange(null);
-    final showExtra = viewModel.showExtra;
     final List<Widget> children = [];
     for (final e in viewModel.formElements) {
       if (e is StringFormElement) {