diff --git a/assets/images/buy.png b/assets/images/buy.png new file mode 100644 index 000000000..ff4549d5a Binary files /dev/null and b/assets/images/buy.png differ diff --git a/assets/images/received.png b/assets/images/received.png new file mode 100644 index 000000000..da614da5b Binary files /dev/null and b/assets/images/received.png differ diff --git a/assets/images/sell.png b/assets/images/sell.png new file mode 100644 index 000000000..6a5b38411 Binary files /dev/null and b/assets/images/sell.png differ 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), )