tmp commit

refacto: walletname and bottomappbar
refacto: widget choose_currency_unit
2022-11-17 15:44:41 +01:00 · 2022-11-16 18:10:38 +01:00 · 2022-11-16 16:57:33 +01:00
16 changed files with 652 additions and 239 deletions
--- a/lib/providers/duniter_indexer.dart
+++ b/lib/providers/duniter_indexer.dart
@ -14,6 +14,7 @@ import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/wallet_name.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:truncate/truncate.dart';
@ -169,7 +170,8 @@ class DuniterIndexer with ChangeNotifier {
        return const SizedBox();
      } else {
        if (canEdit) {
-          return walletOptions.walletName(context, wallet, size, color);
+          return WalletName(
+              context: context, wallet: wallet, size: size, color: color);
        } else {
          return walletOptions.walletNameController(context, wallet, size);
        }
@ -221,7 +223,11 @@ class DuniterIndexer with ChangeNotifier {
                return const SizedBox();
              } else {
                if (canEdit) {
-                  return walletOptions.walletName(context, wallet, size, color);
+                  return WalletName(
+                      context: context,
+                      wallet: wallet,
+                      size: size,
+                      color: color);
                } else {
                  return walletOptions.walletNameController(
                      context, wallet, size);
@ -244,6 +250,58 @@ class DuniterIndexer with ChangeNotifier {
    );
  }

+  Widget balance(BuildContext context, String address, double size,
+    [Color color = Colors.black,
+    Color loadingColor = const Color(0xffd07316)]) {
+  return Column(children: <Widget>[
+    Consumer<SubstrateSdk>(builder: (context, sdk, _) {
+      return FutureBuilder(
+          future: sdk.getBalance(address),
+          builder: (BuildContext context,
+              AsyncSnapshot<Map<String, double>> globalBalance) {
+            if (globalBalance.connectionState != ConnectionState.done ||
+                globalBalance.hasError) {
+              if (balanceCache[address] != null &&
+                  balanceCache[address] != -1) {
+                return Row(children: [
+                  Text(balanceCache[address]!.toString(),
+                      style: TextStyle(
+                          fontSize: isTall ? size : size * 0.9, color: color)),
+                  const SizedBox(width: 5),
+                  udUnitDisplay(size, color),
+                ]);
+              } else {
+                return SizedBox(
+                  height: 15,
+                  width: 15,
+                  child: CircularProgressIndicator(
+                    color: loadingColor,
+                    strokeWidth: 2,
+                  ),
+                );
+              }
+            }
+            balanceCache[address] = globalBalance.data!['transferableBalance']!;
+            if (balanceCache[address] != -1) {
+              return Row(children: [
+                Text(
+                  balanceCache[address]!.toString(),
+                  style: TextStyle(
+                    fontSize: isTall ? size : size * 0.9,
+                    color: color,
+                  ),
+                ),
+                const SizedBox(width: 5),
+                udUnitDisplay(size, color),
+              ]);
+            } else {
+              return const Text('');
+            }
+          });
+    }),
+  ]);
+}
+
  Widget searchIdentity(BuildContext context, String name) {
    // WalletOptionsProvider _walletOptions =
    //     Provider.of<WalletOptionsProvider>(context, listen: false);
--- a/lib/providers/home.dart
+++ b/lib/providers/home.dart
@ -10,15 +10,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'dart:async';
 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/providers/substrate_sdk.dart';
 import 'package:gecko/providers/wallet_options.dart';
-import 'package:gecko/providers/wallets_profiles.dart';
-import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
-import 'package:gecko/screens/myWallets/wallets_home.dart';
-import 'package:gecko/screens/search.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:flutter/foundation.dart' show kDebugMode, kIsWeb;
 import 'package:path_provider/path_provider.dart' as pp;
@ -132,104 +125,6 @@ class HomeProvider with ChangeNotifier {
  //       volume: volume, mode: PlayerMode.LOW_LATENCY, stayAwake: false);
  // }

-  Widget bottomAppBar(BuildContext context) {
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context, listen: false);
-    WalletsProfilesProvider historyProvider =
-        Provider.of<WalletsProfilesProvider>(context, listen: false);
-
-    final size = MediaQuery.of(context).size;
-
-    const bool showBottomBar = true;
-
-    return Visibility(
-      visible: showBottomBar,
-      child: Container(
-        color: yellowC,
-        width: size.width,
-        height: 80,
-        child:
-            // Stack(
-            //   children: [
-            //     // CustomPaint(
-            //     //   size: Size(size.width, 110),
-            //     //   painter: CustomRoundedButton(),
-            //     // ),
-            Row(mainAxisAlignment: MainAxisAlignment.start, children: [
-          // SizedBox(width: 0),
-          const Spacer(),
-          const SizedBox(width: 11),
-          IconButton(
-            key: keyAppBarSearch,
-            iconSize: 40,
-            icon: const Image(image: AssetImage('assets/loupe-noire.png')),
-            onPressed: () {
-              Navigator.popUntil(
-                context,
-                ModalRoute.withName('/'),
-              );
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (homeContext) {
-                  return const SearchScreen();
-                }),
-              );
-            },
-          ),
-          const SizedBox(width: 22),
-          const Spacer(),
-          IconButton(
-            key: keyAppBarQrcode,
-            iconSize: 70,
-            icon: const Image(image: AssetImage('assets/qrcode-scan.png')),
-            onPressed: () async {
-              Navigator.popUntil(
-                context,
-                ModalRoute.withName('/'),
-              );
-              historyProvider.scan(homeContext);
-            },
-          ),
-          const Spacer(),
-          const SizedBox(width: 15),
-          IconButton(
-            key: keyAppBarChest,
-            iconSize: 60,
-            icon: const Image(image: AssetImage('assets/wallet.png')),
-            onPressed: () async {
-              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 != '') {
-                Navigator.popUntil(
-                  context,
-                  ModalRoute.withName('/'),
-                );
-                Navigator.push(
-                  context,
-                  MaterialPageRoute(builder: (context) {
-                    return const WalletsHome();
-                  }),
-                );
-              }
-            },
-          ),
-          const Spacer(),
-        ]),
-      ),
-    );
-  }
-
  void reload() {
    notifyListeners();
  }
--- a/lib/providers/wallet_options.dart
+++ b/lib/providers/wallet_options.dart
@ -18,7 +18,6 @@ import 'package:gecko/screens/transaction_in_progress.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:provider/provider.dart';
 import 'package:image_cropper/image_cropper.dart';
-import 'package:truncate/truncate.dart';

 class WalletOptionsProvider with ChangeNotifier {
  TextEditingController address = TextEditingController();
@ -504,81 +503,11 @@ class WalletOptionsProvider with ChangeNotifier {
      ]),
    );
  }
-
-  Widget walletName(BuildContext context, WalletData wallet,
-      [double size = 20, Color color = Colors.black]) {
-    double newSize = wallet.name!.length <= 15 ? size : size - 2;
-
-    return Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
-      Text(
-        truncate(wallet.name!, 20),
-        textAlign: TextAlign.center,
-        style: TextStyle(
-          fontSize: isTall ? newSize : newSize * 0.9,
-          color: color,
-          fontWeight: FontWeight.w400,
-          fontStyle: FontStyle.italic,
-        ),
-        softWrap: false,
-        overflow: TextOverflow.ellipsis,
-      ),
-    ]);
-  }
 }

 Map<String, double> balanceCache = {};

-Widget balance(BuildContext context, String address, double size,
-    [Color color = Colors.black,
-    Color loadingColor = const Color(0xffd07316)]) {
-  return Column(children: <Widget>[
-    Consumer<SubstrateSdk>(builder: (context, sdk, _) {
-      return FutureBuilder(
-          future: sdk.getBalance(address),
-          builder: (BuildContext context,
-              AsyncSnapshot<Map<String, double>> globalBalance) {
-            if (globalBalance.connectionState != ConnectionState.done ||
-                globalBalance.hasError) {
-              if (balanceCache[address] != null &&
-                  balanceCache[address] != -1) {
-                return Row(children: [
-                  Text(balanceCache[address]!.toString(),
-                      style: TextStyle(
-                          fontSize: isTall ? size : size * 0.9, color: color)),
-                  const SizedBox(width: 5),
-                  udUnitDisplay(size, color),
-                ]);
-              } else {
-                return SizedBox(
-                  height: 15,
-                  width: 15,
-                  child: CircularProgressIndicator(
-                    color: loadingColor,
-                    strokeWidth: 2,
-                  ),
-                );
-              }
-            }
-            balanceCache[address] = globalBalance.data!['transferableBalance']!;
-            if (balanceCache[address] != -1) {
-              return Row(children: [
-                Text(
-                  balanceCache[address]!.toString(),
-                  style: TextStyle(
-                    fontSize: isTall ? size : size * 0.9,
-                    color: color,
-                  ),
-                ),
-                const SizedBox(width: 5),
-                udUnitDisplay(size, color),
-              ]);
-            } else {
-              return const Text('');
-            }
-          });
-    }),
-  ]);
-}
+

 Widget getCerts(BuildContext context, String address, double size,
    [Color color = Colors.black]) {
--- a/lib/providers/wallets_profiles.dart
+++ b/lib/providers/wallets_profiles.dart
@ -129,6 +129,58 @@ class WalletsProfilesProvider with ChangeNotifier {
    return _balance;
  }

+  Widget balance(BuildContext context, String address, double size,
+    [Color color = Colors.black,
+    Color loadingColor = const Color(0xffd07316)]) {
+  return Column(children: <Widget>[
+    Consumer<SubstrateSdk>(builder: (context, sdk, _) {
+      return FutureBuilder(
+          future: sdk.getBalance(address),
+          builder: (BuildContext context,
+              AsyncSnapshot<Map<String, double>> globalBalance) {
+            if (globalBalance.connectionState != ConnectionState.done ||
+                globalBalance.hasError) {
+              if (balanceCache[address] != null &&
+                  balanceCache[address] != -1) {
+                return Row(children: [
+                  Text(balanceCache[address]!.toString(),
+                      style: TextStyle(
+                          fontSize: isTall ? size : size * 0.9, color: color)),
+                  const SizedBox(width: 5),
+                  udUnitDisplay(size, color),
+                ]);
+              } else {
+                return SizedBox(
+                  height: 15,
+                  width: 15,
+                  child: CircularProgressIndicator(
+                    color: loadingColor,
+                    strokeWidth: 2,
+                  ),
+                );
+              }
+            }
+            balanceCache[address] = globalBalance.data!['transferableBalance']!;
+            if (balanceCache[address] != -1) {
+              return Row(children: [
+                Text(
+                  balanceCache[address]!.toString(),
+                  style: TextStyle(
+                    fontSize: isTall ? size : size * 0.9,
+                    color: color,
+                  ),
+                ),
+                const SizedBox(width: 5),
+                udUnitDisplay(size, color),
+              ]);
+            } else {
+              return const Text('');
+            }
+          });
+    }),
+  ]);
+}
+
  Widget headerProfileView(
      BuildContext context, String address, String? username) {
    const double avatarSize = 140;
--- a/lib/screens/activity.dart
+++ b/lib/screens/activity.dart
@ -7,11 +7,11 @@ import 'package:gecko/models/queries_indexer.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/cesium_plus.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:provider/provider.dart';

@ -34,8 +34,6 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
    WalletsProfilesProvider walletProfile =
        Provider.of<WalletsProfilesProvider>(context, listen: false);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);

    return Scaffold(
        key: _scaffoldKey,
@ -47,7 +45,7 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
            child: Text('accountActivity'.tr()),
          ),
        ),
-        bottomNavigationBar: homeProvider.bottomAppBar(context),
+        bottomNavigationBar: BottomAppBarCustom(context: context),
        body: Column(children: <Widget>[
          walletProfile.headerProfileView(context, address, username),
          historyQuery(context),
--- a/lib/screens/myWallets/chest_options.dart
+++ b/lib/screens/myWallets/chest_options.dart
@ -8,7 +8,6 @@ import 'package:flutter/services.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/chest_provider.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/screens/common_elements.dart';
@ -16,6 +15,7 @@ import 'package:gecko/screens/myWallets/change_pin.dart';
 import 'package:gecko/screens/myWallets/custom_derivations.dart';
 import 'package:gecko/screens/myWallets/show_seed.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:provider/provider.dart';

 class ChestOptions extends StatelessWidget {
@ -28,8 +28,6 @@ class ChestOptions extends StatelessWidget {
    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
    ChestProvider chestProvider =
        Provider.of<ChestProvider>(context, listen: false);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);

    ChestData currentChest = chestBox.get(configBox.get('currentChest'))!;

@ -52,7 +50,7 @@ class ChestOptions extends StatelessWidget {
            height: 22,
            child: Text(currentChest.name!),
          )),
-      bottomNavigationBar: homeProvider.bottomAppBar(context),
+      bottomNavigationBar: BottomAppBarCustom(context: context),
      body: Stack(children: [
        Builder(
          builder: (ctx) => SafeArea(
--- a/lib/screens/myWallets/choose_wallet.dart
+++ b/lib/screens/myWallets/choose_wallet.dart
@ -211,6 +211,58 @@ class ChooseWalletScreen extends StatelessWidget {
    ]);
  }

+  Widget balance(BuildContext context, String address, double size,
+    [Color color = Colors.black,
+    Color loadingColor = const Color(0xffd07316)]) {
+  return Column(children: <Widget>[
+    Consumer<SubstrateSdk>(builder: (context, sdk, _) {
+      return FutureBuilder(
+          future: sdk.getBalance(address),
+          builder: (BuildContext context,
+              AsyncSnapshot<Map<String, double>> globalBalance) {
+            if (globalBalance.connectionState != ConnectionState.done ||
+                globalBalance.hasError) {
+              if (balanceCache[address] != null &&
+                  balanceCache[address] != -1) {
+                return Row(children: [
+                  Text(balanceCache[address]!.toString(),
+                      style: TextStyle(
+                          fontSize: isTall ? size : size * 0.9, color: color)),
+                  const SizedBox(width: 5),
+                  udUnitDisplay(size, color),
+                ]);
+              } else {
+                return SizedBox(
+                  height: 15,
+                  width: 15,
+                  child: CircularProgressIndicator(
+                    color: loadingColor,
+                    strokeWidth: 2,
+                  ),
+                );
+              }
+            }
+            balanceCache[address] = globalBalance.data!['transferableBalance']!;
+            if (balanceCache[address] != -1) {
+              return Row(children: [
+                Text(
+                  balanceCache[address]!.toString(),
+                  style: TextStyle(
+                    fontSize: isTall ? size : size * 0.9,
+                    color: color,
+                  ),
+                ),
+                const SizedBox(width: 5),
+                udUnitDisplay(size, color),
+              ]);
+            } else {
+              return const Text('');
+            }
+          });
+    }),
+  ]);
+}
+
  Widget balanceBuilder(context, String address, bool isDefault) {
    return Container(
      width: double.infinity,
--- a/lib/screens/myWallets/wallet_options.dart
+++ b/lib/screens/myWallets/wallet_options.dart
@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
@ -15,6 +14,7 @@ import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/activity.dart';
 import 'package:gecko/screens/myWallets/manage_membership.dart';
 import 'package:gecko/screens/qrcode_fullscreen.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter/services.dart';
 import 'package:qr_flutter/qr_flutter.dart';
@ -33,8 +33,6 @@ class WalletOptions extends StatelessWidget {
        Provider.of<WalletsProfilesProvider>(context, listen: false);
    MyWalletsProvider myWalletProvider =
        Provider.of<MyWalletsProvider>(context, listen: false);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
    DuniterIndexer duniterIndexer =
        Provider.of<DuniterIndexer>(context, listen: false);

@ -99,7 +97,7 @@ class WalletOptions extends StatelessWidget {
            ),
          ],
        ),
-        bottomNavigationBar: homeProvider.bottomAppBar(context),
+        bottomNavigationBar: BottomAppBarCustom(context: context),
        body: Stack(children: [
          Builder(
            builder: (ctx) => SafeArea(
@ -576,4 +574,58 @@ class WalletOptions extends StatelessWidget {
          );
        });
  }
+
+Widget balance(BuildContext context, String address, double size,
+    [Color color = Colors.black,
+    Color loadingColor = const Color(0xffd07316)]) {
+  return Column(children: <Widget>[
+    Consumer<SubstrateSdk>(builder: (context, sdk, _) {
+      return FutureBuilder(
+          future: sdk.getBalance(address),
+          builder: (BuildContext context,
+              AsyncSnapshot<Map<String, double>> globalBalance) {
+            if (globalBalance.connectionState != ConnectionState.done ||
+                globalBalance.hasError) {
+              if (balanceCache[address] != null &&
+                  balanceCache[address] != -1) {
+                return Row(children: [
+                  Text(balanceCache[address]!.toString(),
+                      style: TextStyle(
+                          fontSize: isTall ? size : size * 0.9, color: color)),
+                  const SizedBox(width: 5),
+                  udUnitDisplay(size, color),
+                ]);
+              } else {
+                return SizedBox(
+                  height: 15,
+                  width: 15,
+                  child: CircularProgressIndicator(
+                    color: loadingColor,
+                    strokeWidth: 2,
+                  ),
+                );
+              }
+            }
+            balanceCache[address] = globalBalance.data!['transferableBalance']!;
+            if (balanceCache[address] != -1) {
+              return Row(children: [
+                Text(
+                  balanceCache[address]!.toString(),
+                  style: TextStyle(
+                    fontSize: isTall ? size : size * 0.9,
+                    color: color,
+                  ),
+                ),
+                const SizedBox(width: 5),
+                udUnitDisplay(size, color),
+              ]);
+            } else {
+              return const Text('');
+            }
+          });
+    }),
+  ]);
+}
+
+
 }
--- a/lib/screens/myWallets/wallets_home.dart
+++ b/lib/screens/myWallets/wallets_home.dart
@ -9,7 +9,6 @@ import 'package:gecko/globals.dart';
 import 'package:gecko/models/chest_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:flutter/material.dart';
@ -22,6 +21,7 @@ import 'package:gecko/screens/myWallets/import_g1_v1.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:gecko/screens/myWallets/wallet_options.dart';
 import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:provider/provider.dart';

 class WalletsHome extends StatelessWidget {
@ -32,8 +32,6 @@ class WalletsHome extends StatelessWidget {
    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
    MyWalletsProvider myWalletProvider =
        Provider.of<MyWalletsProvider>(context);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);

    final int currentChestNumber = myWalletProvider.getCurrentChest();
    final ChestData currentChest = chestBox.get(currentChestNumber)!;
@ -66,7 +64,7 @@ class WalletsHome extends StatelessWidget {
          backgroundColor: const Color(0xffFFD58D),
        ),
        bottomNavigationBar: myWalletProvider.lastFlyBy == ''
-            ? homeProvider.bottomAppBar(context)
+            ? BottomAppBarCustom(context: context)
            : dragInfo(context),
        body: SafeArea(
          child: Stack(children: [
@ -375,6 +373,58 @@ class WalletsHome extends StatelessWidget {
    ]);
  }

+Widget balance(BuildContext context, String address, double size,
+    [Color color = Colors.black,
+    Color loadingColor = const Color(0xffd07316)]) {
+  return Column(children: <Widget>[
+    Consumer<SubstrateSdk>(builder: (context, sdk, _) {
+      return FutureBuilder(
+          future: sdk.getBalance(address),
+          builder: (BuildContext context,
+              AsyncSnapshot<Map<String, double>> globalBalance) {
+            if (globalBalance.connectionState != ConnectionState.done ||
+                globalBalance.hasError) {
+              if (balanceCache[address] != null &&
+                  balanceCache[address] != -1) {
+                return Row(children: [
+                  Text(balanceCache[address]!.toString(),
+                      style: TextStyle(
+                          fontSize: isTall ? size : size * 0.9, color: color)),
+                  const SizedBox(width: 5),
+                  udUnitDisplay(size, color),
+                ]);
+              } else {
+                return SizedBox(
+                  height: 15,
+                  width: 15,
+                  child: CircularProgressIndicator(
+                    color: loadingColor,
+                    strokeWidth: 2,
+                  ),
+                );
+              }
+            }
+            balanceCache[address] = globalBalance.data!['transferableBalance']!;
+            if (balanceCache[address] != -1) {
+              return Row(children: [
+                Text(
+                  balanceCache[address]!.toString(),
+                  style: TextStyle(
+                    fontSize: isTall ? size : size * 0.9,
+                    color: color,
+                  ),
+                ),
+                const SizedBox(width: 5),
+                udUnitDisplay(size, color),
+              ]);
+            } else {
+              return const Text('');
+            }
+          });
+    }),
+  ]);
+}
+
  Widget balanceBuilder(context, String address, bool isDefault) {
    return Container(
      width: double.infinity,
--- a/lib/screens/my_contacts.dart
+++ b/lib/screens/my_contacts.dart
@ -6,12 +6,12 @@ import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/cesium_plus.dart';
 import 'package:gecko/models/g1_wallets_list.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:provider/provider.dart';

 class ContactsScreen extends StatelessWidget {
@ -24,8 +24,6 @@ class ContactsScreen extends StatelessWidget {
        Provider.of<CesiumPlusProvider>(context, listen: false);
    WalletsProfilesProvider walletsProfilesClass =
        Provider.of<WalletsProfilesProvider>(context, listen: true);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
    DuniterIndexer duniterIndexer =
        Provider.of<DuniterIndexer>(context, listen: false);

@ -42,6 +40,58 @@ class ContactsScreen extends StatelessWidget {
          p2.username?.toLowerCase() ?? 'zz');
    });

+    Widget balance(BuildContext context, String address, double size,
+    [Color color = Colors.black,
+    Color loadingColor = const Color(0xffd07316)]) {
+  return Column(children: <Widget>[
+    Consumer<SubstrateSdk>(builder: (context, sdk, _) {
+      return FutureBuilder(
+          future: sdk.getBalance(address),
+          builder: (BuildContext context,
+              AsyncSnapshot<Map<String, double>> globalBalance) {
+            if (globalBalance.connectionState != ConnectionState.done ||
+                globalBalance.hasError) {
+              if (balanceCache[address] != null &&
+                  balanceCache[address] != -1) {
+                return Row(children: [
+                  Text(balanceCache[address]!.toString(),
+                      style: TextStyle(
+                          fontSize: isTall ? size : size * 0.9, color: color)),
+                  const SizedBox(width: 5),
+                  udUnitDisplay(size, color),
+                ]);
+              } else {
+                return SizedBox(
+                  height: 15,
+                  width: 15,
+                  child: CircularProgressIndicator(
+                    color: loadingColor,
+                    strokeWidth: 2,
+                  ),
+                );
+              }
+            }
+            balanceCache[address] = globalBalance.data!['transferableBalance']!;
+            if (balanceCache[address] != -1) {
+              return Row(children: [
+                Text(
+                  balanceCache[address]!.toString(),
+                  style: TextStyle(
+                    fontSize: isTall ? size : size * 0.9,
+                    color: color,
+                  ),
+                ),
+                const SizedBox(width: 5),
+                udUnitDisplay(size, color),
+              ]);
+            } else {
+              return const Text('');
+            }
+          });
+    }),
+  ]);
+}
+
    return Scaffold(
      backgroundColor: backgroundColor,
      appBar: AppBar(
@ -53,7 +103,7 @@ class ContactsScreen extends StatelessWidget {
              'contactsManagementWithNbr'.tr(args: ['${myContacts.length}'])),
        ),
      ),
-      bottomNavigationBar: homeProvider.bottomAppBar(context),
+      bottomNavigationBar: BottomAppBarCustom(context: context),
      body: SafeArea(
        child: Stack(children: [
          Padding(
--- a/lib/screens/search_result.dart
+++ b/lib/screens/search_result.dart
@ -6,18 +6,70 @@ import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/cesium_plus.dart';
 import 'package:gecko/models/g1_wallets_list.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/providers/search.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:provider/provider.dart';

 class SearchResultScreen extends StatelessWidget {
  const SearchResultScreen({Key? key}) : super(key: key);

+Widget balance(BuildContext context, String address, double size,
+    [Color color = Colors.black,
+    Color loadingColor = const Color(0xffd07316)]) {
+  return Column(children: <Widget>[
+    Consumer<SubstrateSdk>(builder: (context, sdk, _) {
+      return FutureBuilder(
+          future: sdk.getBalance(address),
+          builder: (BuildContext context,
+              AsyncSnapshot<Map<String, double>> globalBalance) {
+            if (globalBalance.connectionState != ConnectionState.done ||
+                globalBalance.hasError) {
+              if (balanceCache[address] != null &&
+                  balanceCache[address] != -1) {
+                return Row(children: [
+                  Text(balanceCache[address]!.toString(),
+                      style: TextStyle(
+                          fontSize: isTall ? size : size * 0.9, color: color)),
+                  const SizedBox(width: 5),
+                  udUnitDisplay(size, color),
+                ]);
+              } else {
+                return SizedBox(
+                  height: 15,
+                  width: 15,
+                  child: CircularProgressIndicator(
+                    color: loadingColor,
+                    strokeWidth: 2,
+                  ),
+                );
+              }
+            }
+            balanceCache[address] = globalBalance.data!['transferableBalance']!;
+            if (balanceCache[address] != -1) {
+              return Row(children: [
+                Text(
+                  balanceCache[address]!.toString(),
+                  style: TextStyle(
+                    fontSize: isTall ? size : size * 0.9,
+                    color: color,
+                  ),
+                ),
+                const SizedBox(width: 5),
+                udUnitDisplay(size, color),
+              ]);
+            } else {
+              return const Text('');
+            }
+          });
+    }),
+  ]);
+}
+
  @override
  Widget build(BuildContext context) {
    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
@ -27,8 +79,6 @@ class SearchResultScreen extends StatelessWidget {
        Provider.of<CesiumPlusProvider>(context, listen: false);
    WalletsProfilesProvider walletsProfilesClass =
        Provider.of<WalletsProfilesProvider>(context, listen: false);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
    DuniterIndexer duniterIndexer =
        Provider.of<DuniterIndexer>(context, listen: false);

@ -44,7 +94,7 @@ class SearchResultScreen extends StatelessWidget {
          child: Text('researchResults'.tr()),
        ),
      ),
-      bottomNavigationBar: homeProvider.bottomAppBar(context),
+      bottomNavigationBar: BottomAppBarCustom(context: context),
      body: SafeArea(
        child: Stack(children: [
          Padding(
--- a/lib/screens/settings.dart
+++ b/lib/screens/settings.dart
@ -3,11 +3,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/settings_provider.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/globals.dart';
+import 'package:gecko/widgets/choose_currency_unit.dart';
 import 'package:polkawallet_sdk/api/types/networkParams.dart';
 import 'package:provider/provider.dart';

@ -48,7 +48,7 @@ class SettingsScreen extends StatelessWidget {
          style: TextStyle(color: Colors.grey[500], fontSize: 22),
        ),
        const SizedBox(height: 20),
-        chooseCurrencyUnit(context),
+        ChooseCurrencyUnit(context: context),

        // SizedBox(height: isTall ? 80 : 120),
        const Spacer(),
@ -79,36 +79,6 @@ class SettingsScreen extends StatelessWidget {
    );
  }

-  Widget chooseCurrencyUnit(BuildContext context) {
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
-    return InkWell(
-      key: keyUdUnit,
-      onTap: () async {
-        await homeProvider.changeCurrencyUnit(context);
-      },
-      child: SizedBox(
-        height: 50,
-        child: Row(
-          children: [
-            const SizedBox(width: 12),
-            Text('showUdAmounts'.tr()),
-            const Spacer(),
-            Consumer<HomeProvider>(builder: (context, homeProvider, _) {
-              final bool isUdUnit = configBox.get('isUdUnit') ?? false;
-              return Icon(
-                isUdUnit ? Icons.check_box : Icons.check_box_outline_blank,
-                color: orangeC,
-                size: 32,
-              );
-            }),
-            const SizedBox(width: 30),
-          ],
-        ),
-      ),
-    );
-  }
-
  Widget duniterEndpointSelection(BuildContext context) {
    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
    String? selectedDuniterEndpoint;
--- a/lib/screens/wallet_view.dart
+++ b/lib/screens/wallet_view.dart
@ -7,7 +7,6 @@ import 'package:flutter/material.dart';
 import 'package:gecko/models/g1_wallets_list.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/cesium_plus.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/providers/my_wallets.dart';
@ -19,6 +18,7 @@ import 'package:gecko/screens/myWallets/choose_wallet.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:gecko/screens/qrcode_fullscreen.dart';
 import 'package:gecko/screens/transaction_in_progress.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:provider/provider.dart';
 import 'package:qr_flutter/qr_flutter.dart';

@ -41,8 +41,6 @@ class WalletViewScreen extends StatelessWidget {
        Provider.of<CesiumPlusProvider>(context, listen: false);
    walletProfile.address = address;
    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
    MyWalletsProvider myWalletProvider =
        Provider.of<MyWalletsProvider>(context, listen: false);
    WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
@ -104,7 +102,7 @@ class WalletViewScreen extends StatelessWidget {
            child: Text('seeAWallet'.tr()),
          ),
        ),
-        bottomNavigationBar: homeProvider.bottomAppBar(context),
+        bottomNavigationBar: BottomAppBarCustom(context: context),
        body: SafeArea(
          child: Column(children: <Widget>[
            walletProfile.headerProfileView(context, address, username),
@ -362,6 +360,8 @@ class WalletViewScreen extends StatelessWidget {
        ));
  }

+
+
  Widget waitToCert(String status, String duration) {
    return Column(children: <Widget>[
      SizedBox(
@ -442,6 +442,58 @@ void paymentPopup(BuildContext context, String toAddress) {
    }
  }

+  Widget balance(BuildContext context, String address, double size,
+    [Color color = Colors.black,
+    Color loadingColor = const Color(0xffd07316)]) {
+  return Column(children: <Widget>[
+    Consumer<SubstrateSdk>(builder: (context, sdk, _) {
+      return FutureBuilder(
+          future: sdk.getBalance(address),
+          builder: (BuildContext context,
+              AsyncSnapshot<Map<String, double>> globalBalance) {
+            if (globalBalance.connectionState != ConnectionState.done ||
+                globalBalance.hasError) {
+              if (balanceCache[address] != null &&
+                  balanceCache[address] != -1) {
+                return Row(children: [
+                  Text(balanceCache[address]!.toString(),
+                      style: TextStyle(
+                          fontSize: isTall ? size : size * 0.9, color: color)),
+                  const SizedBox(width: 5),
+                  udUnitDisplay(size, color),
+                ]);
+              } else {
+                return SizedBox(
+                  height: 15,
+                  width: 15,
+                  child: CircularProgressIndicator(
+                    color: loadingColor,
+                    strokeWidth: 2,
+                  ),
+                );
+              }
+            }
+            balanceCache[address] = globalBalance.data!['transferableBalance']!;
+            if (balanceCache[address] != -1) {
+              return Row(children: [
+                Text(
+                  balanceCache[address]!.toString(),
+                  style: TextStyle(
+                    fontSize: isTall ? size : size * 0.9,
+                    color: color,
+                  ),
+                ),
+                const SizedBox(width: 5),
+                udUnitDisplay(size, color),
+              ]);
+            } else {
+              return const Text('');
+            }
+          });
+    }),
+  ]);
+}
+
  showModalBottomSheet<void>(
      shape: const RoundedRectangleBorder(
        borderRadius: BorderRadius.only(
@ -686,4 +738,6 @@ void paymentPopup(BuildContext context, String toAddress) {
          );
        });
      }).then((value) => walletViewProvider.payAmount.text = '');
+
+
 }
--- a/lib/widgets/bottom_app_bar.dart
+++ b/lib/widgets/bottom_app_bar.dart
@ -0,0 +1,120 @@
+// 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/models/widgets_keys.dart';
+import 'package:gecko/providers/my_wallets.dart';
+import 'package:gecko/providers/wallets_profiles.dart';
+import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
+import 'package:gecko/screens/myWallets/wallets_home.dart';
+import 'package:gecko/screens/search.dart';
+import 'package:provider/provider.dart';
+
+class BottomAppBarCustom extends StatelessWidget {
+  const BottomAppBarCustom({
+    Key? key,
+    required this.context,
+  }) : super(key: key);
+
+  final BuildContext context;
+
+  @override
+  Widget build(BuildContext context) {
+    MyWalletsProvider myWalletProvider =
+        Provider.of<MyWalletsProvider>(context, listen: false);
+    WalletsProfilesProvider historyProvider =
+        Provider.of<WalletsProfilesProvider>(context, listen: false);
+
+    final size = MediaQuery.of(context).size;
+
+    const bool showBottomBar = true;
+
+    return Visibility(
+      visible: showBottomBar,
+      child: Container(
+        color: yellowC,
+        width: size.width,
+        height: 80,
+        child:
+            // Stack(
+            //   children: [
+            //     // CustomPaint(
+            //     //   size: Size(size.width, 110),
+            //     //   painter: CustomRoundedButton(),
+            //     // ),
+            Row(mainAxisAlignment: MainAxisAlignment.start, children: [
+          // SizedBox(width: 0),
+          const Spacer(),
+          const SizedBox(width: 11),
+          IconButton(
+            key: keyAppBarSearch,
+            iconSize: 40,
+            icon: const Image(image: AssetImage('assets/loupe-noire.png')),
+            onPressed: () {
+              Navigator.popUntil(
+                context,
+                ModalRoute.withName('/'),
+              );
+              Navigator.push(
+                context,
+                MaterialPageRoute(builder: (homeContext) {
+                  return const SearchScreen();
+                }),
+              );
+            },
+          ),
+          const SizedBox(width: 22),
+          const Spacer(),
+          IconButton(
+            key: keyAppBarQrcode,
+            iconSize: 70,
+            icon: const Image(image: AssetImage('assets/qrcode-scan.png')),
+            onPressed: () async {
+              Navigator.popUntil(
+                context,
+                ModalRoute.withName('/'),
+              );
+              historyProvider.scan(homeContext);
+            },
+          ),
+          const Spacer(),
+          const SizedBox(width: 15),
+          IconButton(
+            key: keyAppBarChest,
+            iconSize: 60,
+            icon: const Image(image: AssetImage('assets/wallet.png')),
+            onPressed: () async {
+              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 != '') {
+                Navigator.popUntil(
+                  context,
+                  ModalRoute.withName('/'),
+                );
+                Navigator.push(
+                  context,
+                  MaterialPageRoute(builder: (context) {
+                    return const WalletsHome();
+                  }),
+                );
+              }
+            },
+          ),
+          const Spacer(),
+        ]),
+      ),
+    );
+  }
+}
--- a/lib/widgets/choose_currency_unit.dart
+++ b/lib/widgets/choose_currency_unit.dart
@ -0,0 +1,46 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
+import 'package:gecko/models/widgets_keys.dart';
+import 'package:gecko/providers/home.dart';
+import 'package:provider/provider.dart';
+
+class ChooseCurrencyUnit extends StatelessWidget {
+  const ChooseCurrencyUnit({
+    Key? key,
+    required this.context,
+  }) : super(key: key);
+
+  final BuildContext context;
+
+  @override
+  Widget build(BuildContext context) {
+    HomeProvider homeProvider =
+        Provider.of<HomeProvider>(context, listen: false);
+    return InkWell(
+      key: keyUdUnit,
+      onTap: () async {
+        await homeProvider.changeCurrencyUnit(context);
+      },
+      child: SizedBox(
+        height: 50,
+        child: Row(
+          children: [
+            const SizedBox(width: 12),
+            Text('showUdAmounts'.tr()),
+            const Spacer(),
+            Consumer<HomeProvider>(builder: (context, homeProvider, _) {
+              final bool isUdUnit = configBox.get('isUdUnit') ?? false;
+              return Icon(
+                isUdUnit ? Icons.check_box : Icons.check_box_outline_blank,
+                color: orangeC,
+                size: 32,
+              );
+            }),
+            const SizedBox(width: 30),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/widgets/wallet_name.dart
+++ b/lib/widgets/wallet_name.dart
@ -0,0 +1,39 @@
+import 'package:gecko/globals.dart';
+import 'package:flutter/material.dart';
+import 'package:gecko/models/wallet_data.dart';
+import 'package:truncate/truncate.dart';
+
+class WalletName extends StatelessWidget {
+  const WalletName({
+    Key? key,
+    required this.context,
+    required this.wallet,
+    required this.size,
+    required this.color,
+  }) : super(key: key);
+
+  final BuildContext context;
+  final WalletData wallet;
+  final double size;
+  final Color color;
+
+  @override
+  Widget build(BuildContext context) {
+    double newSize = wallet.name!.length <= 15 ? size : size - 2;
+
+    return Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
+      Text(
+        truncate(wallet.name!, 20),
+        textAlign: TextAlign.center,
+        style: TextStyle(
+          fontSize: isTall ? newSize : newSize * 0.9,
+          color: color,
+          fontWeight: FontWeight.w400,
+          fontStyle: FontStyle.italic,
+        ),
+        softWrap: false,
+        overflow: TextOverflow.ellipsis,
+      ),
+    ]);
+  }
+}
Author	SHA1	Message	Date
poka	d3582c1da3	tmp commit	2022-11-17 15:44:41 +01:00
guenoel	2bf5adf049	refacto: walletname and bottomappbar	2022-11-16 18:10:38 +01:00
poka	57f5b5ddda	refacto: widget choose_currency_unit	2022-11-16 16:57:33 +01:00