From 4dfed515c7be20b8a5c09c90effba7a5d63fd267 Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Wed, 10 Jun 2020 19:17:55 +0300 Subject: [PATCH 1/2] CWA-222 | decreased height of spaces in the dashboard page; renamed clear button to trail button; changed clear button to reset button on exchange page; changed font color on confirm sending alert; increased next button on seed page --- lib/src/screens/dashboard/dashboard_page.dart | 4 ++-- lib/src/screens/dashboard/widgets/button_header.dart | 2 +- .../dashboard/widgets/trade_history_panel.dart | 2 +- lib/src/screens/exchange/exchange_page.dart | 5 +++-- lib/src/screens/seed/seed_page.dart | 7 ++++--- lib/src/screens/send/send_page.dart | 5 +++-- .../screens/send/widgets/confirm_sending_alert.dart | 8 ++++---- .../widgets/{clear_button.dart => trail_button.dart} | 11 +++++++---- 8 files changed, 25 insertions(+), 19 deletions(-) rename lib/src/widgets/{clear_button.dart => trail_button.dart} (77%) diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart index 91ff1a1c9..1318e0116 100644 --- a/lib/src/screens/dashboard/dashboard_page.dart +++ b/lib/src/screens/dashboard/dashboard_page.dart @@ -64,11 +64,11 @@ class DashboardPageBodyState extends State { ), ), Padding( - padding: EdgeInsets.only(left: 20, top: 20), + padding: EdgeInsets.only(left: 20, top: 5), child: WalletCard(), ), SizedBox( - height: 28, + height: 18, ), Expanded(child: TradeHistoryPanel()) ], diff --git a/lib/src/screens/dashboard/widgets/button_header.dart b/lib/src/screens/dashboard/widgets/button_header.dart index b620e9e14..4af470bba 100644 --- a/lib/src/screens/dashboard/widgets/button_header.dart +++ b/lib/src/screens/dashboard/widgets/button_header.dart @@ -244,7 +244,7 @@ class ButtonHeader extends SliverPersistentHeaderDelegate { } @override - double get maxExtent => 174; + double get maxExtent => 154; @override double get minExtent => 66; diff --git a/lib/src/screens/dashboard/widgets/trade_history_panel.dart b/lib/src/screens/dashboard/widgets/trade_history_panel.dart index 88b41fdd1..df70c3f6f 100644 --- a/lib/src/screens/dashboard/widgets/trade_history_panel.dart +++ b/lib/src/screens/dashboard/widgets/trade_history_panel.dart @@ -75,7 +75,7 @@ class TradeHistoryPanelState extends State { : actionListStore.items; final itemsCount = items.length + 1; final symbol = settingsStore.fiatCurrency.toString(); - double freeSpaceHeight = MediaQuery.of(context).size.height - 496; + double freeSpaceHeight = MediaQuery.of(context).size.height - 460; return SliverList( key: _listKey, diff --git a/lib/src/screens/exchange/exchange_page.dart b/lib/src/screens/exchange/exchange_page.dart index 05830a956..c5226e8f7 100644 --- a/lib/src/screens/exchange/exchange_page.dart +++ b/lib/src/screens/exchange/exchange_page.dart @@ -10,7 +10,7 @@ import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/src/stores/exchange_template/exchange_template_store.dart'; import 'package:cake_wallet/src/screens/exchange/widgets/present_provider_picker.dart'; import 'package:cake_wallet/src/screens/exchange/widgets/base_exchange_widget.dart'; -import 'package:cake_wallet/src/widgets/clear_button.dart'; +import 'package:cake_wallet/src/widgets/trail_button.dart'; class ExchangePage extends BasePage { @override @@ -33,7 +33,8 @@ class ExchangePage extends BasePage { Widget trailing(BuildContext context) { final exchangeStore = Provider.of(context); - return ClearButton( + return TrailButton( + caption: S.of(context).reset, onPressed: () => exchangeStore.reset() ); } diff --git a/lib/src/screens/seed/seed_page.dart b/lib/src/screens/seed/seed_page.dart index 2be122635..3d27e029c 100644 --- a/lib/src/screens/seed/seed_page.dart +++ b/lib/src/screens/seed/seed_page.dart @@ -35,9 +35,10 @@ class SeedPage extends BasePage { ? GestureDetector( onTap: () => onClose(context), child: Container( - width: 70, - height: 32, + width: 100, + height: 42, alignment: Alignment.center, + margin: EdgeInsets.only(left: 10), decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(16)), color: Theme.of(context).accentTextTheme.title.color @@ -45,7 +46,7 @@ class SeedPage extends BasePage { child: Text( S.of(context).seed_language_next, style: TextStyle( - fontSize: 10, + fontSize: 14, fontWeight: FontWeight.w600, color: Colors.blue ), diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart index 3ad851361..cd268c2f6 100644 --- a/lib/src/screens/send/send_page.dart +++ b/lib/src/screens/send/send_page.dart @@ -29,7 +29,7 @@ import 'package:cake_wallet/src/screens/send/widgets/confirm_sending_alert.dart' import 'package:cake_wallet/src/screens/send/widgets/sending_alert.dart'; import 'package:cake_wallet/src/widgets/template_tile.dart'; import 'package:cake_wallet/src/stores/send_template/send_template_store.dart'; -import 'package:cake_wallet/src/widgets/clear_button.dart'; +import 'package:cake_wallet/src/widgets/trail_button.dart'; class SendPage extends BasePage { @override @@ -48,7 +48,8 @@ class SendPage extends BasePage { Widget trailing(context) { final sendStore = Provider.of(context); - return ClearButton( + return TrailButton( + caption: S.of(context).clear, onPressed: () => sendStore.clear() ); } diff --git a/lib/src/screens/send/widgets/confirm_sending_alert.dart b/lib/src/screens/send/widgets/confirm_sending_alert.dart index 373180863..663de3a16 100644 --- a/lib/src/screens/send/widgets/confirm_sending_alert.dart +++ b/lib/src/screens/send/widgets/confirm_sending_alert.dart @@ -55,7 +55,7 @@ class ConfirmSendingAlert extends BaseAlertDialog { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Colors.white, + color: Theme.of(context).primaryTextTheme.title.color, decoration: TextDecoration.none, ), ), @@ -64,7 +64,7 @@ class ConfirmSendingAlert extends BaseAlertDialog { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Colors.white, + color: Theme.of(context).primaryTextTheme.title.color, decoration: TextDecoration.none, ), ) @@ -79,7 +79,7 @@ class ConfirmSendingAlert extends BaseAlertDialog { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Colors.white, + color: Theme.of(context).primaryTextTheme.title.color, decoration: TextDecoration.none, ), ), @@ -88,7 +88,7 @@ class ConfirmSendingAlert extends BaseAlertDialog { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Colors.white, + color: Theme.of(context).primaryTextTheme.title.color, decoration: TextDecoration.none, ), ) diff --git a/lib/src/widgets/clear_button.dart b/lib/src/widgets/trail_button.dart similarity index 77% rename from lib/src/widgets/clear_button.dart rename to lib/src/widgets/trail_button.dart index 5cb6b03a1..d9752e410 100644 --- a/lib/src/widgets/clear_button.dart +++ b/lib/src/widgets/trail_button.dart @@ -1,9 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:cake_wallet/generated/i18n.dart'; -class ClearButton extends StatelessWidget { - ClearButton({@required this.onPressed}); +class TrailButton extends StatelessWidget { + TrailButton({ + @required this.caption, + @required this.onPressed + }); + final String caption; final VoidCallback onPressed; @override @@ -16,7 +19,7 @@ class ClearButton extends StatelessWidget { child: FlatButton( padding: EdgeInsets.all(0), child: Text( - S.of(context).clear, + caption, style: TextStyle( color: Theme.of(context).primaryTextTheme.caption.color, fontWeight: FontWeight.w500, From ea85d19cab3a9f84c87bf1d723979ff8adae89bc Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Thu, 11 Jun 2020 18:35:22 +0300 Subject: [PATCH 2/2] CWA-222 | increased height of spaces between buttons, card and transactions panel in the dashboard page --- lib/src/screens/dashboard/dashboard_page.dart | 2 +- lib/src/screens/dashboard/widgets/button_header.dart | 2 +- lib/src/screens/dashboard/widgets/trade_history_panel.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart index 1318e0116..4a83dab19 100644 --- a/lib/src/screens/dashboard/dashboard_page.dart +++ b/lib/src/screens/dashboard/dashboard_page.dart @@ -68,7 +68,7 @@ class DashboardPageBodyState extends State { child: WalletCard(), ), SizedBox( - height: 18, + height: 28, ), Expanded(child: TradeHistoryPanel()) ], diff --git a/lib/src/screens/dashboard/widgets/button_header.dart b/lib/src/screens/dashboard/widgets/button_header.dart index 4af470bba..0b3ff1261 100644 --- a/lib/src/screens/dashboard/widgets/button_header.dart +++ b/lib/src/screens/dashboard/widgets/button_header.dart @@ -244,7 +244,7 @@ class ButtonHeader extends SliverPersistentHeaderDelegate { } @override - double get maxExtent => 154; + double get maxExtent => 164; @override double get minExtent => 66; diff --git a/lib/src/screens/dashboard/widgets/trade_history_panel.dart b/lib/src/screens/dashboard/widgets/trade_history_panel.dart index df70c3f6f..23992399c 100644 --- a/lib/src/screens/dashboard/widgets/trade_history_panel.dart +++ b/lib/src/screens/dashboard/widgets/trade_history_panel.dart @@ -75,7 +75,7 @@ class TradeHistoryPanelState extends State { : actionListStore.items; final itemsCount = items.length + 1; final symbol = settingsStore.fiatCurrency.toString(); - double freeSpaceHeight = MediaQuery.of(context).size.height - 460; + double freeSpaceHeight = MediaQuery.of(context).size.height - 480; return SliverList( key: _listKey,