From 987e6f21ee66b7acb951c7542be964a43ad17b91 Mon Sep 17 00:00:00 2001 From: Rafia Rahman Chowdhury <55042866+RafiaChy@users.noreply.github.com> Date: Tue, 15 Mar 2022 20:13:34 +0600 Subject: [PATCH] Redesigned bottom bar of main screen according Figma (#279) * Redesigned bottom bar of main screen according Figma * used receiced_icon from figma instead of that present in asset/image folder * removed border colors for dark and light modes * removed fixed width and height --- assets/images/buy.png | Bin 0 -> 12997 bytes assets/images/received.png | Bin 0 -> 5308 bytes assets/images/sell.png | Bin 0 -> 13196 bytes lib/src/screens/dashboard/dashboard_page.dart | 89 +++++++++++------- .../dashboard/widgets/action_button.dart | 9 +- 5 files changed, 57 insertions(+), 41 deletions(-) create mode 100644 assets/images/buy.png create mode 100644 assets/images/received.png create mode 100644 assets/images/sell.png diff --git a/assets/images/buy.png b/assets/images/buy.png new file mode 100644 index 0000000000000000000000000000000000000000..ff4549d5a334c0773d37828ac1ce2c702e0a1d86 GIT binary patch literal 12997 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 literal 0 HcmV?d00001 diff --git a/assets/images/received.png b/assets/images/received.png new file mode 100644 index 0000000000000000000000000000000000000000..da614da5b93c268c6ced51bf9a928f1bc1056e53 GIT binary patch literal 5308 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 Q{%63_%+B<=iBHo10ryUIegFUf literal 0 HcmV?d00001 diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart index 903666279..d009b10c1 100644 --- a/lib/src/screens/dashboard/dashboard_page.dart +++ b/lib/src/screens/dashboard/dashboard_page.dart @@ -92,19 +92,23 @@ class DashboardPage extends BasePage { @override Widget body(BuildContext context) { final sendImage = Image.asset('assets/images/upload.png', - height: 22.24, + height: 24, + width: 24, + color: Theme.of(context).accentTextTheme.display3.backgroundColor); + final receiveImage = Image.asset('assets/images/received.png', + height: 24, width: 24, color: Theme.of(context).accentTextTheme.display3.backgroundColor); final exchangeImage = Image.asset('assets/images/transfer.png', - height: 24.27, - width: 22.25, - color: Theme.of(context).accentTextTheme.display3.backgroundColor); - final buyImage = Image.asset('assets/images/coins.png', - height: 22.24, + height: 24, width: 24, color: Theme.of(context).accentTextTheme.display3.backgroundColor); - final sellImage = Image.asset('assets/images/restore_wallet_image.png', - height: 22.24, + final buyImage = Image.asset('assets/images/buy.png', + height: 24, + width: 24, + color: Theme.of(context).accentTextTheme.display3.backgroundColor); + final sellImage = Image.asset('assets/images/sell.png', + height: 24, width: 24, color: Theme.of(context).accentTextTheme.display3.backgroundColor); _setEffects(context); @@ -134,34 +138,49 @@ class DashboardPage extends BasePage { .display1 .backgroundColor), )), - Container( - padding: EdgeInsets.only(left: 45, right: 45, bottom: 24), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - ActionButton( - image: sendImage, - title: S.of(context).send, - route: Routes.send), - ActionButton( - image: exchangeImage, - title: S.of(context).exchange, - route: Routes.exchange), - if (!isMoneroOnly) - ActionButton( - image: buyImage, - title: S.of(context).buy, - onClick: () async => await _onClickBuyButton(context), + + ClipRect( + child:Container( + margin: const EdgeInsets.only(left: 16, right: 16, bottom: 38), + child: Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(50.0), + border: Border.all(color: currentTheme.type == ThemeType.bright ? Color.fromRGBO(255, 255, 255, 0.2): Colors.transparent, width: 1, ), + color:Theme.of(context).textTheme.title.backgroundColor ), - if (!isMoneroOnly) + child: Container( + padding: EdgeInsets.only(left: 32, right: 32, bottom: 14, top: 16), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + if (!isMoneroOnly) + ActionButton( + image: buyImage, + title: S.of(context).buy, + onClick: () async => await _onClickBuyButton(context), + ), ActionButton( - image: sellImage, - title: S.of(context).sell, - onClick: () async => await _onClickSellButton(context), - ), - ], - ), - ) + image: receiveImage, + title: S.of(context).receive, + route: Routes.receive), + ActionButton( + image: exchangeImage, + title: S.of(context).exchange, + route: Routes.exchange), + ActionButton( + image: sendImage, + title: S.of(context).send, + route: Routes.send), + if (!isMoneroOnly) + ActionButton( + image: sellImage, + title: S.of(context).sell, + onClick: () async => await _onClickSellButton(context), + ), + ], + ),), + ),),), + ], )); } @@ -268,4 +287,4 @@ class DashboardPage extends BasePage { }); } } -} +} \ No newline at end of file diff --git a/lib/src/screens/dashboard/widgets/action_button.dart b/lib/src/screens/dashboard/widgets/action_button.dart index 67499f79b..8ca117ed4 100644 --- a/lib/src/screens/dashboard/widgets/action_button.dart +++ b/lib/src/screens/dashboard/widgets/action_button.dart @@ -20,7 +20,6 @@ class ActionButton extends StatelessWidget { alignment: alignment, child: Column( mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, children: [ GestureDetector( @@ -32,19 +31,17 @@ class ActionButton extends StatelessWidget { } }, child: Container( - height: 60, - width: 60, alignment: Alignment.center, decoration: BoxDecoration( - color: Theme.of(context).buttonColor, shape: BoxShape.circle), + shape: BoxShape.circle), child: image, ), ), - SizedBox(height: 15), + SizedBox(height: 4), Text( title, style: TextStyle( - fontSize: 14, + fontSize: 10, color: Theme.of(context).accentTextTheme.display3 .backgroundColor), )