From 4b34ca31111be080adcea10473e2ca182030620d Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Sat, 25 Apr 2020 19:17:59 +0300 Subject: [PATCH] CWA-201 | added separator between action buttons in alert dialog; fixed overflow bugs for japanese, korean and chinese languages in dashboard page --- lib/src/screens/dashboard/widgets/trade_history_panel.dart | 4 ++-- lib/src/screens/dashboard/widgets/trade_row.dart | 2 +- lib/src/screens/dashboard/widgets/transaction_raw.dart | 2 +- lib/src/screens/dashboard/widgets/wallet_card.dart | 6 +++--- lib/src/widgets/base_alert_dialog.dart | 5 +++++ 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lib/src/screens/dashboard/widgets/trade_history_panel.dart b/lib/src/screens/dashboard/widgets/trade_history_panel.dart index 99035a6d9..61e7ec989 100644 --- a/lib/src/screens/dashboard/widgets/trade_history_panel.dart +++ b/lib/src/screens/dashboard/widgets/trade_history_panel.dart @@ -98,7 +98,7 @@ class TradeHistoryPanelState extends State { } if (item is TransactionListItem) { - freeSpaceHeight -= 58; + freeSpaceHeight -= 62; final transaction = item.transaction; final savedDisplayMode = settingsStore.balanceDisplayMode; final formattedAmount = @@ -123,7 +123,7 @@ class TradeHistoryPanelState extends State { } if (item is TradeListItem) { - freeSpaceHeight -= 58; + freeSpaceHeight -= 62; final trade = item.trade; final savedDisplayMode = settingsStore.balanceDisplayMode; final formattedAmount = trade.amount != null diff --git a/lib/src/screens/dashboard/widgets/trade_row.dart b/lib/src/screens/dashboard/widgets/trade_row.dart index 1ea5f098d..c16f0b42c 100644 --- a/lib/src/screens/dashboard/widgets/trade_row.dart +++ b/lib/src/screens/dashboard/widgets/trade_row.dart @@ -26,7 +26,7 @@ class TradeRow extends StatelessWidget { return InkWell( onTap: onTap, child: Container( - height: 56, + height: 60, decoration: BoxDecoration( color: PaletteDark.historyPanel, border: Border.all( diff --git a/lib/src/screens/dashboard/widgets/transaction_raw.dart b/lib/src/screens/dashboard/widgets/transaction_raw.dart index 517318260..393bb8f58 100644 --- a/lib/src/screens/dashboard/widgets/transaction_raw.dart +++ b/lib/src/screens/dashboard/widgets/transaction_raw.dart @@ -24,7 +24,7 @@ class TransactionRow extends StatelessWidget { return InkWell( onTap: onTap, child: Container( - height: 56, + height: 60, decoration: BoxDecoration( color: PaletteDark.historyPanel, border: Border.all( diff --git a/lib/src/screens/dashboard/widgets/wallet_card.dart b/lib/src/screens/dashboard/widgets/wallet_card.dart index 3177e8abe..f1bfc374f 100644 --- a/lib/src/screens/dashboard/widgets/wallet_card.dart +++ b/lib/src/screens/dashboard/widgets/wallet_card.dart @@ -334,7 +334,7 @@ class WalletCardState extends State { children: [ Expanded( child: Container( - height: 84, + height: 90, child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, @@ -379,8 +379,8 @@ class WalletCardState extends State { ), SizedBox(width: 10), Container( - width: 84, - height: 84, + width: 90, + height: 90, child: QrImage( data: walletStore.subaddress.address, backgroundColor: Colors.transparent, diff --git a/lib/src/widgets/base_alert_dialog.dart b/lib/src/widgets/base_alert_dialog.dart index 8c6f2226e..1bebcd23b 100644 --- a/lib/src/widgets/base_alert_dialog.dart +++ b/lib/src/widgets/base_alert_dialog.dart @@ -75,6 +75,11 @@ class BaseAlertDialog extends StatelessWidget { ), ) ), + Container( + height: 52, + width: 1, + color: Colors.grey.withOpacity(0.2), + ), Flexible( child: Container( padding: EdgeInsets.only(left: 12, right: 12),