feat: Updated show accounts dialog & added import button

Author: reasje

lib/features/settings/presentation/widgets/account_managment/account_managment_panel.dart

@@ -8,7 +8,6 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
-import '../../../subfeatures/accounts/show_add_accounts_dialog.dart';
 import 'copyable_item.dart';
 
 class AccountManagementPanel extends HookConsumerWidget {
@@ -32,20 +31,19 @@ class AccountManagementPanel extends HookConsumerWidget {
           children: [
             InkWell(
               onTap: () => showAccountsDialog(
-                  context: context,
-                  currentAccount: state.account!,
-                  accounts: state.accounts,
-                  isLoading: state.isLoading,
-                  onAdd: () => showAddAccountsDialog(
-                      context: context,
-                      isLoading: state.isLoading,
-                      onAdd: presenter.addNewAccount,
-                      onImport: () => Navigator.of(context).push(
-                route.featureDialog(
-                  const ImportAccountPage(),
+                context: context,
+                currentAccount: state.account!,
+                accounts: state.accounts,
+                isLoading: state.isLoading,
+                onImport: () => Navigator.of(context).push(
+                  route.featureDialog(
+                    const ImportAccountPage(),
+                  ),
                 ),
-              ),),
-                  onSelect: (item) => presenter.changeAccount(item)),
+                onAdd: () => presenter.addNewAccount(),
+                onSelect: (item) => presenter.changeAccount(item),
+                onRemove: (item) => presenter.removeAccount(item),
+              ),
               child: Row(
                 children: [
                   Portrait(
@@ -95,6 +93,7 @@ class AccountManagementPanel extends HookConsumerWidget {
                   onTap: () => Navigator.of(context).push(route(QrCodePage(
                     name: account.mns,
                     address: account.address,
+                    privateKey: state.account?.privateKey ?? '',
                   ))),
                   child: Container(
                     padding: const EdgeInsets.all(Sizes.spaceXSmall),

lib/features/settings/subfeatures/accounts/show_accounts_dialog.dart

@@ -1,72 +1,88 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
 import 'account_item.dart';
 
-void showAccountsDialog({
-  required BuildContext context,
-  required Account currentAccount,
-  required List<Account> accounts,
-  bool isLoading = false,
-  VoidCallback? onAdd,
-  VoidCallback? onImport,
-  required Function(Account) onSelect,
-}) {
+void showAccountsDialog(
+    {required BuildContext context,
+    required Account currentAccount,
+    required List<Account> accounts,
+    bool isLoading = false,
+    VoidCallback? onAdd,
+    VoidCallback? onImport,
+    required Function(Account) onSelect,
+    required Function(Account) onRemove}) {
   showModalBottomSheet<void>(
     context: context,
     useRootNavigator: true,
     isScrollControlled: true,
     useSafeArea: true,
     backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 44),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).screenBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
-        ),
+    builder: (BuildContext context) => ConstrainedBox(
+      constraints: BoxConstraints(
+        maxHeight: MediaQuery.of(context).size.height * 0.95,
       ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          MxcAppBarEvenly.title(
-            titleText: FlutterI18n.translate(context, 'accounts'),
-            action: Container(
-              alignment: Alignment.centerRight,
-              child: InkWell(
-                child: const Icon(Icons.close),
-                onTap: () => Navigator.of(context).pop(false),
+      child: Container(
+        padding: const EdgeInsets.only(
+            left: 16, right: 16, top: 0, bottom: Sizes.space3XLarge),
+        decoration: BoxDecoration(
+          color: ColorsTheme.of(context).screenBackground,
+          borderRadius: const BorderRadius.only(
+            topLeft: Radius.circular(20),
+            topRight: Radius.circular(20),
+          ),
+        ),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            MxcAppBarEvenly.title(
+              titleText: FlutterI18n.translate(context, 'accounts'),
+              action: Container(
+                alignment: Alignment.centerRight,
+                child: InkWell(
+                  child: const Icon(Icons.close),
+                  onTap: () => Navigator.of(context).pop(false),
+                ),
               ),
             ),
-          ),
-          ConstrainedBox(
-            constraints: const BoxConstraints(maxHeight: 400),
-            child: ListView.builder(
-              padding: EdgeInsets.zero,
-              itemCount: accounts.length,
-              shrinkWrap: true,
-              itemBuilder: (ctx, index) {
-                return AccountItem(
-                  account: accounts[index],
-                  isSelected: currentAccount.address == accounts[index].address,
-                  onSelect: () => onSelect(accounts[index]),
-                  isCustom: accounts[index].isCustom,
-                );
-              },
+            Flexible(
+              child: ListView.builder(
+                padding: EdgeInsets.zero,
+                itemCount: accounts.length,
+                shrinkWrap: true,
+                itemBuilder: (ctx, index) {
+                  return AccountItem(
+                    account: accounts[index],
+                    isSelected:
+                        currentAccount.address == accounts[index].address,
+                    onSelect: () => onSelect(accounts[index]),
+                    isCustom: accounts[index].isCustom,
+                    onRemove: onRemove,
+                  );
+                },
+              ),
             ),
-          ),
-          const SizedBox(height: Sizes.spaceXSmall),
-          MxcButton.primary(
-            key: const ValueKey('addAccountButton'),
-            title: FlutterI18n.translate(
-                context, isLoading ? 'adding_account' : 'add_new_account'),
-            onTap: onAdd,
-            size: AxsButtonSize.xl,
-          ),
-        ],
+            const SizedBox(height: Sizes.spaceXSmall),
+            MxcButton.primary(
+              key: const ValueKey('addAccountButton'),
+              title: FlutterI18n.translate(
+                  context, isLoading ? 'adding_account' : 'add_new_account'),
+              onTap: onAdd,
+              size: AxsButtonSize.xl,
+            ),
+            const SizedBox(height: Sizes.spaceXSmall),
+            MxcButton.plainWhite(
+              key: const ValueKey('importAccountButton'),
+              title: FlutterI18n.translate(context, 'import_account'),
+              onTap: onImport,
+              size: AxsButtonSize.xl,
+              titleColor: ColorsTheme.of(context).primary,
+            ),
+          ],
+        ),
       ),
     ),
   );