diff --git a/lib/screens/common_elements.dart b/lib/screens/common_elements.dart index 4056d56..b9f2654 100644 --- a/lib/screens/common_elements.dart +++ b/lib/screens/common_elements.dart @@ -213,6 +213,7 @@ class GeckoSpeechAppBar extends StatelessWidget with PreferredSizeWidget { @override Widget build(BuildContext context) { return AppBar( + toolbarHeight: 60 * ratio, leading: IconButton( icon: SizedBox( height: 30, diff --git a/lib/screens/history.dart b/lib/screens/history.dart index b5dd1b6..7701a56 100644 --- a/lib/screens/history.dart +++ b/lib/screens/history.dart @@ -44,6 +44,7 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier { return Scaffold( key: _scaffoldKey, appBar: AppBar( + toolbarHeight: 60 * ratio, title: _homeProvider.appBarExplorer, actions: [ Padding( diff --git a/lib/screens/myWallets/cesium_wallet_options.dart b/lib/screens/myWallets/cesium_wallet_options.dart index 319bbbe..3a976a9 100644 --- a/lib/screens/myWallets/cesium_wallet_options.dart +++ b/lib/screens/myWallets/cesium_wallet_options.dart @@ -71,6 +71,7 @@ class CesiumWalletOptions extends StatelessWidget { child: Scaffold( resizeToAvoidBottomInset: false, appBar: AppBar( + toolbarHeight: 60 * ratio, leading: IconButton( icon: const Icon(Icons.arrow_back, color: Colors.black), onPressed: () { diff --git a/lib/screens/myWallets/change_pin.dart b/lib/screens/myWallets/change_pin.dart index 2d51a04..477e25c 100644 --- a/lib/screens/myWallets/change_pin.dart +++ b/lib/screens/myWallets/change_pin.dart @@ -31,6 +31,7 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier { child: Scaffold( resizeToAvoidBottomInset: false, appBar: AppBar( + toolbarHeight: 60 * ratio, leading: IconButton( icon: const Icon(Icons.arrow_back, color: Colors.black), onPressed: () { diff --git a/lib/screens/myWallets/choose_chest.dart b/lib/screens/myWallets/choose_chest.dart index 9058d43..c6d78a7 100644 --- a/lib/screens/myWallets/choose_chest.dart +++ b/lib/screens/myWallets/choose_chest.dart @@ -32,10 +32,11 @@ class _ChooseChestState extends State { return Scaffold( appBar: AppBar( + toolbarHeight: 60 * ratio, title: const SizedBox( - height: 22, - child: Text('Sélectionner mon coffre'), - )), + height: 22, + child: Text('Sélectionner mon coffre'), + )), body: SafeArea( child: Column(children: [ SizedBox(height: 160 * ratio), diff --git a/lib/screens/myWallets/confirm_wallet_storage.dart b/lib/screens/myWallets/confirm_wallet_storage.dart index c31bbe7..e822f19 100644 --- a/lib/screens/myWallets/confirm_wallet_storage.dart +++ b/lib/screens/myWallets/confirm_wallet_storage.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:dubp/dubp.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:gecko/globals.dart'; import 'package:gecko/models/generate_wallets.dart'; import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/models/wallet_options.dart'; @@ -45,6 +46,7 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier { child: Scaffold( resizeToAvoidBottomInset: false, appBar: AppBar( + toolbarHeight: 60 * ratio, leading: IconButton( icon: const Icon(Icons.arrow_back, color: Colors.black), onPressed: () { diff --git a/lib/screens/myWallets/generate_wallets.dart b/lib/screens/myWallets/generate_wallets.dart index 8b7bd5e..a4d851e 100644 --- a/lib/screens/myWallets/generate_wallets.dart +++ b/lib/screens/myWallets/generate_wallets.dart @@ -29,10 +29,11 @@ class GenerateWalletsScreen extends StatelessWidget { return Scaffold( appBar: AppBar( + toolbarHeight: 60 * ratio, title: const SizedBox( - height: 22, - child: Text('Générer un trousseau'), - )), + height: 22, + child: Text('Générer un trousseau'), + )), floatingActionButton: SizedBox( height: 80.0, width: 80.0, @@ -182,7 +183,9 @@ class PrintWallet extends StatelessWidget { Provider.of(context); return MaterialApp( home: Scaffold( - appBar: AppBar(title: const Text('Imprimer ce trousseau')), + appBar: AppBar( + toolbarHeight: 60 * ratio, + title: const Text('Imprimer ce trousseau')), body: PdfPreview( build: (format) => _generateWalletProvider.printWallet(sentence), ), diff --git a/lib/screens/myWallets/import_wallet.dart b/lib/screens/myWallets/import_wallet.dart index ed33ff4..5a86fc8 100644 --- a/lib/screens/myWallets/import_wallet.dart +++ b/lib/screens/myWallets/import_wallet.dart @@ -29,6 +29,7 @@ class ImportWalletScreen extends StatelessWidget { }, child: Scaffold( appBar: AppBar( + toolbarHeight: 60 * ratio, leading: IconButton( icon: const Icon(Icons.arrow_back, color: Colors.black), onPressed: () { diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart index 7efbf30..0097057 100644 --- a/lib/screens/myWallets/wallet_options.dart +++ b/lib/screens/myWallets/wallet_options.dart @@ -71,6 +71,7 @@ class WalletOptions extends StatelessWidget { child: Scaffold( resizeToAvoidBottomInset: false, appBar: AppBar( + toolbarHeight: 60 * ratio, leading: IconButton( icon: const Icon(Icons.arrow_back, color: Colors.black), onPressed: () { diff --git a/lib/screens/myWallets/wallets_home.dart b/lib/screens/myWallets/wallets_home.dart index d72834c..af61e18 100644 --- a/lib/screens/myWallets/wallets_home.dart +++ b/lib/screens/myWallets/wallets_home.dart @@ -44,6 +44,7 @@ class WalletsHome extends StatelessWidget { }, child: Scaffold( appBar: AppBar( + toolbarHeight: 60 * ratio, leading: IconButton( icon: const Icon(Icons.arrow_back, color: Colors.black), onPressed: () { diff --git a/lib/screens/onBoarding/7.dart b/lib/screens/onBoarding/7.dart index be94bc4..756f046 100644 --- a/lib/screens/onBoarding/7.dart +++ b/lib/screens/onBoarding/7.dart @@ -196,7 +196,9 @@ class PrintWallet extends StatelessWidget { Provider.of(context); return MaterialApp( home: Scaffold( - appBar: AppBar(title: const Text('Imprimer ce trousseau')), + appBar: AppBar( + toolbarHeight: 60 * ratio, + title: const Text('Imprimer ce trousseau')), body: PdfPreview( build: (format) => _generateWalletProvider.printWallet(sentence), ), diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart index 462c76c..8551d09 100644 --- a/lib/screens/settings.dart +++ b/lib/screens/settings.dart @@ -34,10 +34,11 @@ class SettingsScreen extends StatelessWidget { // getAppDirectory(); return Scaffold( appBar: AppBar( + toolbarHeight: 60 * ratio, title: const SizedBox( - height: 22, - child: Text('Paramètres'), - )), + height: 22, + child: Text('Paramètres'), + )), body: Column(children: [ const SizedBox(height: 40), SizedBox( diff --git a/lib/screens/template_screen.dart b/lib/screens/template_screen.dart index 10b9cf4..4759e7b 100644 --- a/lib/screens/template_screen.dart +++ b/lib/screens/template_screen.dart @@ -17,10 +17,11 @@ class TemplateScreen extends StatelessWidget { // HomeProvider _homeProvider = Provider.of(context); return Scaffold( appBar: AppBar( + toolbarHeight: 60 * ratio, title: const SizedBox( - height: 22, - child: Text('Template screen'), - )), + height: 22, + child: Text('Template screen'), + )), floatingActionButton: SizedBox( height: 80.0, width: 80.0,