feat: wallet membre can be drag and dropped

2023-11-26 17:14:40 +01:00 · 2023-11-26 17:14:40 +01:00 · 19fdf9715d
parent 5dbec1ac53
commit 19fdf9715d
5 changed files with 158 additions and 130 deletions
--- a/lib/screens/myWallets/wallets_home.dart
+++ b/lib/screens/myWallets/wallets_home.dart
@ -15,7 +15,7 @@ import 'package:gecko/screens/myWallets/import_g1_v1.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:gecko/widgets/commons/offline_info.dart';
-import 'package:gecko/widgets/payment_popup.dart';
+import 'package:gecko/widgets/drag_tule_action.dart';
 import 'package:gecko/widgets/wallet_tile.dart';
 import 'package:gecko/widgets/wallet_tile_membre.dart';
 import 'package:provider/provider.dart';
@ -77,11 +77,14 @@ class _WalletsHomeState extends State<WalletsHome> {
          ),
          backgroundColor: const Color(0xffFFD58D),
        ),
-        bottomNavigationBar: myWalletProvider.lastFlyBy == ''
-            ? const GeckoBottomAppBar(
-                actualRoute: 'safeHome',
-              )
-            : dragInfo(context),
+        bottomNavigationBar:
+            Consumer<MyWalletsProvider>(builder: (context, _, __) {
+          return myWalletProvider.lastFlyBy == ''
+              ? const GeckoBottomAppBar(
+                  actualRoute: 'safeHome',
+                )
+              : dragInfo(context);
+        }),
        body: FutureBuilder(
            future: myWalletProvider.readAllWallets(currentChestNumber),
            builder: (context, snapshot) {
@ -240,7 +243,6 @@ class _WalletsHomeState extends State<WalletsHome> {
  Widget myWalletsTiles(BuildContext context, int currentChestNumber) {
    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
    final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
-    final sub = Provider.of<SubstrateSdk>(context, listen: false);

    if (!isWalletsExists) {
      return const Text('');
@ -272,7 +274,6 @@ class _WalletsHomeState extends State<WalletsHome> {
    List<WalletData> listWalletsWithoutIdty = listWallets.toList();
    listWalletsWithoutIdty.removeWhere((w) => w.address == idtyWallet.address);

-    WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
    final screenWidth = MediaQuery.of(context).size.width;
    int nTule;

@ -327,8 +328,11 @@ class _WalletsHomeState extends State<WalletsHome> {
      const SliverToBoxAdapter(child: SizedBox(height: 20)),
      if (idtyWallet.address != '')
        SliverToBoxAdapter(
-            child: WalletTileMembre(
-                repository: idtyWallet, defaultWallet: defaultWallet)),
+          child: DragTuleAction(
+            wallet: idtyWallet,
+            child: WalletTileMembre(repository: idtyWallet),
+          ),
+        ),
      SliverGrid.count(
          key: keyListWallets,
          crossAxisCount: nTule,
@ -337,63 +341,9 @@ class _WalletsHomeState extends State<WalletsHome> {
          mainAxisSpacing: 0,
          children: <Widget>[
            for (WalletData repository in listWalletsWithoutIdty)
-              LongPressDraggable<String>(
-                delay: const Duration(milliseconds: 200),
-                data: repository.address,
-                dragAnchorStrategy:
-                    (Draggable<Object> _, BuildContext __, Offset ___) =>
-                        const Offset(0, 0),
-                // feedbackOffset: const Offset(-500, -500),
-                // dragAnchorStrategy: childDragAnchorStrategy,
-                onDragStarted: () =>
-                    myWalletProvider.dragAddress = repository.address,
-                onDragEnd: (_) {
-                  myWalletProvider.lastFlyBy = '';
-                  myWalletProvider.dragAddress = '';
-                  myWalletProvider.reload();
-                },
-                feedback: ElevatedButton(
-                  onPressed: () {},
-                  style: ElevatedButton.styleFrom(
-                    backgroundColor: orangeC,
-                    shape: const CircleBorder(),
-                    padding: const EdgeInsets.all(15),
-                  ),
-                  child: const SizedBox(
-                    height: 35,
-                    child: Image(image: AssetImage('assets/vector_white.png')),
-                  ),
-                ),
-                child: DragTarget<String>(
-                    onAccept: (senderAddress) async {
-                      log.d(
-                          'INTERPAY: sender: $senderAddress --- receiver: ${repository.address}');
-                      final walletData = myWalletProvider
-                          .getWalletDataByAddress(senderAddress);
-                      await sub.setCurrentWallet(walletData!);
-                      sub.reload();
-                      paymentPopup(
-                          context,
-                          repository.address,
-                          g1WalletsBox.get(repository.address)!.username ??
-                              repository.name!);
-                    },
-                    onMove: (details) {
-                      if (repository.address != myWalletProvider.lastFlyBy) {
-                        myWalletProvider.lastFlyBy = repository.address;
-                        myWalletProvider.reload();
-                      }
-                    },
-                    onWillAccept: (senderAddress) =>
-                        senderAddress != repository.address,
-                    builder: (
-                      BuildContext context,
-                      List<dynamic> accepted,
-                      List<dynamic> rejected,
-                    ) {
-                      return WalletTile(
-                          repository: repository, defaultWallet: defaultWallet);
-                    }),
+              DragTuleAction(
+                wallet: repository,
+                child: WalletTile(repository: repository),
              ),
            Consumer<SubstrateSdk>(builder: (context, sub, _) {
              return sub.nodeConnected &&
@ -412,57 +362,59 @@ class _WalletsHomeState extends State<WalletsHome> {
    String newDerivationName =
        '${'wallet'.tr()} ${myWalletProvider.listWallets.last.number! + 2}';
    return Padding(
-        padding: const EdgeInsets.all(16),
-        child: ClipRRect(
-            borderRadius: const BorderRadius.all(Radius.circular(12)),
-            child: Column(children: <Widget>[
-              Expanded(
-                child: InkWell(
-                    key: keyAddDerivation,
-                    onTap: () async {
-                      if (!myWalletProvider.isNewDerivationLoading) {
-                        WalletData? defaultWallet =
-                            myWalletProvider.getDefaultWallet();
-                        String? pin;
-                        if (myWalletProvider.pinCode == '') {
-                          pin = await Navigator.push(
-                            context,
-                            MaterialPageRoute(
-                              builder: (homeContext) {
-                                return UnlockingWallet(wallet: defaultWallet);
-                              },
-                            ),
-                          );
-                        }
-                        if (pin != null || myWalletProvider.pinCode != '') {
-                          await myWalletProvider.generateNewDerivation(
-                              context, newDerivationName);
-                        }
-                      }
-                    },
-                    child: Container(
-                      width: double.infinity,
-                      height: double.infinity,
-                      decoration: const BoxDecoration(color: floattingYellow),
-                      child: Center(
-                          child: myWalletProvider.isNewDerivationLoading
-                              ? const SizedBox(
-                                  height: 60,
-                                  width: 60,
-                                  child: CircularProgressIndicator(
-                                    color: orangeC,
-                                    strokeWidth: 7,
-                                  ),
-                                )
-                              : const Text(
-                                  '+',
-                                  style: TextStyle(
-                                      fontSize: 150,
-                                      fontWeight: FontWeight.w700,
-                                      color: Color(0xFFFCB437)),
-                                )),
-                    )),
-              ),
-            ])));
+      padding: const EdgeInsets.all(16),
+      child: ClipRRect(
+        borderRadius: const BorderRadius.all(Radius.circular(12)),
+        child: Column(children: <Widget>[
+          Expanded(
+            child: InkWell(
+                key: keyAddDerivation,
+                onTap: () async {
+                  if (!myWalletProvider.isNewDerivationLoading) {
+                    WalletData? defaultWallet =
+                        myWalletProvider.getDefaultWallet();
+                    String? pin;
+                    if (myWalletProvider.pinCode == '') {
+                      pin = await Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                          builder: (homeContext) {
+                            return UnlockingWallet(wallet: defaultWallet);
+                          },
+                        ),
+                      );
+                    }
+                    if (pin != null || myWalletProvider.pinCode != '') {
+                      await myWalletProvider.generateNewDerivation(
+                          context, newDerivationName);
+                    }
+                  }
+                },
+                child: Container(
+                  width: double.infinity,
+                  height: double.infinity,
+                  decoration: const BoxDecoration(color: floattingYellow),
+                  child: Center(
+                      child: myWalletProvider.isNewDerivationLoading
+                          ? const SizedBox(
+                              height: 60,
+                              width: 60,
+                              child: CircularProgressIndicator(
+                                color: orangeC,
+                                strokeWidth: 7,
+                              ),
+                            )
+                          : const Text(
+                              '+',
+                              style: TextStyle(
+                                  fontSize: 150,
+                                  fontWeight: FontWeight.w700,
+                                  color: Color(0xFFFCB437)),
+                            )),
+                )),
+          ),
+        ]),
+      ),
+    );
  }
 }
--- a/lib/screens/transaction_in_progress.dart
+++ b/lib/screens/transaction_in_progress.dart
@ -28,7 +28,7 @@ class TransactionInProgress extends StatelessWidget {
    final myWalletProvider =
        Provider.of<MyWalletsProvider>(context, listen: false);
    bool isValid = false;
-    bool isLoading = true;
+    bool isLoading = false;
    final result = sub.transactionStatus;

    final from = fromAddress ??
@ -68,13 +68,11 @@ class TransactionInProgress extends StatelessWidget {
    };

    if (result.contains('blockHash: ')) {
-      isLoading = false;
      isValid = true;
      resultText = 'extrinsicValidated'
          .tr(args: [actionMap[transType] ?? 'strangeTransaction'.tr()]);
      log.i('Bloc of last transaction: ${sub.blocNumber} --- $result');
    } else if (result.contains('Exception: ')) {
-      isLoading = false;
      isValid = false;
      resultText = "${"anErrorOccurred".tr()}:\n";
      final List exceptionSplit = result.split('Exception: ');
@ -87,6 +85,7 @@ class TransactionInProgress extends StatelessWidget {
      resultText = resultMap[exception] ?? "$resultText\n$exception";
      log.d('expection: $exceptionSplit');
    } else {
+      isLoading = true;
      resultText = resultMap[result] ?? 'unknown status...';
    }

--- a/lib/widgets/drag_tule_action.dart
+++ b/lib/widgets/drag_tule_action.dart
@ -0,0 +1,74 @@
+// ignore_for_file: use_build_context_synchronously
+
+import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
+import 'package:gecko/models/wallet_data.dart';
+import 'package:gecko/providers/my_wallets.dart';
+import 'package:gecko/providers/substrate_sdk.dart';
+import 'package:gecko/widgets/payment_popup.dart';
+import 'package:provider/provider.dart';
+
+class DragTuleAction extends StatelessWidget {
+  const DragTuleAction({Key? key, required this.wallet, required this.child})
+      : super(key: key);
+
+  final WalletData wallet;
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
+    return LongPressDraggable<String>(
+      delay: const Duration(milliseconds: 200),
+      data: wallet.address,
+      dragAnchorStrategy: (Draggable<Object> _, BuildContext __, Offset ___) =>
+          const Offset(0, 0),
+      // feedbackOffset: const Offset(-500, -500),
+      // dragAnchorStrategy: childDragAnchorStrategy,
+      onDragStarted: () => myWalletProvider.dragAddress = wallet.address,
+      onDragEnd: (_) {
+        myWalletProvider.lastFlyBy = '';
+        myWalletProvider.dragAddress = '';
+        myWalletProvider.reload();
+      },
+      feedback: ElevatedButton(
+        onPressed: () {},
+        style: ElevatedButton.styleFrom(
+          backgroundColor: orangeC,
+          shape: const CircleBorder(),
+          padding: const EdgeInsets.all(15),
+        ),
+        child: const SizedBox(
+          height: 35,
+          child: Image(image: AssetImage('assets/vector_white.png')),
+        ),
+      ),
+      child: DragTarget<String>(
+          onAccept: (senderAddress) async {
+            log.d(
+                'INTERPAY: sender: $senderAddress --- receiver: ${wallet.address}');
+            final walletData =
+                myWalletProvider.getWalletDataByAddress(senderAddress);
+            await sub.setCurrentWallet(walletData!);
+            sub.reload();
+            paymentPopup(context, wallet.address,
+                g1WalletsBox.get(wallet.address)!.username ?? wallet.name!);
+          },
+          onMove: (details) {
+            if (wallet.address != myWalletProvider.lastFlyBy) {
+              myWalletProvider.lastFlyBy = wallet.address;
+              myWalletProvider.reload();
+            }
+          },
+          onWillAccept: (senderAddress) => senderAddress != wallet.address,
+          builder: (
+            BuildContext context,
+            List<dynamic> accepted,
+            List<dynamic> rejected,
+          ) {
+            return child;
+          }),
+    );
+  }
+}
--- a/lib/widgets/wallet_tile.dart
+++ b/lib/widgets/wallet_tile.dart
@ -3,23 +3,26 @@ import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
+import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/screens/myWallets/wallet_options.dart';
 import 'package:gecko/widgets/balance.dart';
 import 'package:gecko/widgets/commons/smooth_transition.dart';
 import 'package:gecko/widgets/name_by_address.dart';
+import 'package:provider/provider.dart';

 class WalletTile extends StatelessWidget {
  const WalletTile({
    Key? key,
    required this.repository,
-    required this.defaultWallet,
  }) : super(key: key);

  final WalletData repository;
-  final WalletData defaultWallet;

  @override
  Widget build(BuildContext context) {
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
+    final defaultWallet = myWalletProvider.getDefaultWallet();
+
    return Padding(
      padding: const EdgeInsets.all(16),
      child: GestureDetector(
--- a/lib/widgets/wallet_tile_membre.dart
+++ b/lib/widgets/wallet_tile_membre.dart
@ -3,23 +3,23 @@ import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
+import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/screens/myWallets/wallet_options.dart';
 import 'package:gecko/widgets/balance.dart';
 import 'package:gecko/widgets/commons/smooth_transition.dart';
 import 'package:gecko/widgets/name_by_address.dart';
+import 'package:provider/provider.dart';

 class WalletTileMembre extends StatelessWidget {
-  const WalletTileMembre({
-    Key? key,
-    required this.repository,
-    required this.defaultWallet,
-  }) : super(key: key);
+  const WalletTileMembre({Key? key, required this.repository})
+      : super(key: key);

  final WalletData repository;
-  final WalletData defaultWallet;

  @override
  Widget build(BuildContext context) {
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
+    final defaultWallet = myWalletProvider.getDefaultWallet();
    return Padding(
      padding: const EdgeInsets.symmetric(horizontal: 70, vertical: 20),
      child: GestureDetector(