diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart index 40b38cca4..c8757e9b7 100644 --- a/lib/src/screens/contact/contact_list_page.dart +++ b/lib/src/screens/contact/contact_list_page.dart @@ -252,10 +252,10 @@ class ContactListPage extends BasePage { return AlertWithTwoActions( alertTitle: S.of(context).address_remove_contact, alertContent: S.of(context).address_remove_content, - leftButtonText: S.of(context).remove, - rightButtonText: S.of(context).cancel, - actionLeftButton: () => Navigator.of(context).pop(true), - actionRightButton: () => Navigator.of(context).pop(false)); + rightButtonText: S.of(context).remove, + leftButtonText: S.of(context).cancel, + actionRightButton: () => Navigator.of(context).pop(true), + actionLeftButton: () => Navigator.of(context).pop(false)); }); } @@ -267,10 +267,10 @@ class ContactListPage extends BasePage { return AlertWithTwoActions( alertTitle: name, alertContent: address, - leftButtonText: S.of(context).copy, - rightButtonText: S.of(context).cancel, - actionLeftButton: () => Navigator.of(context).pop(true), - actionRightButton: () => Navigator.of(context).pop(false)); + rightButtonText: S.of(context).copy, + leftButtonText: S.of(context).cancel, + actionRightButton: () => Navigator.of(context).pop(true), + actionLeftButton: () => Navigator.of(context).pop(false)); }); } } diff --git a/lib/src/screens/dashboard/wallet_menu.dart b/lib/src/screens/dashboard/wallet_menu.dart index a3c4666f0..d7a37ce32 100644 --- a/lib/src/screens/dashboard/wallet_menu.dart +++ b/lib/src/screens/dashboard/wallet_menu.dart @@ -78,13 +78,13 @@ class WalletMenu { return AlertWithTwoActions( alertTitle: S.of(context).reconnection, alertContent: S.of(context).reconnect_alert_text, - leftButtonText: S.of(context).ok, - rightButtonText: S.of(context).cancel, - actionLeftButton: () { + rightButtonText: S.of(context).ok, + leftButtonText: S.of(context).cancel, + actionRightButton: () { walletStore.reconnect(); Navigator.of(context).pop(); }, - actionRightButton: () => Navigator.of(context).pop() + actionLeftButton: () => Navigator.of(context).pop() ); }); } diff --git a/lib/src/screens/exchange/widgets/base_exchange_widget.dart b/lib/src/screens/exchange/widgets/base_exchange_widget.dart index f3aa14e0a..46a6d4cb8 100644 --- a/lib/src/screens/exchange/widgets/base_exchange_widget.dart +++ b/lib/src/screens/exchange/widgets/base_exchange_widget.dart @@ -284,14 +284,14 @@ class BaseExchangeWidgetState extends State { return AlertWithTwoActions( alertTitle: S.of(context).template, alertContent: S.of(context).confirm_delete_template, - leftButtonText: S.of(context).delete, - rightButtonText: S.of(context).cancel, - actionLeftButton: () { + rightButtonText: S.of(context).delete, + leftButtonText: S.of(context).cancel, + actionRightButton: () { Navigator.of(dialogContext).pop(); exchangeViewModel.exchangeTemplateStore.remove(template: template); exchangeViewModel.exchangeTemplateStore.update(); }, - actionRightButton: () => Navigator.of(dialogContext).pop() + actionLeftButton: () => Navigator.of(dialogContext).pop() ); } ); diff --git a/lib/src/screens/nodes/nodes_list_page.dart b/lib/src/screens/nodes/nodes_list_page.dart index 177348a3e..574b3adcb 100644 --- a/lib/src/screens/nodes/nodes_list_page.dart +++ b/lib/src/screens/nodes/nodes_list_page.dart @@ -36,13 +36,13 @@ class NodeListPage extends BasePage { alertTitle: S.of(context).node_reset_settings_title, alertContent: S.of(context).nodes_list_reset_to_default_message, - leftButtonText: S.of(context).reset, - rightButtonText: S.of(context).cancel, - actionLeftButton: () async { + rightButtonText: S.of(context).reset, + leftButtonText: S.of(context).cancel, + actionRightButton: () async { Navigator.of(context).pop(); await nodeListViewModel.reset(); }, - actionRightButton: () => Navigator.of(context).pop()); + actionLeftButton: () => Navigator.of(context).pop()); }); }, child: Text( @@ -90,11 +90,11 @@ class NodeListPage extends BasePage { return AlertWithTwoActions( alertTitle: S.of(context).remove_node, alertContent: S.of(context).remove_node_message, - leftButtonText: S.of(context).remove, - rightButtonText: S.of(context).cancel, - actionLeftButton: () => - Navigator.pop(context, true), + rightButtonText: S.of(context).remove, + leftButtonText: S.of(context).cancel, actionRightButton: () => + Navigator.pop(context, true), + actionLeftButton: () => Navigator.pop(context, false)); }); }, diff --git a/lib/src/screens/send/widgets/base_send_widget.dart b/lib/src/screens/send/widgets/base_send_widget.dart index c8d03f389..0aa8c0b3a 100644 --- a/lib/src/screens/send/widgets/base_send_widget.dart +++ b/lib/src/screens/send/widgets/base_send_widget.dart @@ -387,14 +387,14 @@ class BaseSendWidget extends StatelessWidget { return AlertWithTwoActions( alertTitle: S.of(context).template, alertContent: S.of(context).confirm_delete_template, - leftButtonText: S.of(context).delete, - rightButtonText: S.of(context).cancel, - actionLeftButton: () { + rightButtonText: S.of(context).delete, + leftButtonText: S.of(context).cancel, + actionRightButton: () { Navigator.of(dialogContext).pop(); sendViewModel.sendTemplateStore.remove(template: template); sendViewModel.sendTemplateStore.update(); }, - actionRightButton: () => Navigator.of(dialogContext).pop() + actionLeftButton: () => Navigator.of(dialogContext).pop() ); } ); diff --git a/lib/src/screens/settings/change_language.dart b/lib/src/screens/settings/change_language.dart index 5ef079216..9e207390b 100644 --- a/lib/src/screens/settings/change_language.dart +++ b/lib/src/screens/settings/change_language.dart @@ -43,15 +43,15 @@ class ChangeLanguage extends BasePage { return AlertWithTwoActions( alertTitle: S.of(context).change_language, alertContent: S.of(context).change_language_to(item), - leftButtonText: S.of(context).change, - rightButtonText: S.of(context).cancel, - actionLeftButton: () { + rightButtonText: S.of(context).change, + leftButtonText: S.of(context).cancel, + actionRightButton: () { settingsStore.saveLanguageCode( languageCode: code); currentLanguage.setCurrentLanguage(code); Navigator.of(context).pop(); }, - actionRightButton: () => Navigator.of(context).pop() + actionLeftButton: () => Navigator.of(context).pop() ); }); } diff --git a/lib/src/widgets/base_alert_dialog.dart b/lib/src/widgets/base_alert_dialog.dart index d22d01d5a..7cfafe284 100644 --- a/lib/src/widgets/base_alert_dialog.dart +++ b/lib/src/widgets/base_alert_dialog.dart @@ -47,7 +47,7 @@ class BaseAlertDialog extends StatelessWidget { child: Container( height: 52, padding: EdgeInsets.only(left: 6, right: 6), - color: Palette.blueCraiola, + color: Palette.alizarinRed, child: ButtonTheme( minWidth: double.infinity, child: FlatButton( @@ -72,7 +72,7 @@ class BaseAlertDialog extends StatelessWidget { child: Container( height: 52, padding: EdgeInsets.only(left: 6, right: 6), - color: Palette.alizarinRed, + color: Palette.blueCraiola, child: ButtonTheme( minWidth: double.infinity, child: FlatButton( @@ -92,7 +92,7 @@ class BaseAlertDialog extends StatelessWidget { )), ), ) - ) + ), ], ); } diff --git a/lib/themes.dart b/lib/themes.dart index f8d984baf..e9d074f47 100644 --- a/lib/themes.dart +++ b/lib/themes.dart @@ -168,16 +168,6 @@ class Themes { decorationColor: Palette.darkGray // switch (PIN code) ) ), - - - - cardColor: Palette.blueAlice, - cardTheme: CardTheme( - color: Colors.white, // synced card start - ), - - - ); @@ -346,17 +336,5 @@ class Themes { decorationColor: PaletteDark.lightPurpleBlue // switch (PIN code) ) ), - - - - cardColor: PaletteDark.darkNightBlue, - cardTheme: CardTheme( - color: PaletteDark.moderateBlue, // synced card start - ), - - - - ); - } \ No newline at end of file