From 94896ea19f019d88f62dae5d0de81bca6c961ee0 Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Tue, 24 Jan 2023 11:48:07 -0700 Subject: [PATCH 1/5] notification icon + fruit theme added to main --- assets/svg/fruitSorbet/bell-new.svg | 8 ++++---- lib/main.dart | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/assets/svg/fruitSorbet/bell-new.svg b/assets/svg/fruitSorbet/bell-new.svg index ffb3d630b..6131bc550 100644 --- a/assets/svg/fruitSorbet/bell-new.svg +++ b/assets/svg/fruitSorbet/bell-new.svg @@ -1,5 +1,5 @@ - - - - + + + + diff --git a/lib/main.dart b/lib/main.dart index ba6757259..b2f75705d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -57,6 +57,7 @@ import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/stack_file_system.dart'; import 'package:stackwallet/utilities/theme/color_theme.dart'; import 'package:stackwallet/utilities/theme/dark_colors.dart'; +import 'package:stackwallet/utilities/theme/fruit_sorbet_colors.dart'; import 'package:stackwallet/utilities/theme/light_colors.dart'; import 'package:stackwallet/utilities/theme/ocean_breeze_colors.dart'; import 'package:stackwallet/utilities/theme/oled_black_colors.dart'; @@ -334,8 +335,11 @@ class _MaterialAppWithThemeState extends ConsumerState colorTheme = OceanBreezeColors(); break; case "light": - default: colorTheme = LightColors(); + break; + case "fruitSorbet": + default: + colorTheme = FruitSorbetColors(); } loadingCompleter = Completer(); WidgetsBinding.instance.addObserver(this); From 9c0992ffbf535ce1190111d67bfda6ad16b75241 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 24 Jan 2023 13:03:00 -0600 Subject: [PATCH 2/5] home view button bar secondary color --- lib/pages/home_view/sub_widgets/home_view_button_bar.dart | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/pages/home_view/sub_widgets/home_view_button_bar.dart b/lib/pages/home_view/sub_widgets/home_view_button_bar.dart index 83a445cbf..b995a9503 100644 --- a/lib/pages/home_view/sub_widgets/home_view_button_bar.dart +++ b/lib/pages/home_view/sub_widgets/home_view_button_bar.dart @@ -71,7 +71,9 @@ class _HomeViewButtonBarState extends ConsumerState { ? Theme.of(context) .extension()! .buttonTextPrimary - : Theme.of(context).extension()!.textDark, + : Theme.of(context) + .extension()! + .buttonTextSecondary, ), ), ), @@ -118,7 +120,9 @@ class _HomeViewButtonBarState extends ConsumerState { ? Theme.of(context) .extension()! .buttonTextPrimary - : Theme.of(context).extension()!.textDark, + : Theme.of(context) + .extension()! + .buttonTextSecondary, ), ), ), From 028b261deee429d1a6e4b28d73e353231186c5ac Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 24 Jan 2023 13:29:12 -0600 Subject: [PATCH 3/5] refactor button style getter names --- .../sub_widgets/next_button.dart | 4 ++-- .../create_wallet_button_group.dart | 4 ++-- .../name_your_wallet_view.dart | 4 ++-- .../new_wallet_recovery_phrase_view.dart | 2 +- ...w_wallet_recovery_phrase_warning_view.dart | 4 ++-- .../restore_options_next_button.dart | 4 ++-- .../sub_widgets/restore_failed_dialog.dart | 2 +- .../sub_widgets/restore_succeeded_dialog.dart | 2 +- .../sub_widgets/restoring_dialog.dart | 2 +- .../verify_recovery_phrase_view.dart | 4 ++-- .../subviews/contact_details_view.dart | 6 +++--- .../subviews/contact_popup.dart | 2 +- .../confirm_change_now_send.dart | 2 +- .../exchange_view/edit_trade_note_view.dart | 2 +- lib/pages/exchange_view/exchange_form.dart | 5 ++--- .../exchange_loading_overlay.dart | 2 +- .../exchange_step_views/step_1_view.dart | 2 +- .../exchange_step_views/step_2_view.dart | 2 +- .../exchange_step_views/step_3_view.dart | 4 ++-- .../exchange_step_views/step_4_view.dart | 8 ++++---- lib/pages/exchange_view/send_from_view.dart | 2 +- .../exchange_view/trade_details_view.dart | 2 +- .../sub_widgets/home_view_button_bar.dart | 8 ++++---- lib/pages/intro_view.dart | 4 ++-- .../generate_receiving_uri_qr_code_view.dart | 2 +- lib/pages/receive_view/receive_view.dart | 2 +- .../send_view/confirm_transaction_view.dart | 2 +- lib/pages/send_view/send_view.dart | 10 +++++----- .../building_transaction_dialog.dart | 2 +- .../advanced_views/debug_view.dart | 4 ++-- .../delete_account_view.dart | 9 ++++----- .../add_edit_node_view.dart | 6 +++--- .../stack_backup_views/auto_backup_view.dart | 8 ++++---- .../create_auto_backup_view.dart | 4 ++-- .../create_backup_information_view.dart | 2 +- .../create_backup_view.dart | 4 ++-- .../dialogs/cancel_stack_restore_dialog.dart | 4 ++-- .../edit_auto_backup_view.dart | 4 ++-- .../restore_from_encrypted_string_view.dart | 4 ++-- .../restore_from_file_view.dart | 4 ++-- .../stack_restore_progress_view.dart | 2 +- .../wallet_backup_view.dart | 4 ++-- .../sub_widgets/confirm_full_rescan.dart | 4 ++-- .../wallet_network_settings_view.dart | 4 ++-- .../wallet_settings_view.dart | 2 +- .../delete_wallet_recovery_phrase_view.dart | 6 +++--- .../delete_wallet_warning_view.dart | 4 ++-- .../rename_wallet_view.dart | 2 +- .../wallet_settings_wallet_settings_view.dart | 4 ++-- .../transaction_views/edit_note_view.dart | 2 +- .../transaction_details_view.dart | 2 +- lib/pages/wallet_view/wallet_view.dart | 4 ++-- .../sub_widgets/empty_wallets.dart | 2 +- .../desktop_menu_item.dart | 4 ++-- .../exit_to_my_stack_button.dart | 2 +- .../password/create_password_view.dart | 4 ++-- .../backup_and_restore_settings.dart | 4 ++-- .../settings/settings_menu_item.dart | 4 ++-- lib/utilities/theme/stack_colors.dart | 20 +++++++++---------- lib/widgets/desktop/delete_button.dart | 4 ++-- lib/widgets/desktop/primary_button.dart | 4 ++-- lib/widgets/desktop/secondary_button.dart | 4 ++-- lib/widgets/node_options_sheet.dart | 6 +++--- lib/widgets/stack_dialog.dart | 2 +- 64 files changed, 126 insertions(+), 128 deletions(-) diff --git a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/next_button.dart b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/next_button.dart index 9cc91cb45..939f16a31 100644 --- a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/next_button.dart +++ b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/next_button.dart @@ -38,10 +38,10 @@ class AddWalletNextButton extends ConsumerWidget { style: enabled ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context) + .getPrimaryEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context), + .getPrimaryDisabledButtonStyle(context), child: Text( "Next", style: isDesktop diff --git a/lib/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/create_wallet_button_group.dart b/lib/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/create_wallet_button_group.dart index 4a7661892..fff984b59 100644 --- a/lib/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/create_wallet_button_group.dart +++ b/lib/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/create_wallet_button_group.dart @@ -30,7 +30,7 @@ class CreateWalletButtonGroup extends StatelessWidget { child: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: () { Navigator.of(context).pushNamed( NameYourWalletView.routeName, @@ -59,7 +59,7 @@ class CreateWalletButtonGroup extends StatelessWidget { child: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), onPressed: () { Navigator.of(context).pushNamed( NameYourWalletView.routeName, diff --git a/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart b/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart index 71faf92e4..1718e554a 100644 --- a/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart +++ b/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart @@ -364,10 +364,10 @@ class _NameYourWalletViewState extends ConsumerState { style: _nextEnabled ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context) + .getPrimaryEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context), + .getPrimaryDisabledButtonStyle(context), child: Text( "Next", style: isDesktop diff --git a/lib/pages/add_wallet_views/new_wallet_recovery_phrase_view/new_wallet_recovery_phrase_view.dart b/lib/pages/add_wallet_views/new_wallet_recovery_phrase_view/new_wallet_recovery_phrase_view.dart index 6fca0774c..0b358753d 100644 --- a/lib/pages/add_wallet_views/new_wallet_recovery_phrase_view/new_wallet_recovery_phrase_view.dart +++ b/lib/pages/add_wallet_views/new_wallet_recovery_phrase_view/new_wallet_recovery_phrase_view.dart @@ -298,7 +298,7 @@ class _NewWalletRecoveryPhraseViewState }, style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "I saved my recovery phrase", style: isDesktop diff --git a/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart b/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart index 97dc91361..262d882d4 100644 --- a/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart +++ b/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart @@ -512,10 +512,10 @@ class _NewWalletRecoveryPhraseWarningViewState style: ref.read(checkBoxStateProvider.state).state ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context) + .getPrimaryEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context), + .getPrimaryDisabledButtonStyle(context), child: Text( "View recovery phrase", style: isDesktop diff --git a/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/sub_widgets/restore_options_next_button.dart b/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/sub_widgets/restore_options_next_button.dart index 502502f94..4fe96a7e2 100644 --- a/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/sub_widgets/restore_options_next_button.dart +++ b/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/sub_widgets/restore_options_next_button.dart @@ -23,10 +23,10 @@ class RestoreOptionsNextButton extends StatelessWidget { style: onPressed != null ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context) + .getPrimaryEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context), + .getPrimaryDisabledButtonStyle(context), child: Text( "Next", style: STextStyles.button(context), diff --git a/lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restore_failed_dialog.dart b/lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restore_failed_dialog.dart index daf5cf1fc..b3cb957c3 100644 --- a/lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restore_failed_dialog.dart +++ b/lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restore_failed_dialog.dart @@ -47,7 +47,7 @@ class _RestoreFailedDialogState extends ConsumerState { rightButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Ok", style: STextStyles.itemSubtitle12(context), diff --git a/lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restore_succeeded_dialog.dart b/lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restore_succeeded_dialog.dart index 51bb8f2d7..a763b3501 100644 --- a/lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restore_succeeded_dialog.dart +++ b/lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restore_succeeded_dialog.dart @@ -80,7 +80,7 @@ class RestoreSucceededDialog extends StatelessWidget { rightButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Ok", style: STextStyles.itemSubtitle12(context), diff --git a/lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restoring_dialog.dart b/lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restoring_dialog.dart index 001fff6c0..e3630b922 100644 --- a/lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restoring_dialog.dart +++ b/lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restoring_dialog.dart @@ -139,7 +139,7 @@ class _RestoringDialogState extends State rightButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Cancel", style: STextStyles.itemSubtitle12(context), diff --git a/lib/pages/add_wallet_views/verify_recovery_phrase_view/verify_recovery_phrase_view.dart b/lib/pages/add_wallet_views/verify_recovery_phrase_view/verify_recovery_phrase_view.dart index 2c3c3af83..643783369 100644 --- a/lib/pages/add_wallet_views/verify_recovery_phrase_view/verify_recovery_phrase_view.dart +++ b/lib/pages/add_wallet_views/verify_recovery_phrase_view/verify_recovery_phrase_view.dart @@ -331,10 +331,10 @@ class _VerifyRecoveryPhraseViewState style: selectedWord.isNotEmpty ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context) + .getPrimaryEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context), + .getPrimaryDisabledButtonStyle(context), child: isDesktop ? Text( "Verify", diff --git a/lib/pages/address_book_views/subviews/contact_details_view.dart b/lib/pages/address_book_views/subviews/contact_details_view.dart index b95818a97..ff15420ca 100644 --- a/lib/pages/address_book_views/subviews/contact_details_view.dart +++ b/lib/pages/address_book_views/subviews/contact_details_view.dart @@ -177,7 +177,7 @@ class _ContactDetailsViewState extends ConsumerState { leftButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Cancel", style: STextStyles.itemSubtitle12(context), @@ -189,7 +189,7 @@ class _ContactDetailsViewState extends ConsumerState { rightButton: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Delete", style: STextStyles.button(context), @@ -273,7 +273,7 @@ class _ContactDetailsViewState extends ConsumerState { }, style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context)! + .getSecondaryEnabledButtonStyle(context)! .copyWith( minimumSize: MaterialStateProperty.all( const Size(46, 32)), diff --git a/lib/pages/address_book_views/subviews/contact_popup.dart b/lib/pages/address_book_views/subviews/contact_popup.dart index 67ab32cda..e9dca9385 100644 --- a/lib/pages/address_book_views/subviews/contact_popup.dart +++ b/lib/pages/address_book_views/subviews/contact_popup.dart @@ -148,7 +148,7 @@ class ContactPopUp extends ConsumerWidget { }, style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor( + .getSecondaryEnabledButtonStyle( context)! .copyWith( minimumSize: diff --git a/lib/pages/exchange_view/confirm_change_now_send.dart b/lib/pages/exchange_view/confirm_change_now_send.dart index 86599f2e5..2abe0d347 100644 --- a/lib/pages/exchange_view/confirm_change_now_send.dart +++ b/lib/pages/exchange_view/confirm_change_now_send.dart @@ -135,7 +135,7 @@ class _ConfirmChangeNowSendViewState rightButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Ok", style: STextStyles.button(context).copyWith( diff --git a/lib/pages/exchange_view/edit_trade_note_view.dart b/lib/pages/exchange_view/edit_trade_note_view.dart index 19804b7c5..85e6fad2b 100644 --- a/lib/pages/exchange_view/edit_trade_note_view.dart +++ b/lib/pages/exchange_view/edit_trade_note_view.dart @@ -136,7 +136,7 @@ class _EditNoteViewState extends ConsumerState { }, style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Save", style: STextStyles.button(context), diff --git a/lib/pages/exchange_view/exchange_form.dart b/lib/pages/exchange_view/exchange_form.dart index 0366b8da3..87acb68c7 100644 --- a/lib/pages/exchange_view/exchange_form.dart +++ b/lib/pages/exchange_view/exchange_form.dart @@ -144,7 +144,6 @@ class _ExchangeFormState extends ConsumerState { await Future.delayed(const Duration(milliseconds: 300)); Navigator.of(context, rootNavigator: true).pop(); - } else { final toTicker = ref.read(exchangeFormStateProvider).toTicker ?? ""; final fromTicker = ref.read(exchangeFormStateProvider).fromTicker ?? ""; @@ -1017,7 +1016,7 @@ class _ExchangeFormState extends ConsumerState { leftButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Cancel", style: STextStyles.itemSubtitle12(context), @@ -1030,7 +1029,7 @@ class _ExchangeFormState extends ConsumerState { rightButton: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Attempt", style: STextStyles.button(context), diff --git a/lib/pages/exchange_view/exchange_loading_overlay.dart b/lib/pages/exchange_view/exchange_loading_overlay.dart index 15d8dccec..383d5391c 100644 --- a/lib/pages/exchange_view/exchange_loading_overlay.dart +++ b/lib/pages/exchange_view/exchange_loading_overlay.dart @@ -91,7 +91,7 @@ class _ExchangeLoadingOverlayViewState rightButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "OK", style: STextStyles.button(context).copyWith( diff --git a/lib/pages/exchange_view/exchange_step_views/step_1_view.dart b/lib/pages/exchange_view/exchange_step_views/step_1_view.dart index b51bccc55..8733be77c 100644 --- a/lib/pages/exchange_view/exchange_step_views/step_1_view.dart +++ b/lib/pages/exchange_view/exchange_step_views/step_1_view.dart @@ -188,7 +188,7 @@ class _Step1ViewState extends State { }, style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Next", style: STextStyles.button(context), diff --git a/lib/pages/exchange_view/exchange_step_views/step_2_view.dart b/lib/pages/exchange_view/exchange_step_views/step_2_view.dart index d943adcfa..238499c5f 100644 --- a/lib/pages/exchange_view/exchange_step_views/step_2_view.dart +++ b/lib/pages/exchange_view/exchange_step_views/step_2_view.dart @@ -698,7 +698,7 @@ class _Step2ViewState extends ConsumerState { }, style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Back", style: STextStyles.button(context).copyWith( diff --git a/lib/pages/exchange_view/exchange_step_views/step_3_view.dart b/lib/pages/exchange_view/exchange_step_views/step_3_view.dart index 467a3b9e7..650d238e6 100644 --- a/lib/pages/exchange_view/exchange_step_views/step_3_view.dart +++ b/lib/pages/exchange_view/exchange_step_views/step_3_view.dart @@ -208,7 +208,7 @@ class _Step3ViewState extends ConsumerState { }, style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Back", style: STextStyles.button(context).copyWith( @@ -322,7 +322,7 @@ class _Step3ViewState extends ConsumerState { }, style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Next", style: STextStyles.button(context), diff --git a/lib/pages/exchange_view/exchange_step_views/step_4_view.dart b/lib/pages/exchange_view/exchange_step_views/step_4_view.dart index 101ac637f..d5f1339d0 100644 --- a/lib/pages/exchange_view/exchange_step_views/step_4_view.dart +++ b/lib/pages/exchange_view/exchange_step_views/step_4_view.dart @@ -426,7 +426,7 @@ class _Step4ViewState extends ConsumerState { Navigator.of(context).pop(), style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor( + .getSecondaryEnabledButtonStyle( context), child: Text( "Cancel", @@ -451,7 +451,7 @@ class _Step4ViewState extends ConsumerState { }, style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Show QR Code", style: STextStyles.button(context), @@ -578,7 +578,7 @@ class _Step4ViewState extends ConsumerState { style: Theme.of(context) .extension< StackColors>()! - .getSecondaryEnabledButtonColor( + .getSecondaryEnabledButtonStyle( context), child: Text( "Ok", @@ -628,7 +628,7 @@ class _Step4ViewState extends ConsumerState { }, style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( buttonTitle, style: STextStyles.button(context).copyWith( diff --git a/lib/pages/exchange_view/send_from_view.dart b/lib/pages/exchange_view/send_from_view.dart index a1e242eba..41df723da 100644 --- a/lib/pages/exchange_view/send_from_view.dart +++ b/lib/pages/exchange_view/send_from_view.dart @@ -338,7 +338,7 @@ class _SendFromCardState extends ConsumerState { rightButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Ok", style: STextStyles.button(context).copyWith( diff --git a/lib/pages/exchange_view/trade_details_view.dart b/lib/pages/exchange_view/trade_details_view.dart index b5f2bda6e..9d8a1d223 100644 --- a/lib/pages/exchange_view/trade_details_view.dart +++ b/lib/pages/exchange_view/trade_details_view.dart @@ -713,7 +713,7 @@ class _TradeDetailsViewState extends ConsumerState { }, style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor( + .getSecondaryEnabledButtonStyle( context), child: Text( "Cancel", diff --git a/lib/pages/home_view/sub_widgets/home_view_button_bar.dart b/lib/pages/home_view/sub_widgets/home_view_button_bar.dart index b995a9503..79328a29e 100644 --- a/lib/pages/home_view/sub_widgets/home_view_button_bar.dart +++ b/lib/pages/home_view/sub_widgets/home_view_button_bar.dart @@ -45,14 +45,14 @@ class _HomeViewButtonBarState extends ConsumerState { style: selectedIndex == 0 ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context)! + .getPrimaryEnabledButtonStyle(context)! .copyWith( minimumSize: MaterialStateProperty.all(const Size(46, 36)), ) : Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context)! + .getSecondaryEnabledButtonStyle(context)! .copyWith( minimumSize: MaterialStateProperty.all(const Size(46, 36)), @@ -86,14 +86,14 @@ class _HomeViewButtonBarState extends ConsumerState { style: selectedIndex == 1 ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context)! + .getPrimaryEnabledButtonStyle(context)! .copyWith( minimumSize: MaterialStateProperty.all(const Size(46, 36)), ) : Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context)! + .getSecondaryEnabledButtonStyle(context)! .copyWith( minimumSize: MaterialStateProperty.all(const Size(46, 36)), diff --git a/lib/pages/intro_view.dart b/lib/pages/intro_view.dart index 9218c0610..b90eb0ab1 100644 --- a/lib/pages/intro_view.dart +++ b/lib/pages/intro_view.dart @@ -259,7 +259,7 @@ class GetStartedButton extends StatelessWidget { ? TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: () { Prefs.instance.externalCalls = true; Navigator.of(context).pushNamed( @@ -278,7 +278,7 @@ class GetStartedButton extends StatelessWidget { child: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: () { Navigator.of(context).pushNamed( StackPrivacyCalls.routeName, diff --git a/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart b/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart index 3c61681f0..ca219b92e 100644 --- a/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart +++ b/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart @@ -225,7 +225,7 @@ class _GenerateUriQrCodeViewState extends State { }, style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Row( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, diff --git a/lib/pages/receive_view/receive_view.dart b/lib/pages/receive_view/receive_view.dart index 1ba00f8ee..c43964779 100644 --- a/lib/pages/receive_view/receive_view.dart +++ b/lib/pages/receive_view/receive_view.dart @@ -206,7 +206,7 @@ class _ReceiveViewState extends ConsumerState { onPressed: generateNewAddress, style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Generate new address", style: STextStyles.button(context).copyWith( diff --git a/lib/pages/send_view/confirm_transaction_view.dart b/lib/pages/send_view/confirm_transaction_view.dart index 1164e0418..24bce86e5 100644 --- a/lib/pages/send_view/confirm_transaction_view.dart +++ b/lib/pages/send_view/confirm_transaction_view.dart @@ -196,7 +196,7 @@ class _ConfirmTransactionViewState rightButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Ok", style: STextStyles.button(context).copyWith( diff --git a/lib/pages/send_view/send_view.dart b/lib/pages/send_view/send_view.dart index 7f9c82423..f687ab9a6 100644 --- a/lib/pages/send_view/send_view.dart +++ b/lib/pages/send_view/send_view.dart @@ -1608,7 +1608,7 @@ class _SendViewState extends ConsumerState { leftButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor( + .getSecondaryEnabledButtonStyle( context), child: Text( "Cancel", @@ -1628,7 +1628,7 @@ class _SendViewState extends ConsumerState { rightButton: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor( + .getPrimaryEnabledButtonStyle( context), child: Text( "Yes", @@ -1738,7 +1738,7 @@ class _SendViewState extends ConsumerState { rightButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor( + .getSecondaryEnabledButtonStyle( context), child: Text( "Ok", @@ -1767,10 +1767,10 @@ class _SendViewState extends ConsumerState { .state ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context) + .getPrimaryEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context), + .getPrimaryDisabledButtonStyle(context), child: Text( "Preview", style: STextStyles.button(context), diff --git a/lib/pages/send_view/sub_widgets/building_transaction_dialog.dart b/lib/pages/send_view/sub_widgets/building_transaction_dialog.dart index 1f6c95df6..6750e1b4c 100644 --- a/lib/pages/send_view/sub_widgets/building_transaction_dialog.dart +++ b/lib/pages/send_view/sub_widgets/building_transaction_dialog.dart @@ -107,7 +107,7 @@ class _RestoringDialogState extends State rightButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Cancel", style: STextStyles.itemSubtitle12(context), diff --git a/lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart b/lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart index 442ad5d2a..5c12fb1ad 100644 --- a/lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart +++ b/lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart @@ -144,7 +144,7 @@ class _DebugViewState extends ConsumerState { leftButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Cancel", style: STextStyles.itemSubtitle12(context), @@ -156,7 +156,7 @@ class _DebugViewState extends ConsumerState { rightButton: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Delete logs", style: STextStyles.button(context), diff --git a/lib/pages/settings_views/global_settings_view/delete_account_view.dart b/lib/pages/settings_views/global_settings_view/delete_account_view.dart index e9cc819dc..d69a0feac 100644 --- a/lib/pages/settings_views/global_settings_view/delete_account_view.dart +++ b/lib/pages/settings_views/global_settings_view/delete_account_view.dart @@ -1,16 +1,15 @@ import 'package:flutter/material.dart'; import 'package:stackwallet/pages/intro_view.dart'; +import 'package:stackwallet/utilities/delete_everything.dart'; import 'package:stackwallet/utilities/text_styles.dart'; +import 'package:stackwallet/utilities/theme/stack_colors.dart'; import 'package:stackwallet/utilities/util.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart'; - import 'package:stackwallet/widgets/stack_dialog.dart'; -import 'package:stackwallet/utilities/delete_everything.dart'; -import 'package:stackwallet/utilities/theme/stack_colors.dart'; class DeleteAccountView extends StatefulWidget { const DeleteAccountView({Key? key}) : super(key: key); @@ -35,7 +34,7 @@ class _DeleteAccountViewState extends State { leftButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), onPressed: () { Navigator.pop(context); }, @@ -50,7 +49,7 @@ class _DeleteAccountViewState extends State { rightButton: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: () async { await deleteEverything(); diff --git a/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart b/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart index 70e208ed5..7e308c61f 100644 --- a/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart +++ b/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart @@ -284,7 +284,7 @@ class _AddEditNodeViewState extends ConsumerState { }, style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Save", style: STextStyles.button(context), @@ -603,10 +603,10 @@ class _AddEditNodeViewState extends ConsumerState { style: saveEnabled ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context) + .getPrimaryEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context), + .getPrimaryDisabledButtonStyle(context), onPressed: saveEnabled ? attemptSave : null, child: Text( "Save", diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/auto_backup_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/auto_backup_view.dart index 15b5a12fa..85fd9c1e9 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/auto_backup_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/auto_backup_view.dart @@ -85,7 +85,7 @@ class _AutoBackupViewState extends ConsumerState { leftButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Back", style: STextStyles.button(context).copyWith( @@ -100,7 +100,7 @@ class _AutoBackupViewState extends ConsumerState { rightButton: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Continue", style: STextStyles.button(context), @@ -142,7 +142,7 @@ class _AutoBackupViewState extends ConsumerState { leftButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Back", style: STextStyles.button(context).copyWith( @@ -157,7 +157,7 @@ class _AutoBackupViewState extends ConsumerState { rightButton: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Disable", style: STextStyles.button(context), diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/create_auto_backup_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/create_auto_backup_view.dart index e95424cc0..a6103710f 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/create_auto_backup_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/create_auto_backup_view.dart @@ -483,10 +483,10 @@ class _EnableAutoBackupViewState extends ConsumerState { style: shouldEnableCreate ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context) + .getPrimaryEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context), + .getPrimaryDisabledButtonStyle(context), onPressed: !shouldEnableCreate ? null : () async { diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_information_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_information_view.dart index 012477a5b..1b740c32b 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_information_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_information_view.dart @@ -67,7 +67,7 @@ class CreateBackupInfoView extends StatelessWidget { TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: () { Navigator.of(context) .pushNamed(CreateBackupView.routeName); diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_view.dart index 4d69ce4e9..b7cbf20a5 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_view.dart @@ -454,10 +454,10 @@ class _RestoreFromFileViewState extends State { style: shouldEnableCreate ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context) + .getPrimaryEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context), + .getPrimaryDisabledButtonStyle(context), onPressed: !shouldEnableCreate ? null : () async { diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/dialogs/cancel_stack_restore_dialog.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/dialogs/cancel_stack_restore_dialog.dart index 905cdea72..62e15a82b 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/dialogs/cancel_stack_restore_dialog.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/dialogs/cancel_stack_restore_dialog.dart @@ -27,7 +27,7 @@ class CancelStackRestoreDialog extends StatelessWidget { leftButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Back", style: STextStyles.itemSubtitle12(context), @@ -39,7 +39,7 @@ class CancelStackRestoreDialog extends StatelessWidget { rightButton: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Yes, cancel", style: STextStyles.itemSubtitle12(context).copyWith( diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart index 69fc4ca48..7a156e6ba 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart @@ -781,10 +781,10 @@ class _EditAutoBackupViewState extends ConsumerState { style: shouldEnableCreate ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context) + .getPrimaryEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context), + .getPrimaryDisabledButtonStyle(context), onPressed: !shouldEnableCreate ? null : onSavePressed, child: Text( "Save", diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_encrypted_string_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_encrypted_string_view.dart index 14a262d99..f5a94ef19 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_encrypted_string_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_encrypted_string_view.dart @@ -158,10 +158,10 @@ class _RestoreFromEncryptedStringViewState style: passwordController.text.isEmpty ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context) + .getPrimaryEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context), + .getPrimaryDisabledButtonStyle(context), onPressed: passwordController.text.isEmpty ? null : () async { diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_file_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_file_view.dart index 4b0d1e044..230904fd0 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_file_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_file_view.dart @@ -280,10 +280,10 @@ class _RestoreFromFileViewState extends ConsumerState { fileLocationController.text.isEmpty ? Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context) + .getPrimaryDisabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: passwordController.text.isEmpty || fileLocationController.text.isEmpty ? null diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart index 40a0b0f9f..5172144be 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart @@ -669,7 +669,7 @@ class _StackRestoreProgressViewState }, style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( _success ? "OK" : "Cancel restore process", style: STextStyles.button(context).copyWith( diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart index a9235172f..33cf445b6 100644 --- a/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart +++ b/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart @@ -140,7 +140,7 @@ class WalletBackupView extends ConsumerWidget { TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: () { String data = AddressUtils.encodeQRSeedData(mnemonic); @@ -194,7 +194,7 @@ class WalletBackupView extends ConsumerWidget { }, style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Cancel", style: STextStyles.button(context).copyWith( diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_network_settings_view/sub_widgets/confirm_full_rescan.dart b/lib/pages/settings_views/wallet_settings_view/wallet_network_settings_view/sub_widgets/confirm_full_rescan.dart index 150af6ac5..009d1312b 100644 --- a/lib/pages/settings_views/wallet_settings_view/wallet_network_settings_view/sub_widgets/confirm_full_rescan.dart +++ b/lib/pages/settings_views/wallet_settings_view/wallet_network_settings_view/sub_widgets/confirm_full_rescan.dart @@ -96,7 +96,7 @@ class ConfirmFullRescanDialog extends StatelessWidget { leftButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Cancel", style: STextStyles.itemSubtitle12(context), @@ -108,7 +108,7 @@ class ConfirmFullRescanDialog extends StatelessWidget { rightButton: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Rescan", style: STextStyles.button(context), diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_network_settings_view/wallet_network_settings_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_network_settings_view/wallet_network_settings_view.dart index 84cda95fc..cc552279c 100644 --- a/lib/pages/settings_views/wallet_settings_view/wallet_network_settings_view/wallet_network_settings_view.dart +++ b/lib/pages/settings_views/wallet_settings_view/wallet_network_settings_view/wallet_network_settings_view.dart @@ -126,7 +126,7 @@ class _WalletNetworkSettingsViewState rightButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Ok", style: STextStyles.itemSubtitle12(context), @@ -156,7 +156,7 @@ class _WalletNetworkSettingsViewState rightButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Ok", style: STextStyles.itemSubtitle12(context), diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_settings_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_settings_view.dart index f27f57312..e96258f3f 100644 --- a/lib/pages/settings_views/wallet_settings_view/wallet_settings_view.dart +++ b/lib/pages/settings_views/wallet_settings_view/wallet_settings_view.dart @@ -306,7 +306,7 @@ class _WalletSettingsViewState extends State { }, style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Log out", style: STextStyles.button(context).copyWith( diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_recovery_phrase_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_recovery_phrase_view.dart index 5543bf1c0..16602cc7e 100644 --- a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_recovery_phrase_view.dart +++ b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_recovery_phrase_view.dart @@ -156,7 +156,7 @@ class _DeleteWalletRecoveryPhraseViewState TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: () { showDialog( barrierDismissible: true, @@ -166,7 +166,7 @@ class _DeleteWalletRecoveryPhraseViewState leftButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), onPressed: () { Navigator.pop(context); }, @@ -181,7 +181,7 @@ class _DeleteWalletRecoveryPhraseViewState rightButton: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: () async { final walletId = _manager.walletId; final walletsInstance = diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_warning_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_warning_view.dart index f953a975a..7cf07b061 100644 --- a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_warning_view.dart +++ b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_warning_view.dart @@ -69,7 +69,7 @@ class DeleteWalletWarningView extends ConsumerWidget { TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), onPressed: () { Navigator.pop(context); }, @@ -87,7 +87,7 @@ class DeleteWalletWarningView extends ConsumerWidget { TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: () async { final manager = ref .read(walletsChangeNotifierProvider) diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/rename_wallet_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/rename_wallet_view.dart index f76422750..3fb319211 100644 --- a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/rename_wallet_view.dart +++ b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/rename_wallet_view.dart @@ -114,7 +114,7 @@ class _RenameWalletViewState extends ConsumerState { TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: () async { final newName = _controller.text; final success = await ref diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/wallet_settings_wallet_settings_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/wallet_settings_wallet_settings_view.dart index a9c0f92af..d26bc9508 100644 --- a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/wallet_settings_wallet_settings_view.dart +++ b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/wallet_settings_wallet_settings_view.dart @@ -105,7 +105,7 @@ class WalletSettingsWalletSettingsView extends ConsumerWidget { leftButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), onPressed: () { Navigator.pop(context); }, @@ -120,7 +120,7 @@ class WalletSettingsWalletSettingsView extends ConsumerWidget { rightButton: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: () { Navigator.pop(context); Navigator.push( diff --git a/lib/pages/wallet_view/transaction_views/edit_note_view.dart b/lib/pages/wallet_view/transaction_views/edit_note_view.dart index e8d7b05f9..c7b717337 100644 --- a/lib/pages/wallet_view/transaction_views/edit_note_view.dart +++ b/lib/pages/wallet_view/transaction_views/edit_note_view.dart @@ -204,7 +204,7 @@ class _EditNoteViewState extends ConsumerState { }, style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Save", style: STextStyles.button(context), diff --git a/lib/pages/wallet_view/transaction_views/transaction_details_view.dart b/lib/pages/wallet_view/transaction_views/transaction_details_view.dart index 4a2e9e758..f2755f547 100644 --- a/lib/pages/wallet_view/transaction_views/transaction_details_view.dart +++ b/lib/pages/wallet_view/transaction_views/transaction_details_view.dart @@ -202,7 +202,7 @@ class _TransactionDetailsViewState rightButton: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: () { Navigator.of(context).pop(true); }, diff --git a/lib/pages/wallet_view/wallet_view.dart b/lib/pages/wallet_view/wallet_view.dart index 6d44e226e..7416e349d 100644 --- a/lib/pages/wallet_view/wallet_view.dart +++ b/lib/pages/wallet_view/wallet_view.dart @@ -579,7 +579,7 @@ class _WalletViewState extends ConsumerState { child: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), onPressed: () async { await showDialog( context: context, @@ -609,7 +609,7 @@ class _WalletViewState extends ConsumerState { }, style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor( + .getPrimaryEnabledButtonStyle( context), child: Text( "Continue", diff --git a/lib/pages/wallets_view/sub_widgets/empty_wallets.dart b/lib/pages/wallets_view/sub_widgets/empty_wallets.dart index 8691b7d84..2ba548957 100644 --- a/lib/pages/wallets_view/sub_widgets/empty_wallets.dart +++ b/lib/pages/wallets_view/sub_widgets/empty_wallets.dart @@ -94,7 +94,7 @@ class AddWalletButton extends StatelessWidget { return TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: () { if (isDesktop) { Navigator.of( diff --git a/lib/pages_desktop_specific/desktop_menu_item.dart b/lib/pages_desktop_specific/desktop_menu_item.dart index e75f3410f..804268797 100644 --- a/lib/pages_desktop_specific/desktop_menu_item.dart +++ b/lib/pages_desktop_specific/desktop_menu_item.dart @@ -262,10 +262,10 @@ class _DesktopMenuItemState extends ConsumerState> style: value == group ? Theme.of(context) .extension()! - .getDesktopMenuButtonColorSelected(context) + .getDesktopMenuButtonStyleSelected(context) : Theme.of(context) .extension()! - .getDesktopMenuButtonColor(context), + .getDesktopMenuButtonStyle(context), onPressed: () { onChanged(value); }, diff --git a/lib/pages_desktop_specific/my_stack_view/exit_to_my_stack_button.dart b/lib/pages_desktop_specific/my_stack_view/exit_to_my_stack_button.dart index d09bc6310..250bd7299 100644 --- a/lib/pages_desktop_specific/my_stack_view/exit_to_my_stack_button.dart +++ b/lib/pages_desktop_specific/my_stack_view/exit_to_my_stack_button.dart @@ -22,7 +22,7 @@ class ExitToMyStackButton extends StatelessWidget { child: TextButton( style: Theme.of(context) .extension()! - .getSmallSecondaryEnabledButtonColor(context), + .getSmallSecondaryEnabledButtonStyle(context), onPressed: onPressed ?? () { Navigator.of(context).popUntil( diff --git a/lib/pages_desktop_specific/password/create_password_view.dart b/lib/pages_desktop_specific/password/create_password_view.dart index 2f440ec92..ded1f1e30 100644 --- a/lib/pages_desktop_specific/password/create_password_view.dart +++ b/lib/pages_desktop_specific/password/create_password_view.dart @@ -425,10 +425,10 @@ class _CreatePasswordViewState extends ConsumerState { style: nextEnabled ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context) + .getPrimaryEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context), + .getPrimaryDisabledButtonStyle(context), onPressed: nextEnabled ? onNextPressed : null, child: Text( "Next", diff --git a/lib/pages_desktop_specific/settings/settings_menu/backup_and_restore/backup_and_restore_settings.dart b/lib/pages_desktop_specific/settings/settings_menu/backup_and_restore/backup_and_restore_settings.dart index de9a68418..37b40b004 100644 --- a/lib/pages_desktop_specific/settings/settings_menu/backup_and_restore/backup_and_restore_settings.dart +++ b/lib/pages_desktop_specific/settings/settings_menu/backup_and_restore/backup_and_restore_settings.dart @@ -159,7 +159,7 @@ class _BackupRestoreSettings extends ConsumerState { leftButton: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), child: Text( "Back", style: STextStyles.button(context).copyWith( @@ -175,7 +175,7 @@ class _BackupRestoreSettings extends ConsumerState { rightButton: TextButton( style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Disable", style: STextStyles.button(context), diff --git a/lib/pages_desktop_specific/settings/settings_menu_item.dart b/lib/pages_desktop_specific/settings/settings_menu_item.dart index 28ddffb50..59cc7b62c 100644 --- a/lib/pages_desktop_specific/settings/settings_menu_item.dart +++ b/lib/pages_desktop_specific/settings/settings_menu_item.dart @@ -25,10 +25,10 @@ class SettingsMenuItem extends StatelessWidget { style: value == group ? Theme.of(context) .extension()! - .getDesktopSettingsButtonColor(context) + .getDesktopSettingsButtonStyle(context) : Theme.of(context) .extension()! - .getDesktopSettingsButtonColor(context), + .getDesktopSettingsButtonStyle(context), onPressed: () { onChanged(value); }, diff --git a/lib/utilities/theme/stack_colors.dart b/lib/utilities/theme/stack_colors.dart index 9b0de36f5..06acdbe7b 100644 --- a/lib/utilities/theme/stack_colors.dart +++ b/lib/utilities/theme/stack_colors.dart @@ -1526,70 +1526,70 @@ class StackColors extends ThemeExtension { } } - ButtonStyle? getDeleteEnabledButtonColor(BuildContext context) => + ButtonStyle? getDeleteEnabledButtonStyle(BuildContext context) => Theme.of(context).textButtonTheme.style?.copyWith( backgroundColor: MaterialStateProperty.all( textFieldErrorBG, ), ); - ButtonStyle? getDeleteDisabledButtonColor(BuildContext context) => + ButtonStyle? getDeleteDisabledButtonStyle(BuildContext context) => Theme.of(context).textButtonTheme.style?.copyWith( backgroundColor: MaterialStateProperty.all( buttonBackSecondaryDisabled, ), ); - ButtonStyle? getPrimaryEnabledButtonColor(BuildContext context) => + ButtonStyle? getPrimaryEnabledButtonStyle(BuildContext context) => Theme.of(context).textButtonTheme.style?.copyWith( backgroundColor: MaterialStateProperty.all( buttonBackPrimary, ), ); - ButtonStyle? getPrimaryDisabledButtonColor(BuildContext context) => + ButtonStyle? getPrimaryDisabledButtonStyle(BuildContext context) => Theme.of(context).textButtonTheme.style?.copyWith( backgroundColor: MaterialStateProperty.all( buttonBackPrimaryDisabled, ), ); - ButtonStyle? getSecondaryEnabledButtonColor(BuildContext context) => + ButtonStyle? getSecondaryEnabledButtonStyle(BuildContext context) => Theme.of(context).textButtonTheme.style?.copyWith( backgroundColor: MaterialStateProperty.all( buttonBackSecondary, ), ); - ButtonStyle? getSecondaryDisabledButtonColor(BuildContext context) => + ButtonStyle? getSecondaryDisabledButtonStyle(BuildContext context) => Theme.of(context).textButtonTheme.style?.copyWith( backgroundColor: MaterialStateProperty.all( buttonBackSecondaryDisabled, ), ); - ButtonStyle? getSmallSecondaryEnabledButtonColor(BuildContext context) => + ButtonStyle? getSmallSecondaryEnabledButtonStyle(BuildContext context) => Theme.of(context).textButtonTheme.style?.copyWith( backgroundColor: MaterialStateProperty.all( textFieldDefaultBG, ), ); - ButtonStyle? getDesktopMenuButtonColor(BuildContext context) => + ButtonStyle? getDesktopMenuButtonStyle(BuildContext context) => Theme.of(context).textButtonTheme.style?.copyWith( backgroundColor: MaterialStateProperty.all( popupBG, ), ); - ButtonStyle? getDesktopMenuButtonColorSelected(BuildContext context) => + ButtonStyle? getDesktopMenuButtonStyleSelected(BuildContext context) => Theme.of(context).textButtonTheme.style?.copyWith( backgroundColor: MaterialStateProperty.all( textFieldDefaultBG, ), ); - ButtonStyle? getDesktopSettingsButtonColor(BuildContext context) => + ButtonStyle? getDesktopSettingsButtonStyle(BuildContext context) => Theme.of(context).textButtonTheme.style?.copyWith( backgroundColor: MaterialStateProperty.all( background, diff --git a/lib/widgets/desktop/delete_button.dart b/lib/widgets/desktop/delete_button.dart index e64c85f34..cb255ebd2 100644 --- a/lib/widgets/desktop/delete_button.dart +++ b/lib/widgets/desktop/delete_button.dart @@ -64,10 +64,10 @@ class DeleteButton extends StatelessWidget { style: enabled ? Theme.of(context) .extension()! - .getDeleteEnabledButtonColor(context) + .getDeleteEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getDeleteDisabledButtonColor(context), + .getDeleteDisabledButtonStyle(context), child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/widgets/desktop/primary_button.dart b/lib/widgets/desktop/primary_button.dart index a4fb4c35c..a275bd570 100644 --- a/lib/widgets/desktop/primary_button.dart +++ b/lib/widgets/desktop/primary_button.dart @@ -136,10 +136,10 @@ class PrimaryButton extends StatelessWidget { style: enabled ? Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context) + .getPrimaryEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context), + .getPrimaryDisabledButtonStyle(context), child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/widgets/desktop/secondary_button.dart b/lib/widgets/desktop/secondary_button.dart index 244ee356a..6dba6fdd8 100644 --- a/lib/widgets/desktop/secondary_button.dart +++ b/lib/widgets/desktop/secondary_button.dart @@ -139,10 +139,10 @@ class SecondaryButton extends StatelessWidget { style: enabled ? Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context) + .getSecondaryEnabledButtonStyle(context) : Theme.of(context) .extension()! - .getSecondaryDisabledButtonColor(context), + .getSecondaryDisabledButtonStyle(context), child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/widgets/node_options_sheet.dart b/lib/widgets/node_options_sheet.dart index 80ce2f5be..7542a42a6 100644 --- a/lib/widgets/node_options_sheet.dart +++ b/lib/widgets/node_options_sheet.dart @@ -307,7 +307,7 @@ class NodeOptionsSheet extends ConsumerWidget { child: TextButton( style: Theme.of(context) .extension()! - .getSecondaryEnabledButtonColor(context), + .getSecondaryEnabledButtonStyle(context), onPressed: () { Navigator.pop(context); Navigator.of(context).pushNamed( @@ -337,10 +337,10 @@ class NodeOptionsSheet extends ConsumerWidget { style: status == "Connected" ? Theme.of(context) .extension()! - .getPrimaryDisabledButtonColor(context) + .getPrimaryDisabledButtonStyle(context) : Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), onPressed: status == "Connected" ? null : () async { diff --git a/lib/widgets/stack_dialog.dart b/lib/widgets/stack_dialog.dart index ea2638264..f9b156831 100644 --- a/lib/widgets/stack_dialog.dart +++ b/lib/widgets/stack_dialog.dart @@ -193,7 +193,7 @@ class StackOkDialog extends StatelessWidget { }, style: Theme.of(context) .extension()! - .getPrimaryEnabledButtonColor(context), + .getPrimaryEnabledButtonStyle(context), child: Text( "Ok", style: STextStyles.button(context), From 914e0e9034cb29a913361790e14c8b73263ef425 Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Tue, 24 Jan 2023 12:29:14 -0700 Subject: [PATCH 4/5] buttonBackBorderSecondary + disabled colors added --- lib/utilities/theme/color_theme.dart | 2 ++ lib/utilities/theme/dark_colors.dart | 4 ++++ lib/utilities/theme/fruit_sorbet_colors.dart | 4 ++++ lib/utilities/theme/light_colors.dart | 4 ++++ lib/utilities/theme/ocean_breeze_colors.dart | 4 ++++ lib/utilities/theme/oled_black_colors.dart | 4 ++++ lib/utilities/theme/stack_colors.dart | 23 ++++++++++++++++++++ 7 files changed, 45 insertions(+) diff --git a/lib/utilities/theme/color_theme.dart b/lib/utilities/theme/color_theme.dart index 1d2772815..2eea34806 100644 --- a/lib/utilities/theme/color_theme.dart +++ b/lib/utilities/theme/color_theme.dart @@ -82,6 +82,8 @@ abstract class StackColorTheme { Color get buttonBackSecondaryDisabled; Color get buttonBackBorder; Color get buttonBackBorderDisabled; + Color get buttonBackBorderSecondary; + Color get buttonBackBorderSecondaryDisabled; Color get numberBackDefault; Color get numpadBackDefault; Color get bottomNavBack; diff --git a/lib/utilities/theme/dark_colors.dart b/lib/utilities/theme/dark_colors.dart index b5938066c..298d8c86d 100644 --- a/lib/utilities/theme/dark_colors.dart +++ b/lib/utilities/theme/dark_colors.dart @@ -71,6 +71,10 @@ class DarkColors extends StackColorTheme { Color get buttonBackBorder => const Color(0xFF4C86E9); @override Color get buttonBackBorderDisabled => const Color(0xFF314265); + @override + Color get buttonBackBorderSecondary => buttonBackSecondary; + @override + Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled; @override Color get numberBackDefault => const Color(0xFF484B51); diff --git a/lib/utilities/theme/fruit_sorbet_colors.dart b/lib/utilities/theme/fruit_sorbet_colors.dart index 6853c9bca..12ae33e7b 100644 --- a/lib/utilities/theme/fruit_sorbet_colors.dart +++ b/lib/utilities/theme/fruit_sorbet_colors.dart @@ -71,6 +71,10 @@ class FruitSorbetColors extends StackColorTheme { Color get buttonBackBorder => const Color(0xFFF95369); @override Color get buttonBackBorderDisabled => const Color(0xFFFCA7B3); + @override + Color get buttonBackBorderSecondary => buttonBackBorder; + @override + Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled; @override Color get numberBackDefault => const Color(0xFFFFF8EE); diff --git a/lib/utilities/theme/light_colors.dart b/lib/utilities/theme/light_colors.dart index 57c02fc3c..fc825747c 100644 --- a/lib/utilities/theme/light_colors.dart +++ b/lib/utilities/theme/light_colors.dart @@ -71,6 +71,10 @@ class LightColors extends StackColorTheme { Color get buttonBackBorder => const Color(0xFF232323); @override Color get buttonBackBorderDisabled => const Color(0xFFB6B6B6); + @override + Color get buttonBackBorderSecondary => buttonBackSecondary; + @override + Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled; @override Color get numberBackDefault => const Color(0xFFFFFFFF); diff --git a/lib/utilities/theme/ocean_breeze_colors.dart b/lib/utilities/theme/ocean_breeze_colors.dart index 4efa85d49..e907fd2cf 100644 --- a/lib/utilities/theme/ocean_breeze_colors.dart +++ b/lib/utilities/theme/ocean_breeze_colors.dart @@ -78,6 +78,10 @@ class OceanBreezeColors extends StackColorTheme { Color get buttonBackBorder => const Color(0xFF227386); @override Color get buttonBackBorderDisabled => const Color(0xFFBDD5DB); + @override + Color get buttonBackBorderSecondary => buttonBackSecondary; + @override + Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled; @override Color get numberBackDefault => const Color(0xFFFFFFFF); diff --git a/lib/utilities/theme/oled_black_colors.dart b/lib/utilities/theme/oled_black_colors.dart index e012f2c78..1d9f2c61f 100644 --- a/lib/utilities/theme/oled_black_colors.dart +++ b/lib/utilities/theme/oled_black_colors.dart @@ -72,6 +72,10 @@ class OledBlackColors extends StackColorTheme { Color get buttonBackBorder => const Color(0xFF6F9CE9); @override Color get buttonBackBorderDisabled => const Color(0xFF212F46); + @override + Color get buttonBackBorderSecondary => buttonBackSecondary; + @override + Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled; @override Color get numberBackDefault => const Color(0xFF242424); diff --git a/lib/utilities/theme/stack_colors.dart b/lib/utilities/theme/stack_colors.dart index 9b0de36f5..458672827 100644 --- a/lib/utilities/theme/stack_colors.dart +++ b/lib/utilities/theme/stack_colors.dart @@ -41,6 +41,8 @@ class StackColors extends ThemeExtension { final Color buttonBackSecondaryDisabled; final Color buttonBackBorder; final Color buttonBackBorderDisabled; + final Color buttonBackBorderSecondary; + final Color buttonBackBorderSecondaryDisabled; final Color numberBackDefault; final Color numpadBackDefault; final Color bottomNavBack; @@ -211,6 +213,8 @@ class StackColors extends ThemeExtension { required this.buttonBackSecondaryDisabled, required this.buttonBackBorder, required this.buttonBackBorderDisabled, + required this.buttonBackBorderSecondary, + required this.buttonBackBorderSecondaryDisabled, required this.numberBackDefault, required this.numpadBackDefault, required this.bottomNavBack, @@ -352,6 +356,9 @@ class StackColors extends ThemeExtension { buttonBackSecondaryDisabled: colorTheme.buttonBackSecondaryDisabled, buttonBackBorder: colorTheme.buttonBackBorder, buttonBackBorderDisabled: colorTheme.buttonBackBorderDisabled, + buttonBackBorderSecondary: colorTheme.buttonBackBorderSecondary, + buttonBackBorderSecondaryDisabled: + colorTheme.buttonBackBorderSecondaryDisabled, numberBackDefault: colorTheme.numberBackDefault, numpadBackDefault: colorTheme.numpadBackDefault, bottomNavBack: colorTheme.bottomNavBack, @@ -496,6 +503,8 @@ class StackColors extends ThemeExtension { Color? buttonBackSecondaryDisabled, Color? buttonBackBorder, Color? buttonBackBorderDisabled, + Color? buttonBackBorderSecondary, + Color? buttonBackBorderSecondaryDisabled, Color? numberBackDefault, Color? numpadBackDefault, Color? bottomNavBack, @@ -638,6 +647,10 @@ class StackColors extends ThemeExtension { buttonBackBorder: buttonBackBorder ?? this.buttonBackBorder, buttonBackBorderDisabled: buttonBackBorderDisabled ?? this.buttonBackBorderDisabled, + buttonBackBorderSecondary: + buttonBackBorderSecondary ?? this.buttonBackBorderSecondary, + buttonBackBorderSecondaryDisabled: buttonBackBorderSecondaryDisabled ?? + this.buttonBackBorderSecondaryDisabled, numberBackDefault: numberBackDefault ?? this.numberBackDefault, numpadBackDefault: numpadBackDefault ?? this.numpadBackDefault, bottomNavBack: bottomNavBack ?? this.bottomNavBack, @@ -942,6 +955,16 @@ class StackColors extends ThemeExtension { other.buttonBackBorderDisabled, t, )!, + buttonBackBorderSecondary: Color.lerp( + buttonBackBorderSecondary, + other.buttonBackBorderSecondary, + t, + )!, + buttonBackBorderSecondaryDisabled: Color.lerp( + buttonBackBorderSecondaryDisabled, + other.buttonBackBorderSecondaryDisabled, + t, + )!, numberBackDefault: Color.lerp( numberBackDefault, other.numberBackDefault, From aced68aa3208ea395c56418ba44d0f9266ca915a Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 24 Jan 2023 13:30:00 -0600 Subject: [PATCH 5/5] add border to secondary buttons based on theme --- lib/utilities/theme/stack_colors.dart | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/lib/utilities/theme/stack_colors.dart b/lib/utilities/theme/stack_colors.dart index 06acdbe7b..5175bef91 100644 --- a/lib/utilities/theme/stack_colors.dart +++ b/lib/utilities/theme/stack_colors.dart @@ -1559,6 +1559,15 @@ class StackColors extends ThemeExtension { backgroundColor: MaterialStateProperty.all( buttonBackSecondary, ), + shape: MaterialStateProperty.all( + RoundedRectangleBorder( + side: BorderSide( + color: buttonBackBorder, + width: 1, + ), + borderRadius: BorderRadius.circular(10000), + ), + ), ); ButtonStyle? getSecondaryDisabledButtonStyle(BuildContext context) => @@ -1566,6 +1575,15 @@ class StackColors extends ThemeExtension { backgroundColor: MaterialStateProperty.all( buttonBackSecondaryDisabled, ), + shape: MaterialStateProperty.all( + RoundedRectangleBorder( + side: BorderSide( + color: buttonBackBorder, + width: 1, + ), + borderRadius: BorderRadius.circular(10000), + ), + ), ); ButtonStyle? getSmallSecondaryEnabledButtonStyle(BuildContext context) => @@ -1573,6 +1591,15 @@ class StackColors extends ThemeExtension { backgroundColor: MaterialStateProperty.all( textFieldDefaultBG, ), + shape: MaterialStateProperty.all( + RoundedRectangleBorder( + side: BorderSide( + color: buttonBackBorder, + width: 1, + ), + borderRadius: BorderRadius.circular(10000), + ), + ), ); ButtonStyle? getDesktopMenuButtonStyle(BuildContext context) =>