diff --git a/lib/providers/home.dart b/lib/providers/home.dart index 7977088..75cda4d 100644 --- a/lib/providers/home.dart +++ b/lib/providers/home.dart @@ -149,64 +149,61 @@ class HomeProvider with ChangeNotifier { color: yellowC, width: double.infinity, height: 80, - child: Expanded( - child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - const Spacer(flex: 1), - IconButton( - iconSize: 50, - icon: const Image(image: AssetImage('assets/loupe-noire.png')), - onPressed: () { - Navigator.popUntil( - context, - ModalRoute.withName('/'), - ); - Navigator.push( - context, - MaterialPageRoute(builder: (context) { - return const SearchScreen(); - }), - ); - }, - ), - // SizedBox(width: 0), - const Spacer(flex: 2), - IconButton( - iconSize: 60, - icon: const Image( - image: AssetImage('assets/qrcode-scan.png'), height: 50), - onPressed: () async { - Navigator.popUntil( - context, - ModalRoute.withName('/'), - ); - await _historyProvider.scan(context); - }, - ), - const Spacer(flex: 2), - IconButton( - iconSize: 60, - icon: const Image(image: AssetImage('assets/wallet.png')), - onPressed: () { - WalletData? defaultWallet = - _myWalletProvider.getDefaultWallet(); - Navigator.push( - context, - MaterialPageRoute( - builder: (context) { - return UnlockingWallet( - wallet: defaultWallet, - action: "mywallets", - ); - }, - ), - ); - }, - ), - const Spacer(flex: 1), - ], - ), + child: Row( + // mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + const Spacer(flex: 1), + IconButton( + iconSize: 40, + icon: const Image(image: AssetImage('assets/loupe-noire.png')), + onPressed: () { + // Navigator.popUntil( + // context, + // ModalRoute.withName('/'), + // ); + Navigator.push( + context, + MaterialPageRoute(builder: (context) { + return const SearchScreen(); + }), + ); + }, + ), + // SizedBox(width: 0), + const Spacer(flex: 2), + IconButton( + iconSize: 60, + icon: const Image(image: AssetImage('assets/qrcode-scan.png')), + onPressed: () async { + // Navigator.popUntil( + // context, + // ModalRoute.withName('/'), + // ); + await _historyProvider.scan(context); + }, + ), + const Spacer(flex: 2), + IconButton( + iconSize: 60, + icon: const Image(image: AssetImage('assets/wallet.png')), + onPressed: () { + WalletData? defaultWallet = + _myWalletProvider.getDefaultWallet(); + Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return UnlockingWallet( + wallet: defaultWallet, + action: "mywallets", + ); + }, + ), + ); + }, + ), + const Spacer(flex: 1), + ], ), ), ); diff --git a/lib/screens/myWallets/wallets_home.dart b/lib/screens/myWallets/wallets_home.dart index 2b7b996..ceac16a 100644 --- a/lib/screens/myWallets/wallets_home.dart +++ b/lib/screens/myWallets/wallets_home.dart @@ -56,7 +56,7 @@ class WalletsHome extends StatelessWidget { style: TextStyle(color: Colors.grey[850])), backgroundColor: const Color(0xffFFD58D), ), - bottomNavigationBar: _homeProvider.bottomAppBar(context, 2), + bottomNavigationBar: _homeProvider.bottomAppBar(context, 3), body: SafeArea( child: myWalletsTiles(context, _currentChestNumber!), ), diff --git a/pubspec.yaml b/pubspec.yaml index d5d196a..dc90277 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ description: Pay with G1. # pub.dev using `pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 0.0.6+6 +version: 0.0.6+7 environment: sdk: '>=2.12.0 <3.0.0'