From baabc0a9153e69b6be27b71c2bcd2726a000a87e Mon Sep 17 00:00:00 2001 From: Rafael Saes <76502841+saltrafael@users.noreply.github.com> Date: Wed, 24 May 2023 20:19:51 -0300 Subject: [PATCH] Cw 373 theme refactoring in preparation to support additional themes (#933) * refactor(Theme): migrate accentColor - based on the specs at https://docs.flutter.dev/release/breaking-changes/theme-data-accent-properties#migration-guide. * refactor(Theme): all deprecated TextTheme styles * refactor(Theme): deprecated backgroundColor for colorScheme.background * refactor(Theme): deprecated buttonColor to use TextTheme backgroundColor instead * refactor(Theme): deprecated isAlwaysShown to use thumbVisibility instead --- lib/src/screens/auth/auth_page.dart | 2 +- lib/src/screens/backup/backup_page.dart | 5 +- .../backup/edit_backup_password_page.dart | 12 +- lib/src/screens/base_page.dart | 4 +- lib/src/screens/buy/pre_order_page.dart | 18 +- .../screens/contact/contact_list_page.dart | 13 +- lib/src/screens/contact/contact_page.dart | 13 +- lib/src/screens/dashboard/dashboard_page.dart | 26 +- .../dashboard/desktop_dashboard_page.dart | 2 +- .../desktop_action_button.dart | 17 +- .../desktop_sidebar/side_menu_item.dart | 2 +- .../desktop_sidebar_wrapper.dart | 2 +- .../desktop_wallet_selection_dropdown.dart | 8 +- .../desktop_widgets/dropdown_item_widget.dart | 2 +- .../dashboard/widgets/action_button.dart | 6 +- .../dashboard/widgets/address_page.dart | 43 ++- .../widgets/anonpay_transaction_row.dart | 6 +- .../dashboard/widgets/balance_page.dart | 57 ++- .../dashboard/widgets/date_section_raw.dart | 5 +- .../dashboard/widgets/filter_widget.dart | 8 +- .../screens/dashboard/widgets/header_row.dart | 15 +- .../dashboard/widgets/market_place_page.dart | 7 +- .../dashboard/widgets/menu_widget.dart | 33 +- .../screens/dashboard/widgets/order_row.dart | 12 +- .../present_receive_option_picker.dart | 12 +- .../dashboard/widgets/sync_indicator.dart | 6 +- .../widgets/sync_indicator_icon.dart | 5 +- .../screens/dashboard/widgets/trade_row.dart | 6 +- .../dashboard/widgets/transaction_raw.dart | 10 +- .../dashboard/widgets/transactions_page.dart | 4 +- .../screens/disclaimer/disclaimer_page.dart | 22 +- lib/src/screens/exchange/exchange_page.dart | 12 +- .../exchange/exchange_template_page.dart | 22 +- .../widgets/currency_picker_item_widget.dart | 31 +- .../widgets/currency_picker_widget.dart | 5 +- .../exchange/widgets/exchange_card.dart | 46 ++- .../mobile_exchange_cards_section.dart | 11 +- .../widgets/present_provider_picker.dart | 5 +- .../exchange_trade/exchange_confirm_page.dart | 32 +- .../exchange_trade/exchange_trade_page.dart | 26 +- .../exchange_trade/information_page.dart | 8 +- lib/src/screens/faq/faq_item.dart | 9 +- .../ionia/auth/ionia_create_account_page.dart | 23 +- .../screens/ionia/auth/ionia_login_page.dart | 10 +- .../ionia/auth/ionia_verify_otp_page.dart | 17 +- .../ionia/auth/ionia_welcome_page.dart | 16 +- .../ionia/cards/ionia_account_cards_page.dart | 49 ++- .../ionia/cards/ionia_account_page.dart | 17 +- .../cards/ionia_activate_debit_card_page.dart | 10 +- .../cards/ionia_buy_card_detail_page.dart | 40 +-- .../ionia/cards/ionia_buy_gift_card.dart | 46 ++- .../ionia/cards/ionia_custom_redeem_page.dart | 43 ++- .../ionia/cards/ionia_custom_tip_page.dart | 45 ++- .../ionia/cards/ionia_debit_card_page.dart | 56 ++- .../cards/ionia_gift_card_detail_page.dart | 19 +- .../ionia/cards/ionia_manage_cards_page.dart | 40 ++- .../ionia/cards/ionia_more_options_page.dart | 9 +- .../cards/ionia_payment_status_page.dart | 25 +- .../ionia/widgets/ionia_alert_model.dart | 12 +- .../ionia/widgets/ionia_filter_modal.dart | 12 +- lib/src/screens/ionia/widgets/ionia_tile.dart | 4 +- .../ionia/widgets/rounded_checkbox.dart | 4 +- .../ionia/widgets/text_icon_button.dart | 4 +- .../monero_account_edit_or_create_page.dart | 2 +- .../monero_account_list_page.dart | 2 +- .../monero_accounts/widgets/account_tile.dart | 10 +- .../advanced_privacy_settings_page.dart | 10 +- .../screens/new_wallet/new_wallet_page.dart | 21 +- .../new_wallet/new_wallet_type_page.dart | 10 +- .../new_wallet/widgets/select_button.dart | 24 +- .../nodes/node_create_or_edit_page.dart | 5 +- .../screens/nodes/widgets/node_list_row.dart | 2 +- lib/src/screens/pin_code/pin_code_widget.dart | 27 +- .../screens/receive/anonpay_invoice_page.dart | 21 +- .../screens/receive/anonpay_receive_page.dart | 24 +- .../screens/receive/fullscreen_qr_page.dart | 14 +- lib/src/screens/receive/receive_page.dart | 52 ++- .../widgets/anonpay_currency_input_field.dart | 27 +- .../receive/widgets/anonpay_input_form.dart | 21 +- .../widgets/anonpay_status_section.dart | 24 +- .../receive/widgets/copy_link_item.dart | 15 +- .../receive/widgets/currency_input_field.dart | 23 +- .../screens/receive/widgets/header_tile.dart | 11 +- .../screens/receive/widgets/qr_widget.dart | 18 +- .../release_notes/release_notes_screen.dart | 10 +- lib/src/screens/rescan/rescan_page.dart | 5 +- .../restore/restore_from_backup_page.dart | 5 +- .../restore_wallet_from_seed_details.dart | 5 +- .../screens/restore/sweeping_wallet_page.dart | 17 +- .../wallet_restore_from_keys_form.dart | 2 +- .../wallet_restore_from_seed_form.dart | 2 +- .../screens/restore/wallet_restore_page.dart | 20 +- .../restore/widgets/restore_button.dart | 19 +- lib/src/screens/seed/pre_seed_page.dart | 7 +- lib/src/screens/seed/wallet_seed_page.dart | 13 +- .../seed_language/seed_language_page.dart | 3 +- lib/src/screens/send/send_page.dart | 12 +- lib/src/screens/send/send_template_page.dart | 33 +- .../widgets/choose_yat_address_alert.dart | 4 +- .../send/widgets/confirm_sending_alert.dart | 14 +- lib/src/screens/send/widgets/send_card.dart | 46 +-- .../desktop_settings_page.dart | 5 +- .../widgets/settings_cell_with_arrow.dart | 2 +- .../widgets/settings_choices_cell.dart | 23 +- .../widgets/settings_picker_cell.dart | 2 +- .../widgets/settings_version_cell.dart | 3 +- .../address_edit_or_create_page.dart | 5 +- lib/src/screens/support/support_page.dart | 5 +- .../widgets/textfield_list_row.dart | 17 +- .../unspent_coins_list_page.dart | 2 +- .../widgets/unspent_coins_switch_row.dart | 6 +- .../screens/wallet_keys/wallet_keys_page.dart | 4 +- .../screens/wallet_list/wallet_list_page.dart | 18 +- lib/src/screens/welcome/welcome_page.dart | 46 ++- lib/src/screens/yat_emoji_id.dart | 7 +- lib/src/widgets/add_template_button.dart | 13 +- lib/src/widgets/address_text_field.dart | 19 +- lib/src/widgets/alert_with_one_action.dart | 9 +- lib/src/widgets/base_alert_dialog.dart | 25 +- lib/src/widgets/base_text_form_field.dart | 19 +- lib/src/widgets/blockchain_height_widget.dart | 3 +- lib/src/widgets/cake_scrollbar.dart | 6 +- lib/src/widgets/check_box_picker.dart | 26 +- lib/src/widgets/checkbox_widget.dart | 16 +- .../widgets/collapsible_standart_list.dart | 2 +- lib/src/widgets/introducing_card.dart | 6 +- lib/src/widgets/list_row.dart | 10 +- lib/src/widgets/market_place_item.dart | 6 +- lib/src/widgets/picker.dart | 69 ++-- lib/src/widgets/seed_widget.dart | 17 +- lib/src/widgets/setting_action_button.dart | 4 +- lib/src/widgets/standard_checkbox.dart | 8 +- lib/src/widgets/standard_list.dart | 14 +- lib/src/widgets/standard_list_card.dart | 4 +- lib/src/widgets/standard_list_status_row.dart | 8 +- lib/src/widgets/standard_switch.dart | 10 +- lib/src/widgets/template_tile.dart | 4 +- lib/src/widgets/trail_button.dart | 5 +- lib/themes/bright_theme.dart | 304 +++++++++------- lib/themes/dark_theme.dart | 337 ++++++++++-------- lib/themes/light_theme.dart | 305 +++++++++------- 141 files changed, 1954 insertions(+), 1111 deletions(-) diff --git a/lib/src/screens/auth/auth_page.dart b/lib/src/screens/auth/auth_page.dart index 7a1bd8420..dcd1c8016 100644 --- a/lib/src/screens/auth/auth_page.dart +++ b/lib/src/screens/auth/auth_page.dart @@ -141,7 +141,7 @@ class AuthPageState extends State { ), )) : Container(), - backgroundColor: Theme.of(context).backgroundColor, + backgroundColor: Theme.of(context).colorScheme.background, border: null), resizeToAvoidBottomInset: false, body: PinCode((pin, _) => widget.authViewModel.auth(password: pin), diff --git a/lib/src/screens/backup/backup_page.dart b/lib/src/screens/backup/backup_page.dart index 966b289d1..6f720ed9a 100644 --- a/lib/src/screens/backup/backup_page.dart +++ b/lib/src/screens/backup/backup_page.dart @@ -79,7 +79,10 @@ class BackupPage extends BasePage { isLoading: backupViewModelBase.state is IsExecutingState, onPressed: () => onExportBackup(context), text: S.of(context).export_backup, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white)), bottom: 24, left: 24, diff --git a/lib/src/screens/backup/edit_backup_password_page.dart b/lib/src/screens/backup/edit_backup_password_page.dart index f1ddaf4e1..40eb722c9 100644 --- a/lib/src/screens/backup/edit_backup_password_page.dart +++ b/lib/src/screens/backup/edit_backup_password_page.dart @@ -38,14 +38,20 @@ class EditBackupPasswordPage extends BasePage { keyboardType: TextInputType.visiblePassword, controller: textEditingController, style: TextStyle( - fontSize: 26, - color: Theme.of(context).primaryTextTheme!.headline6!.color!)))), + fontSize: 26, + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!)))), Positioned( child: Observer( builder: (_) => PrimaryButton( onPressed: () => onSave(context), text: S.of(context).save, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, isDisabled: !editBackupPasswordViewModel.canSave)), bottom: 24, diff --git a/lib/src/screens/base_page.dart b/lib/src/screens/base_page.dart index 51f8c1ad2..a06e0ae5a 100644 --- a/lib/src/screens/base_page.dart +++ b/lib/src/screens/base_page.dart @@ -48,7 +48,7 @@ abstract class BasePage extends StatelessWidget { } final _backButton = Icon(Icons.arrow_back_ios, - color: titleColor ?? Theme.of(context).primaryTextTheme.headline6!.color!, + color: titleColor ?? Theme.of(context).primaryTextTheme!.titleLarge!.color!, size: 16,); return MergeSemantics( @@ -83,7 +83,7 @@ abstract class BasePage extends StatelessWidget { fontWeight: FontWeight.bold, fontFamily: 'Lato', color: titleColor ?? - Theme.of(context).primaryTextTheme!.headline6!.color!), + Theme.of(context).primaryTextTheme!.titleLarge!.color!), ); } diff --git a/lib/src/screens/buy/pre_order_page.dart b/lib/src/screens/buy/pre_order_page.dart index 00a64896f..ccd6a5422 100644 --- a/lib/src/screens/buy/pre_order_page.dart +++ b/lib/src/screens/buy/pre_order_page.dart @@ -80,7 +80,9 @@ class PreOrderPage extends BasePage { return KeyboardActions( config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1! + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! .backgroundColor!, nextFocus: false, actions: [ @@ -91,7 +93,7 @@ class PreOrderPage extends BasePage { ]), child: Container( height: 0, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: ScrollableWithBottomSection( contentPadding: EdgeInsets.only(bottom: 24), content: Observer(builder: (_) => Column( @@ -102,9 +104,9 @@ class PreOrderPage extends BasePage { bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), gradient: LinearGradient(colors: [ - Theme.of(context).primaryTextTheme.subtitle1!.color!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, Theme.of(context) - .primaryTextTheme.subtitle1! + .primaryTextTheme!.titleMedium! .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight), ), @@ -160,11 +162,11 @@ class PreOrderPage extends BasePage { ), ), hintText: '0.00', - borderColor: Theme.of(context).primaryTextTheme.bodyText1!.decorationColor!, + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.decorationColor!, borderWidth: 0.5, textStyle: TextStyle(fontSize: 36, fontWeight: FontWeight.w500, color: Colors.white), placeholderTextStyle: TextStyle( - color: Theme.of(context).primaryTextTheme.headline5!.decorationColor!, + color: Theme.of(context).primaryTextTheme!.headlineSmall!.decorationColor!, fontWeight: FontWeight.w500, fontSize: 36, ), @@ -179,7 +181,7 @@ class PreOrderPage extends BasePage { S.of(context).buy_with + ':', textAlign: TextAlign.center, style: TextStyle( - color: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context).primaryTextTheme.titleLarge!.color!, fontSize: 18, fontWeight: FontWeight.bold ), @@ -246,7 +248,7 @@ class PreOrderPage extends BasePage { ? S.of(context).buy : S.of(context).buy_with + ' ${buyViewModel.selectedProvider!.description.title}', - color: Theme.of(context).accentTextTheme.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white, isLoading: buyViewModel.isRunning, isDisabled: (buyViewModel.selectedProvider == null) || diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart index 96887ff5f..c276b9d80 100644 --- a/lib/src/screens/contact/contact_list_page.dart +++ b/lib/src/screens/contact/contact_list_page.dart @@ -29,12 +29,15 @@ class ContactListPage extends BasePage { height: 32.0, decoration: BoxDecoration( shape: BoxShape.circle, - color: Theme.of(context).accentTextTheme.caption!.color!), + color: Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!), child: Stack( alignment: Alignment.center, children: [ Icon(Icons.add, - color: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, size: 22.0), ButtonTheme( minWidth: 32.0, @@ -64,9 +67,9 @@ class ContactListPage extends BasePage { return CollapsibleSectionList( context: context, sectionCount: 2, - themeColor: Theme.of(context).primaryTextTheme.headline6!.color!, + themeColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!, dividerThemeColor: - Theme.of(context).primaryTextTheme.caption!.decorationColor!, + Theme.of(context).primaryTextTheme!.bodySmall!.decorationColor!, sectionTitleBuilder: (_, int sectionIndex) { var title = S.current.contact_list_contacts; @@ -140,7 +143,7 @@ class ContactListPage extends BasePage { style: TextStyle( fontSize: 14, fontWeight: FontWeight.normal, - color: Theme.of(context).primaryTextTheme.headline6!.color!), + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!), ), ) ) diff --git a/lib/src/screens/contact/contact_page.dart b/lib/src/screens/contact/contact_page.dart index 09dc5efc3..fc9c6c109 100644 --- a/lib/src/screens/contact/contact_page.dart +++ b/lib/src/screens/contact/contact_page.dart @@ -47,7 +47,8 @@ class ContactPage extends BasePage { @override Widget body(BuildContext context) { final downArrow = Image.asset('assets/images/arrow_bottom_purple_icon.png', - color: Theme.of(context).primaryTextTheme!.overline!.color!, height: 8); + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!, + height: 8); reaction((_) => contactViewModel.state, (ExecutionState state) { if (state is FailureState) { @@ -98,12 +99,14 @@ class ContactPage extends BasePage { AddressTextFieldOption.paste, AddressTextFieldOption.qrCode, ], - buttonColor: - Theme.of(context).accentTextTheme!.headline3!.color!, + buttonColor: Theme.of(context) + .accentTextTheme! + .displaySmall! + .color!, iconColor: PaletteDark.gray, borderColor: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .backgroundColor!, validator: AddressValidator(type: contactViewModel.currency!), @@ -142,7 +145,7 @@ class ContactPage extends BasePage { text: S.of(context).save, color: Theme.of(context) .accentTextTheme! - .bodyText1! + .bodyLarge! .color!, textColor: Colors.white, isDisabled: !contactViewModel.isReady))) diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart index a76b93fc0..2b485aa7a 100644 --- a/lib/src/screens/dashboard/dashboard_page.dart +++ b/lib/src/screens/dashboard/dashboard_page.dart @@ -77,7 +77,7 @@ class _DashboardPageView extends BasePage { (BuildContext context, Widget scaffold) => Container( decoration: BoxDecoration( gradient: LinearGradient(colors: [ - Theme.of(context).accentColor, + Theme.of(context).colorScheme.secondary, Theme.of(context).scaffoldBackgroundColor, Theme.of(context).primaryColor, ], begin: Alignment.topRight, end: Alignment.bottomLeft)), @@ -99,7 +99,10 @@ class _DashboardPageView extends BasePage { @override Widget trailing(BuildContext context) { final menuButton = Image.asset('assets/images/menu.png', - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!); + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor); return Container( alignment: Alignment.centerRight, @@ -167,7 +170,7 @@ class _DashboardPageView extends BasePage { dotColor: Theme.of(context).indicatorColor, activeDotColor: Theme.of(context) .accentTextTheme! - .headline4! + .headlineMedium! .backgroundColor!), ), ); @@ -186,7 +189,10 @@ class _DashboardPageView extends BasePage { : Colors.transparent, width: 1, ), - color: Theme.of(context).textTheme.headline6!.backgroundColor!, + color: Theme.of(context) + .textTheme! + .titleLarge! + .backgroundColor!, ), child: Container( padding: EdgeInsets.only(left: 32, right: 32), @@ -207,12 +213,12 @@ class _DashboardPageView extends BasePage { dashboardViewModel) ?? true ? Theme.of(context) - .accentTextTheme - .headline2! + .accentTextTheme! + .displayMedium! .backgroundColor! : Theme.of(context) - .accentTextTheme - .headline3! + .accentTextTheme! + .displaySmall! .backgroundColor!), title: action.name(context), onClick: () async => await action.onTap( @@ -222,8 +228,8 @@ class _DashboardPageView extends BasePage { true ? null : Theme.of(context) - .accentTextTheme - .headline3! + .accentTextTheme! + .displaySmall! .backgroundColor!, ), )) diff --git a/lib/src/screens/dashboard/desktop_dashboard_page.dart b/lib/src/screens/dashboard/desktop_dashboard_page.dart index df74a3f6f..2332f4db6 100644 --- a/lib/src/screens/dashboard/desktop_dashboard_page.dart +++ b/lib/src/screens/dashboard/desktop_dashboard_page.dart @@ -37,7 +37,7 @@ class DesktopDashboardPage extends StatelessWidget { _setEffects(context); return Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart index 0e3588a17..6e6db72cc 100644 --- a/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart +++ b/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart @@ -30,7 +30,7 @@ class DesktopActionButton extends StatelessWidget { width: double.infinity, decoration: BoxDecoration( borderRadius: BorderRadius.circular(15.0), - color: Theme.of(context).textTheme.headline6!.backgroundColor!, + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!, ), child: Center( child: Row( @@ -41,8 +41,14 @@ class DesktopActionButton extends StatelessWidget { height: 30, width: 30, color: isEnabled - ? Theme.of(context).accentTextTheme.headline2!.backgroundColor! - : Theme.of(context).accentTextTheme.headline3!.backgroundColor!, + ? Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor! + : Theme.of(context) + .accentTextTheme! + .displaySmall! + .backgroundColor!, ), const SizedBox(width: 10), AutoSizeText( @@ -52,7 +58,10 @@ class DesktopActionButton extends StatelessWidget { fontFamily: 'Lato', fontWeight: FontWeight.bold, color: isEnabled - ? Theme.of(context).accentTextTheme.headline2!.backgroundColor! + ? Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor! : null, height: 1, ), diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart index 42f4b0e4e..74ad54870 100644 --- a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart +++ b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart @@ -16,7 +16,7 @@ class SideMenuItem extends StatelessWidget { Color _setColor(BuildContext context) { if (isSelected) { - return Theme.of(context).primaryTextTheme.headline6!.color!; + return Theme.of(context).primaryTextTheme!.titleLarge!.color!; } else { return Theme.of(context).highlightColor; } diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart index 72e65da34..31348aed4 100644 --- a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart +++ b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart @@ -126,7 +126,7 @@ class DesktopSidebarWrapper extends BasePage { children: [ child, Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, padding: EdgeInsets.all(20), child: Navigator( initialRoute: Routes.support, diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart index a8f050002..501252978 100644 --- a/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart +++ b/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart @@ -36,14 +36,14 @@ class _DesktopWalletSelectionDropDownState extends State Image.asset( 'assets/images/restore_wallet.png', height: 12, width: 12, - color: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ); Flushbar? _progressBar; @@ -93,8 +93,8 @@ class _DesktopWalletSelectionDropDownState extends State dropDownItems.map((item) => item.child).toList(), value: dropDownItems.firstWhere((element) => element.isSelected), underline: const SizedBox(), diff --git a/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart b/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart index 47efd04a7..14dcbb0d8 100644 --- a/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart +++ b/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart @@ -23,7 +23,7 @@ class DropDownItemWidget extends StatelessWidget { style: TextStyle( fontSize: 22, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), overflow: TextOverflow.ellipsis, maxLines: 1, diff --git a/lib/src/screens/dashboard/widgets/action_button.dart b/lib/src/screens/dashboard/widgets/action_button.dart index e9ef3669a..a3626fe3f 100644 --- a/lib/src/screens/dashboard/widgets/action_button.dart +++ b/lib/src/screens/dashboard/widgets/action_button.dart @@ -45,7 +45,11 @@ class ActionButton extends StatelessWidget { title, style: TextStyle( fontSize: 10, - color: textColor ?? Theme.of(context).accentTextTheme!.headline2!.backgroundColor!), + color: textColor ?? + Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!), ) ], ), diff --git a/lib/src/screens/dashboard/widgets/address_page.dart b/lib/src/screens/dashboard/widgets/address_page.dart index 975887a7a..a5fac2053 100644 --- a/lib/src/screens/dashboard/widgets/address_page.dart +++ b/lib/src/screens/dashboard/widgets/address_page.dart @@ -63,7 +63,10 @@ class AddressPage extends BasePage { Widget? leading(BuildContext context) { final _backButton = Icon( Icons.arrow_back_ios, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, size: 16, ); final _closeButton = currentTheme.type == ThemeType.dark @@ -106,7 +109,7 @@ class AddressPage extends BasePage { (BuildContext context, Widget scaffold) => Container( decoration: BoxDecoration( gradient: LinearGradient(colors: [ - Theme.of(context).accentColor, + Theme.of(context).colorScheme.secondary, Theme.of(context).scaffoldBackgroundColor, Theme.of(context).primaryColor, ], begin: Alignment.topRight, end: Alignment.bottomLeft)), @@ -131,7 +134,10 @@ class AddressPage extends BasePage { icon: Icon( Icons.share, size: 20, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ), ); @@ -172,7 +178,10 @@ class AddressPage extends BasePage { tapOutsideToDismiss: true, config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -204,8 +213,15 @@ class AddressPage extends BasePage { decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(25)), border: Border.all( - color: Theme.of(context).textTheme.subtitle1!.color!, width: 1), - color: Theme.of(context).buttonColor), + color: Theme.of(context) + .textTheme! + .titleMedium! + .color!, + width: 1), + color: Theme.of(context) + .textTheme! + .titleLarge! + .backgroundColor!), child: Row( mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -219,15 +235,17 @@ class AddressPage extends BasePage { fontSize: 14, fontWeight: FontWeight.w500, color: Theme.of(context) - .accentTextTheme - .headline2! + .accentTextTheme! + .displayMedium! .backgroundColor!), )), Icon( Icons.arrow_forward_ios, size: 14, - color: - Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ) ], ), @@ -237,7 +255,10 @@ class AddressPage extends BasePage { textAlign: TextAlign.center, style: TextStyle( fontSize: 15, - color: Theme.of(context).accentTextTheme.headline3!.backgroundColor!)); + color: Theme.of(context) + .accentTextTheme! + .displaySmall! + .backgroundColor!)); }) ], ), diff --git a/lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart b/lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart index 38f0ffd88..3b33e8e22 100644 --- a/lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart +++ b/lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart @@ -37,19 +37,19 @@ class AnonpayTransactionRow extends StatelessWidget { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!)), + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!)), Text(amount + ' ' + currency, style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!)) + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!)) ]), SizedBox(height: 5), Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text(createdAt, style: TextStyle( fontSize: 14, - color: Theme.of(context).textTheme.overline!.backgroundColor!)) + color: Theme.of(context).textTheme!.labelSmall!.backgroundColor!)) ]) ], )) diff --git a/lib/src/screens/dashboard/widgets/balance_page.dart b/lib/src/screens/dashboard/widgets/balance_page.dart index 14933e7c5..6e2893429 100644 --- a/lib/src/screens/dashboard/widgets/balance_page.dart +++ b/lib/src/screens/dashboard/widgets/balance_page.dart @@ -35,7 +35,10 @@ class BalancePage extends StatelessWidget { fontSize: 24, fontFamily: 'Lato', fontWeight: FontWeight.w600, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1), maxLines: 1, textAlign: TextAlign.center); @@ -98,7 +101,7 @@ class BalancePage extends StatelessWidget { : Colors.transparent, width: 1, ), - color: Theme.of(context).textTheme!.headline6!.backgroundColor!), + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!), child: Container( margin: const EdgeInsets.only(top: 16, left: 24, right: 24, bottom: 24), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -111,7 +114,10 @@ class BalancePage extends StatelessWidget { fontSize: 12, fontFamily: 'Lato', fontWeight: FontWeight.w400, - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displaySmall! + .backgroundColor!, height: 1)), SizedBox(height: 5), Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -120,7 +126,10 @@ class BalancePage extends StatelessWidget { fontSize: 24, fontFamily: 'Lato', fontWeight: FontWeight.w900, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1), maxLines: 1, textAlign: TextAlign.center), @@ -129,7 +138,10 @@ class BalancePage extends StatelessWidget { fontSize: 28, fontFamily: 'Lato', fontWeight: FontWeight.w800, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1)), ]), SizedBox( @@ -141,7 +153,10 @@ class BalancePage extends StatelessWidget { fontSize: 16, fontFamily: 'Lato', fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1)), SizedBox(height: 26), if (frozenBalance.isNotEmpty) @@ -152,7 +167,10 @@ class BalancePage extends StatelessWidget { fontSize: 12, fontFamily: 'Lato', fontWeight: FontWeight.w400, - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displaySmall! + .backgroundColor!, height: 1)), SizedBox(height: 8), AutoSizeText(frozenBalance, @@ -160,7 +178,10 @@ class BalancePage extends StatelessWidget { fontSize: 20, fontFamily: 'Lato', fontWeight: FontWeight.w400, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1), maxLines: 1, textAlign: TextAlign.center), @@ -172,7 +193,10 @@ class BalancePage extends StatelessWidget { fontSize: 12, fontFamily: 'Lato', fontWeight: FontWeight.w400, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1), ), SizedBox(height: 24) @@ -183,7 +207,10 @@ class BalancePage extends StatelessWidget { fontSize: 12, fontFamily: 'Lato', fontWeight: FontWeight.w400, - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displaySmall! + .backgroundColor!, height: 1)), SizedBox(height: 8), AutoSizeText(additionalBalance, @@ -191,7 +218,10 @@ class BalancePage extends StatelessWidget { fontSize: 20, fontFamily: 'Lato', fontWeight: FontWeight.w400, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1), maxLines: 1, textAlign: TextAlign.center), @@ -205,7 +235,10 @@ class BalancePage extends StatelessWidget { fontSize: 12, fontFamily: 'Lato', fontWeight: FontWeight.w400, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1), ) ])), diff --git a/lib/src/screens/dashboard/widgets/date_section_raw.dart b/lib/src/screens/dashboard/widgets/date_section_raw.dart index e5f1625f7..7abaa0ba7 100644 --- a/lib/src/screens/dashboard/widgets/date_section_raw.dart +++ b/lib/src/screens/dashboard/widgets/date_section_raw.dart @@ -36,6 +36,9 @@ class DateSectionRaw extends StatelessWidget { child: Text(title, style: TextStyle( fontSize: 12, - color: Theme.of(context).textTheme!.overline!.backgroundColor!))); + color: Theme.of(context) + .textTheme! + .labelSmall! + .backgroundColor!))); } } diff --git a/lib/src/screens/dashboard/widgets/filter_widget.dart b/lib/src/screens/dashboard/widgets/filter_widget.dart index 456ed95f7..da13208bc 100644 --- a/lib/src/screens/dashboard/widgets/filter_widget.dart +++ b/lib/src/screens/dashboard/widgets/filter_widget.dart @@ -23,7 +23,7 @@ class FilterWidget extends StatelessWidget { child: ClipRRect( borderRadius: BorderRadius.all(Radius.circular(24)), child: Container( - color: Theme.of(context).textTheme!.bodyText1!.decorationColor!, + color: Theme.of(context).textTheme!.bodyLarge!.decorationColor!, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -33,8 +33,8 @@ class FilterWidget extends StatelessWidget { S.of(context).filter_by, style: TextStyle( color: Theme.of(context) - .primaryTextTheme - .overline! + .primaryTextTheme! + .labelSmall! .color!, fontSize: 16, fontFamily: 'Lato', @@ -65,7 +65,7 @@ class FilterWidget extends StatelessWidget { style: TextStyle( color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!, fontSize: 16, fontFamily: 'Lato', diff --git a/lib/src/screens/dashboard/widgets/header_row.dart b/lib/src/screens/dashboard/widgets/header_row.dart index f3553c0e9..44fdb6c59 100644 --- a/lib/src/screens/dashboard/widgets/header_row.dart +++ b/lib/src/screens/dashboard/widgets/header_row.dart @@ -12,7 +12,7 @@ class HeaderRow extends StatelessWidget { @override Widget build(BuildContext context) { final filterIcon = Image.asset('assets/images/filter_icon.png', - color: Theme.of(context).textTheme!.caption!.decorationColor!); + color: Theme.of(context).textTheme!.bodySmall!.decorationColor!); return Container( height: 52, @@ -25,10 +25,12 @@ class HeaderRow extends StatelessWidget { Text( S.of(context).transactions, style: TextStyle( - fontSize: 20, - fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor! - ), + fontSize: 20, + fontWeight: FontWeight.w500, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!), ), GestureDetector( onTap: () { @@ -43,8 +45,7 @@ class HeaderRow extends StatelessWidget { width: 36, decoration: BoxDecoration( shape: BoxShape.circle, - color: Theme.of(context).textTheme!.overline!.color! - ), + color: Theme.of(context).textTheme!.labelSmall!.color!), child: filterIcon, ), ) diff --git a/lib/src/screens/dashboard/widgets/market_place_page.dart b/lib/src/screens/dashboard/widgets/market_place_page.dart index 9ac225634..fe0eb9ec8 100644 --- a/lib/src/screens/dashboard/widgets/market_place_page.dart +++ b/lib/src/screens/dashboard/widgets/market_place_page.dart @@ -22,7 +22,7 @@ class MarketPlacePage extends StatelessWidget { child: RawScrollbar( thumbColor: Colors.white.withOpacity(0.15), radius: Radius.circular(20), - isAlwaysShown: true, + thumbVisibility: true, thickness: 2, controller: _scrollController, child: Padding( @@ -36,7 +36,10 @@ class MarketPlacePage extends StatelessWidget { style: TextStyle( fontSize: 24, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ), Expanded( diff --git a/lib/src/screens/dashboard/widgets/menu_widget.dart b/lib/src/screens/dashboard/widgets/menu_widget.dart index ac1835869..56b2e87e6 100644 --- a/lib/src/screens/dashboard/widgets/menu_widget.dart +++ b/lib/src/screens/dashboard/widgets/menu_widget.dart @@ -84,9 +84,15 @@ class MenuWidgetState extends State { final itemCount = SettingActions.all.length; moneroIcon = Image.asset('assets/images/monero_menu.png', - color: Theme.of(context).accentTextTheme.overline!.decorationColor!); + color: Theme.of(context) + .accentTextTheme! + .labelSmall! + .decorationColor!); bitcoinIcon = Image.asset('assets/images/bitcoin_menu.png', - color: Theme.of(context).accentTextTheme.overline!.decorationColor!); + color: Theme.of(context) + .accentTextTheme! + .labelSmall! + .decorationColor!); litecoinIcon = Image.asset('assets/images/litecoin_menu.png'); havenIcon = Image.asset('assets/images/haven_menu.png'); @@ -108,7 +114,8 @@ class MenuWidgetState extends State { borderRadius: BorderRadius.only( topLeft: Radius.circular(24), bottomLeft: Radius.circular(24)), child: Container( - color: Theme.of(context).textTheme.bodyText1!.decorationColor!, + color: + Theme.of(context).textTheme!.bodyLarge!.decorationColor!, child: ListView.separated( padding: EdgeInsets.only(top: 0), itemBuilder: (_, index) { @@ -117,9 +124,14 @@ class MenuWidgetState extends State { height: headerHeight, decoration: BoxDecoration( gradient: LinearGradient(colors: [ - Theme.of(context).accentTextTheme.headline4!.color!, - Theme.of(context).accentTextTheme.headline4!.decorationColor!, - ], begin: Alignment.topLeft, end: Alignment.bottomRight), + Theme.of(context) + .accentTextTheme! + .headlineMedium! + .color!, + Theme.of(context) + .accentTextTheme! + .headlineMedium! + .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight), ), padding: EdgeInsets.only( left: 24, top: fromTopEdge, right: 24, bottom: fromBottomEdge), @@ -149,8 +161,8 @@ class MenuWidgetState extends State { widget.dashboardViewModel.subname, style: TextStyle( color: Theme.of(context) - .accentTextTheme - .overline! + .accentTextTheme! + .labelSmall! .decorationColor!, fontWeight: FontWeight.w500, fontSize: 12), @@ -182,7 +194,10 @@ class MenuWidgetState extends State { }, separatorBuilder: (_, index) => Container( height: 1, - color: Theme.of(context).primaryTextTheme.caption!.decorationColor!, + color: Theme.of(context) + .primaryTextTheme! + .bodySmall! + .decorationColor!, ), itemCount: itemCount + 1), ))) diff --git a/lib/src/screens/dashboard/widgets/order_row.dart b/lib/src/screens/dashboard/widgets/order_row.dart index edfe0eb21..961f31784 100644 --- a/lib/src/screens/dashboard/widgets/order_row.dart +++ b/lib/src/screens/dashboard/widgets/order_row.dart @@ -20,7 +20,7 @@ class OrderRow extends StatelessWidget { @override Widget build(BuildContext context) { final iconColor = - Theme.of(context).primaryTextTheme!.headline1!.backgroundColor!; + Theme.of(context).primaryTextTheme!.displayLarge!.backgroundColor!; final providerIcon = getBuyProviderIcon(provider, iconColor: iconColor); @@ -48,14 +48,14 @@ class OrderRow extends StatelessWidget { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor! + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor! )), formattedAmount != null ? Text(formattedAmount! + ' ' + to, style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor! + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor! )) : Container() ]), @@ -66,8 +66,10 @@ class OrderRow extends StatelessWidget { Text(createdAtFormattedDate, style: TextStyle( fontSize: 14, - color: Theme.of(context).textTheme! - .overline!.backgroundColor!)) + color: Theme.of(context) + .textTheme! + .labelSmall! + .backgroundColor!)) ]) ], ) diff --git a/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart b/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart index 7b02765b3..c29442450 100644 --- a/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart +++ b/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart @@ -18,7 +18,10 @@ class PresentReceiveOptionPicker extends StatelessWidget { @override Widget build(BuildContext context) { final textIconTheme = hasWhiteBackground - ? Theme.of(context).accentTextTheme.headline2!.backgroundColor! + ? Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor! : Colors.white; final arrowBottom = Image.asset( 'assets/images/arrow_bottom_purple_icon.png', @@ -83,7 +86,7 @@ class PresentReceiveOptionPicker extends StatelessWidget { margin: EdgeInsets.symmetric(horizontal: 24), decoration: BoxDecoration( borderRadius: BorderRadius.circular(30), - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, ), child: Padding( padding: const EdgeInsets.only(top: 24, bottom: 24), @@ -110,7 +113,10 @@ class PresentReceiveOptionPicker extends StatelessWidget { Text(option.toString(), textAlign: TextAlign.left, style: textSmall( - color: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!, ).copyWith( fontWeight: value == option ? FontWeight.w800 : FontWeight.w500, diff --git a/lib/src/screens/dashboard/widgets/sync_indicator.dart b/lib/src/screens/dashboard/widgets/sync_indicator.dart index 90da3b83f..11a973d6e 100644 --- a/lib/src/screens/dashboard/widgets/sync_indicator.dart +++ b/lib/src/screens/dashboard/widgets/sync_indicator.dart @@ -32,7 +32,7 @@ class SyncIndicator extends StatelessWidget { child: Container( height: 30, width: syncIndicatorWidth, - color: Theme.of(context).textTheme!.headline6!.decorationColor!, + color: Theme.of(context).textTheme!.titleLarge!.decorationColor!, child: Stack( alignment: Alignment.center, children: [ @@ -44,7 +44,7 @@ class SyncIndicator extends StatelessWidget { child: Container( width: indicatorWidth, height: 30, - color: Theme.of(context).textTheme!.headline6!.backgroundColor!, + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!, ) ) : Offstage(), @@ -66,7 +66,7 @@ class SyncIndicator extends StatelessWidget { style: TextStyle( fontSize: 12, fontWeight: FontWeight.w500, - color: Theme.of(context).textTheme!.headline6!.color! + color: Theme.of(context).textTheme!.titleLarge!.color! ), ), ) diff --git a/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart b/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart index a73163824..0aa8fa7c5 100644 --- a/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart +++ b/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart @@ -26,14 +26,15 @@ class SyncIndicatorIcon extends StatelessWidget { if (boolMode) { indicatorColor = isSynced ? PaletteDark.brightGreen - : Theme.of(context).textTheme!.caption!.color!; + : Theme.of(context).textTheme!.bodySmall!.color!; } else { switch (value.toLowerCase()) { case waiting: indicatorColor = Colors.red; break; case actionRequired: - indicatorColor = Theme.of(context).textTheme!.headline2!.decorationColor!; + indicatorColor = + Theme.of(context).textTheme!.displayMedium!.decorationColor!; break; case created: indicatorColor = PaletteDark.brightGreen; diff --git a/lib/src/screens/dashboard/widgets/trade_row.dart b/lib/src/screens/dashboard/widgets/trade_row.dart index 3b613b0e2..754e9d237 100644 --- a/lib/src/screens/dashboard/widgets/trade_row.dart +++ b/lib/src/screens/dashboard/widgets/trade_row.dart @@ -43,14 +43,14 @@ class TradeRow extends StatelessWidget { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!)), + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!)), formattedAmount != null ? Text(formattedAmount! + ' ' + amountCrypto, style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, color: - Theme.of(context).accentTextTheme!.headline2!.backgroundColor!)) + Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!)) : Container() ]), SizedBox(height: 5), @@ -59,7 +59,7 @@ class TradeRow extends StatelessWidget { Text(createdAtFormattedDate!, style: TextStyle( fontSize: 14, - color: Theme.of(context).textTheme!.overline!.backgroundColor!)) + color: Theme.of(context).textTheme!.labelSmall!.backgroundColor!)) ]) ], )) diff --git a/lib/src/screens/dashboard/widgets/transaction_raw.dart b/lib/src/screens/dashboard/widgets/transaction_raw.dart index b7d8cef93..aae3397ee 100644 --- a/lib/src/screens/dashboard/widgets/transaction_raw.dart +++ b/lib/src/screens/dashboard/widgets/transaction_raw.dart @@ -35,7 +35,7 @@ class TransactionRow extends StatelessWidget { width: 36, decoration: BoxDecoration( shape: BoxShape.circle, - color: Theme.of(context).textTheme!.overline!.decorationColor! + color: Theme.of(context).textTheme!.labelSmall!.decorationColor! ), child: Image.asset( direction == TransactionDirection.incoming @@ -55,13 +55,13 @@ class TransactionRow extends StatelessWidget { fontSize: 16, fontWeight: FontWeight.w500, color: Theme.of(context).accentTextTheme! - .headline2!.backgroundColor!)), + .displayMedium!.backgroundColor!)), Text(formattedAmount, style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, color: Theme.of(context).accentTextTheme! - .headline2!.backgroundColor!)) + .displayMedium!.backgroundColor!)) ]), SizedBox(height: 5), Row( @@ -72,14 +72,14 @@ class TransactionRow extends StatelessWidget { fontSize: 14, color: Theme.of(context) .textTheme! - .overline! + .labelSmall! .backgroundColor!)), Text(formattedFiatAmount, style: TextStyle( fontSize: 14, color: Theme.of(context) .textTheme! - .overline! + .labelSmall! .backgroundColor!)) ]) ], diff --git a/lib/src/screens/dashboard/widgets/transactions_page.dart b/lib/src/screens/dashboard/widgets/transactions_page.dart index 2efb38e89..c80edc8d9 100644 --- a/lib/src/screens/dashboard/widgets/transactions_page.dart +++ b/lib/src/screens/dashboard/widgets/transactions_page.dart @@ -28,7 +28,7 @@ class TransactionsPage extends StatelessWidget { return Container( color: ResponsiveLayoutUtil.instance.isMobile(context) ? null - : Theme.of(context).backgroundColor, + : Theme.of(context).colorScheme.background, padding: EdgeInsets.only(top: 24, bottom: 24), child: Column( children: [ @@ -121,7 +121,7 @@ class TransactionsPage extends StatelessWidget { S.of(context).placeholder_transactions, style: TextStyle( fontSize: 14, - color: Theme.of(context).primaryTextTheme.overline!.decorationColor!), + color: Theme.of(context).primaryTextTheme!.labelSmall!.decorationColor!), ), ); })) diff --git a/lib/src/screens/disclaimer/disclaimer_page.dart b/lib/src/screens/disclaimer/disclaimer_page.dart index b6ec835d9..1bb05eca0 100644 --- a/lib/src/screens/disclaimer/disclaimer_page.dart +++ b/lib/src/screens/disclaimer/disclaimer_page.dart @@ -67,7 +67,7 @@ class DisclaimerBodyState extends State { return WillPopScope( onWillPop: () async => false, child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Column( children: [ SizedBox(height: 10.0), @@ -89,7 +89,7 @@ class DisclaimerBodyState extends State { fontWeight: FontWeight.bold, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!), ), ) @@ -109,7 +109,7 @@ class DisclaimerBodyState extends State { fontWeight: FontWeight.bold, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!), ), ) @@ -128,7 +128,7 @@ class DisclaimerBodyState extends State { fontWeight: FontWeight.normal, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!), )) ], @@ -148,7 +148,7 @@ class DisclaimerBodyState extends State { fontWeight: FontWeight.bold, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!), ), ) @@ -195,7 +195,7 @@ class DisclaimerBodyState extends State { Theme.of(context) .backgroundColor .withOpacity(0.0), - Theme.of(context).backgroundColor, + Theme.of(context).colorScheme.background, ], begin: FractionalOffset.topCenter, end: FractionalOffset.bottomCenter, @@ -234,12 +234,12 @@ class DisclaimerBodyState extends State { border: Border.all( color: Theme.of(context) .primaryTextTheme! - .caption! + .bodySmall! .color!, width: 1.0), borderRadius: BorderRadius.all( Radius.circular(8.0)), - color: Theme.of(context).backgroundColor), + color: Theme.of(context).colorScheme.background), child: _checked ? Icon( Icons.check, @@ -255,7 +255,7 @@ class DisclaimerBodyState extends State { fontSize: 14.0, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!), ) ], @@ -275,11 +275,11 @@ class DisclaimerBodyState extends State { text: 'Accept', color: Theme.of(context) .accentTextTheme! - .subtitle2! + .titleSmall! .decorationColor!, textColor: Theme.of(context) .accentTextTheme! - .headline5! + .headlineSmall! .decorationColor!), ), ], diff --git a/lib/src/screens/exchange/exchange_page.dart b/lib/src/screens/exchange/exchange_page.dart index 0254ef0d4..6eea29b42 100644 --- a/lib/src/screens/exchange/exchange_page.dart +++ b/lib/src/screens/exchange/exchange_page.dart @@ -151,7 +151,7 @@ class ExchangePage extends BasePage { config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, keyboardBarColor: - Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, + Theme.of(context).accentTextTheme!.bodyLarge!.backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -162,7 +162,7 @@ class ExchangePage extends BasePage { toolbarButtons: [(_) => KeyboardDoneButton()]) ]), child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Form( key: _formKey, child: ScrollableWithBottomSection( @@ -209,7 +209,7 @@ class ExchangePage extends BasePage { style: TextStyle( color: Theme.of(context) .primaryTextTheme! - .headline1! + .displayLarge! .decorationColor!, fontWeight: FontWeight.w500, fontSize: 12), @@ -243,7 +243,7 @@ class ExchangePage extends BasePage { } } }, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white, isDisabled: exchangeViewModel.selectedProviders.isEmpty, isLoading: exchangeViewModel.tradeState is TradeIsCreating)), @@ -654,7 +654,7 @@ class ExchangePage extends BasePage { imageArrow: arrowBottomPurple, currencyButtonColor: Colors.transparent, addressButtonsColor: Theme.of(context).focusColor!, - borderColor: Theme.of(context).primaryTextTheme!.bodyText1!.color!, + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!, currencyValueValidator: (value) { return !exchangeViewModel.isFixedRateMode ? AmountValidator( @@ -704,7 +704,7 @@ class ExchangePage extends BasePage { currencyButtonColor: Colors.transparent, addressButtonsColor: Theme.of(context).focusColor!, borderColor: - Theme.of(context).primaryTextTheme!.bodyText1!.decorationColor!, + Theme.of(context).primaryTextTheme!.bodyLarge!.decorationColor!, currencyValueValidator: (value) { return exchangeViewModel.isFixedRateMode ? AmountValidator( diff --git a/lib/src/screens/exchange/exchange_template_page.dart b/lib/src/screens/exchange/exchange_template_page.dart index 00eee49c2..ddd2c90b7 100644 --- a/lib/src/screens/exchange/exchange_template_page.dart +++ b/lib/src/screens/exchange/exchange_template_page.dart @@ -73,8 +73,10 @@ class ExchangeTemplatePage extends BasePage { disableScroll: true, config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: - Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -85,7 +87,7 @@ class ExchangeTemplatePage extends BasePage { toolbarButtons: [(_) => KeyboardDoneButton()]) ]), child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Form( key: _formKey, child: ScrollableWithBottomSection( @@ -99,8 +101,8 @@ class ExchangeTemplatePage extends BasePage { ), gradient: LinearGradient( colors: [ - Theme.of(context).primaryTextTheme.bodyText2!.color!, - Theme.of(context).primaryTextTheme.bodyText2!.decorationColor!, + Theme.of(context).primaryTextTheme!.bodyMedium!.color!, + Theme.of(context).primaryTextTheme!.bodyMedium!.decorationColor!, ], stops: [0.35, 1.0], begin: Alignment.topLeft, @@ -119,10 +121,10 @@ class ExchangeTemplatePage extends BasePage { gradient: LinearGradient( colors: [ Theme.of(context) - .primaryTextTheme.subtitle2! + .primaryTextTheme!.titleSmall! .color!, Theme.of(context) - .primaryTextTheme.subtitle2! + .primaryTextTheme!.titleSmall! .decorationColor!, ], begin: Alignment.topLeft, @@ -157,7 +159,7 @@ class ExchangeTemplatePage extends BasePage { addressButtonsColor: Theme.of(context).focusColor, borderColor: Theme.of(context) - .primaryTextTheme.bodyText1! + .primaryTextTheme!.bodyLarge! .color!, currencyValueValidator: AmountValidator( currency: exchangeViewModel.depositCurrency), @@ -197,7 +199,7 @@ class ExchangeTemplatePage extends BasePage { addressButtonsColor: Theme.of(context).focusColor, borderColor: Theme.of(context) - .primaryTextTheme.bodyText1! + .primaryTextTheme!.bodyLarge! .decorationColor!, currencyValueValidator: AmountValidator( currency: exchangeViewModel.receiveCurrency), @@ -225,7 +227,7 @@ class ExchangeTemplatePage extends BasePage { textAlign: TextAlign.center, style: TextStyle( color: Theme.of(context) - .primaryTextTheme.headline1! + .primaryTextTheme!.displayLarge! .decorationColor!, fontWeight: FontWeight.w500, fontSize: 12), diff --git a/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart b/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart index 88aaaedd3..3dc0f80e3 100644 --- a/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart +++ b/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart @@ -20,7 +20,10 @@ class PickerItemWidget extends StatelessWidget { return GestureDetector( onTap: onTap, child: Container( - color: Theme.of(context).accentTextTheme!.headline6!.color!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .color!, child: Padding( padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 24), child: Row( @@ -39,7 +42,12 @@ class PickerItemWidget extends StatelessWidget { Text( title.toUpperCase(), style: TextStyle( - color: isSelected ? Palette.blueCraiola : Theme.of(context).primaryTextTheme!.headline6!.color!, + color: isSelected + ? Palette.blueCraiola + : Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!, fontSize: isSelected ? 16 : 14.0, fontFamily: 'Lato', fontWeight: FontWeight.w600, @@ -55,20 +63,33 @@ class PickerItemWidget extends StatelessWidget { child: Text( tag!, style: TextStyle( - fontSize: 7.0, fontFamily: 'Lato', color: Theme.of(context).textTheme!.bodyText2!.color!), + fontSize: 7.0, + fontFamily: 'Lato', + color: Theme.of(context) + .textTheme! + .bodyMedium! + .color!), ), ), decoration: BoxDecoration( borderRadius: BorderRadius.circular(6.0), //border: Border.all(color: ), - color: Theme.of(context).textTheme!.bodyText2!.decorationColor!, + color: Theme.of(context) + .textTheme! + .bodyMedium! + .decorationColor!, ), ), ), ], ), ), - if (isSelected) Icon(Icons.check_circle, color: Theme.of(context).accentTextTheme!.bodyText1!.color!) + if (isSelected) + Icon(Icons.check_circle, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!) ], ), ), diff --git a/lib/src/screens/exchange/widgets/currency_picker_widget.dart b/lib/src/screens/exchange/widgets/currency_picker_widget.dart index ae7fa052e..de835fe18 100644 --- a/lib/src/screens/exchange/widgets/currency_picker_widget.dart +++ b/lib/src/screens/exchange/widgets/currency_picker_widget.dart @@ -20,7 +20,10 @@ class CurrencyPickerWidget extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - color: Theme.of(context).accentTextTheme!.headline6!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .backgroundColor!, child: Scrollbar( controller: _scrollController, child: GridView.builder( diff --git a/lib/src/screens/exchange/widgets/exchange_card.dart b/lib/src/screens/exchange/widgets/exchange_card.dart index ae92fa0c1..f77e885c2 100644 --- a/lib/src/screens/exchange/widgets/exchange_card.dart +++ b/lib/src/screens/exchange/widgets/exchange_card.dart @@ -160,7 +160,7 @@ class ExchangeCardState extends State { final copyImage = Image.asset('assets/images/copy_content.png', height: 16, width: 16, - color: Theme.of(context).primaryTextTheme.headline3!.color!); + color: Theme.of(context).primaryTextTheme!.displaySmall!.color!); return Container( width: double.infinity, @@ -175,7 +175,7 @@ class ExchangeCardState extends State { style: TextStyle( fontSize: 18, fontWeight: FontWeight.w600, - color: Theme.of(context).textTheme.headline5!.color!), + color: Theme.of(context).textTheme!.headlineSmall!.color!), ) ], ), @@ -210,7 +210,11 @@ class ExchangeCardState extends State { child: Container( height: 32, decoration: BoxDecoration( - color: widget.addressButtonsColor ?? Theme.of(context).primaryTextTheme.headline4!.color!, + color: widget.addressButtonsColor ?? + Theme.of(context) + .primaryTextTheme! + .headlineMedium! + .color!, borderRadius: BorderRadius.all(Radius.circular(6))), child: Center( @@ -221,7 +225,8 @@ class ExchangeCardState extends State { fontSize: 12, fontWeight: FontWeight.bold, color: Theme.of(context) - .primaryTextTheme.headline4! + .primaryTextTheme! + .headlineMedium! .decorationColor!)), ), ), @@ -264,7 +269,8 @@ class ExchangeCardState extends State { fontSize: 16, fontWeight: FontWeight.w600, color: Theme.of(context) - .accentTextTheme.headline1! + .accentTextTheme! + .displayLarge! .decorationColor!), validator: _isAmountEditable ? widget.currencyValueValidator @@ -277,7 +283,8 @@ class ExchangeCardState extends State { width: 32, decoration: BoxDecoration( color: Theme.of(context) - .primaryTextTheme.headline4! + .primaryTextTheme! + .headlineMedium! .color!, borderRadius: BorderRadius.all(Radius.circular(6))), @@ -290,7 +297,8 @@ class ExchangeCardState extends State { fontSize: 12, fontWeight: FontWeight.bold, color: Theme.of(context) - .primaryTextTheme.headline4! + .primaryTextTheme! + .headlineMedium! .decorationColor!)), ), ), @@ -300,9 +308,12 @@ class ExchangeCardState extends State { ), ], )), - Divider(height: 1,color: Theme.of(context) - .primaryTextTheme.headline5! - .decorationColor!), + Divider( + height: 1, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .decorationColor!), Padding( padding: EdgeInsets.only(top: 5), child: Container( @@ -319,7 +330,8 @@ class ExchangeCardState extends State { fontSize: 10, height: 1.2, color: Theme.of(context) - .accentTextTheme.headline1! + .accentTextTheme! + .displayLarge! .decorationColor!), ) : Offstage(), @@ -333,7 +345,8 @@ class ExchangeCardState extends State { fontSize: 10, height: 1.2, color: Theme.of(context) - .accentTextTheme.headline1! + .accentTextTheme! + .displayLarge! .decorationColor!)) : Offstage(), ])), @@ -347,7 +360,8 @@ class ExchangeCardState extends State { fontSize: 14, fontWeight: FontWeight.w500, color: Theme.of(context) - .accentTextTheme.headline1! + .accentTextTheme! + .displayLarge! .decorationColor!), )) : Offstage(), @@ -387,7 +401,8 @@ class ExchangeCardState extends State { fontSize: 16, fontWeight: FontWeight.w600, color: Theme.of(context) - .accentTextTheme.headline1! + .accentTextTheme! + .displayLarge! .decorationColor!), buttonColor: widget.addressButtonsColor, validator: widget.addressTextFieldValidator, @@ -458,7 +473,8 @@ class ExchangeCardState extends State { child: Image.asset( 'assets/images/open_book.png', color: Theme.of(context) - .primaryTextTheme.headline4! + .primaryTextTheme! + .headlineMedium! .decorationColor!, )), )), diff --git a/lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart b/lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart index 762c36a55..61da007f1 100644 --- a/lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart +++ b/lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart @@ -21,8 +21,8 @@ class MobileExchangeCardsSection extends StatelessWidget { ), gradient: LinearGradient( colors: [ - Theme.of(context).primaryTextTheme.bodyText2!.color!, - Theme.of(context).primaryTextTheme.bodyText2!.decorationColor!, + Theme.of(context).primaryTextTheme!.bodyMedium!.color!, + Theme.of(context).primaryTextTheme!.bodyMedium!.decorationColor!, ], stops: [0.35, 1.0], begin: Alignment.topLeft, @@ -37,8 +37,11 @@ class MobileExchangeCardsSection extends StatelessWidget { bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), gradient: LinearGradient( colors: [ - Theme.of(context).primaryTextTheme.subtitle2!.color!, - Theme.of(context).primaryTextTheme.subtitle2!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleSmall!.color!, + Theme.of(context) + .primaryTextTheme! + .titleSmall! + .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight, diff --git a/lib/src/screens/exchange/widgets/present_provider_picker.dart b/lib/src/screens/exchange/widgets/present_provider_picker.dart index 9300aaf89..20d3bf70c 100644 --- a/lib/src/screens/exchange/widgets/present_provider_picker.dart +++ b/lib/src/screens/exchange/widgets/present_provider_picker.dart @@ -49,7 +49,10 @@ class PresentProviderPicker extends StatelessWidget { style: TextStyle( fontSize: 10.0, fontWeight: FontWeight.w500, - color: Theme.of(context).textTheme.headline5!.color!))) + color: Theme.of(context) + .textTheme! + .headlineSmall! + .color!))) ], ), SizedBox(width: 5), diff --git a/lib/src/screens/exchange_trade/exchange_confirm_page.dart b/lib/src/screens/exchange_trade/exchange_confirm_page.dart index 9bd217816..e4422c36f 100644 --- a/lib/src/screens/exchange_trade/exchange_confirm_page.dart +++ b/lib/src/screens/exchange_trade/exchange_confirm_page.dart @@ -36,7 +36,10 @@ class ExchangeConfirmPage extends BasePage { style: TextStyle( fontSize: 18.0, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme!.headline6!.color!), + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!), ), )), Container( @@ -45,8 +48,14 @@ class ExchangeConfirmPage extends BasePage { borderRadius: BorderRadius.all(Radius.circular(30)), border: Border.all( width: 1, - color: Theme.of(context).accentTextTheme!.caption!.color!), - color: Theme.of(context).accentTextTheme!.headline6!.color!), + color: Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!), + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .color!), child: Column( children: [ Expanded( @@ -63,7 +72,7 @@ class ExchangeConfirmPage extends BasePage { fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme! - .overline! + .labelSmall! .color!), ), Text( @@ -75,7 +84,7 @@ class ExchangeConfirmPage extends BasePage { fontWeight: FontWeight.w600, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!), ), ], @@ -93,10 +102,12 @@ class ExchangeConfirmPage extends BasePage { text: S.of(context).copy_id, color: Theme.of(context) .accentTextTheme! - .caption! + .bodySmall! .backgroundColor!, - textColor: - Theme.of(context).primaryTextTheme!.headline6!.color!), + textColor: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!), ), ) ], @@ -125,7 +136,10 @@ class ExchangeConfirmPage extends BasePage { onPressed: () => Navigator.of(context) .pushReplacementNamed(Routes.exchangeTrade), text: S.of(context).saved_the_trade_id, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white) ], ), diff --git a/lib/src/screens/exchange_trade/exchange_trade_page.dart b/lib/src/screens/exchange_trade/exchange_trade_page.dart index f06e879a9..b230488cc 100644 --- a/lib/src/screens/exchange_trade/exchange_trade_page.dart +++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart @@ -51,7 +51,7 @@ class ExchangeTradePage extends BasePage { @override Widget trailing(BuildContext context) { final questionImage = Image.asset('assets/images/question_mark.png', - color: Theme.of(context).primaryTextTheme!.headline6!.color!); + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!); return SizedBox( height: 20.0, @@ -111,7 +111,7 @@ class ExchangeTradeState extends State { final copyImage = Image.asset('assets/images/copy_content.png', height: 16, width: 16, - color: Theme.of(context).primaryTextTheme!.overline!.color!); + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!); _setEffects(); @@ -135,14 +135,14 @@ class ExchangeTradeState extends State { fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme! - .overline! + .labelSmall! .color!), ), if (trade.expiredAt != null) TimerWidget(trade.expiredAt!, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!) ]) : Offstage(), @@ -162,7 +162,7 @@ class ExchangeTradeState extends State { width: 3, color: Theme.of(context) .accentTextTheme! - .subtitle2! + .titleSmall! .color! ) ), @@ -181,7 +181,7 @@ class ExchangeTradeState extends State { height: 1, color: Theme.of(context) .accentTextTheme! - .subtitle2! + .titleSmall! .backgroundColor!, ), itemBuilder: (context, index) { @@ -228,7 +228,10 @@ class ExchangeTradeState extends State { onPressed: () => widget.exchangeTradeViewModel.confirmSending(), text: S.of(context).confirm, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white) : Offstage(); })), @@ -340,7 +343,7 @@ class ExchangeTradeState extends State { fontWeight: FontWeight.bold, color: Theme.of(popupContext) .primaryTextTheme! - .headline6! + .titleLarge! .color, decoration: TextDecoration.none, ), @@ -359,7 +362,7 @@ class ExchangeTradeState extends State { text: S.of(popupContext).send_got_it, color: Theme.of(popupContext) .accentTextTheme! - .bodyText1! + .bodyLarge! .color!, textColor: Colors.white)) ], @@ -392,7 +395,10 @@ class ExchangeTradeState extends State { style: TextStyle( fontSize: 22, fontWeight: FontWeight.bold, - color: Theme.of(popupContext).primaryTextTheme!.headline6!.color!, + color: Theme.of(popupContext) + .primaryTextTheme! + .titleLarge! + .color!, decoration: TextDecoration.none, ), ), diff --git a/lib/src/screens/exchange_trade/information_page.dart b/lib/src/screens/exchange_trade/information_page.dart index 4d9cc9b3c..76c2d5c1a 100644 --- a/lib/src/screens/exchange_trade/information_page.dart +++ b/lib/src/screens/exchange_trade/information_page.dart @@ -21,7 +21,7 @@ class InformationPage extends StatelessWidget { ), decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(30)), - color: Theme.of(context).textTheme!.bodyText1!.decorationColor! + color: Theme.of(context).textTheme!.bodyLarge!.decorationColor! ), child: Column( mainAxisSize: MainAxisSize.min, @@ -35,7 +35,7 @@ class InformationPage extends StatelessWidget { fontWeight: FontWeight.normal, fontFamily: 'Lato', decoration: TextDecoration.none, - color: Theme.of(context).accentTextTheme!.caption!.decorationColor! + color: Theme.of(context).accentTextTheme!.bodySmall!.decorationColor! ), ), ), @@ -44,8 +44,8 @@ class InformationPage extends StatelessWidget { child: PrimaryButton( onPressed: () => Navigator.of(context).pop(), text: S.of(context).send_got_it, - color: Theme.of(context).accentTextTheme!.caption!.backgroundColor!, - textColor: Theme.of(context).primaryTextTheme!.headline6!.color! + color: Theme.of(context).accentTextTheme!.bodySmall!.backgroundColor!, + textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color! ), ) ], diff --git a/lib/src/screens/faq/faq_item.dart b/lib/src/screens/faq/faq_item.dart index 5827f71a0..c41adf399 100644 --- a/lib/src/screens/faq/faq_item.dart +++ b/lib/src/screens/faq/faq_item.dart @@ -25,13 +25,13 @@ class FAQItemState extends State { @override Widget build(BuildContext context) { - final addIcon = - Icon(Icons.add, color: Theme.of(context).primaryTextTheme!.headline6!.color!); + final addIcon = Icon(Icons.add, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!); final removeIcon = Icon(Icons.remove, color: Palette.blueCraiola); final icon = isActive ? removeIcon : addIcon; final color = isActive ? Palette.blueCraiola - : Theme.of(context).primaryTextTheme!.headline6!.color!; + : Theme.of(context).primaryTextTheme!.titleLarge!.color!; return ListTileTheme( contentPadding: EdgeInsets.fromLTRB(0, 6, 24, 6), @@ -53,7 +53,8 @@ class FAQItemState extends State { style: TextStyle( fontSize: 14, fontWeight: FontWeight.normal, - color: Theme.of(context).primaryTextTheme!.headline6!.color!), + color: + Theme.of(context).primaryTextTheme!.titleLarge!.color!), ), )) ]) diff --git a/lib/src/screens/ionia/auth/ionia_create_account_page.dart b/lib/src/screens/ionia/auth/ionia_create_account_page.dart index abdf3501c..3c8c71290 100644 --- a/lib/src/screens/ionia/auth/ionia_create_account_page.dart +++ b/lib/src/screens/ionia/auth/ionia_create_account_page.dart @@ -40,7 +40,10 @@ class IoniaCreateAccountPage extends BasePage { return Text( S.current.sign_up, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -79,8 +82,12 @@ class IoniaCreateAccountPage extends BasePage { builder: (_) => LoadingPrimaryButton( text: S.of(context).create_account, onPressed: _createAccount, - isLoading: _authViewModel.createUserState is IoniaCreateStateLoading, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + isLoading: + _authViewModel.createUserState is IoniaCreateStateLoading, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), ), @@ -100,7 +107,10 @@ class IoniaCreateAccountPage extends BasePage { TextSpan( text: S.of(context).settings_terms_and_conditions, style: TextStyle( - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, fontWeight: FontWeight.w700, ), recognizer: TapGestureRecognizer() @@ -112,7 +122,10 @@ class IoniaCreateAccountPage extends BasePage { TextSpan( text: S.of(context).privacy_policy, style: TextStyle( - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, fontWeight: FontWeight.w700, ), recognizer: TapGestureRecognizer() diff --git a/lib/src/screens/ionia/auth/ionia_login_page.dart b/lib/src/screens/ionia/auth/ionia_login_page.dart index e6e8680f3..912b9c3dc 100644 --- a/lib/src/screens/ionia/auth/ionia_login_page.dart +++ b/lib/src/screens/ionia/auth/ionia_login_page.dart @@ -33,7 +33,10 @@ class IoniaLoginPage extends BasePage { return Text( S.current.login, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -71,7 +74,10 @@ class IoniaLoginPage extends BasePage { text: S.of(context).login, onPressed: _login, isLoading: _authViewModel.signInState is IoniaCreateStateLoading, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), ), diff --git a/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart b/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart index b9829b1b5..7382a6aee 100644 --- a/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart +++ b/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart @@ -41,7 +41,10 @@ class IoniaVerifyIoniaOtp extends BasePage { return Text( S.current.verification, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -62,7 +65,10 @@ class IoniaVerifyIoniaOtp extends BasePage { return KeyboardActions( config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -72,7 +78,7 @@ class IoniaVerifyIoniaOtp extends BasePage { ]), child: Container( height: 0, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: ScrollableWithBottomSection( contentPadding: EdgeInsets.all(24), content: Column( @@ -120,7 +126,10 @@ class IoniaVerifyIoniaOtp extends BasePage { onPressed: _verify, isDisabled: _authViewModel.otpState is IoniaOtpSendDisabled, isLoading: _authViewModel.otpState is IoniaOtpValidating, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), ), diff --git a/lib/src/screens/ionia/auth/ionia_welcome_page.dart b/lib/src/screens/ionia/auth/ionia_welcome_page.dart index 0b68cdd63..4d0cf69c0 100644 --- a/lib/src/screens/ionia/auth/ionia_welcome_page.dart +++ b/lib/src/screens/ionia/auth/ionia_welcome_page.dart @@ -17,7 +17,10 @@ class IoniaWelcomePage extends BasePage { return Text( S.current.welcome_to_cakepay, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -45,7 +48,7 @@ class IoniaWelcomePage extends BasePage { fontSize: 18, fontWeight: FontWeight.w400, fontFamily: 'Lato', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), SizedBox(height: 20), @@ -55,7 +58,7 @@ class IoniaWelcomePage extends BasePage { fontSize: 18, fontWeight: FontWeight.w400, fontFamily: 'Lato', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), ], @@ -66,7 +69,10 @@ class IoniaWelcomePage extends BasePage { PrimaryButton( text: S.of(context).create_account, onPressed: () => Navigator.of(context).pushNamed(Routes.ioniaCreateAccountPage), - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), SizedBox( @@ -78,7 +84,7 @@ class IoniaWelcomePage extends BasePage { fontSize: 15, fontWeight: FontWeight.w500, fontFamily: 'Lato', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), SizedBox(height: 8), diff --git a/lib/src/screens/ionia/cards/ionia_account_cards_page.dart b/lib/src/screens/ionia/cards/ionia_account_cards_page.dart index d5442987f..1e88078ee 100644 --- a/lib/src/screens/ionia/cards/ionia_account_cards_page.dart +++ b/lib/src/screens/ionia/cards/ionia_account_cards_page.dart @@ -20,7 +20,10 @@ class IoniaAccountCardsPage extends BasePage { return Text( S.of(context).cards, style: textLargeSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -69,23 +72,34 @@ class _IoniaCardTabsState extends State<_IoniaCardTabs> with SingleTickerProvide width: 230, padding: EdgeInsets.all(5), decoration: BoxDecoration( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1), + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor! + .withOpacity(0.1), borderRadius: BorderRadius.circular( 25.0, ), ), child: Theme( - data: ThemeData(primaryTextTheme: TextTheme(bodyText1: TextStyle(backgroundColor: Colors.transparent))), + data: ThemeData(primaryTextTheme: TextTheme(bodyLarge: TextStyle(backgroundColor: Colors.transparent))), child: TabBar( controller: _tabController, indicator: BoxDecoration( borderRadius: BorderRadius.circular( 25.0, ), - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, ), - labelColor: Theme.of(context).primaryTextTheme!.headline1!.backgroundColor!, - unselectedLabelColor: Theme.of(context).primaryTextTheme!.headline6!.color!, + labelColor: Theme.of(context) + .primaryTextTheme! + .displayLarge! + .backgroundColor!, + unselectedLabelColor: + Theme.of(context).primaryTextTheme!.titleLarge!.color!, tabs: [ Tab( text: S.of(context).active, @@ -154,9 +168,13 @@ class _IoniaCardListView extends StatelessWidget { Widget build(BuildContext context) { if(isLoading){ return Center( - child: CircularProgressIndicator( - backgroundColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, - valueColor: AlwaysStoppedAnimation(Theme.of(context).primaryTextTheme!.bodyText2!.color!), + child: CircularProgressIndicator( + backgroundColor: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, + valueColor: AlwaysStoppedAnimation( + Theme.of(context).primaryTextTheme!.bodyMedium!.color!), ), ); } @@ -166,7 +184,7 @@ class _IoniaCardListView extends StatelessWidget { emptyText, textAlign: TextAlign.center, style: textSmall( - color: Theme.of(context).primaryTextTheme!.overline!.color!, + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!, ), ), ) @@ -179,11 +197,18 @@ class _IoniaCardListView extends StatelessWidget { child: CardItem( onTap: () => onTap?.call(merchant), title: merchant.legalName, - backgroundColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1), + backgroundColor: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor! + .withOpacity(0.1), discount: 0, hideBorder: true, discountBackground: AssetImage('assets/images/red_badge_discount.png'), - titleColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + titleColor: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, subtitleColor: Theme.of(context).hintColor, subTitle: '', logoUrl: merchant.logoUrl, diff --git a/lib/src/screens/ionia/cards/ionia_account_page.dart b/lib/src/screens/ionia/cards/ionia_account_page.dart index 31f7db409..f3ce3f560 100644 --- a/lib/src/screens/ionia/cards/ionia_account_page.dart +++ b/lib/src/screens/ionia/cards/ionia_account_page.dart @@ -19,7 +19,10 @@ class IoniaAccountPage extends BasePage { return Text( S.current.account, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -133,7 +136,10 @@ class IoniaAccountPage extends BasePage { bottomSection: Column( children: [ PrimaryButton( - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, text: S.of(context).logout, onPressed: () { @@ -164,11 +170,8 @@ class _GradiantContainer extends StatelessWidget { borderRadius: BorderRadius.circular(15), gradient: LinearGradient( colors: [ - Theme.of(context) - .primaryTextTheme! - .subtitle1! - .decorationColor!, - Theme.of(context).primaryTextTheme!.subtitle1!.color!, + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, ], begin: Alignment.topRight, end: Alignment.bottomLeft, diff --git a/lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart b/lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart index 62bb5bd06..ff1b918eb 100644 --- a/lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart +++ b/lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart @@ -23,7 +23,10 @@ class IoniaActivateDebitCardPage extends BasePage { return Text( S.current.debit_card, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -76,7 +79,10 @@ class IoniaActivateDebitCardPage extends BasePage { }, isLoading: _cardsListViewModel.createCardState is IoniaCreateCardLoading, text: S.of(context).agree_and_continue, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), ); diff --git a/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart b/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart index 4b9f0a220..0080c551c 100644 --- a/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart +++ b/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart @@ -28,7 +28,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage { Widget middle(BuildContext context) { return Text( ioniaPurchaseViewModel.ioniaMerchant.legalName, - style: textMediumSemiBold(color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!), + style: textMediumSemiBold(color: Theme.of(context).accentTextTheme!.displayLarge!.backgroundColor!), ); } @@ -96,8 +96,8 @@ class IoniaBuyGiftCardDetailPage extends BasePage { borderRadius: BorderRadius.circular(20), gradient: LinearGradient( colors: [ - Theme.of(context).primaryTextTheme!.subtitle1!.color!, - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight, @@ -163,7 +163,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage { Text( S.of(context).tip, style: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, fontWeight: FontWeight.w700, fontSize: 14, ), @@ -202,7 +202,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage { ioniaPurchaseViewModel.invoiceCommittingState is IsExecutingState, onPressed: () => purchaseCard(context), text: S.of(context).purchase_gift_card, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white, ); }), @@ -212,7 +212,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage { onTap: () => _showTermsAndCondition(context), child: Text(S.of(context).settings_terms_and_conditions, style: textMediumSemiBold( - color: Theme.of(context).primaryTextTheme!.bodyText2!.color!, + color: Theme.of(context).primaryTextTheme.bodyMedium!.color!, ).copyWith(fontSize: 12)), ), SizedBox(height: 16) @@ -232,7 +232,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage { child: Text( ioniaPurchaseViewModel.ioniaMerchant.termsAndConditions, style: textMedium( - color: Theme.of(context).textTheme!.headline3!.color!, + color: Theme.of(context).textTheme!.displaySmall!.color!, ), ), ), @@ -270,13 +270,13 @@ class IoniaBuyGiftCardDetailPage extends BasePage { child: Text( instruction.header, style: textLargeSemiBold( - color: Theme.of(context).textTheme!.headline3!.color!, + color: Theme.of(context).textTheme!.displaySmall!.color!, ), )), Text( instruction.body, style: textMedium( - color: Theme.of(context).textTheme!.headline3!.color!, + color: Theme.of(context).textTheme!.displaySmall!.color!, ), ) ]; @@ -323,7 +323,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage { alertLeftActionButtonTextColor: Colors.white, alertRightActionButtonTextColor: Colors.white, alertLeftActionButtonColor: Palette.brightOrange, - alertRightActionButtonColor: Theme.of(context).textTheme!.subtitle2!.color, + alertRightActionButtonColor: Theme.of(context).textTheme!.titleSmall!.color, actionRightButton: () async { Navigator.of(context).pop(); await ioniaPurchaseViewModel.commitPaymentInvoice(); @@ -399,34 +399,34 @@ class TipButton extends StatelessWidget { Color captionTextColor(BuildContext context) { if (isDark(context)) { - return Theme.of(context).primaryTextTheme!.headline6!.color!; + return Theme.of(context).primaryTextTheme!.titleLarge!.color!; } return isSelected - ? Theme.of(context).accentTextTheme!.headline6!.color! - : Theme.of(context).primaryTextTheme!.headline6!.color!; + ? Theme.of(context).accentTextTheme!.titleLarge!.color! + : Theme.of(context).primaryTextTheme!.titleLarge!.color!; } Color subTitleTextColor(BuildContext context) { if (isDark(context)) { - return Theme.of(context).primaryTextTheme!.headline6!.color!; + return Theme.of(context).primaryTextTheme!.titleLarge!.color!; } return isSelected - ? Theme.of(context).accentTextTheme!.headline6!.color! - : Theme.of(context).primaryTextTheme!.overline!.color!; + ? Theme.of(context).accentTextTheme!.titleLarge!.color! + : Theme.of(context).primaryTextTheme!.labelSmall!.color!; } Color? backgroundColor(BuildContext context) { if (isDark(context)) { return isSelected ? null - : Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.01); + : Theme.of(context).accentTextTheme!.displayLarge!.backgroundColor!.withOpacity(0.01); } return isSelected ? null - : Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1); + : Theme.of(context).accentTextTheme!.displayLarge!.backgroundColor!.withOpacity(0.1); } @override @@ -459,8 +459,8 @@ class TipButton extends StatelessWidget { gradient: isSelected ? LinearGradient( colors: [ - Theme.of(context).primaryTextTheme!.subtitle1!.color!, - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight, diff --git a/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart b/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart index a60b967f2..e8dce712e 100644 --- a/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart +++ b/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart @@ -50,7 +50,10 @@ class IoniaBuyGiftCardPage extends BasePage { disableScroll: true, config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -59,7 +62,7 @@ class IoniaBuyGiftCardPage extends BasePage { ), ]), child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: ScrollableWithBottomSection( contentPadding: EdgeInsets.zero, content: Column( @@ -72,8 +75,11 @@ class IoniaBuyGiftCardPage extends BasePage { bottomRight: Radius.circular(24), ), gradient: LinearGradient(colors: [ - Theme.of(context).primaryTextTheme!.subtitle1!.color!, - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context) + .primaryTextTheme! + .titleMedium! + .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight), ), child: Column( @@ -95,7 +101,10 @@ class IoniaBuyGiftCardPage extends BasePage { ], hintText: '1000', placeholderTextStyle: TextStyle( - color: Theme.of(context).primaryTextTheme.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, fontWeight: FontWeight.w600, fontSize: 36, ), @@ -115,7 +124,10 @@ class IoniaBuyGiftCardPage extends BasePage { ), ), Divider( - color: Theme.of(context).primaryTextTheme.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, height: 1, ), SizedBox(height: 8), @@ -126,13 +138,19 @@ class IoniaBuyGiftCardPage extends BasePage { Text( S.of(context).min_amount(merchant.minimumCardPurchase.toStringAsFixed(2)), style: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, ), ), Text( S.of(context).max_amount(merchant.maximumCardPurchase.toStringAsFixed(2)), style: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, ), ), ], @@ -147,11 +165,14 @@ class IoniaBuyGiftCardPage extends BasePage { title: merchant.legalName, backgroundColor: Theme.of(context) .accentTextTheme! - .headline1! + .displayLarge! .backgroundColor! .withOpacity(0.1), discount: merchant.discount, - titleColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + titleColor: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, subtitleColor: Theme.of(context).hintColor, subTitle: merchant.avaibilityStatus, logoUrl: merchant.logoUrl, @@ -174,7 +195,10 @@ class IoniaBuyGiftCardPage extends BasePage { ), text: S.of(context).continue_text, isDisabled: !ioniaBuyCardViewModel.isEnablePurchase, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), ); diff --git a/lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart b/lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart index f2702d791..2a5f39845 100644 --- a/lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart +++ b/lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart @@ -50,7 +50,10 @@ class IoniaCustomRedeemPage extends BasePage { disableScroll: true, config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -59,7 +62,7 @@ class IoniaCustomRedeemPage extends BasePage { ), ]), child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: ScrollableWithBottomSection( contentPadding: EdgeInsets.zero, content: Column( @@ -70,8 +73,11 @@ class IoniaCustomRedeemPage extends BasePage { borderRadius: BorderRadius.only( bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), gradient: LinearGradient(colors: [ - Theme.of(context).primaryTextTheme.subtitle1!.color!, - Theme.of(context).primaryTextTheme.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context) + .primaryTextTheme! + .titleMedium! + .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight), ), child: Column( @@ -86,11 +92,17 @@ class IoniaCustomRedeemPage extends BasePage { inputFormatters: [FilteringTextInputFormatter.deny(RegExp('[\-|\ ]'))], hintText: '1000', placeholderTextStyle: TextStyle( - color: Theme.of(context).primaryTextTheme.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, fontWeight: FontWeight.w500, fontSize: 36, ), - borderColor: Theme.of(context).primaryTextTheme.headline5!.color!, + borderColor: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, textColor: Colors.white, textStyle: TextStyle( color: Colors.white, @@ -121,7 +133,10 @@ class IoniaCustomRedeemPage extends BasePage { child: Text( '\$${giftCard.remainingAmount} - \$${ioniaCustomRedeemViewModel.amount} = \$${ioniaCustomRedeemViewModel.formattedRemaining} ${S.of(context).remaining}', style: TextStyle( - color: Theme.of(context).primaryTextTheme.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, ), ), ) @@ -136,14 +151,17 @@ class IoniaCustomRedeemPage extends BasePage { child: CardItem( title: giftCard.legalName, backgroundColor: Theme.of(context) - .accentTextTheme - .headline1! + .accentTextTheme! + .displayLarge! .backgroundColor! .withOpacity(0.1), discount: giftCard.remainingAmount, isAmount: true, discountBackground: AssetImage('assets/images/red_badge_discount.png'), - titleColor: Theme.of(context).accentTextTheme.headline1!.backgroundColor!, + titleColor: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, subtitleColor: Theme.of(context).hintColor, subTitle: S.of(context).online, logoUrl: giftCard.logoUrl, @@ -160,7 +178,10 @@ class IoniaCustomRedeemPage extends BasePage { isLoading: ioniaCustomRedeemViewModel.redeemState is IsExecutingState, isDisabled: ioniaCustomRedeemViewModel.disableRedeem, text: S.of(context).add_custom_redemption, - color: Theme.of(context).accentTextTheme.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, onPressed: () => ioniaCustomRedeemViewModel.addCustomRedeem().then((value) { Navigator.of(context).pop(ioniaCustomRedeemViewModel.remaining.toString()); diff --git a/lib/src/screens/ionia/cards/ionia_custom_tip_page.dart b/lib/src/screens/ionia/cards/ionia_custom_tip_page.dart index b52b2082d..f31f0ef30 100644 --- a/lib/src/screens/ionia/cards/ionia_custom_tip_page.dart +++ b/lib/src/screens/ionia/cards/ionia_custom_tip_page.dart @@ -51,7 +51,10 @@ class IoniaCustomTipPage extends BasePage { disableScroll: true, config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -60,7 +63,7 @@ class IoniaCustomTipPage extends BasePage { ), ]), child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: ScrollableWithBottomSection( contentPadding: EdgeInsets.zero, content: Column( @@ -70,8 +73,11 @@ class IoniaCustomTipPage extends BasePage { decoration: BoxDecoration( borderRadius: BorderRadius.only(bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), gradient: LinearGradient(colors: [ - Theme.of(context).primaryTextTheme!.subtitle1!.color!, - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context) + .primaryTextTheme! + .titleMedium! + .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight), ), child: Column( @@ -86,11 +92,17 @@ class IoniaCustomTipPage extends BasePage { inputFormatters: [FilteringTextInputFormatter.deny(RegExp('[\-|\ ]'))], hintText: '1000', placeholderTextStyle: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, fontWeight: FontWeight.w500, fontSize: 36, ), - borderColor: Theme.of(context).primaryTextTheme!.headline5!.color!, + borderColor: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, textColor: Colors.white, textStyle: TextStyle( color: Colors.white, @@ -125,7 +137,10 @@ class IoniaCustomTipPage extends BasePage { text: TextSpan( text: '\$${_amountController.text}', style: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, ), children: [ TextSpan(text: ' ${S.of(context).is_percentage} '), @@ -143,9 +158,16 @@ class IoniaCustomTipPage extends BasePage { padding: const EdgeInsets.all(24.0), child: CardItem( title: merchant.legalName, - backgroundColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1), + backgroundColor: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor! + .withOpacity(0.1), discount: 0.0, - titleColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + titleColor: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, subtitleColor: Theme.of(context).hintColor, subTitle: merchant.isOnline ? S.of(context).online : S.of(context).offline, logoUrl: merchant.logoUrl, @@ -162,7 +184,10 @@ class IoniaCustomTipPage extends BasePage { Navigator.of(context).pop(customTipViewModel.customTip); }, text: S.of(context).add_tip, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), ), diff --git a/lib/src/screens/ionia/cards/ionia_debit_card_page.dart b/lib/src/screens/ionia/cards/ionia_debit_card_page.dart index 52888ac11..968e8cc34 100644 --- a/lib/src/screens/ionia/cards/ionia_debit_card_page.dart +++ b/lib/src/screens/ionia/cards/ionia_debit_card_page.dart @@ -23,7 +23,10 @@ class IoniaDebitCardPage extends BasePage { return Text( S.current.debit_card, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -51,7 +54,11 @@ class IoniaDebitCardPage extends BasePage { padding: const EdgeInsets.symmetric(horizontal: 20.0), child: Text( S.of(context).billing_address_info, - style: textSmall(color: Theme.of(context).textTheme!.headline4!.color!), + style: textSmall( + color: Theme.of(context) + .textTheme! + .headlineMedium! + .color!), textAlign: TextAlign.center, ), ), @@ -60,13 +67,16 @@ class IoniaDebitCardPage extends BasePage { text: S.of(context).order_physical_card, onPressed: () {}, color: Color(0xffE9F2FC), - textColor: Theme.of(context).textTheme!.headline3!.color!, + textColor: Theme.of(context).textTheme!.displaySmall!.color!, ), SizedBox(height: 8), PrimaryButton( text: S.of(context).add_value, onPressed: () {}, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), SizedBox(height: 16) @@ -112,11 +122,17 @@ class IoniaDebitCardPage extends BasePage { child: RichText( text: TextSpan( text: S.of(context).get_a, - style: textMedium(color: Theme.of(context).textTheme!.headline3!.color!), + style: textMedium( + color: + Theme.of(context).textTheme!.displaySmall!.color!), children: [ TextSpan( text: S.of(context).digital_and_physical_card, - style: textMediumBold(color: Theme.of(context).textTheme!.headline3!.color!), + style: textMediumBold( + color: Theme.of(context) + .textTheme! + .displaySmall! + .color!), ), TextSpan( text: S.of(context).get_card_note, @@ -134,7 +150,10 @@ class IoniaDebitCardPage extends BasePage { bottomSection: PrimaryButton( text: S.of(context).activate, onPressed: () => _showHowToUseCard(context, activate: true), - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), ); @@ -157,7 +176,7 @@ class IoniaDebitCardPage extends BasePage { padding: EdgeInsets.only(top: 24, left: 24, right: 24), margin: EdgeInsets.all(24), decoration: BoxDecoration( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, borderRadius: BorderRadius.circular(30), ), child: Column( @@ -165,7 +184,8 @@ class IoniaDebitCardPage extends BasePage { Text( S.of(context).how_to_use_card, style: textLargeSemiBold( - color: Theme.of(context).textTheme!.bodyText2!.color!, + color: + Theme.of(context).textTheme!.bodyMedium!.color!, ), ), SizedBox(height: 24), @@ -174,7 +194,10 @@ class IoniaDebitCardPage extends BasePage { child: Text( S.of(context).signup_for_card_accept_terms, style: textSmallSemiBold( - color: Theme.of(context).textTheme!.headline3!.color!, + color: Theme.of(context) + .textTheme! + .displaySmall! + .color!, ), ), ), @@ -195,7 +218,8 @@ class IoniaDebitCardPage extends BasePage { : Navigator.pop(context), text: S.of(context).send_got_it, color: Color.fromRGBO(233, 242, 252, 1), - textColor: Theme.of(context).textTheme!.headline3!.color!, + textColor: + Theme.of(context).textTheme!.displaySmall!.color!, ), SizedBox(height: 21), ], @@ -259,8 +283,8 @@ class _IoniaDebitCardState extends State<_IoniaDebitCard> { borderRadius: BorderRadius.circular(24), gradient: LinearGradient( colors: [ - Theme.of(context).primaryTextTheme!.subtitle1!.color!, - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight, @@ -368,12 +392,14 @@ class _TitleSubtitleTile extends StatelessWidget { children: [ Text( title, - style: textSmallSemiBold(color: Theme.of(context).textTheme!.headline3!.color!), + style: textSmallSemiBold( + color: Theme.of(context).textTheme!.displaySmall!.color!), ), SizedBox(height: 4), Text( subtitle, - style: textSmall(color: Theme.of(context).textTheme!.headline3!.color!), + style: textSmall( + color: Theme.of(context).textTheme!.displaySmall!.color!), ), ], ); diff --git a/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart b/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart index 0b7a479e0..9d017bc69 100644 --- a/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart +++ b/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart @@ -33,7 +33,7 @@ class IoniaGiftCardDetailPage extends BasePage { final _backButton = Icon( Icons.arrow_back_ios, - color: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, size: 16, ); return Padding( @@ -59,8 +59,11 @@ class IoniaGiftCardDetailPage extends BasePage { Widget middle(BuildContext context) { return Text( viewModel.giftCard.legalName, - style: - textMediumSemiBold(color: Theme.of(context).accentTextTheme.headline1!.backgroundColor!), + style: textMediumSemiBold( + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!), ); } @@ -142,8 +145,8 @@ class IoniaGiftCardDetailPage extends BasePage { viewModel.refeshCard(); }, text: S.of(context).more_options, - color: Theme.of(context).accentTextTheme.caption!.color!, - textColor: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context).accentTextTheme!.bodySmall!.color!, + textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), SizedBox(height: 12), LoadingPrimaryButton( @@ -155,7 +158,7 @@ class IoniaGiftCardDetailPage extends BasePage { }, ), text: S.of(context).mark_as_redeemed, - color: Theme.of(context).accentTextTheme.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white, ), ], @@ -198,13 +201,13 @@ class IoniaGiftCardDetailPage extends BasePage { child: Text( instruction.header, style: textLargeSemiBold( - color: Theme.of(context).textTheme.headline3!.color!, + color: Theme.of(context).textTheme!.displaySmall!.color!, ), )), Text( instruction.body, style: textMedium( - color: Theme.of(context).textTheme.headline3!.color!, + color: Theme.of(context).textTheme!.displaySmall!.color!, ), ) ]; diff --git a/lib/src/screens/ionia/cards/ionia_manage_cards_page.dart b/lib/src/screens/ionia/cards/ionia_manage_cards_page.dart index 1c13f7a88..9baa38f24 100644 --- a/lib/src/screens/ionia/cards/ionia_manage_cards_page.dart +++ b/lib/src/screens/ionia/cards/ionia_manage_cards_page.dart @@ -48,7 +48,7 @@ class IoniaManageCardsPage extends BasePage { decoration: BoxDecoration( gradient: LinearGradient( colors: [ - Theme.of(context).accentColor, + Theme.of(context).colorScheme.secondary, Theme.of(context).scaffoldBackgroundColor, Theme.of(context).primaryColor, ], @@ -69,7 +69,10 @@ class IoniaManageCardsPage extends BasePage { Widget leading(BuildContext context) { final _backButton = Icon( Icons.arrow_back_ios, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, size: 16, ); @@ -94,7 +97,10 @@ class IoniaManageCardsPage extends BasePage { return Text( S.of(context).gift_cards, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ); } @@ -118,7 +124,7 @@ class IoniaManageCardsPage extends BasePage { width: 32, padding: EdgeInsets.all(8), decoration: BoxDecoration( - color: Theme.of(context).textTheme!.headline6!.backgroundColor!, + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!, border: Border.all( color: Colors.white.withOpacity(0.2), ), @@ -126,7 +132,7 @@ class IoniaManageCardsPage extends BasePage { ), child: Image.asset( 'assets/images/filter.png', - color: Theme.of(context).textTheme!.caption!.decorationColor!, + color: Theme.of(context).textTheme!.bodySmall!.decorationColor!, ), ) ); @@ -225,9 +231,9 @@ class _IoniaManageCardsPageBodyState extends State { }, title: merchant.legalName, subTitle: merchant.avaibilityStatus, - backgroundColor: Theme.of(context).textTheme!.headline6!.backgroundColor!, - titleColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, - subtitleColor: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, + backgroundColor: Theme.of(context).textTheme!.titleLarge!.backgroundColor!, + titleColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, + subtitleColor: Theme.of(context).accentTextTheme!.displaySmall!.backgroundColor!, discount: merchant.discount, ); }, @@ -238,8 +244,8 @@ class _IoniaManageCardsPageBodyState extends State { thumbHeight: thumbHeight, rightOffset: 1, width: 3, - backgroundColor: Theme.of(context).textTheme!.caption!.decorationColor!.withOpacity(0.05), - thumbColor: Theme.of(context).textTheme!.caption!.decorationColor!.withOpacity(0.5), + backgroundColor: Theme.of(context).textTheme!.bodySmall!.decorationColor!.withOpacity(0.05), + thumbColor: Theme.of(context).textTheme!.bodySmall!.decorationColor!.withOpacity(0.5), fromTop: widget.cardsListViewModel.scrollOffsetFromTop, ) : Offstage() @@ -247,8 +253,8 @@ class _IoniaManageCardsPageBodyState extends State { } return Center( child: CircularProgressIndicator( - backgroundColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, - valueColor: AlwaysStoppedAnimation(Theme.of(context).primaryTextTheme!.bodyText2!.color!), + backgroundColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, + valueColor: AlwaysStoppedAnimation(Theme.of(context).primaryTextTheme!.bodyMedium!.color!), ), ); } @@ -269,12 +275,12 @@ class _SearchWidget extends StatelessWidget { padding: EdgeInsets.all(8), child: Image.asset( 'assets/images/mini_search_icon.png', - color: Theme.of(context).textTheme!.caption!.decorationColor!, + color: Theme.of(context).textTheme!.bodySmall!.decorationColor!, ), ); return TextField( - style: TextStyle(color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!), + style: TextStyle(color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!), controller: controller, decoration: InputDecoration( filled: true, @@ -282,10 +288,10 @@ class _SearchWidget extends StatelessWidget { top: 10, left: 10, ), - fillColor: Theme.of(context).textTheme!.headline6!.backgroundColor!, + fillColor: Theme.of(context).textTheme!.titleLarge!.backgroundColor!, hintText: S.of(context).search, hintStyle: TextStyle( - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, + color: Theme.of(context).accentTextTheme!.displaySmall!.backgroundColor!, ), alignLabelWithHint: true, floatingLabelBehavior: FloatingLabelBehavior.never, @@ -329,7 +335,7 @@ class _TrailingIcon extends StatelessWidget { onPressed: onPressed, icon: Image.asset( asset, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, ), ), ); diff --git a/lib/src/screens/ionia/cards/ionia_more_options_page.dart b/lib/src/screens/ionia/cards/ionia_more_options_page.dart index 7d38c5e1e..c2b76c1b8 100644 --- a/lib/src/screens/ionia/cards/ionia_more_options_page.dart +++ b/lib/src/screens/ionia/cards/ionia_more_options_page.dart @@ -15,7 +15,10 @@ class IoniaMoreOptionsPage extends BasePage { return Text( S.current.more_options, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -34,7 +37,7 @@ class IoniaMoreOptionsPage extends BasePage { child: Text( S.of(context).choose_from_available_options, style: textMedium( - color: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), ), @@ -78,7 +81,7 @@ class _GradiantContainer extends StatelessWidget { gradient: LinearGradient( colors: [ Theme.of(context).scaffoldBackgroundColor, - Theme.of(context).accentColor, + Theme.of(context).colorScheme.secondary, ], begin: Alignment.topRight, end: Alignment.bottomLeft, diff --git a/lib/src/screens/ionia/cards/ionia_payment_status_page.dart b/lib/src/screens/ionia/cards/ionia_payment_status_page.dart index 4096560db..50af2f2f6 100644 --- a/lib/src/screens/ionia/cards/ionia_payment_status_page.dart +++ b/lib/src/screens/ionia/cards/ionia_payment_status_page.dart @@ -23,8 +23,11 @@ class IoniaPaymentStatusPage extends BasePage { S.of(context).generating_gift_card, textAlign: TextAlign.center, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!)); - } + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!)); + } @override Widget body(BuildContext context) { @@ -90,7 +93,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage Text( S.of(context).awaiting_payment_confirmation, style: textLargeSemiBold( - color: Theme.of(context).primaryTextTheme!.headline6!.color!)) + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!)) ]), SizedBox(height: 40), Row(children: [ @@ -129,7 +132,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage Text( S.of(context).gift_card_is_generated, style: textLargeSemiBold( - color: Theme.of(context).primaryTextTheme!.headline6!.color!)) + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!)) ])); } @@ -147,7 +150,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage Text( S.of(context).generating_gift_card, style: textLargeSemiBold( - color: Theme.of(context).primaryTextTheme!.headline6!.color!))]); + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!))]); }), ], ), @@ -160,7 +163,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage widget.viewModel.payingByBitcoin ? S.of(context).bitcoin_payments_require_1_confirmation : S.of(context).proceed_after_one_minute, style: textMedium( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ).copyWith(fontWeight: FontWeight.w500), textAlign: TextAlign.center, )), @@ -172,15 +175,15 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage Routes.ioniaGiftCardDetailPage, arguments: [widget.viewModel.giftCard]), text: S.of(context).open_gift_card, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white); } return PrimaryButton( onPressed: () => Navigator.of(context).pushNamed(Routes.support), text: S.of(context).contact_support, - color: Theme.of(context).accentTextTheme!.caption!.color!, - textColor: Theme.of(context).primaryTextTheme!.headline6!.color!); + color: Theme.of(context).accentTextTheme!.bodySmall!.color!, + textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!); }) ]) ), @@ -196,14 +199,14 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage Text( title, style: textXSmall( - color: Theme.of(context).primaryTextTheme!.overline!.color!, + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!, ), ), SizedBox(height: 8), Text( subtitle, style: textMedium( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), ], diff --git a/lib/src/screens/ionia/widgets/ionia_alert_model.dart b/lib/src/screens/ionia/widgets/ionia_alert_model.dart index d6ea02342..536bb19d4 100644 --- a/lib/src/screens/ionia/widgets/ionia_alert_model.dart +++ b/lib/src/screens/ionia/widgets/ionia_alert_model.dart @@ -32,7 +32,7 @@ class IoniaAlertModal extends StatelessWidget { padding: EdgeInsets.only(top: 24, left: 24, right: 24), margin: EdgeInsets.all(24), decoration: BoxDecoration( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, borderRadius: BorderRadius.circular(30), ), child: Column( @@ -41,7 +41,7 @@ class IoniaAlertModal extends StatelessWidget { Text( title, style: textLargeSemiBold( - color: Theme.of(context).textTheme!.bodyText2!.color!, + color: Theme.of(context).textTheme!.bodyMedium!.color!, ), ), Container( @@ -56,8 +56,12 @@ class IoniaAlertModal extends StatelessWidget { PrimaryButton( onPressed: () => Navigator.pop(context), text: actionTitle, - color: Theme.of(context).accentTextTheme!.caption!.color!, - textColor: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!, + textColor: + Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), SizedBox(height: 21), ], diff --git a/lib/src/screens/ionia/widgets/ionia_filter_modal.dart b/lib/src/screens/ionia/widgets/ionia_filter_modal.dart index 2b885f736..4c40270b1 100644 --- a/lib/src/screens/ionia/widgets/ionia_filter_modal.dart +++ b/lib/src/screens/ionia/widgets/ionia_filter_modal.dart @@ -20,7 +20,7 @@ class IoniaFilterModal extends StatelessWidget { padding: EdgeInsets.all(10), child: Image.asset( 'assets/images/mini_search_icon.png', - color: Theme.of(context).textTheme.subtitle2!.color!, + color: Theme.of(context).textTheme!.titleSmall!.color!, ), ); return Scaffold( @@ -34,7 +34,7 @@ class IoniaFilterModal extends StatelessWidget { padding: EdgeInsets.only(top: 24, bottom: 20), margin: EdgeInsets.all(24), decoration: BoxDecoration( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, borderRadius: BorderRadius.circular(30), ), child: Column( @@ -46,14 +46,14 @@ class IoniaFilterModal extends StatelessWidget { child: TextField( onChanged: ioniaGiftCardsListViewModel.onSearchFilter, style: textMedium( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), decoration: InputDecoration( filled: true, prefixIcon: searchIcon, hintText: S.of(context).search_category, contentPadding: EdgeInsets.only(bottom: 5), - fillColor: Theme.of(context).primaryTextTheme!.caption!.decorationColor!.withOpacity(0.5), + fillColor: Theme.of(context).primaryTextTheme!.bodySmall!.decorationColor!.withOpacity(0.5), border: OutlineInputBorder( borderSide: BorderSide.none, borderRadius: BorderRadius.circular(8), @@ -84,12 +84,12 @@ class IoniaFilterModal extends StatelessWidget { children: [ Image.asset( category.iconPath, - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), SizedBox(width: 10), Text(category.title, style: textSmall( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ).copyWith(fontWeight: FontWeight.w500)), ], ), diff --git a/lib/src/screens/ionia/widgets/ionia_tile.dart b/lib/src/screens/ionia/widgets/ionia_tile.dart index 2a9e346b8..b7a672b35 100644 --- a/lib/src/screens/ionia/widgets/ionia_tile.dart +++ b/lib/src/screens/ionia/widgets/ionia_tile.dart @@ -26,14 +26,14 @@ class IoniaTile extends StatelessWidget { Text( title, style: textXSmall( - color: Theme.of(context).primaryTextTheme!.overline!.color!, + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!, ), ), SizedBox(height: 8), Text( subTitle, style: textMediumBold( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), ], diff --git a/lib/src/screens/ionia/widgets/rounded_checkbox.dart b/lib/src/screens/ionia/widgets/rounded_checkbox.dart index 7461eb646..51a09e5d9 100644 --- a/lib/src/screens/ionia/widgets/rounded_checkbox.dart +++ b/lib/src/screens/ionia/widgets/rounded_checkbox.dart @@ -15,11 +15,11 @@ class RoundedCheckbox extends StatelessWidget { width: 20.0, decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(50.0)), - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, ), child: Icon( Icons.check, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, size: 14.0, )) : Offstage(); diff --git a/lib/src/screens/ionia/widgets/text_icon_button.dart b/lib/src/screens/ionia/widgets/text_icon_button.dart index dffec60a6..600e62aa2 100644 --- a/lib/src/screens/ionia/widgets/text_icon_button.dart +++ b/lib/src/screens/ionia/widgets/text_icon_button.dart @@ -22,12 +22,12 @@ class TextIconButton extends StatelessWidget { Text( label, style: textMediumSemiBold( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), Icon( Icons.chevron_right_rounded, - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ], ), diff --git a/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart b/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart index dbf7279b2..1b5f6be6b 100644 --- a/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart +++ b/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart @@ -56,7 +56,7 @@ class MoneroAccountEditOrCreatePage extends BasePage { text: moneroAccountCreationViewModel.isEdit ? S.of(context).rename : S.of(context).add, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white, isLoading: moneroAccountCreationViewModel.state is IsExecutingState, diff --git a/lib/src/screens/monero_accounts/monero_account_list_page.dart b/lib/src/screens/monero_accounts/monero_account_list_page.dart index 09a08a425..ff5087cdd 100644 --- a/lib/src/screens/monero_accounts/monero_account_list_page.dart +++ b/lib/src/screens/monero_accounts/monero_account_list_page.dart @@ -65,7 +65,7 @@ class MoneroAccountListPage extends StatelessWidget { borderRadius: BorderRadius.all(Radius.circular(14)), child: Container( height: 296, - color: Theme.of(context).textTheme!.headline1!.decorationColor!, + color: Theme.of(context).textTheme!.displayLarge!.decorationColor!, child: Column( children: [ Expanded( diff --git a/lib/src/screens/monero_accounts/widgets/account_tile.dart b/lib/src/screens/monero_accounts/widgets/account_tile.dart index c214fa4e2..a446ca556 100644 --- a/lib/src/screens/monero_accounts/widgets/account_tile.dart +++ b/lib/src/screens/monero_accounts/widgets/account_tile.dart @@ -20,11 +20,11 @@ class AccountTile extends StatelessWidget { @override Widget build(BuildContext context) { final color = isCurrent - ? Theme.of(context).textTheme.subtitle2!.decorationColor! - : Theme.of(context).textTheme.headline1!.decorationColor!; + ? Theme.of(context).textTheme!.titleSmall!.decorationColor! + : Theme.of(context).textTheme!.displayLarge!.decorationColor!; final textColor = isCurrent - ? Theme.of(context).textTheme.subtitle2!.color! - : Theme.of(context).textTheme.headline1!.color!; + ? Theme.of(context).textTheme!.titleSmall!.color! + : Theme.of(context).textTheme!.displayLarge!.color!; final Widget cell = GestureDetector( onTap: onTap, @@ -57,7 +57,7 @@ class AccountTile extends StatelessWidget { fontSize: 15, fontWeight: FontWeight.w600, fontFamily: 'Lato', - color: Theme.of(context).textTheme.headline4!.color!, + color: Theme.of(context).textTheme!.headlineMedium!.color!, decoration: TextDecoration.none, ), ), diff --git a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart index cf0708f21..c49644d7c 100644 --- a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart +++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart @@ -111,7 +111,10 @@ class _AdvancedPrivacySettingsBodyState extends State { style: TextStyle( fontSize: 20.0, fontWeight: FontWeight.w600, - color: Theme.of(context).primaryTextTheme!.headline6!.color!), + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!), decoration: InputDecoration( hintStyle: TextStyle( fontSize: 18.0, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.color!), + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .color), hintText: S.of(context).wallet_name, focusedBorder: UnderlineInputBorder( borderSide: BorderSide( color: Theme.of(context) .accentTextTheme! - .headline2! + .displayMedium! .decorationColor!, width: 1.0)), enabledBorder: UnderlineInputBorder( borderSide: BorderSide( color: Theme.of(context) .accentTextTheme! - .headline2! + .displayMedium! .decorationColor!, width: 1.0), ), @@ -165,7 +171,7 @@ class _WalletNameFormState extends State { 'assets/images/refresh_icon.png', color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .decorationColor!, ), ), @@ -187,7 +193,10 @@ class _WalletNameFormState extends State { style: TextStyle( fontSize: 16.0, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme!.headline6!.color!), + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!), ), ), Padding( diff --git a/lib/src/screens/new_wallet/new_wallet_type_page.dart b/lib/src/screens/new_wallet/new_wallet_type_page.dart index 407582923..e2521b95b 100644 --- a/lib/src/screens/new_wallet/new_wallet_type_page.dart +++ b/lib/src/screens/new_wallet/new_wallet_type_page.dart @@ -80,7 +80,10 @@ class WalletTypeFormState extends State { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme.headline6!.color!), + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!), ), ), ...types.map((type) => Padding( @@ -99,7 +102,10 @@ class WalletTypeFormState extends State { bottomSection: PrimaryButton( onPressed: () => onTypeSelected(), text: S.of(context).seed_language_next, - color: Theme.of(context).accentTextTheme.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, isDisabled: selected == null, ), diff --git a/lib/src/screens/new_wallet/widgets/select_button.dart b/lib/src/screens/new_wallet/widgets/select_button.dart index fad7053f5..f8f5ac41f 100644 --- a/lib/src/screens/new_wallet/widgets/select_button.dart +++ b/lib/src/screens/new_wallet/widgets/select_button.dart @@ -16,14 +16,26 @@ class SelectButton extends StatelessWidget { @override Widget build(BuildContext context) { final color = isSelected - ? Colors.green - : Theme.of(context).accentTextTheme!.caption!.color!; + ? Colors.green + : Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!; final textColor = isSelected - ? Theme.of(context).accentTextTheme!.headline5!.decorationColor! - : Theme.of(context).primaryTextTheme!.headline6!.color!; + ? Theme.of(context) + .accentTextTheme! + .headlineSmall! + .decorationColor! + : Theme.of(context).primaryTextTheme!.titleLarge!.color!; final arrowColor = isSelected - ? Theme.of(context).accentTextTheme!.headline5!.decorationColor! - : Theme.of(context).accentTextTheme!.subtitle1!.color!; + ? Theme.of(context) + .accentTextTheme! + .headlineSmall! + .decorationColor! + : Theme.of(context) + .accentTextTheme! + .titleMedium! + .color!; final selectArrowImage = Image.asset('assets/images/select_arrow.png', color: arrowColor); diff --git a/lib/src/screens/nodes/node_create_or_edit_page.dart b/lib/src/screens/nodes/node_create_or_edit_page.dart index 6ca77d8de..71f615c6a 100644 --- a/lib/src/screens/nodes/node_create_or_edit_page.dart +++ b/lib/src/screens/nodes/node_create_or_edit_page.dart @@ -148,7 +148,10 @@ class NodeCreateOrEditPage extends BasePage { Navigator.of(context).pop(); }, text: S.of(context).save, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, isDisabled: (!nodeCreateOrEditViewModel.isReady)|| (nodeCreateOrEditViewModel diff --git a/lib/src/screens/nodes/widgets/node_list_row.dart b/lib/src/screens/nodes/widgets/node_list_row.dart index 90bb3eba1..6169c6df4 100644 --- a/lib/src/screens/nodes/widgets/node_list_row.dart +++ b/lib/src/screens/nodes/widgets/node_list_row.dart @@ -36,7 +36,7 @@ class NodeHeaderListRow extends StandardListRow { return SizedBox( width: 20, child: Icon(Icons.add, - color: Theme.of(context).accentTextTheme.subtitle1?.color, size: 24.0), + color: Theme.of(context).accentTextTheme!.titleMedium!.color,size: 24.0), ); } } diff --git a/lib/src/screens/pin_code/pin_code_widget.dart b/lib/src/screens/pin_code/pin_code_widget.dart index 0ce4ab333..628d5ab6f 100644 --- a/lib/src/screens/pin_code/pin_code_widget.dart +++ b/lib/src/screens/pin_code/pin_code_widget.dart @@ -110,11 +110,11 @@ class PinCodeState extends State { Widget body(BuildContext context) { final deleteIconImage = Image.asset( 'assets/images/delete_icon.png', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ); final faceImage = Image.asset( 'assets/images/face.png', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ); return RawKeyboardListener( @@ -133,7 +133,7 @@ class PinCodeState extends State { } }, child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, padding: EdgeInsets.only(left: 40.0, right: 40.0, bottom: 40.0), child: Column( children: [ @@ -142,7 +142,8 @@ class PinCodeState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme!.headline6!.color!)), + color: + Theme.of(context).primaryTextTheme!.titleLarge!.color!)), Spacer(flex: 3), Container( width: 180, @@ -158,10 +159,13 @@ class PinCodeState extends State { decoration: BoxDecoration( shape: BoxShape.circle, color: isFilled - ? Theme.of(context).primaryTextTheme!.headline6!.color! + ? Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color! : Theme.of(context) .accentTextTheme! - .bodyText2! + .bodyMedium! .color! .withOpacity(0.25), )); @@ -181,7 +185,10 @@ class PinCodeState extends State { style: TextStyle( fontSize: 14.0, fontWeight: FontWeight.normal, - color: Theme.of(context).accentTextTheme!.bodyText2!.decorationColor!), + color: Theme.of(context) + .accentTextTheme! + .bodyMedium! + .decorationColor!), ), ) ], @@ -225,7 +232,7 @@ class PinCodeState extends State { child: TextButton( onPressed: () => _pop(), style: TextButton.styleFrom( - backgroundColor: Theme.of(context).backgroundColor, + backgroundColor: Theme.of(context).colorScheme.background, shape: CircleBorder(), ), child: deleteIconImage, @@ -242,7 +249,7 @@ class PinCodeState extends State { child: TextButton( onPressed: () => _push(index), style: TextButton.styleFrom( - backgroundColor: Theme.of(context).backgroundColor, + backgroundColor: Theme.of(context).colorScheme.background, shape: CircleBorder(), ), child: Text('$index', @@ -251,7 +258,7 @@ class PinCodeState extends State { fontWeight: FontWeight.w600, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!)), ), ); diff --git a/lib/src/screens/receive/anonpay_invoice_page.dart b/lib/src/screens/receive/anonpay_invoice_page.dart index 055307d08..199c33e09 100644 --- a/lib/src/screens/receive/anonpay_invoice_page.dart +++ b/lib/src/screens/receive/anonpay_invoice_page.dart @@ -73,7 +73,10 @@ class AnonPayInvoicePage extends BasePage { disableScroll: true, config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -82,7 +85,7 @@ class AnonPayInvoicePage extends BasePage { ), ]), child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: ScrollableWithBottomSection( contentPadding: EdgeInsets.only(bottom: 24), content: Container( @@ -91,8 +94,8 @@ class AnonPayInvoicePage extends BasePage { bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), gradient: LinearGradient( colors: [ - Theme.of(context).primaryTextTheme.subtitle2!.color!, - Theme.of(context).primaryTextTheme.subtitle2!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleSmall!.color!, + Theme.of(context).primaryTextTheme!.titleSmall!.decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight, @@ -130,7 +133,10 @@ class AnonPayInvoicePage extends BasePage { : S.of(context).anonpay_description("a donation link", "donate"), textAlign: TextAlign.center, style: TextStyle( - color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!, + color: Theme.of(context) + .primaryTextTheme! + .displayLarge! + .decorationColor!, fontWeight: FontWeight.w500, fontSize: 12), ), @@ -157,7 +163,10 @@ class AnonPayInvoicePage extends BasePage { anonInvoicePageViewModel.generateDonationLink(); } }, - color: Theme.of(context).accentTextTheme.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, isLoading: anonInvoicePageViewModel.state is IsExecutingState, ), diff --git a/lib/src/screens/receive/anonpay_receive_page.dart b/lib/src/screens/receive/anonpay_receive_page.dart index 1ee947d49..0c175eb19 100644 --- a/lib/src/screens/receive/anonpay_receive_page.dart +++ b/lib/src/screens/receive/anonpay_receive_page.dart @@ -35,7 +35,10 @@ class AnonPayReceivePage extends BasePage { Widget leading(BuildContext context) { final _backButton = Icon( Icons.arrow_back_ios, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, size: 16, ); @@ -62,7 +65,10 @@ class AnonPayReceivePage extends BasePage { fontSize: 18.0, fontWeight: FontWeight.bold, fontFamily: 'Lato', - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!), + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!), ), Text( invoiceInfo is AnonpayInvoiceInfo @@ -71,7 +77,7 @@ class AnonPayReceivePage extends BasePage { style: TextStyle( fontSize: 10.0, fontWeight: FontWeight.w500, - color: Theme.of(context).textTheme.headline5!.color!), + color: Theme.of(context).textTheme!.headlineSmall!.color!), ) ], ); @@ -93,7 +99,10 @@ class AnonPayReceivePage extends BasePage { ), icon: Icon( Icons.edit, - color: Theme.of(context).accentTextTheme.caption!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!, size: 22.0, ), ), @@ -105,7 +114,7 @@ class AnonPayReceivePage extends BasePage { (BuildContext context, Widget scaffold) => Container( decoration: BoxDecoration( gradient: LinearGradient(colors: [ - Theme.of(context).accentColor, + Theme.of(context).colorScheme.secondary, Theme.of(context).scaffoldBackgroundColor, Theme.of(context).primaryColor, ], begin: Alignment.topRight, end: Alignment.bottomLeft)), @@ -151,7 +160,10 @@ class AnonPayReceivePage extends BasePage { decoration: BoxDecoration( border: Border.all( width: 3, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ), child: QrImage( diff --git a/lib/src/screens/receive/fullscreen_qr_page.dart b/lib/src/screens/receive/fullscreen_qr_page.dart index 2fcc24e2c..b7949013e 100644 --- a/lib/src/screens/receive/fullscreen_qr_page.dart +++ b/lib/src/screens/receive/fullscreen_qr_page.dart @@ -22,7 +22,10 @@ class FullscreenQRPage extends BasePage { Widget leading(BuildContext context) { final _backButton = Icon( Icons.arrow_back_ios, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, size: 16, ); @@ -48,7 +51,7 @@ class FullscreenQRPage extends BasePage { decoration: BoxDecoration( gradient: LinearGradient( colors: [ - Theme.of(context).accentColor, + Theme.of(context).colorScheme.secondary, Theme.of(context).scaffoldBackgroundColor, Theme.of(context).primaryColor, ], @@ -70,7 +73,12 @@ class FullscreenQRPage extends BasePage { child: Container( padding: EdgeInsets.all(10), decoration: BoxDecoration( - border: Border.all(width: 3, color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!)), + border: Border.all( + width: 3, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!)), child: Container( decoration: BoxDecoration( border: Border.all(width: 3, color: Colors.white)), diff --git a/lib/src/screens/receive/receive_page.dart b/lib/src/screens/receive/receive_page.dart index 1dd4b8585..9077bf08c 100644 --- a/lib/src/screens/receive/receive_page.dart +++ b/lib/src/screens/receive/receive_page.dart @@ -64,7 +64,10 @@ class ReceivePage extends BasePage { fontSize: 18.0, fontWeight: FontWeight.bold, fontFamily: 'Lato', - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!), + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!), ); } @@ -73,7 +76,7 @@ class ReceivePage extends BasePage { (BuildContext context, Widget scaffold) => Container( decoration: BoxDecoration( gradient: LinearGradient(colors: [ - Theme.of(context).accentColor, + Theme.of(context).colorScheme.secondary, Theme.of(context).scaffoldBackgroundColor, Theme.of(context).primaryColor, ], begin: Alignment.topRight, end: Alignment.bottomLeft)), @@ -100,7 +103,10 @@ class ReceivePage extends BasePage { icon: Icon( Icons.share, size: 20, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ), )); @@ -113,7 +119,10 @@ class ReceivePage extends BasePage { ? KeyboardActions( config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -154,7 +163,10 @@ class ReceivePage extends BasePage { icon: Icon( Icons.arrow_forward_ios, size: 14, - color: Theme.of(context).textTheme!.headline4!.color!, + color: Theme.of(context) + .textTheme! + .headlineMedium! + .color!, )); } @@ -166,7 +178,10 @@ class ReceivePage extends BasePage { icon: Icon( Icons.add, size: 20, - color: Theme.of(context).textTheme!.headline4!.color!, + color: Theme.of(context) + .textTheme! + .headlineMedium! + .color!, )); } @@ -175,11 +190,23 @@ class ReceivePage extends BasePage { final isCurrent = item.address == addressListViewModel.address.address; final backgroundColor = isCurrent - ? Theme.of(context).textTheme!.headline2!.decorationColor! - : Theme.of(context).textTheme!.headline3!.decorationColor!; + ? Theme.of(context) + .textTheme! + .displayMedium! + .decorationColor! + : Theme.of(context) + .textTheme! + .displaySmall! + .decorationColor!; final textColor = isCurrent - ? Theme.of(context).textTheme!.headline2!.color! - : Theme.of(context).textTheme!.headline3!.color!; + ? Theme.of(context) + .textTheme! + .displayMedium! + .color! + : Theme.of(context) + .textTheme! + .displaySmall! + .color!; return AddressCell.fromItem(item, isCurrent: isCurrent, @@ -225,7 +252,10 @@ class ReceivePage extends BasePage { textAlign: TextAlign.center, style: TextStyle( fontSize: 15, - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!)), + color: Theme.of(context) + .accentTextTheme! + .displaySmall! + .backgroundColor!)), ], ), ); diff --git a/lib/src/screens/receive/widgets/anonpay_currency_input_field.dart b/lib/src/screens/receive/widgets/anonpay_currency_input_field.dart index 824044333..5bca308c9 100644 --- a/lib/src/screens/receive/widgets/anonpay_currency_input_field.dart +++ b/lib/src/screens/receive/widgets/anonpay_currency_input_field.dart @@ -32,7 +32,8 @@ class AnonpayCurrencyInputField extends StatelessWidget { decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Theme.of(context).primaryTextTheme.bodyText1!.color!, + color: + Theme.of(context).primaryTextTheme!.bodyLarge!.color!, width: 1)), ), child: Padding( @@ -64,7 +65,10 @@ class AnonpayCurrencyInputField extends StatelessWidget { child: Container( height: 32, decoration: BoxDecoration( - color: Theme.of(context).primaryTextTheme.headline4!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineMedium! + .color!, borderRadius: BorderRadius.all(Radius.circular(6))), child: Center( child: Padding( @@ -75,8 +79,8 @@ class AnonpayCurrencyInputField extends StatelessWidget { fontSize: 12, fontWeight: FontWeight.bold, color: Theme.of(context) - .primaryTextTheme - .headline4! + .primaryTextTheme! + .headlineMedium! .decorationColor!, ), ), @@ -115,7 +119,10 @@ class AnonpayCurrencyInputField extends StatelessWidget { placeholderTextStyle: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .decorationColor!, ), validator: null, ), @@ -136,14 +143,20 @@ class AnonpayCurrencyInputField extends StatelessWidget { style: TextStyle( fontSize: 10, height: 1.2, - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!), + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .decorationColor!), ), SizedBox(width: 10), Text(S.of(context).max_value(maxAmount, selectedCurrency.toString()), style: TextStyle( fontSize: 10, height: 1.2, - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!)), + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .decorationColor!)), ], ), ) diff --git a/lib/src/screens/receive/widgets/anonpay_input_form.dart b/lib/src/screens/receive/widgets/anonpay_input_form.dart index bd8a23d9c..b041aeee9 100644 --- a/lib/src/screens/receive/widgets/anonpay_input_form.dart +++ b/lib/src/screens/receive/widgets/anonpay_input_form.dart @@ -69,14 +69,17 @@ class AnonInvoiceForm extends StatelessWidget { BaseTextFormField( controller: nameController, focusNode: _nameFocusNode, - borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!, + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!, suffixIcon: SizedBox(width: 36), hintText: S.of(context).optional_name, textInputAction: TextInputAction.next, placeholderTextStyle: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .decorationColor!, ), textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white), validator: null, @@ -88,13 +91,16 @@ class AnonInvoiceForm extends StatelessWidget { controller: descriptionController, focusNode: _descriptionFocusNode, textInputAction: TextInputAction.next, - borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!, + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!, suffixIcon: SizedBox(width: 36), hintText: S.of(context).optional_description, placeholderTextStyle: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .decorationColor!, ), textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white), validator: null, @@ -104,14 +110,17 @@ class AnonInvoiceForm extends StatelessWidget { controller: emailController, textInputAction: TextInputAction.next, focusNode: _emailFocusNode, - borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!, + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!, suffixIcon: SizedBox(width: 36), keyboardType: TextInputType.emailAddress, hintText: S.of(context).optional_email_hint, placeholderTextStyle: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .decorationColor!, ), textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white), validator: EmailValidator(), diff --git a/lib/src/screens/receive/widgets/anonpay_status_section.dart b/lib/src/screens/receive/widgets/anonpay_status_section.dart index d1c8f5137..21817d686 100644 --- a/lib/src/screens/receive/widgets/anonpay_status_section.dart +++ b/lib/src/screens/receive/widgets/anonpay_status_section.dart @@ -18,7 +18,7 @@ class AnonInvoiceStatusSection extends StatelessWidget { width: 200, padding: EdgeInsets.all(19), decoration: BoxDecoration( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, borderRadius: BorderRadius.circular(30), ), child: Column( @@ -31,13 +31,19 @@ class AnonInvoiceStatusSection extends StatelessWidget { style: TextStyle( fontSize: 14, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!, + color: Theme.of(context) + .primaryTextTheme! + .displayLarge! + .decorationColor!, ), ), Container( padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), decoration: BoxDecoration( - color: Theme.of(context).accentTextTheme.headline3!.color!, + color: Theme.of(context) + .accentTextTheme! + .displaySmall! + .color!, borderRadius: BorderRadius.circular(10), ), child: Row( @@ -52,7 +58,10 @@ class AnonInvoiceStatusSection extends StatelessWidget { Text( invoiceInfo.status ?? '', style: textSmallSemiBold( - color: Theme.of(context).primaryTextTheme.headline6!.color, + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color, ), ) ], @@ -69,13 +78,16 @@ class AnonInvoiceStatusSection extends StatelessWidget { style: TextStyle( fontSize: 14, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!, + color: Theme.of(context) + .primaryTextTheme! + .displayLarge! + .decorationColor!, ), ), Text( invoiceInfo.invoiceId ?? '', style: textSmallSemiBold( - color: Theme.of(context).primaryTextTheme.headline6!.color, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color, ), ), ], diff --git a/lib/src/screens/receive/widgets/copy_link_item.dart b/lib/src/screens/receive/widgets/copy_link_item.dart index 5fe122028..cecf33e6c 100644 --- a/lib/src/screens/receive/widgets/copy_link_item.dart +++ b/lib/src/screens/receive/widgets/copy_link_item.dart @@ -14,7 +14,10 @@ class CopyLinkItem extends StatelessWidget { @override Widget build(BuildContext context) { final copyImage = Image.asset('assets/images/copy_address.png', - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!); + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!); return Row( mainAxisAlignment: MainAxisAlignment.center, @@ -22,7 +25,10 @@ class CopyLinkItem extends StatelessWidget { Text( title, style: textMedium( - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ), SizedBox(width: 50), @@ -45,7 +51,10 @@ class CopyLinkItem extends StatelessWidget { onPressed: () => Share.share(url), icon: Icon( Icons.share, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ) ], diff --git a/lib/src/screens/receive/widgets/currency_input_field.dart b/lib/src/screens/receive/widgets/currency_input_field.dart index 273bbb46b..f1ce170f7 100644 --- a/lib/src/screens/receive/widgets/currency_input_field.dart +++ b/lib/src/screens/receive/widgets/currency_input_field.dart @@ -22,7 +22,10 @@ class CurrencyInputField extends StatelessWidget { Widget build(BuildContext context) { final arrowBottomPurple = Image.asset( 'assets/images/arrow_bottom_purple_icon.png', - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 8, ); final _width = MediaQuery.of(context).size.width; @@ -40,13 +43,13 @@ class CurrencyInputField extends StatelessWidget { inputFormatters: [FilteringTextInputFormatter.allow(RegExp(r'^\d+(\.|\,)?\d{0,8}'))], hintText: '0.000', placeholderTextStyle: isLight ? null : TextStyle( - color: Theme.of(context).primaryTextTheme.headline5!.color!, + color: Theme.of(context).primaryTextTheme!.headlineSmall!.color!, fontWeight: FontWeight.w600, ), - borderColor: Theme.of(context).accentTextTheme.headline6!.backgroundColor!, - textColor: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + borderColor: Theme.of(context).accentTextTheme!.titleLarge!.backgroundColor!, + textColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, textStyle: TextStyle( - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, ), prefixIcon: Padding( padding: EdgeInsets.only( @@ -69,7 +72,7 @@ class CurrencyInputField extends StatelessWidget { style: TextStyle( fontWeight: FontWeight.w600, fontSize: 16, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, ), ), if (selectedCurrency.tag != null) @@ -77,7 +80,7 @@ class CurrencyInputField extends StatelessWidget { padding: const EdgeInsets.only(right: 3.0), child: Container( decoration: BoxDecoration( - color: Theme.of(context).primaryTextTheme.headline4!.color!, + color: Theme.of(context).primaryTextTheme!.headlineMedium!.color!, borderRadius: BorderRadius.all( Radius.circular(6), ), @@ -89,8 +92,8 @@ class CurrencyInputField extends StatelessWidget { fontSize: 12, fontWeight: FontWeight.bold, color: Theme.of(context) - .primaryTextTheme - .headline4! + .primaryTextTheme! + .headlineMedium! .decorationColor!, ), ), @@ -105,7 +108,7 @@ class CurrencyInputField extends StatelessWidget { fontWeight: FontWeight.w600, fontSize: 20, color: - Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, ), ), ), diff --git a/lib/src/screens/receive/widgets/header_tile.dart b/lib/src/screens/receive/widgets/header_tile.dart index 40243a3a3..ef9cd7779 100644 --- a/lib/src/screens/receive/widgets/header_tile.dart +++ b/lib/src/screens/receive/widgets/header_tile.dart @@ -22,7 +22,7 @@ class HeaderTile extends StatelessWidget { top: 24, bottom: 24 ), - color: Theme.of(context).textTheme!.headline3!.decorationColor!, + color: Theme.of(context).textTheme!.displaySmall!.decorationColor!, child: Row( mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -32,16 +32,17 @@ class HeaderTile extends StatelessWidget { style: TextStyle( fontSize: 18, fontWeight: FontWeight.w600, - color: Theme.of(context).textTheme!.headline3!.color! - ), + color: Theme.of(context)!.textTheme.displaySmall!.color!), ), Container( height: 32, width: 32, decoration: BoxDecoration( shape: BoxShape.circle, - color: Theme.of(context).textTheme!.headline4!.decorationColor! - ), + color: Theme.of(context) + .textTheme! + .headlineMedium! + .decorationColor!), child: icon, ) ], diff --git a/lib/src/screens/receive/widgets/qr_widget.dart b/lib/src/screens/receive/widgets/qr_widget.dart index 610b0d245..70a8e48bc 100644 --- a/lib/src/screens/receive/widgets/qr_widget.dart +++ b/lib/src/screens/receive/widgets/qr_widget.dart @@ -35,7 +35,7 @@ class QRWidget extends StatelessWidget { @override Widget build(BuildContext context) { final copyImage = Image.asset('assets/images/copy_address.png', - color: Theme.of(context).textTheme.subtitle1!.decorationColor!); + color: Theme.of(context).textTheme!.titleMedium!.decorationColor!); return Column( mainAxisSize: MainAxisSize.min, @@ -51,7 +51,10 @@ class QRWidget extends StatelessWidget { style: TextStyle( fontSize: 14, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!), + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!), ), ), Row( @@ -82,8 +85,10 @@ class QRWidget extends StatelessWidget { decoration: BoxDecoration( border: Border.all( width: 3, - color: - Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ), child: Container( @@ -147,7 +152,10 @@ class QRWidget extends StatelessWidget { style: TextStyle( fontSize: 15, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!), + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!), ), ), Padding( diff --git a/lib/src/screens/release_notes/release_notes_screen.dart b/lib/src/screens/release_notes/release_notes_screen.dart index f8b3730fb..f72a85a3e 100644 --- a/lib/src/screens/release_notes/release_notes_screen.dart +++ b/lib/src/screens/release_notes/release_notes_screen.dart @@ -51,7 +51,10 @@ class ReleaseNotesScreen extends StatelessWidget { fontSize: 24.0, fontWeight: FontWeight.bold, fontFamily: 'Lato', - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), child: Text(title), ), @@ -118,7 +121,10 @@ class ReleaseNotesScreen extends StatelessWidget { decoration: TextDecoration.none, fontSize: 16.0, fontFamily: 'Lato', - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), child: Row( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/src/screens/rescan/rescan_page.dart b/lib/src/screens/rescan/rescan_page.dart index c88a1e7f4..58c51ae5b 100644 --- a/lib/src/screens/rescan/rescan_page.dart +++ b/lib/src/screens/rescan/rescan_page.dart @@ -35,7 +35,10 @@ class RescanPage extends BasePage { _blockchainHeightWidgetKey.currentState!.height); Navigator.of(context).pop(); }, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, isDisabled: !_rescanViewModel.isButtonEnabled, )) diff --git a/lib/src/screens/restore/restore_from_backup_page.dart b/lib/src/screens/restore/restore_from_backup_page.dart index 16aa3dbef..a057dd131 100644 --- a/lib/src/screens/restore/restore_from_backup_page.dart +++ b/lib/src/screens/restore/restore_from_backup_page.dart @@ -75,7 +75,10 @@ class RestoreFromBackupPage extends BasePage { restoreFromBackupViewModel.state is IsExecutingState, onPressed: () => onImportHandler(context), text: S.of(context).import, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white); })) ])), diff --git a/lib/src/screens/restore/restore_wallet_from_seed_details.dart b/lib/src/screens/restore/restore_wallet_from_seed_details.dart index bb662150d..d13606fa1 100644 --- a/lib/src/screens/restore/restore_wallet_from_seed_details.dart +++ b/lib/src/screens/restore/restore_wallet_from_seed_details.dart @@ -134,7 +134,10 @@ class _RestoreFromSeedDetailsFormState isLoading: widget.walletRestorationFromSeedVM.state is IsExecutingState, text: S.of(context).restore_recover, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, isDisabled: _nameController.text.isNotEmpty, ); diff --git a/lib/src/screens/restore/sweeping_wallet_page.dart b/lib/src/screens/restore/sweeping_wallet_page.dart index a7828b385..96887b955 100644 --- a/lib/src/screens/restore/sweeping_wallet_page.dart +++ b/lib/src/screens/restore/sweeping_wallet_page.dart @@ -16,7 +16,7 @@ class SweepingWalletPage extends BasePage { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Theme.of(context).backgroundColor, + backgroundColor: Theme.of(context).colorScheme.background, resizeToAvoidBottomInset: false, body: body(context)); } @@ -82,7 +82,10 @@ class _SweepingWalletWidgetState extends State { style: TextStyle( fontSize: 18, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.color!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .color, ), textAlign: TextAlign.center, ), @@ -94,7 +97,10 @@ class _SweepingWalletWidgetState extends State { style: TextStyle( fontSize: 36, fontWeight: FontWeight.bold, - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!, ), textAlign: TextAlign.center, ), @@ -106,7 +112,10 @@ class _SweepingWalletWidgetState extends State { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.color!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .color, ), textAlign: TextAlign.center, ), diff --git a/lib/src/screens/restore/wallet_restore_from_keys_form.dart b/lib/src/screens/restore/wallet_restore_from_keys_form.dart index f8411b138..732bd650e 100644 --- a/lib/src/screens/restore/wallet_restore_from_keys_form.dart +++ b/lib/src/screens/restore/wallet_restore_from_keys_form.dart @@ -91,7 +91,7 @@ class WalletRestoreFromKeysFromState extends State { 'assets/images/refresh_icon.png', color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .decorationColor!, ), ), diff --git a/lib/src/screens/restore/wallet_restore_from_seed_form.dart b/lib/src/screens/restore/wallet_restore_from_seed_form.dart index 3071d9a82..eeba53b04 100644 --- a/lib/src/screens/restore/wallet_restore_from_seed_form.dart +++ b/lib/src/screens/restore/wallet_restore_from_seed_form.dart @@ -95,7 +95,7 @@ class WalletRestoreFromSeedFormState extends State { 'assets/images/refresh_icon.png', color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .decorationColor!, ), ), diff --git a/lib/src/screens/restore/wallet_restore_page.dart b/lib/src/screens/restore/wallet_restore_page.dart index aa9d31f1b..8e4407b3c 100644 --- a/lib/src/screens/restore/wallet_restore_page.dart +++ b/lib/src/screens/restore/wallet_restore_page.dart @@ -91,7 +91,8 @@ class WalletRestorePage extends BasePage { fontSize: 18.0, fontWeight: FontWeight.bold, fontFamily: 'Lato', - color: titleColor ?? Theme.of(context).primaryTextTheme.headline6!.color!), + color: titleColor ?? + Theme.of(context).primaryTextTheme!.titleLarge!.color!), )); final WalletRestoreViewModel walletRestoreViewModel; @@ -138,7 +139,10 @@ class WalletRestorePage extends BasePage { return KeyboardActions( config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -149,7 +153,7 @@ class WalletRestorePage extends BasePage { ), child: Container( height: 0, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Center( child: ConstrainedBox( constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint), @@ -190,8 +194,14 @@ class WalletRestorePage extends BasePage { return LoadingPrimaryButton( onPressed: _confirmForm, text: S.of(context).restore_recover, - color: Theme.of(context).accentTextTheme.subtitle2!.decorationColor!, - textColor: Theme.of(context).accentTextTheme.headline5!.decorationColor!, + color: Theme.of(context) + .accentTextTheme! + .titleSmall! + .decorationColor!, + textColor: Theme.of(context) + .accentTextTheme! + .headlineSmall! + .decorationColor!, isLoading: walletRestoreViewModel.state is IsExecutingState, isDisabled: !walletRestoreViewModel.isButtonEnabled, ); diff --git a/lib/src/screens/restore/widgets/restore_button.dart b/lib/src/screens/restore/widgets/restore_button.dart index 3b89bcae2..aa44947b5 100644 --- a/lib/src/screens/restore/widgets/restore_button.dart +++ b/lib/src/screens/restore/widgets/restore_button.dart @@ -23,8 +23,11 @@ class RestoreButton extends StatelessWidget { padding: EdgeInsets.all(24), alignment: Alignment.topLeft, decoration: BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(12)), - color: Theme.of(context).accentTextTheme!.caption!.color!, + borderRadius: BorderRadius.all(Radius.circular(12)), + color: Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!, ), child: Row( mainAxisSize: MainAxisSize.max, @@ -45,8 +48,10 @@ class RestoreButton extends StatelessWidget { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme!.headline6!.color! - ), + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!), ), Padding( padding: EdgeInsets.only(top: 5), @@ -55,8 +60,10 @@ class RestoreButton extends StatelessWidget { style: TextStyle( fontSize: 14, fontWeight: FontWeight.normal, - color: Theme.of(context).primaryTextTheme!.overline!.color! - ), + color: Theme.of(context) + .primaryTextTheme! + .labelSmall! + .color!), ), ) ], diff --git a/lib/src/screens/seed/pre_seed_page.dart b/lib/src/screens/seed/pre_seed_page.dart index 86d88c96e..5d0b0b804 100644 --- a/lib/src/screens/seed/pre_seed_page.dart +++ b/lib/src/screens/seed/pre_seed_page.dart @@ -62,7 +62,7 @@ class PreSeedPage extends BasePage { fontWeight: FontWeight.normal, color: Theme.of(context) .primaryTextTheme! - .caption! + .bodySmall! .color!), ), ), @@ -70,7 +70,10 @@ class PreSeedPage extends BasePage { onPressed: () => Navigator.of(context) .popAndPushNamed(Routes.seed, arguments: true), text: S.of(context).pre_seed_button_text, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white) ], )) diff --git a/lib/src/screens/seed/wallet_seed_page.dart b/lib/src/screens/seed/wallet_seed_page.dart index 034ab832c..d0687aa74 100644 --- a/lib/src/screens/seed/wallet_seed_page.dart +++ b/lib/src/screens/seed/wallet_seed_page.dart @@ -67,7 +67,10 @@ class WalletSeedPage extends BasePage { margin: EdgeInsets.only(left: 10), decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(16)), - color: Theme.of(context).accentTextTheme!.caption!.color!), + color: Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!), child: Text( S.of(context).seed_language_next, style: TextStyle( @@ -115,7 +118,7 @@ class WalletSeedPage extends BasePage { fontWeight: FontWeight.w600, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!), ), Padding( @@ -129,7 +132,7 @@ class WalletSeedPage extends BasePage { fontWeight: FontWeight.normal, color: Theme.of(context) .primaryTextTheme! - .caption! + .bodySmall! .color!), ), ) @@ -151,7 +154,7 @@ class WalletSeedPage extends BasePage { fontWeight: FontWeight.normal, color: Theme.of(context) .primaryTextTheme! - .overline! + .labelSmall! .color!), ), ) @@ -187,7 +190,7 @@ class WalletSeedPage extends BasePage { text: S.of(context).copy, color: Theme.of(context) .accentTextTheme! - .bodyText2! + .bodyMedium! .color!, textColor: Colors.white)), )) diff --git a/lib/src/screens/seed_language/seed_language_page.dart b/lib/src/screens/seed_language/seed_language_page.dart index 38f8b67c7..287a1ef07 100644 --- a/lib/src/screens/seed_language/seed_language_page.dart +++ b/lib/src/screens/seed_language/seed_language_page.dart @@ -66,7 +66,8 @@ class SeedLanguageFormState extends State { style: TextStyle( fontSize: 16.0, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme!.headline6!.color!), + color: + Theme.of(context).primaryTextTheme!.titleLarge!.color!), ), ), Padding( diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart index ee0d8431c..9e648d094 100644 --- a/lib/src/screens/send/send_page.dart +++ b/lib/src/screens/send/send_page.dart @@ -192,10 +192,10 @@ class SendPage extends BasePage { dotWidth: 6.0, dotHeight: 6.0, dotColor: Theme.of(context) - .primaryTextTheme.headline3! + .primaryTextTheme!.displaySmall! .backgroundColor!, activeDotColor: Theme.of(context) - .primaryTextTheme.headline2! + .primaryTextTheme!.displayMedium! .backgroundColor!), ) : Offstage(); @@ -294,7 +294,7 @@ class SendPage extends BasePage { text: 'Change your asset (${sendViewModel.selectedCryptoCurrency})', color: Colors.transparent, textColor: Theme.of(context) - .accentTextTheme.headline3! + .accentTextTheme!.displaySmall! .decorationColor!, ) ) @@ -312,11 +312,11 @@ class SendPage extends BasePage { text: S.of(context).add_receiver, color: Colors.transparent, textColor: Theme.of(context) - .accentTextTheme.headline3! + .accentTextTheme!.displaySmall! .decorationColor!, isDottedBorder: true, borderColor: Theme.of(context) - .primaryTextTheme.headline3! + .primaryTextTheme!.displaySmall! .decorationColor!, )), Observer( @@ -345,7 +345,7 @@ class SendPage extends BasePage { }, text: S.of(context).send, - color: Theme.of(context).accentTextTheme.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white, isLoading: sendViewModel.state is IsExecutingState || sendViewModel.state is TransactionCommitting, diff --git a/lib/src/screens/send/send_template_page.dart b/lib/src/screens/send/send_template_page.dart index d7a9a6d4b..51c591fe3 100644 --- a/lib/src/screens/send/send_template_page.dart +++ b/lib/src/screens/send/send_template_page.dart @@ -50,8 +50,10 @@ class SendTemplatePage extends BasePage { return KeyboardActions( config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: - Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -65,7 +67,7 @@ class SendTemplatePage extends BasePage { ]), child: Container( height: 0, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: ScrollableWithBottomSection( contentPadding: EdgeInsets.only(bottom: 24), content: Container( @@ -75,8 +77,11 @@ class SendTemplatePage extends BasePage { bottomRight: Radius.circular(24), ), gradient: LinearGradient(colors: [ - Theme.of(context).primaryTextTheme!.subtitle1!.color!, - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context) + .primaryTextTheme! + .titleMedium! + .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight), ), child: Form( @@ -92,7 +97,7 @@ class SendTemplatePage extends BasePage { hintText: S.of(context).send_name, borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -101,7 +106,7 @@ class SendTemplatePage extends BasePage { placeholderTextStyle: TextStyle( color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!, fontWeight: FontWeight.w500, fontSize: 14), @@ -123,11 +128,11 @@ class SendTemplatePage extends BasePage { ], buttonColor: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .color!, borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -138,7 +143,7 @@ class SendTemplatePage extends BasePage { fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!), ), ), @@ -170,7 +175,7 @@ class SendTemplatePage extends BasePage { hintText: '0.0000', borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -179,7 +184,7 @@ class SendTemplatePage extends BasePage { placeholderTextStyle: TextStyle( color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!, fontWeight: FontWeight.w500, fontSize: 14), @@ -212,7 +217,7 @@ class SendTemplatePage extends BasePage { hintText: '0.00', borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -221,7 +226,7 @@ class SendTemplatePage extends BasePage { placeholderTextStyle: TextStyle( color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!, fontWeight: FontWeight.w500, fontSize: 14), diff --git a/lib/src/screens/send/widgets/choose_yat_address_alert.dart b/lib/src/screens/send/widgets/choose_yat_address_alert.dart index 5d937a571..f18c116f6 100644 --- a/lib/src/screens/send/widgets/choose_yat_address_alert.dart +++ b/lib/src/screens/send/widgets/choose_yat_address_alert.dart @@ -66,7 +66,7 @@ class ChooseYatAddressButtonsState extends State { Container( width: 300, height: 158, - color: Theme.of(context).accentTextTheme!.bodyText2!.backgroundColor!, + color: Theme.of(context).accentTextTheme!.bodyMedium!.backgroundColor!, child: ListView.separated( controller: controller, padding: EdgeInsets.all(0), @@ -95,7 +95,7 @@ class ChooseYatAddressButtonsState extends State { fontSize: 15, fontWeight: FontWeight.w600, fontFamily: 'Lato', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, decoration: TextDecoration.none, ), ) diff --git a/lib/src/screens/send/widgets/confirm_sending_alert.dart b/lib/src/screens/send/widgets/confirm_sending_alert.dart index 3d5f5c928..775971fe8 100644 --- a/lib/src/screens/send/widgets/confirm_sending_alert.dart +++ b/lib/src/screens/send/widgets/confirm_sending_alert.dart @@ -206,7 +206,7 @@ class ConfirmSendingAlertContentState extends State fontWeight: FontWeight.normal, fontFamily: 'Lato', color: Theme.of(context).primaryTextTheme! - .headline6!.color!, + .titleLarge!.color!, decoration: TextDecoration.none, ), ), @@ -220,7 +220,7 @@ class ConfirmSendingAlertContentState extends State fontWeight: FontWeight.w600, fontFamily: 'Lato', color: Theme.of(context).primaryTextTheme! - .headline6!.color!, + .titleLarge!.color!, decoration: TextDecoration.none, ), ), @@ -242,7 +242,7 @@ class ConfirmSendingAlertContentState extends State fontFamily: 'Lato', color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!, decoration: TextDecoration.none, ), @@ -258,7 +258,7 @@ class ConfirmSendingAlertContentState extends State fontFamily: 'Lato', color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color, decoration: TextDecoration.none, ), @@ -290,7 +290,7 @@ class ConfirmSendingAlertContentState extends State fontSize: 16, fontWeight: FontWeight.normal, fontFamily: 'Lato', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, decoration: TextDecoration.none, ), ), @@ -303,7 +303,7 @@ class ConfirmSendingAlertContentState extends State fontSize: 18, fontWeight: FontWeight.w600, fontFamily: 'Lato', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, decoration: TextDecoration.none, ), ), @@ -334,7 +334,7 @@ class ConfirmSendingAlertContentState extends State fontFamily: 'Lato', color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!, decoration: TextDecoration.none, ), diff --git a/lib/src/screens/send/widgets/send_card.dart b/lib/src/screens/send/widgets/send_card.dart index 297e7d660..96045b1bd 100644 --- a/lib/src/screens/send/widgets/send_card.dart +++ b/lib/src/screens/send/widgets/send_card.dart @@ -102,7 +102,9 @@ class SendCardState extends State KeyboardActions( config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1! + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! .backgroundColor!, nextFocus: false, actions: [ @@ -125,10 +127,10 @@ class SendCardState extends State bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), gradient: LinearGradient(colors: [ - Theme.of(context).primaryTextTheme!.subtitle1!.color!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, Theme.of(context) .primaryTextTheme! - .subtitle1! + .titleMedium! .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight), ) : null, @@ -164,11 +166,11 @@ class SendCardState extends State ], buttonColor: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .color!, borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -179,7 +181,7 @@ class SendCardState extends State fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!), onPushPasteButton: (context) async { output.resetParsedAddress(); @@ -200,7 +202,7 @@ class SendCardState extends State readOnly: true, borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -232,7 +234,7 @@ class SendCardState extends State decoration: BoxDecoration( color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .color!, borderRadius: BorderRadius.all(Radius.circular(6))), @@ -245,7 +247,7 @@ class SendCardState extends State fontWeight: FontWeight.bold, color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .decorationColor!)), ), ), @@ -286,7 +288,7 @@ class SendCardState extends State placeholderTextStyle: TextStyle( color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!, fontWeight: FontWeight.w500, fontSize: 14), @@ -307,7 +309,7 @@ class SendCardState extends State decoration: BoxDecoration( color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .color!, borderRadius: BorderRadius.all( @@ -324,7 +326,7 @@ class SendCardState extends State color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .decorationColor!))), ))))]), ), @@ -333,7 +335,7 @@ class SendCardState extends State )), Divider(height: 1,color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!), Observer( builder: (_) => Padding( @@ -352,7 +354,7 @@ class SendCardState extends State fontWeight: FontWeight.w600, color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!), )), Text( @@ -362,7 +364,7 @@ class SendCardState extends State fontWeight: FontWeight.w600, color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!), ) ], @@ -393,7 +395,7 @@ class SendCardState extends State hintText: '0.00', borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -401,7 +403,7 @@ class SendCardState extends State color: Colors.white), placeholderTextStyle: TextStyle( color: Theme.of(context) - .primaryTextTheme!.headline5!.decorationColor!, + .primaryTextTheme!.headlineSmall!.decorationColor!, fontWeight: FontWeight.w500, fontSize: 14), )), @@ -413,7 +415,7 @@ class SendCardState extends State maxLines: null, borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -425,7 +427,7 @@ class SendCardState extends State fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!), ), ), @@ -448,7 +450,7 @@ class SendCardState extends State fontSize: 12, fontWeight: FontWeight.w500, - //color: Theme.of(context).primaryTextTheme!.headline3!.color!, + //color: Theme.of(context).primaryTextTheme!.displaySmall!.color!, color: Colors.white)), Container( child: Row( @@ -469,7 +471,7 @@ class SendCardState extends State fontSize: 12, fontWeight: FontWeight.w600, - //color: Theme.of(context).primaryTextTheme!.headline3!.color!, + //color: Theme.of(context).primaryTextTheme!.displaySmall!.color!, color: Colors.white)), Padding( @@ -489,7 +491,7 @@ class SendCardState extends State color: Theme .of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!)) ), ], diff --git a/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart b/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart index 54af82526..dabdafb64 100644 --- a/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart +++ b/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart @@ -71,7 +71,10 @@ class _DesktopSettingsPageState extends State { }, separatorBuilder: (_, index) => Container( height: 1, - color: Theme.of(context).primaryTextTheme.caption!.decorationColor!, + color: Theme.of(context) + .primaryTextTheme! + .bodySmall! + .decorationColor!, ), itemCount: itemCount, ), diff --git a/lib/src/screens/settings/widgets/settings_cell_with_arrow.dart b/lib/src/screens/settings/widgets/settings_cell_with_arrow.dart index 1f1828b88..1d97db08c 100644 --- a/lib/src/screens/settings/widgets/settings_cell_with_arrow.dart +++ b/lib/src/screens/settings/widgets/settings_cell_with_arrow.dart @@ -8,5 +8,5 @@ class SettingsCellWithArrow extends StandardListRow { @override Widget buildTrailing(BuildContext context) => Image.asset('assets/images/select_arrow.png', - color: Theme.of(context).primaryTextTheme!.overline!.color!); + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!); } \ No newline at end of file diff --git a/lib/src/screens/settings/widgets/settings_choices_cell.dart b/lib/src/screens/settings/widgets/settings_choices_cell.dart index f08a555b0..49bc301f1 100644 --- a/lib/src/screens/settings/widgets/settings_choices_cell.dart +++ b/lib/src/screens/settings/widgets/settings_choices_cell.dart @@ -9,7 +9,7 @@ class SettingsChoicesCell extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, padding: EdgeInsets.all(24), child: Column( mainAxisSize: MainAxisSize.min, @@ -22,7 +22,7 @@ class SettingsChoicesCell extends StatelessWidget { style: TextStyle( fontSize: 14, fontWeight: FontWeight.normal, - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), ], @@ -34,7 +34,10 @@ class SettingsChoicesCell extends StatelessWidget { child: Container( decoration: BoxDecoration( borderRadius: BorderRadius.circular(30), - color: Theme.of(context).accentTextTheme!.headline3!.color!, + color: Theme.of(context) + .accentTextTheme! + .displaySmall! + .color!, ), child: Row( mainAxisAlignment: MainAxisAlignment.center, @@ -48,12 +51,22 @@ class SettingsChoicesCell extends StatelessWidget { padding: EdgeInsets.symmetric(horizontal: 32, vertical: 8), decoration: BoxDecoration( borderRadius: BorderRadius.circular(30), - color: isSelected ? Theme.of(context).accentTextTheme!.bodyText1!.color! : null, + color: isSelected + ? Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color! + : null, ), child: Text( choicesListItem.displayItem?.call(e) ?? e.toString(), style: TextStyle( - color: isSelected ? Colors.white : Theme.of(context).primaryTextTheme!.caption!.color!, + color: isSelected + ? Colors.white + : Theme.of(context) + .primaryTextTheme! + .bodySmall! + .color!, fontWeight: isSelected ? FontWeight.w700 : FontWeight.normal, ), ), diff --git a/lib/src/screens/settings/widgets/settings_picker_cell.dart b/lib/src/screens/settings/widgets/settings_picker_cell.dart index 8dd5c8c2c..64086d8d1 100644 --- a/lib/src/screens/settings/widgets/settings_picker_cell.dart +++ b/lib/src/screens/settings/widgets/settings_picker_cell.dart @@ -55,7 +55,7 @@ class SettingsPickerCell extends StandardListRow { style: TextStyle( fontSize: 14.0, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme.overline?.color, + color: Theme.of(context).primaryTextTheme!.labelSmall?.color, ), ); } diff --git a/lib/src/screens/settings/widgets/settings_version_cell.dart b/lib/src/screens/settings/widgets/settings_version_cell.dart index 4451bb125..e314d549d 100644 --- a/lib/src/screens/settings/widgets/settings_version_cell.dart +++ b/lib/src/screens/settings/widgets/settings_version_cell.dart @@ -18,8 +18,7 @@ class SettingsVersionCell extends StatelessWidget { style: TextStyle( fontSize: 12, fontWeight: FontWeight.normal, - color: Theme.of(context).primaryTextTheme!.overline!.color! - ), + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!), ) ], ), diff --git a/lib/src/screens/subaddress/address_edit_or_create_page.dart b/lib/src/screens/subaddress/address_edit_or_create_page.dart index c0b003dec..86659130a 100644 --- a/lib/src/screens/subaddress/address_edit_or_create_page.dart +++ b/lib/src/screens/subaddress/address_edit_or_create_page.dart @@ -53,7 +53,10 @@ class AddressEditOrCreatePage extends BasePage { text: addressEditOrCreateViewModel.isEdit ? S.of(context).rename : S.of(context).new_subaddress_create, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, isLoading: addressEditOrCreateViewModel.state is AddressIsSaving, diff --git a/lib/src/screens/support/support_page.dart b/lib/src/screens/support/support_page.dart index 801f81775..b385530fb 100644 --- a/lib/src/screens/support/support_page.dart +++ b/lib/src/screens/support/support_page.dart @@ -19,7 +19,10 @@ class SupportPage extends BasePage { @override Widget body(BuildContext context) { - final iconColor = Theme.of(context).accentTextTheme!.headline1!.backgroundColor!; + final iconColor = Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!; // FIX-ME: Added `context` it was not used here before, maby bug ? return Center( child: ConstrainedBox( diff --git a/lib/src/screens/transaction_details/widgets/textfield_list_row.dart b/lib/src/screens/transaction_details/widgets/textfield_list_row.dart index 81776da10..18e5368a6 100644 --- a/lib/src/screens/transaction_details/widgets/textfield_list_row.dart +++ b/lib/src/screens/transaction_details/widgets/textfield_list_row.dart @@ -23,7 +23,7 @@ class TextFieldListRow extends StatelessWidget { Widget build(BuildContext context) { return Container( width: double.infinity, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Padding( padding: const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24), @@ -35,7 +35,9 @@ class TextFieldListRow extends StatelessWidget { fontSize: titleFontSize, fontWeight: FontWeight.w500, color: Theme.of(context) - .primaryTextTheme!.overline!.color!), + .primaryTextTheme! + .labelSmall! + .color!), textAlign: TextAlign.left), TextField( controller: _textController, @@ -46,8 +48,8 @@ class TextFieldListRow extends StatelessWidget { style: TextStyle( fontSize: valueFontSize, fontWeight: FontWeight.w500, - color: Theme.of(context) - .primaryTextTheme!.headline6!.color!), + color: + Theme.of(context).primaryTextTheme!.titleLarge!.color!), decoration: InputDecoration( isDense: true, contentPadding: EdgeInsets.only(top: 12, bottom: 0), @@ -56,9 +58,10 @@ class TextFieldListRow extends StatelessWidget { fontSize: valueFontSize, fontWeight: FontWeight.w500, color: Theme.of(context) - .primaryTextTheme!.overline!.color!), - border: InputBorder.none - ), + .primaryTextTheme! + .labelSmall! + .color!), + border: InputBorder.none), onSubmitted: (value) => onSubmitted?.call(value), ) ]), diff --git a/lib/src/screens/unspent_coins/unspent_coins_list_page.dart b/lib/src/screens/unspent_coins/unspent_coins_list_page.dart index cb2a75f9f..432fdc5f6 100644 --- a/lib/src/screens/unspent_coins/unspent_coins_list_page.dart +++ b/lib/src/screens/unspent_coins/unspent_coins_list_page.dart @@ -18,7 +18,7 @@ class UnspentCoinsListPage extends BasePage { //@override //Widget trailing(BuildContext context) { // final questionImage = Image.asset('assets/images/question_mark.png', - // color: Theme.of(context).primaryTextTheme!.headline6!.color!); + // color: Theme.of(context).primaryTextTheme!.titleLarge!.color!); // return SizedBox( // height: 20.0, diff --git a/lib/src/screens/unspent_coins/widgets/unspent_coins_switch_row.dart b/lib/src/screens/unspent_coins/widgets/unspent_coins_switch_row.dart index 734aeb7ee..43550a9c5 100644 --- a/lib/src/screens/unspent_coins/widgets/unspent_coins_switch_row.dart +++ b/lib/src/screens/unspent_coins/widgets/unspent_coins_switch_row.dart @@ -17,7 +17,7 @@ class UnspentCoinsSwitchRow extends StatelessWidget { Widget build(BuildContext context) { return Container( width: double.infinity, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Padding( padding: const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24), @@ -29,7 +29,9 @@ class UnspentCoinsSwitchRow extends StatelessWidget { fontSize: titleFontSize, fontWeight: FontWeight.w500, color: Theme.of(context) - .primaryTextTheme!.overline!.color!), + .primaryTextTheme! + .labelSmall! + .color!), textAlign: TextAlign.left), Padding( padding: EdgeInsets.only(top: 12), diff --git a/lib/src/screens/wallet_keys/wallet_keys_page.dart b/lib/src/screens/wallet_keys/wallet_keys_page.dart index c1c2e6fb5..5142fb2c2 100644 --- a/lib/src/screens/wallet_keys/wallet_keys_page.dart +++ b/lib/src/screens/wallet_keys/wallet_keys_page.dart @@ -56,7 +56,7 @@ class WalletKeysPage extends BasePage { width: double.infinity, decoration: BoxDecoration( borderRadius: BorderRadius.circular(12.0), - color: Theme.of(context).accentTextTheme!.caption!.color!, + color: Theme.of(context).accentTextTheme!.bodySmall!.color!, ), child: Center( child: Padding( @@ -84,7 +84,7 @@ class WalletKeysPage extends BasePage { separatorBuilder: (context, index) => Container( height: 1, padding: EdgeInsets.only(left: 24), - color: Theme.of(context).accentTextTheme!.headline6!.backgroundColor!, + color: Theme.of(context).accentTextTheme!.titleLarge!.backgroundColor!, child: const SectionDivider(), ), itemCount: walletKeysViewModel.items.length, diff --git a/lib/src/screens/wallet_list/wallet_list_page.dart b/lib/src/screens/wallet_list/wallet_list_page.dart index dce7e2ccf..b20b2bd1a 100644 --- a/lib/src/screens/wallet_list/wallet_list_page.dart +++ b/lib/src/screens/wallet_list/wallet_list_page.dart @@ -57,7 +57,7 @@ class WalletListBodyState extends State { final newWalletImage = Image.asset('assets/images/new_wallet.png', height: 12, width: 12, color: Colors.white); final restoreWalletImage = Image.asset('assets/images/restore_wallet.png', - height: 12, width: 12, color: Theme.of(context).primaryTextTheme.headline6!.color!); + height: 12, width: 12, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!); return Container( padding: EdgeInsets.only(top: 16), @@ -69,13 +69,13 @@ class WalletListBodyState extends State { shrinkWrap: true, physics: const NeverScrollableScrollPhysics(), separatorBuilder: (_, index) => - Divider(color: Theme.of(context).backgroundColor, height: 32), + Divider(color: Theme.of(context).colorScheme.background, height: 32), itemCount: widget.walletListViewModel.wallets.length, itemBuilder: (__, index) { final wallet = widget.walletListViewModel.wallets[index]; final currentColor = wallet.isCurrent - ? Theme.of(context).accentTextTheme.subtitle2!.decorationColor! - : Theme.of(context).backgroundColor; + ? Theme.of(context).accentTextTheme!.titleSmall!.decorationColor! + : Theme.of(context).colorScheme.background; final row = GestureDetector( onTap: () async { if (wallet.isCurrent || !wallet.isEnabled) { @@ -120,7 +120,7 @@ class WalletListBodyState extends State { child: Container( height: tileHeight, padding: EdgeInsets.only(left: 20, right: 20), - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, alignment: Alignment.centerLeft, child: Row( crossAxisAlignment: CrossAxisAlignment.center, @@ -136,7 +136,7 @@ class WalletListBodyState extends State { fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme - .headline6! + .titleLarge! .color!), ) ], @@ -171,7 +171,7 @@ class WalletListBodyState extends State { }, image: newWalletImage, text: S.of(context).wallet_list_create_new_wallet, - color: Theme.of(context).accentTextTheme.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white, ), SizedBox(height: 10.0), @@ -181,8 +181,8 @@ class WalletListBodyState extends State { }, image: restoreWalletImage, text: S.of(context).wallet_list_restore_wallet, - color: Theme.of(context).accentTextTheme.caption!.color!, - textColor: Theme.of(context).primaryTextTheme.headline6!.color!) + color: Theme.of(context).accentTextTheme!.bodySmall!.color!, + textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!) ])), ); } diff --git a/lib/src/screens/welcome/welcome_page.dart b/lib/src/screens/welcome/welcome_page.dart index 0249093bd..3d3e4c2e4 100644 --- a/lib/src/screens/welcome/welcome_page.dart +++ b/lib/src/screens/welcome/welcome_page.dart @@ -39,7 +39,7 @@ class WelcomePage extends BasePage { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Theme.of(context).backgroundColor, + backgroundColor: Theme.of(context).colorScheme.background, resizeToAvoidBottomInset: false, body: body(context)); } @@ -51,9 +51,14 @@ class WelcomePage extends BasePage { final newWalletImage = Image.asset('assets/images/new_wallet.png', height: 12, width: 12, - color: Theme.of(context).accentTextTheme!.headline5!.decorationColor!); + color: Theme.of(context) + .accentTextTheme! + .headlineSmall! + .decorationColor!); final restoreWalletImage = Image.asset('assets/images/restore_wallet.png', - height: 12, width: 12, color: Theme.of(context).primaryTextTheme!.headline6!.color!); + height: 12, + width: 12, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!); return WillPopScope( onWillPop: () async => false, @@ -85,7 +90,10 @@ class WelcomePage extends BasePage { style: TextStyle( fontSize: 18, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.color!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .color, ), textAlign: TextAlign.center, ), @@ -97,7 +105,10 @@ class WelcomePage extends BasePage { style: TextStyle( fontSize: 36, fontWeight: FontWeight.bold, - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!, ), textAlign: TextAlign.center, ), @@ -109,7 +120,10 @@ class WelcomePage extends BasePage { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.color!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .color, ), textAlign: TextAlign.center, ), @@ -123,7 +137,10 @@ class WelcomePage extends BasePage { style: TextStyle( fontSize: 12, fontWeight: FontWeight.normal, - color: Theme.of(context).accentTextTheme!.headline2!.color!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .color, ), textAlign: TextAlign.center, ), @@ -136,11 +153,11 @@ class WelcomePage extends BasePage { text: S.of(context).create_new, color: Theme.of(context) .accentTextTheme! - .subtitle2! + .titleSmall! .decorationColor!, textColor: Theme.of(context) .accentTextTheme! - .headline5! + .headlineSmall! .decorationColor!, ), ), @@ -153,9 +170,14 @@ class WelcomePage extends BasePage { }, image: restoreWalletImage, text: S.of(context).restore_wallet, - color: Theme.of(context).accentTextTheme!.caption!.color!, - textColor: - Theme.of(context).primaryTextTheme!.headline6!.color!), + color: Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!, + textColor: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!), ) ], ) diff --git a/lib/src/screens/yat_emoji_id.dart b/lib/src/screens/yat_emoji_id.dart index 1ae86aa41..6e3ec9cb1 100644 --- a/lib/src/screens/yat_emoji_id.dart +++ b/lib/src/screens/yat_emoji_id.dart @@ -38,7 +38,8 @@ class YatEmojiId extends StatelessWidget { topRight: Radius.circular(24)), child: Container( height: 420, - color: Theme.of(context).buttonColor, + color: + Theme.of(context).textTheme!.titleLarge!.backgroundColor!, padding: EdgeInsets.fromLTRB(24, 15, 24, 24), child: Column( mainAxisSize: MainAxisSize.max, @@ -88,7 +89,7 @@ class YatEmojiId extends StatelessWidget { fontSize: 32, fontWeight: FontWeight.bold, fontFamily: 'Lato', - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, decoration: TextDecoration.none, ) ), @@ -103,7 +104,7 @@ class YatEmojiId extends StatelessWidget { fontFamily: 'Lato', color: Theme.of(context) .accentTextTheme! - .headline3! + .displaySmall! .backgroundColor!, decoration: TextDecoration.none, ) diff --git a/lib/src/widgets/add_template_button.dart b/lib/src/widgets/add_template_button.dart index 249c493a6..87951e044 100644 --- a/lib/src/widgets/add_template_button.dart +++ b/lib/src/widgets/add_template_button.dart @@ -19,7 +19,8 @@ class AddTemplateButton extends StatelessWidget { child: DottedBorder( borderType: BorderType.RRect, dashPattern: [6, 4], - color: Theme.of(context).primaryTextTheme.headline3!.decorationColor!, + color: + Theme.of(context).primaryTextTheme!.displaySmall!.decorationColor!, strokeWidth: 2, radius: Radius.circular(20), child: Container( @@ -34,14 +35,20 @@ class AddTemplateButton extends StatelessWidget { child: currentTemplatesLength >= 1 ? Icon( Icons.add, - color: Theme.of(context).primaryTextTheme.headline2!.color!, + color: Theme.of(context) + .primaryTextTheme! + .displayMedium! + .color!, ) : Text( S.of(context).new_template, style: TextStyle( fontSize: 14, fontWeight: FontWeight.w600, - color: Theme.of(context).primaryTextTheme.headline2!.color!, + color: Theme.of(context) + .primaryTextTheme! + .displayMedium! + .color!, ), ), ), diff --git a/lib/src/widgets/address_text_field.dart b/lib/src/widgets/address_text_field.dart index 059dc51aa..415d40c6d 100644 --- a/lib/src/widgets/address_text_field.dart +++ b/lib/src/widgets/address_text_field.dart @@ -68,7 +68,7 @@ class AddressTextField extends StatelessWidget { style: textStyle ?? TextStyle( fontSize: 16, - color: Theme.of(context).primaryTextTheme.headline6!.color!), + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!), decoration: InputDecoration( suffixIcon: SizedBox( width: prefixIconWidth * options.length + @@ -121,7 +121,8 @@ class AddressTextField extends StatelessWidget { decoration: BoxDecoration( color: buttonColor ?? Theme.of(context) - .accentTextTheme.headline6! + .accentTextTheme! + .titleLarge! .color!, borderRadius: BorderRadius.all(Radius.circular(6))), @@ -129,7 +130,8 @@ class AddressTextField extends StatelessWidget { 'assets/images/paste_ios.png', color: iconColor ?? Theme.of(context) - .primaryTextTheme.headline4! + .primaryTextTheme! + .headlineMedium! .decorationColor!, )), )), @@ -147,7 +149,8 @@ class AddressTextField extends StatelessWidget { decoration: BoxDecoration( color: buttonColor ?? Theme.of(context) - .accentTextTheme.headline6! + .accentTextTheme + .titleLarge! .color!, borderRadius: BorderRadius.all(Radius.circular(6))), @@ -155,7 +158,7 @@ class AddressTextField extends StatelessWidget { 'assets/images/qr_code_icon.png', color: iconColor ?? Theme.of(context) - .primaryTextTheme.headline4! + .primaryTextTheme!.headlineMedium! .decorationColor!, )), )) @@ -174,7 +177,8 @@ class AddressTextField extends StatelessWidget { decoration: BoxDecoration( color: buttonColor ?? Theme.of(context) - .accentTextTheme.headline6! + .accentTextTheme! + .titleLarge! .color!, borderRadius: BorderRadius.all(Radius.circular(6))), @@ -182,7 +186,8 @@ class AddressTextField extends StatelessWidget { 'assets/images/open_book.png', color: iconColor ?? Theme.of(context) - .primaryTextTheme.headline4! + .primaryTextTheme! + .headlineMedium! .decorationColor!, )), )) diff --git a/lib/src/widgets/alert_with_one_action.dart b/lib/src/widgets/alert_with_one_action.dart index 78752a4c3..c3b364e8d 100644 --- a/lib/src/widgets/alert_with_one_action.dart +++ b/lib/src/widgets/alert_with_one_action.dart @@ -31,7 +31,10 @@ class AlertWithOneAction extends BaseAlertDialog { width: 300, height: 52, padding: EdgeInsets.only(left: 12, right: 12), - color: Theme.of(context).accentTextTheme!.bodyText2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .bodyMedium! + .backgroundColor!, child: ButtonTheme( minWidth: double.infinity, child: TextButton( @@ -45,7 +48,9 @@ class AlertWithOneAction extends BaseAlertDialog { style: TextStyle( fontSize: 15, fontWeight: FontWeight.w600, - color: Theme.of(context).primaryTextTheme!.bodyText2! + color: Theme.of(context) + .primaryTextTheme! + .bodyMedium! .backgroundColor!, decoration: TextDecoration.none, ), diff --git a/lib/src/widgets/base_alert_dialog.dart b/lib/src/widgets/base_alert_dialog.dart index effbbc562..995e3f205 100644 --- a/lib/src/widgets/base_alert_dialog.dart +++ b/lib/src/widgets/base_alert_dialog.dart @@ -25,7 +25,7 @@ class BaseAlertDialog extends StatelessWidget { fontSize: 20, fontFamily: 'Lato', fontWeight: FontWeight.w600, - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, decoration: TextDecoration.none, ), ); @@ -39,7 +39,7 @@ class BaseAlertDialog extends StatelessWidget { fontSize: 16, fontWeight: FontWeight.normal, fontFamily: 'Lato', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, decoration: TextDecoration.none, ), ); @@ -59,7 +59,7 @@ class BaseAlertDialog extends StatelessWidget { backgroundColor: leftActionButtonColor ?? Theme.of(context) .accentTextTheme! - .bodyText1! + .bodyLarge! .decorationColor!, shape: const RoundedRectangleBorder( borderRadius: BorderRadius.all(Radius.zero))), @@ -71,8 +71,10 @@ class BaseAlertDialog extends StatelessWidget { fontFamily: 'Lato', fontWeight: FontWeight.w600, color: leftActionButtonTextColor ?? - Theme.of(context).primaryTextTheme! - .bodyText1!.backgroundColor!, + Theme.of(context) + .primaryTextTheme! + .bodyLarge! + .backgroundColor!, decoration: TextDecoration.none, ), )), @@ -83,8 +85,10 @@ class BaseAlertDialog extends StatelessWidget { onPressed: actionRight, style: TextButton.styleFrom( backgroundColor: rightActionButtonColor ?? - Theme.of(context).accentTextTheme! - .bodyText2!.backgroundColor!, + Theme.of(context) + .accentTextTheme! + .bodyMedium! + .backgroundColor!, shape: const RoundedRectangleBorder( borderRadius: BorderRadius.all(Radius.zero))), child: Text( @@ -97,7 +101,7 @@ class BaseAlertDialog extends StatelessWidget { color: rightActionButtonTextColor ?? Theme.of(context) .primaryTextTheme! - .bodyText2! + .bodyMedium! .backgroundColor!, decoration: TextDecoration.none, ), @@ -124,7 +128,10 @@ class BaseAlertDialog extends StatelessWidget { borderRadius: BorderRadius.all(Radius.circular(30)), child: Container( width: 300, - color: Theme.of(context).accentTextTheme!.headline6!.decorationColor!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .decorationColor!, child: Column( mainAxisSize: MainAxisSize.min, children: [ diff --git a/lib/src/widgets/base_text_form_field.dart b/lib/src/widgets/base_text_form_field.dart index ff2102843..a9dd51380 100644 --- a/lib/src/widgets/base_text_form_field.dart +++ b/lib/src/widgets/base_text_form_field.dart @@ -77,8 +77,8 @@ class BaseTextFormField extends StatelessWidget { style: textStyle ?? TextStyle( fontSize: 16.0, - color: - textColor ?? Theme.of(context).primaryTextTheme.headline6!.color!), + color: textColor ?? + Theme.of(context).primaryTextTheme!.titleLarge!.color!), decoration: InputDecoration( prefix: prefix, prefixIcon: prefixIcon, @@ -92,17 +92,26 @@ class BaseTextFormField extends StatelessWidget { focusedBorder: UnderlineInputBorder( borderSide: BorderSide( color: borderColor ?? - Theme.of(context).primaryTextTheme.headline6!.backgroundColor!, + Theme.of(context) + .primaryTextTheme! + .titleLarge! + .backgroundColor!, width: borderWidth)), disabledBorder: UnderlineInputBorder( borderSide: BorderSide( color: borderColor ?? - Theme.of(context).primaryTextTheme.headline6!.backgroundColor!, + Theme.of(context) + .primaryTextTheme! + .titleLarge! + .backgroundColor!, width: borderWidth)), enabledBorder: UnderlineInputBorder( borderSide: BorderSide( color: borderColor ?? - Theme.of(context).primaryTextTheme.headline6!.backgroundColor!, + Theme.of(context) + .primaryTextTheme! + .titleLarge! + .backgroundColor!, width: borderWidth))), validator: validator, ); diff --git a/lib/src/widgets/blockchain_height_widget.dart b/lib/src/widgets/blockchain_height_widget.dart index f40ef0cf1..6d2b891db 100644 --- a/lib/src/widgets/blockchain_height_widget.dart +++ b/lib/src/widgets/blockchain_height_widget.dart @@ -80,7 +80,8 @@ class BlockchainHeightState extends State { style: TextStyle( fontSize: 16.0, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme!.headline6!.color!), + color: + Theme.of(context).primaryTextTheme!.titleLarge!.color!), ), ), Row( diff --git a/lib/src/widgets/cake_scrollbar.dart b/lib/src/widgets/cake_scrollbar.dart index 23da151ec..6b8cb59da 100644 --- a/lib/src/widgets/cake_scrollbar.dart +++ b/lib/src/widgets/cake_scrollbar.dart @@ -27,7 +27,8 @@ class CakeScrollbar extends StatelessWidget { height: backgroundHeight, width: width, decoration: BoxDecoration( - color: backgroundColor ?? Theme.of(context).textTheme!.bodyText2!.decorationColor!, + color: backgroundColor ?? + Theme.of(context).textTheme!.bodyMedium!.decorationColor!, borderRadius: BorderRadius.all(Radius.circular(3))), child: Stack( children: [ @@ -38,7 +39,8 @@ class CakeScrollbar extends StatelessWidget { height: thumbHeight, width: width, decoration: BoxDecoration( - color: thumbColor ?? Theme.of(context).textTheme!.bodyText2!.color!, + color: thumbColor ?? + Theme.of(context).textTheme!.bodyMedium!.color!, borderRadius: BorderRadius.all(Radius.circular(3))), ), ) diff --git a/lib/src/widgets/check_box_picker.dart b/lib/src/widgets/check_box_picker.dart index 47b0be041..7fd0b57a3 100644 --- a/lib/src/widgets/check_box_picker.dart +++ b/lib/src/widgets/check_box_picker.dart @@ -53,7 +53,10 @@ class CheckBoxPickerState extends State { child: ClipRRect( borderRadius: BorderRadius.all(Radius.circular(30)), child: Container( - color: Theme.of(context).accentTextTheme.headline6!.color!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .color!, child: ConstrainedBox( constraints: BoxConstraints( maxHeight: MediaQuery.of(context).size.height * 0.65, @@ -87,7 +90,10 @@ class CheckBoxPickerState extends State { Widget itemsList() { return Container( - color: Theme.of(context).accentTextTheme.headline6!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .backgroundColor!, child: ListView.separated( padding: EdgeInsets.zero, controller: controller, @@ -95,8 +101,8 @@ class CheckBoxPickerState extends State { separatorBuilder: (context, index) => widget.isSeparated ? Divider( color: Theme.of(context) - .accentTextTheme - .headline6! + .accentTextTheme! + .titleLarge! .backgroundColor!, height: 1, ) @@ -116,13 +122,19 @@ class CheckBoxPickerState extends State { }, child: Container( height: 55, - color: Theme.of(context).accentTextTheme.headline6!.color!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .color!, padding: EdgeInsets.only(left: 24, right: 24), child: CheckboxListTile( value: item.value, activeColor: item.value ? Palette.blueCraiola - : Theme.of(context).accentTextTheme.subtitle1!.decorationColor!, + : Theme.of(context) + .accentTextTheme! + .titleMedium! + .decorationColor!, checkColor: Colors.white, title: widget.displayItem?.call(item) ?? Text( @@ -133,7 +145,7 @@ class CheckBoxPickerState extends State { fontWeight: FontWeight.w600, color: item.isDisabled ? Colors.grey.withOpacity(0.5) - : Theme.of(context).primaryTextTheme.headline6!.color!, + : Theme.of(context).primaryTextTheme!.titleLarge!.color!, decoration: TextDecoration.none, ), ), diff --git a/lib/src/widgets/checkbox_widget.dart b/lib/src/widgets/checkbox_widget.dart index 748f2d4a8..a2603ad19 100644 --- a/lib/src/widgets/checkbox_widget.dart +++ b/lib/src/widgets/checkbox_widget.dart @@ -42,15 +42,19 @@ class CheckboxWidgetState extends State { decoration: BoxDecoration( color: value ? Palette.blueCraiola - : Theme.of(context).accentTextTheme!.subtitle1!.decorationColor!, + : Theme.of(context) + .accentTextTheme! + .titleMedium! + .decorationColor!, borderRadius: BorderRadius.all(Radius.circular(2)), border: Border.all( color: value ? Palette.blueCraiola - : Theme.of(context).accentTextTheme!.overline!.color!, - width: 1 - ) - ), + : Theme.of(context) + .accentTextTheme! + .labelSmall! + .color!, + width: 1)), child: value ? Center( child: Icon( @@ -66,7 +70,7 @@ class CheckboxWidgetState extends State { child: Text( caption, style: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, fontSize: 18, fontFamily: 'Lato', fontWeight: FontWeight.w500, diff --git a/lib/src/widgets/collapsible_standart_list.dart b/lib/src/widgets/collapsible_standart_list.dart index 514308b45..1fef64969 100644 --- a/lib/src/widgets/collapsible_standart_list.dart +++ b/lib/src/widgets/collapsible_standart_list.dart @@ -38,7 +38,7 @@ class CollapsibleSectionList extends SectionStandardList { items.add(Theme( data: ThemeData( - textTheme: TextTheme(subtitle1: TextStyle(color: themeColor,fontFamily: 'Lato')), + textTheme: TextTheme(titleMedium: TextStyle(color: themeColor,fontFamily: 'Lato')), backgroundColor: dividerThemeColor, unselectedWidgetColor: themeColor, accentColor: themeColor) diff --git a/lib/src/widgets/introducing_card.dart b/lib/src/widgets/introducing_card.dart index 59885d440..638d68c8a 100644 --- a/lib/src/widgets/introducing_card.dart +++ b/lib/src/widgets/introducing_card.dart @@ -26,7 +26,7 @@ class IntroducingCard extends StatelessWidget { color: borderColor, width: 1, ), - color: Theme.of(context).textTheme!.headline6!.backgroundColor!), + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, @@ -46,7 +46,7 @@ class IntroducingCard extends StatelessWidget { fontWeight: FontWeight.bold, color: Theme.of(context) .accentTextTheme! - .headline2! + .displayMedium! .backgroundColor!, height: 1), maxLines: 1, @@ -59,7 +59,7 @@ class IntroducingCard extends StatelessWidget { fontFamily: 'Lato', color: Theme.of(context) .accentTextTheme! - .headline2! + .displayMedium! .backgroundColor!, height: 1)), ], diff --git a/lib/src/widgets/list_row.dart b/lib/src/widgets/list_row.dart index 40824fe59..d9d9e2f8d 100644 --- a/lib/src/widgets/list_row.dart +++ b/lib/src/widgets/list_row.dart @@ -19,7 +19,7 @@ class ListRow extends StatelessWidget { Widget build(BuildContext context) { return Container( width: double.infinity, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Padding( padding: const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24), @@ -30,8 +30,10 @@ class ListRow extends StatelessWidget { style: TextStyle( fontSize: titleFontSize, fontWeight: FontWeight.w500, - color: - Theme.of(context).primaryTextTheme!.overline!.color!), + color: Theme.of(context) + .primaryTextTheme! + .labelSmall! + .color!), textAlign: TextAlign.left), Padding( padding: const EdgeInsets.only(top: 12), @@ -47,7 +49,7 @@ class ListRow extends StatelessWidget { fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!)), ), image != null diff --git a/lib/src/widgets/market_place_item.dart b/lib/src/widgets/market_place_item.dart index 438391c97..30e617258 100644 --- a/lib/src/widgets/market_place_item.dart +++ b/lib/src/widgets/market_place_item.dart @@ -26,7 +26,7 @@ class MarketPlaceItem extends StatelessWidget { padding: EdgeInsets.all(20), width: double.infinity, decoration: BoxDecoration( - color: Theme.of(context).textTheme!.headline6!.backgroundColor!, + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!, borderRadius: BorderRadius.circular(20), border: Border.all( color: Colors.white.withOpacity(0.20), @@ -41,7 +41,7 @@ class MarketPlaceItem extends StatelessWidget { style: TextStyle( color: Theme.of(context) .accentTextTheme! - .headline2! + .displayMedium! .backgroundColor!, fontSize: 24, fontWeight: FontWeight.w900, @@ -53,7 +53,7 @@ class MarketPlaceItem extends StatelessWidget { style: TextStyle( color: Theme.of(context) .accentTextTheme! - .headline2! + .displayMedium! .backgroundColor!, fontWeight: FontWeight.w500, fontFamily: 'Lato'), diff --git a/lib/src/widgets/picker.dart b/lib/src/widgets/picker.dart index e160a083b..7be1d611a 100644 --- a/lib/src/widgets/picker.dart +++ b/lib/src/widgets/picker.dart @@ -143,7 +143,10 @@ class _PickerState extends State> { child: ClipRRect( borderRadius: BorderRadius.all(Radius.circular(30)), child: Container( - color: Theme.of(context).accentTextTheme.headline6!.color!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .color!, child: ConstrainedBox( constraints: BoxConstraints( maxHeight: containerHeight, @@ -159,8 +162,8 @@ class _PickerState extends State> { controller: searchController, style: TextStyle( color: Theme.of(context) - .primaryTextTheme - .headline6! + .primaryTextTheme! + .titleLarge! .color!), decoration: InputDecoration( hintText: widget.hintText, @@ -168,8 +171,8 @@ class _PickerState extends State> { Image.asset("assets/images/search_icon.png"), filled: true, fillColor: Theme.of(context) - .accentTextTheme - .headline3! + .accentTextTheme! + .displaySmall! .color!, alignLabelWithHint: false, contentPadding: const EdgeInsets.symmetric( @@ -189,8 +192,8 @@ class _PickerState extends State> { ), Divider( color: Theme.of(context) - .accentTextTheme - .headline6! + .accentTextTheme! + .titleLarge! .backgroundColor!, height: 1, ), @@ -220,8 +223,8 @@ class _PickerState extends State> { fontFamily: 'Lato', decoration: TextDecoration.none, color: Theme.of(context) - .primaryTextTheme - .headline6! + .primaryTextTheme! + .titleLarge! .color!, ), ), @@ -242,7 +245,10 @@ class _PickerState extends State> { Widget itemsList() { return Container( - color: Theme.of(context).accentTextTheme.headline6!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .backgroundColor!, child: widget.isGridView ? GridView.builder( padding: EdgeInsets.zero, @@ -263,8 +269,8 @@ class _PickerState extends State> { separatorBuilder: (context, index) => widget.isSeparated ? Divider( color: Theme.of(context) - .accentTextTheme - .headline6! + .accentTextTheme! + .titleLarge! .backgroundColor!, height: 1, ) @@ -296,7 +302,10 @@ class _PickerState extends State> { }, child: Container( height: 55, - color: Theme.of(context).accentTextTheme.headline6!.color!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .color!, padding: EdgeInsets.symmetric(horizontal: 24), child: Row( mainAxisSize: MainAxisSize.max, @@ -318,8 +327,8 @@ class _PickerState extends State> { fontFamily: 'Lato', fontWeight: FontWeight.w600, color: Theme.of(context) - .primaryTextTheme - .headline6! + .primaryTextTheme! + .titleLarge! .color!, decoration: TextDecoration.none, ), @@ -338,8 +347,8 @@ class _PickerState extends State> { fontSize: 7.0, fontFamily: 'Lato', color: Theme.of(context) - .textTheme - .bodyText2! + .textTheme! + .bodyMedium! .color!), ), ), @@ -347,8 +356,8 @@ class _PickerState extends State> { borderRadius: BorderRadius.circular(6.0), //border: Border.all(color: ), color: Theme.of(context) - .textTheme - .bodyText2! + .textTheme! + .bodyMedium! .decorationColor!, ), ), @@ -383,7 +392,10 @@ class _PickerState extends State> { }, child: Container( height: 55, - color: Theme.of(context).accentTextTheme.headline6!.color!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .color!, padding: EdgeInsets.symmetric(horizontal: 24), child: Row( mainAxisSize: MainAxisSize.max, @@ -405,8 +417,8 @@ class _PickerState extends State> { fontFamily: 'Lato', fontWeight: FontWeight.w700, color: Theme.of(context) - .primaryTextTheme - .headline6! + .primaryTextTheme! + .titleLarge! .color!, decoration: TextDecoration.none, ), @@ -425,8 +437,8 @@ class _PickerState extends State> { fontSize: 7.0, fontFamily: 'Lato', color: Theme.of(context) - .textTheme - .bodyText2! + .textTheme! + .bodyMedium! .color!), ), ), @@ -434,8 +446,8 @@ class _PickerState extends State> { borderRadius: BorderRadius.circular(6.0), //border: Border.all(color: ), color: Theme.of(context) - .textTheme - .bodyText2! + .textTheme! + .bodyMedium! .decorationColor!, ), ), @@ -445,7 +457,10 @@ class _PickerState extends State> { ), ), Icon(Icons.check_circle, - color: Theme.of(context).accentTextTheme.bodyText1!.color!), + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!), ], ), ), diff --git a/lib/src/widgets/seed_widget.dart b/lib/src/widgets/seed_widget.dart index dad6480e9..0041f9b79 100644 --- a/lib/src/widgets/seed_widget.dart +++ b/lib/src/widgets/seed_widget.dart @@ -89,7 +89,10 @@ class SeedWidgetState extends State { cursorColor: Colors.blue, backgroundCursorColor: Colors.blue, validStyle: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!, backgroundColor: Colors.transparent, fontWeight: FontWeight.normal, fontSize: 16), @@ -102,7 +105,10 @@ class SeedWidgetState extends State { controller: controller, words: words, textStyle: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!, backgroundColor: Colors.transparent, fontWeight: FontWeight.normal, fontSize: 16), @@ -124,14 +130,17 @@ class SeedWidgetState extends State { child: Image.asset('assets/images/paste_ios.png', color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .decorationColor!)), ))) ]), Container( margin: EdgeInsets.only(top: 15), height: 1.0, - color: Theme.of(context).primaryTextTheme!.headline6!.backgroundColor!), + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .backgroundColor!), ])); } diff --git a/lib/src/widgets/setting_action_button.dart b/lib/src/widgets/setting_action_button.dart index ef2d4e1bd..939e6b857 100644 --- a/lib/src/widgets/setting_action_button.dart +++ b/lib/src/widgets/setting_action_button.dart @@ -29,10 +29,10 @@ class SettingActionButton extends StatelessWidget { @override Widget build(BuildContext context) { Color? color = isSelected - ? Theme.of(context).textTheme.headline3!.color + ? Theme.of(context).textTheme!.displaySmall!.color : selectionActive ? Palette.darkBlue - : Theme.of(context).textTheme.headline3!.color; + : Theme.of(context).textTheme!.displaySmall!.color; return InkWell( onTap: onTap, hoverColor: Colors.transparent, diff --git a/lib/src/widgets/standard_checkbox.dart b/lib/src/widgets/standard_checkbox.dart index d2cd6463d..b1d14cc92 100644 --- a/lib/src/widgets/standard_checkbox.dart +++ b/lib/src/widgets/standard_checkbox.dart @@ -21,12 +21,12 @@ class StandardCheckbox extends StatelessWidget { @override Widget build(BuildContext context) { final baseGradient = LinearGradient(colors: [ - Theme.of(context).primaryTextTheme.subtitle1!.color!, - Theme.of(context).primaryTextTheme.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!, ], begin: Alignment.centerLeft, end: Alignment.centerRight); final boxBorder = Border.all( - color: borderColor ?? Theme.of(context).primaryTextTheme.caption!.color!, width: 1.0); + color: borderColor ?? Theme.of(context).primaryTextTheme!.bodySmall!.color!, width: 1.0); final checkedBoxDecoration = BoxDecoration( gradient: gradientBackground ? baseGradient : null, @@ -60,7 +60,7 @@ class StandardCheckbox extends StatelessWidget { child: Text( caption, style: TextStyle( - fontSize: 16.0, color: Theme.of(context).primaryTextTheme!.headline6!.color!), + fontSize: 16.0, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!), )) ], ), diff --git a/lib/src/widgets/standard_list.dart b/lib/src/widgets/standard_list.dart index 680cf6edd..0e371ac8a 100644 --- a/lib/src/widgets/standard_list.dart +++ b/lib/src/widgets/standard_list.dart @@ -54,10 +54,10 @@ class StandardListRow extends StatelessWidget { Color titleColor(BuildContext context) => isSelected ? Palette.blueCraiola - : Theme.of(context).primaryTextTheme!.headline6!.color!; + : Theme.of(context).primaryTextTheme!.titleLarge!.color!; Color _backgroundColor(BuildContext context) { - return Theme.of(context).backgroundColor; + return Theme.of(context).colorScheme.background; } } @@ -68,7 +68,7 @@ class SectionHeaderListRow extends StatelessWidget { Container( width: double.infinity, height: 40, - color: Theme.of(context).backgroundColor), + color: Theme.of(context).colorScheme.background), //StandardListSeparator(padding: EdgeInsets.only(left: 24)) ]); } @@ -85,11 +85,13 @@ class StandardListSeparator extends StatelessWidget { return Container( height: height, padding: padding, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Container( height: height, - color: Theme.of(context).primaryTextTheme.headline6?.backgroundColor - )); + color: Theme.of(context) + .primaryTextTheme! + .titleLarge + ?.backgroundColor)); } } diff --git a/lib/src/widgets/standard_list_card.dart b/lib/src/widgets/standard_list_card.dart index 7b2ecc2ce..27385bd44 100644 --- a/lib/src/widgets/standard_list_card.dart +++ b/lib/src/widgets/standard_list_card.dart @@ -21,8 +21,8 @@ class TradeDetailsStandardListCard extends StatelessWidget { final darkTheme = currentTheme == ThemeType.dark; final baseGradient = LinearGradient(colors: [ - Theme.of(context).primaryTextTheme!.subtitle2!.color!, - Theme.of(context).primaryTextTheme!.subtitle2!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleSmall!.color!, + Theme.of(context).primaryTextTheme!.titleSmall!.decorationColor!, ], begin: Alignment.centerLeft, end: Alignment.centerRight); final gradient = LinearGradient(colors: [ diff --git a/lib/src/widgets/standard_list_status_row.dart b/lib/src/widgets/standard_list_status_row.dart index f958e83ae..5f5970a24 100644 --- a/lib/src/widgets/standard_list_status_row.dart +++ b/lib/src/widgets/standard_list_status_row.dart @@ -13,7 +13,7 @@ class StandardListStatusRow extends StatelessWidget { Widget build(BuildContext context) { return Container( width: double.infinity, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Padding( padding: const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24), @@ -24,13 +24,13 @@ class StandardListStatusRow extends StatelessWidget { style: TextStyle( fontSize: 14, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme!.overline!.color!), + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!), textAlign: TextAlign.left), Padding( padding: const EdgeInsets.only(top: 12), child: Container( decoration: BoxDecoration( - color: Theme.of(context).accentTextTheme!.headline3!.color!, + color: Theme.of(context).accentTextTheme!.displaySmall!.color!, borderRadius: BorderRadius.circular(30.0), ), child: Padding( @@ -52,7 +52,7 @@ class StandardListStatusRow extends StatelessWidget { fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!)) ], ), diff --git a/lib/src/widgets/standard_switch.dart b/lib/src/widgets/standard_switch.dart index 929286058..060e27990 100644 --- a/lib/src/widgets/standard_switch.dart +++ b/lib/src/widgets/standard_switch.dart @@ -24,8 +24,14 @@ class StandardSwitchState extends State { height: 28, decoration: BoxDecoration( color: widget.value - ? Theme.of(context).accentTextTheme!.bodyText1!.color! - : Theme.of(context).accentTextTheme!.headline1!.color!, + ? Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color! + : Theme.of(context) + .accentTextTheme! + .displayLarge! + .color!, borderRadius: BorderRadius.all(Radius.circular(14.0))), child: Container( width: 24.0, diff --git a/lib/src/widgets/template_tile.dart b/lib/src/widgets/template_tile.dart index 8667384d2..8798e2518 100644 --- a/lib/src/widgets/template_tile.dart +++ b/lib/src/widgets/template_tile.dart @@ -47,7 +47,7 @@ class TemplateTileState extends State { @override Widget build(BuildContext context) { - final color = isRemovable ? Colors.white : Theme.of(context).primaryTextTheme!.headline6!.color!; + final color = isRemovable ? Colors.white : Theme.of(context).primaryTextTheme!.titleLarge!.color!; final toIcon = Image.asset('assets/images/to_icon.png', color: color); final content = Row( @@ -105,7 +105,7 @@ class TemplateTileState extends State { child: Container( height: 40, padding: EdgeInsets.only(left: 24, right: 24), - color: Theme.of(context).primaryTextTheme!.headline2!.decorationColor!, + color: Theme.of(context).primaryTextTheme!.displayMedium!.decorationColor!, child: content, ), ), diff --git a/lib/src/widgets/trail_button.dart b/lib/src/widgets/trail_button.dart index f2aafe563..b9c430d5d 100644 --- a/lib/src/widgets/trail_button.dart +++ b/lib/src/widgets/trail_button.dart @@ -24,7 +24,10 @@ class TrailButton extends StatelessWidget { caption, style: TextStyle( color: textColor ?? - Theme.of(context).accentTextTheme!.headline1!.decorationColor!, + Theme.of(context) + .accentTextTheme! + .displayLarge! + .decorationColor!, fontWeight: FontWeight.w600, fontSize: 14), ), diff --git a/lib/themes/bright_theme.dart b/lib/themes/bright_theme.dart index bd1275246..4e5437b64 100644 --- a/lib/themes/bright_theme.dart +++ b/lib/themes/bright_theme.dart @@ -12,78 +12,82 @@ class BrightTheme extends ThemeBase { @override ThemeType get type => ThemeType.bright; - @override - ThemeData get themeData => ThemeData( + ThemeData theme = ThemeData( fontFamily: 'Lato', brightness: Brightness.light, - backgroundColor: Colors.white, - accentColor: Palette.blueCraiola, // first gradient color scaffoldBackgroundColor: Palette.pinkFlamingo, // second gradient color primaryColor: Palette.redHat, // third gradient color - buttonColor: Colors.white.withOpacity(0.2), // action buttons on dashboard page indicatorColor: Colors.white.withOpacity(0.5), // page indicator hoverColor: Colors.white, // amount hint text (receive page) dividerColor: Palette.paleBlue, hintColor: Palette.gray, textTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> titleLarge + titleLarge: TextStyle( color: Colors.white, // sync_indicator text backgroundColor: Colors.white.withOpacity(0.2), // synced sync_indicator decorationColor: Colors.white.withOpacity(0.15), // not synced sync_indicator ), - caption: TextStyle( + bodySmall: TextStyle( color: Palette.shineOrange, // not synced light decorationColor: Colors.white, // filter icon ), - overline: TextStyle( + labelSmall: TextStyle( color: Colors.white.withOpacity(0.2), // filter button - backgroundColor: Colors.white.withOpacity(0.5), // date section row - decorationColor: Colors.white.withOpacity(0.2) // icons (transaction and trade rows) - ), - // subhead -> subtitle1 - subtitle1: TextStyle( + backgroundColor: + Colors.white.withOpacity(0.5), // date section row + decorationColor: Colors.white + .withOpacity(0.2) // icons (transaction and trade rows) + ), + // subhead -> titleMedium + titleMedium: TextStyle( color: Colors.white.withOpacity(0.2), // address button border decorationColor: Colors.white.withOpacity(0.4), // copy button (qr widget) ), - // headline -> headline5 - headline5: TextStyle( + // headline -> headlineSmall + headlineSmall: TextStyle( color: Colors.white, // qr code decorationColor: Colors.white.withOpacity(0.5), // bottom border of amount (receive page) ), - // display1 -> headline4 - headline4: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( color: PaletteDark.lightBlueGrey, // icons color (receive page) decorationColor: Palette.lavender, // icons background (receive page) ), - // display2 -> headline3 - headline3: TextStyle( - color: Palette.darkBlueCraiola, // text color of tiles (receive page) - decorationColor: Colors.white // background of tiles (receive page) - ), - // display3 -> headline2 - headline2: TextStyle( + // display2 -> displaySmall + displaySmall: TextStyle( + color: + Palette.darkBlueCraiola, // text color of tiles (receive page) + decorationColor: + Colors.white // background of tiles (receive page) + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: Colors.white, // text color of current tile (receive page), //decorationColor: Palette.blueCraiola // background of current tile (receive page) - decorationColor: Palette.moderateSlateBlue // background of current tile (receive page) - ), - // display4 -> headline1 - headline1: TextStyle( + decorationColor: Palette + .moderateSlateBlue // background of current tile (receive page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: Palette.violetBlue, // text color of tiles (account list) - decorationColor: Colors.white // background of tiles (account list) - ), - // subtitle -> subtitle2 - subtitle2: TextStyle( - color: Palette.moderateSlateBlue, // text color of current tile (account list) - decorationColor: Colors.white // background of current tile (account list) - ), - // body -> bodyText2 - bodyText2: TextStyle( + decorationColor: + Colors.white // background of tiles (account list) + ), + // subtitle -> titleSmall + titleSmall: TextStyle( + color: Palette + .moderateSlateBlue, // text color of current tile (account list) + decorationColor: + Colors.white // background of current tile (account list) + ), + // body -> bodyMedium + bodyMedium: TextStyle( color: Palette.moderatePurpleBlue, // scrollbar thumb decorationColor: Palette.periwinkleCraiola // scrollbar background - ), - // body2 -> bodyText1 - bodyText1: TextStyle( + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( color: Palette.moderateLavender, // menu header decorationColor: Colors.white, // menu background ) @@ -93,147 +97,179 @@ class BrightTheme extends ThemeBase { trackColor: MaterialStateProperty.all(Palette.periwinkleCraiola), radius: Radius.circular(3), thickness: MaterialStateProperty.all(6), - isAlwaysShown: true, + thumbVisibility: MaterialStateProperty.all(true), crossAxisMargin: 6, ), primaryTextTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + titleLarge: TextStyle( color: Palette.darkBlueCraiola, // title color backgroundColor: Palette.wildPeriwinkle // textfield underline - ), - caption: TextStyle( + ), + bodySmall: TextStyle( color: PaletteDark.pigeonBlue, // secondary text decorationColor: Palette.wildLavender // menu divider - ), - overline: TextStyle( + ), + labelSmall: TextStyle( color: Palette.darkGray, // transaction/trade details titles decorationColor: Colors.white.withOpacity(0.5), // placeholder ), - // subhead -> subtitle1 - subtitle1: TextStyle( + // subhead -> titleMedium + titleMedium: TextStyle( color: Palette.blueCraiola, // first gradient color (send page) - decorationColor: Palette.pinkFlamingo // second gradient color (send page) + decorationColor: + Palette.pinkFlamingo // second gradient color (send page) + ), + // headline -> headlineSmall + headlineSmall: TextStyle( + color: Colors.white + .withOpacity(0.5), // text field border color (send page) + decorationColor: Colors.white + .withOpacity(0.5), // text field hint color (send page) ), - // headline -> headline5 - headline5: TextStyle( - color: Colors.white.withOpacity(0.5), // text field border color (send page) - decorationColor: Colors.white.withOpacity(0.5), // text field hint color (send page) - ), - // display1 -> headline4 - headline4: TextStyle( - color: Colors.white.withOpacity(0.2), // text field button color (send page) - decorationColor: Colors.white // text field button icon color (send page) - ), - // display2 -> headline3 - headline3: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( + color: Colors.white + .withOpacity(0.2), // text field button color (send page) + decorationColor: + Colors.white // text field button icon color (send page) + ), + // display2 -> displaySmall + displaySmall: TextStyle( color: Colors.white.withOpacity(0.5), // estimated fee (send page) - backgroundColor: PaletteDark.darkCyanBlue.withOpacity(0.67), // dot color for indicator on send page - decorationColor: Palette.shadowWhite // template dotted border (send page) - ), - // display3 -> headline2 - headline2: TextStyle( + backgroundColor: PaletteDark.darkCyanBlue + .withOpacity(0.67), // dot color for indicator on send page + decorationColor: + Palette.shadowWhite // template dotted border (send page) + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: Palette.darkBlueCraiola, // template new text (send page) - backgroundColor: PaletteDark.darkNightBlue, // active dot color for indicator on send page - decorationColor: Palette.shadowWhite // template background color (send page) - ), - // display4 -> headline1 - headline1: TextStyle( + backgroundColor: PaletteDark + .darkNightBlue, // active dot color for indicator on send page + decorationColor: + Palette.shadowWhite // template background color (send page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: Palette.darkBlueCraiola, // template title (send page) - backgroundColor: Colors.white, // icon color on order row (moonpay) - decorationColor: Palette.niagara // receive amount text (exchange page) - ), - // subtitle -> subtitle2 - subtitle2: TextStyle( - color: Palette.blueCraiola, // first gradient color top panel (exchange page) - decorationColor: Palette.pinkFlamingo // second gradient color top panel (exchange page) - ), - // body -> bodyText2 - bodyText2: TextStyle( - color: Palette.blueCraiola.withOpacity(0.7), // first gradient color bottom panel (exchange page) - decorationColor: Palette.pinkFlamingo.withOpacity(0.7), // second gradient color bottom panel (exchange page) - backgroundColor: Palette.moderateSlateBlue // alert right button text - ), - // body2 -> bodyText1 - bodyText1: TextStyle( - color: Colors.white.withOpacity(0.5), // text field border on top panel (exchange page) - decorationColor: Colors.white.withOpacity(0.5), // text field border on bottom panel (exchange page) + backgroundColor: + Colors.white, // icon color on order row (moonpay) + decorationColor: + Palette.niagara // receive amount text (exchange page) + ), + // subtitle -> titleSmall + titleSmall: TextStyle( + color: Palette + .blueCraiola, // first gradient color top panel (exchange page) + decorationColor: Palette + .pinkFlamingo // second gradient color top panel (exchange page) + ), + // body -> bodyMedium + bodyMedium: TextStyle( + color: Palette.blueCraiola.withOpacity( + 0.7), // first gradient color bottom panel (exchange page) + decorationColor: Palette.pinkFlamingo.withOpacity( + 0.7), // second gradient color bottom panel (exchange page) + backgroundColor: + Palette.moderateSlateBlue // alert right button text + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( + color: Colors.white.withOpacity( + 0.5), // text field border on top panel (exchange page) + decorationColor: Colors.white.withOpacity( + 0.5), // text field border on bottom panel (exchange page) backgroundColor: Palette.brightOrange // alert left button text ) ), focusColor: Colors.white.withOpacity(0.2), // text field button (exchange page) accentTextTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> titleLarge + titleLarge: TextStyle( color: Colors.white, // picker background backgroundColor: Palette.periwinkleCraiola, // picker divider decorationColor: Colors.white // dialog background - ), - caption: TextStyle( + ), + bodySmall: TextStyle( color: Palette.moderateLavender, // container (confirm exchange) backgroundColor: Palette.moderateLavender, // button background (confirm exchange) decorationColor: Palette.darkBlueCraiola, // text color (information page) ), - // subtitle -> subtitle2 - subtitle2: TextStyle( + // subtitle -> titleSmall + titleSmall: TextStyle( color: Palette.darkBlueCraiola, // QR code (exchange trade page) backgroundColor: Palette.wildPeriwinkle, // divider (exchange trade page) //decorationColor: Palette.blueCraiola // crete new wallet button background (wallet list page) - decorationColor: Palette.moderateSlateBlue // crete new wallet button background (wallet list page) - ), - // headline -> headline5 - headline5: TextStyle( - color: Palette.moderateLavender, // first gradient color of wallet action buttons (wallet list page) - backgroundColor: Palette.moderateLavender, // second gradient color of wallet action buttons (wallet list page) - decorationColor: Colors.white // restore wallet button text color (wallet list page) - ), - // subhead -> subtitle1 - subtitle1: TextStyle( + decorationColor: Palette + .moderateSlateBlue // crete new wallet button background (wallet list page) + ), + // headline -> headlineSmall + headlineSmall: TextStyle( + color: Palette + .moderateLavender, // first gradient color of wallet action buttons (wallet list page) + backgroundColor: Palette + .moderateLavender, // second gradient color of wallet action buttons (wallet list page) + decorationColor: Colors + .white // restore wallet button text color (wallet list page) + ), + // subhead -> titleMedium + titleMedium: TextStyle( color: Palette.darkGray, // titles color (filter widget) backgroundColor: Palette.periwinkle, // divider color (filter widget) decorationColor: Colors.white // checkbox background (filter widget) - ), - overline: TextStyle( + ), + labelSmall: TextStyle( color: Palette.wildPeriwinkle, // checkbox bounds (filter widget) decorationColor: Colors.white, // menu subname ), - // display1 -> headline4 - headline4: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( color: Palette.blueCraiola, // first gradient color (menu header) decorationColor: Palette.pinkFlamingo, // second gradient color(menu header) backgroundColor: Colors.white // active dot color - ), - // display2 -> headline3 - headline3: TextStyle( - color: Palette.shadowWhite, // action button color (address text field) + ), + // display2 -> displaySmall + displaySmall: TextStyle( + color: + Palette.shadowWhite, // action button color (address text field) decorationColor: Palette.darkGray, // hint text (seed widget) - backgroundColor: Colors.white.withOpacity(0.5) // text on balance page - ), - // display3 -> headline2 - headline2: TextStyle( + backgroundColor: + Colors.white.withOpacity(0.5) // text on balance page + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: Palette.darkGray, // hint text (new wallet page) - decorationColor: Palette.periwinkleCraiola, // underline (new wallet page) - backgroundColor: Colors.white // menu, icons, balance (dashboard page) - ), - // display4 -> headline1 - headline1: TextStyle( + decorationColor: + Palette.periwinkleCraiola, // underline (new wallet page) + backgroundColor: + Colors.white // menu, icons, balance (dashboard page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: Palette.darkGray, // switch background (settings page) - backgroundColor: Colors.black, // icon color on support page (moonpay, github) - decorationColor: Colors.white.withOpacity(0.4) // hint text (exchange page) - ), - // body -> bodyText2 - bodyText2: TextStyle( + backgroundColor: + Colors.black, // icon color on support page (moonpay, github) + decorationColor: + Colors.white.withOpacity(0.4) // hint text (exchange page) + ), + // body -> bodyMedium + bodyMedium: TextStyle( color: Palette.darkGray, // indicators (PIN code) decorationColor: Palette.darkGray, // switch (PIN code) backgroundColor: Colors.white // alert right button - ), - // body2 -> bodyText1 - bodyText1: TextStyle( + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( color: Palette.moderateSlateBlue, // primary buttons decorationColor: Colors.white, // alert left button, backgroundColor: Palette.dullGray // keyboard bar color ), ), cardColor: Palette.moderateSlateBlue // bottom button (action list) - ); -} \ No newline at end of file + ); + + @override + ThemeData get themeData => theme.copyWith( + colorScheme: theme.colorScheme + .copyWith(background: Colors.white, secondary: Palette.blueCraiola)); +} diff --git a/lib/themes/dark_theme.dart b/lib/themes/dark_theme.dart index 9b2d471fe..e8cfab633 100644 --- a/lib/themes/dark_theme.dart +++ b/lib/themes/dark_theme.dart @@ -12,77 +12,83 @@ class DarkTheme extends ThemeBase { @override ThemeType get type => ThemeType.dark; - @override - ThemeData get themeData => ThemeData( + ThemeData theme = ThemeData( fontFamily: 'Lato', brightness: Brightness.dark, - backgroundColor: PaletteDark.backgroundColor, - accentColor: PaletteDark.backgroundColor, // first gradient color - scaffoldBackgroundColor: PaletteDark.backgroundColor, // second gradient color + scaffoldBackgroundColor: + PaletteDark.backgroundColor, // second gradient color primaryColor: PaletteDark.backgroundColor, // third gradient color - buttonColor: PaletteDark.nightBlue, // action buttons on dashboard page indicatorColor: PaletteDark.cyanBlue, // page indicator hoverColor: PaletteDark.cyanBlue, // amount hint text (receive page) dividerColor: PaletteDark.dividerColor, hintColor: PaletteDark.pigeonBlue, // menu textTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> titleLarge + titleLarge: TextStyle( color: PaletteDark.wildBlue, // sync_indicator text - backgroundColor: PaletteDark.lightNightBlue, // synced sync_indicator - decorationColor: PaletteDark.oceanBlue // not synced sync_indicator - ), - caption: TextStyle( + backgroundColor: + PaletteDark.lightNightBlue, // synced sync_indicator + decorationColor: + PaletteDark.oceanBlue // not synced sync_indicator + ), + bodySmall: TextStyle( color: PaletteDark.orangeYellow, // not synced light decorationColor: PaletteDark.wildBlue, // filter icon ), - overline: TextStyle( + labelSmall: TextStyle( color: PaletteDark.oceanBlue, // filter button backgroundColor: PaletteDark.darkCyanBlue, // date section row - decorationColor: PaletteDark.wildNightBlue // icons (transaction and trade rows) - ), - // subhead -> subtitle1 - subtitle1: TextStyle( + decorationColor: PaletteDark + .wildNightBlue // icons (transaction and trade rows) + ), + // subhead -> titleMedium + titleMedium: TextStyle( color: PaletteDark.nightBlue, // address button border decorationColor: PaletteDark.lightBlueGrey, // copy button (qr widget) ), - // headline -> headline5 - headline5: TextStyle( + // headline -> headlineSmall + headlineSmall: TextStyle( color: PaletteDark.lightBlueGrey, // qr code decorationColor: PaletteDark.darkGrey, // bottom border of amount (receive page) ), - // display1 -> headline4 - headline4: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( color: Colors.white, // icons color (receive page) decorationColor: PaletteDark.distantNightBlue, // icons background (receive page) ), - // display2 -> headline3 - headline3: TextStyle( + // display2 -> displaySmall + displaySmall: TextStyle( color: Colors.white, // text color of tiles (receive page) - decorationColor: PaletteDark.nightBlue // background of tiles (receive page) - ), - // display3 -> headline2 - headline2: TextStyle( - color: Palette.blueCraiola, // text color of current tile (receive page) - decorationColor: PaletteDark.lightOceanBlue // background of current tile (receive page) - ), - // display4 -> headline1 - headline1: TextStyle( + decorationColor: + PaletteDark.nightBlue // background of tiles (receive page) + ), + // display3 -> displayMedium + displayMedium: TextStyle( + color: Palette + .blueCraiola, // text color of current tile (receive page) + decorationColor: PaletteDark + .lightOceanBlue // background of current tile (receive page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: Colors.white, // text color of tiles (account list) - decorationColor: PaletteDark.darkOceanBlue // background of tiles (account list) - ), - // subtitle -> subtitle2 - subtitle2: TextStyle( - color: Palette.blueCraiola, // text color of current tile (account list) - decorationColor: PaletteDark.darkNightBlue // background of current tile (account list) - ), - // body1 -> bodyText2 - bodyText2: TextStyle( + decorationColor: PaletteDark + .darkOceanBlue // background of tiles (account list) + ), + // subtitle -> titleSmall + titleSmall: TextStyle( + color: Palette + .blueCraiola, // text color of current tile (account list) + decorationColor: PaletteDark + .darkNightBlue // background of current tile (account list) + ), + // body1 -> bodyMedium + bodyMedium: TextStyle( color: PaletteDark.wildBlueGrey, // scrollbar thumb decorationColor: PaletteDark.violetBlue // scrollbar background - ), - // body2 -> bodyText1 - bodyText1: TextStyle( + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( color: PaletteDark.deepPurpleBlue, // menu header decorationColor: PaletteDark.deepPurpleBlue, // menu background ) @@ -92,147 +98,188 @@ class DarkTheme extends ThemeBase { trackColor: MaterialStateProperty.all(PaletteDark.violetBlue), radius: Radius.circular(3), thickness: MaterialStateProperty.all(6), - isAlwaysShown: true, + thumbVisibility: MaterialStateProperty.all(true), crossAxisMargin: 6, ), primaryTextTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> titleLarge + titleLarge: TextStyle( color: Colors.white, // title color backgroundColor: PaletteDark.darkOceanBlue // textfield underline - ), - caption: TextStyle( + ), + bodySmall: TextStyle( color: PaletteDark.darkCyanBlue, // secondary text decorationColor: PaletteDark.darkOceanBlue // menu divider - ), - overline: TextStyle( - color: PaletteDark.lightBlueGrey, // transaction/trade details titles + ), + labelSmall: TextStyle( + color: + PaletteDark.lightBlueGrey, // transaction/trade details titles decorationColor: Colors.grey, // placeholder ), - // subhead -> subtitle1 - subtitle1: TextStyle( - color: PaletteDark.darkNightBlue, // first gradient color (send page) - decorationColor: PaletteDark.darkNightBlue // second gradient color (send page) + // subhead -> titleMedium + titleMedium: TextStyle( + color: + PaletteDark.darkNightBlue, // first gradient color (send page) + decorationColor: + PaletteDark.darkNightBlue // second gradient color (send page) + ), + // headline -> headlineSmall + headlineSmall: TextStyle( + color: PaletteDark + .lightVioletBlue, // text field border color (send page) + decorationColor: + PaletteDark.darkCyanBlue, // text field hint color (send page) ), - // headline -> headline5 - headline5: TextStyle( - color: PaletteDark.lightVioletBlue, // text field border color (send page) - decorationColor: PaletteDark.darkCyanBlue, // text field hint color (send page) - ), - // display1 -> headline4 - headline4: TextStyle( - color: PaletteDark.buttonNightBlue, // text field button color (send page) - decorationColor: PaletteDark.gray // text field button icon color (send page) - ), - // display2 -> headline3 - headline3: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( + color: PaletteDark + .buttonNightBlue, // text field button color (send page) + decorationColor: + PaletteDark.gray // text field button icon color (send page) + ), + // display2 -> displaySmall + displaySmall: TextStyle( color: Colors.white, // estimated fee (send page) - backgroundColor: PaletteDark.cyanBlue, // dot color for indicator on send page - decorationColor: PaletteDark.darkCyanBlue // template dotted border (send page) - ), - // display3 -> headline2 - headline2: TextStyle( + backgroundColor: + PaletteDark.cyanBlue, // dot color for indicator on send page + decorationColor: + PaletteDark.darkCyanBlue // template dotted border (send page) + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: PaletteDark.darkCyanBlue, // template new text (send page) - backgroundColor: Colors.white, // active dot color for indicator on send page - decorationColor: PaletteDark.darkVioletBlue // template background color (send page) - ), - // display4 -> headline1 - headline1: TextStyle( + backgroundColor: + Colors.white, // active dot color for indicator on send page + decorationColor: PaletteDark + .darkVioletBlue // template background color (send page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: PaletteDark.cyanBlue, // template title (send page) - backgroundColor: Colors.white, // icon color on order row (moonpay) - decorationColor: PaletteDark.darkCyanBlue // receive amount text (exchange page) - ), - // subtitle -> subtitle2 - subtitle2: TextStyle( - color: PaletteDark.wildVioletBlue, // first gradient color top panel (exchange page) - decorationColor: PaletteDark.wildVioletBlue // second gradient color top panel (exchange page) - ), - // body1 -> bodyText2 - bodyText2: TextStyle( - color: PaletteDark.darkNightBlue, // first gradient color bottom panel (exchange page) - decorationColor: PaletteDark.darkNightBlue, // second gradient color bottom panel (exchange page) + backgroundColor: + Colors.white, // icon color on order row (moonpay) + decorationColor: PaletteDark + .darkCyanBlue // receive amount text (exchange page) + ), + // subtitle -> titleSmall + titleSmall: TextStyle( + color: PaletteDark + .wildVioletBlue, // first gradient color top panel (exchange page) + decorationColor: PaletteDark + .wildVioletBlue // second gradient color top panel (exchange page) + ), + // body1 -> bodyMedium + bodyMedium: TextStyle( + color: PaletteDark + .darkNightBlue, // first gradient color bottom panel (exchange page) + decorationColor: PaletteDark + .darkNightBlue, // second gradient color bottom panel (exchange page) backgroundColor: Palette.blueCraiola // alert right button text - ), - // body2 -> bodyText1 - bodyText1: TextStyle( - color: PaletteDark.blueGrey, // text field border on top panel (exchange page) - decorationColor: PaletteDark.moderateVioletBlue, // text field border on bottom panel (exchange page) + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( + color: PaletteDark + .blueGrey, // text field border on top panel (exchange page) + decorationColor: PaletteDark + .moderateVioletBlue, // text field border on bottom panel (exchange page) backgroundColor: Palette.alizarinRed // alert left button text ) ), focusColor: PaletteDark.moderateBlue, // text field button (exchange page) accentTextTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> titleLarge + titleLarge: TextStyle( color: PaletteDark.nightBlue, // picker background backgroundColor: PaletteDark.dividerColor, // picker divider decorationColor: PaletteDark.darkNightBlue // dialog background - ), - caption: TextStyle( + ), + bodySmall: TextStyle( color: PaletteDark.nightBlue, // container (confirm exchange) backgroundColor: PaletteDark.deepVioletBlue, // button background (confirm exchange) decorationColor: Palette.darkLavender, // text color (information page) ), - // subtitle -> subtitle2 - subtitle2: TextStyle( - //color: PaletteDark.lightBlueGrey, // QR code (exchange trade page) + // subtitle -> titleSmall + titleSmall: TextStyle( + //color: PaletteDark.lightBlueGrey, // QR code (exchange trade page) color: Colors.white, // QR code (exchange trade page) - backgroundColor: PaletteDark.deepVioletBlue, // divider (exchange trade page) - decorationColor: Colors.white // crete new wallet button background (wallet list page) - ), - // headline -> headline5 - headline5: TextStyle( - color: PaletteDark.distantBlue, // first gradient color of wallet action buttons (wallet list page) - backgroundColor: PaletteDark.distantNightBlue, // second gradient color of wallet action buttons (wallet list page) - decorationColor: Palette.darkBlueCraiola // restore wallet button text color (wallet list page) - ), - // subhead -> subtitle1 - subtitle1: TextStyle( + backgroundColor: + PaletteDark.deepVioletBlue, // divider (exchange trade page) + decorationColor: Colors + .white // crete new wallet button background (wallet list page) + ), + // headline -> headlineSmall + headlineSmall: TextStyle( + color: PaletteDark + .distantBlue, // first gradient color of wallet action buttons (wallet list page) + backgroundColor: PaletteDark + .distantNightBlue, // second gradient color of wallet action buttons (wallet list page) + decorationColor: Palette + .darkBlueCraiola // restore wallet button text color (wallet list page) + ), + // subhead -> titleMedium + titleMedium: TextStyle( color: Colors.white, // titles color (filter widget) - backgroundColor: PaletteDark.darkOceanBlue, // divider color (filter widget) - decorationColor: PaletteDark.wildVioletBlue.withOpacity(0.3) // checkbox background (filter widget) - ), - overline: TextStyle( + backgroundColor: + PaletteDark.darkOceanBlue, // divider color (filter widget) + decorationColor: PaletteDark.wildVioletBlue + .withOpacity(0.3) // checkbox background (filter widget) + ), + labelSmall: TextStyle( color: PaletteDark.wildVioletBlue, // checkbox bounds (filter widget) decorationColor: PaletteDark.darkCyanBlue, // menu subname ), - // display1 -> headline4 - headline4: TextStyle( - color: PaletteDark.deepPurpleBlue, // first gradient color (menu header) - decorationColor: PaletteDark.deepPurpleBlue, // second gradient color(menu header) + // display1 -> headlineMedium + headlineMedium: TextStyle( + color: PaletteDark + .deepPurpleBlue, // first gradient color (menu header) + decorationColor: PaletteDark + .deepPurpleBlue, // second gradient color(menu header) backgroundColor: Colors.white // active dot color - ), - // display2 -> headline3 - headline3: TextStyle( - color: PaletteDark.nightBlue, // action button color (address text field) - decorationColor: PaletteDark.darkCyanBlue, // hint text (seed widget) + ), + // display2 -> displaySmall + displaySmall: TextStyle( + color: PaletteDark + .nightBlue, // action button color (address text field) + decorationColor: + PaletteDark.darkCyanBlue, // hint text (seed widget) backgroundColor: PaletteDark.cyanBlue // text on balance page - ), - // display3 -> headline2 - headline2: TextStyle( + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: PaletteDark.cyanBlue, // hint text (new wallet page) - decorationColor: PaletteDark.darkGrey, // underline (new wallet page) - backgroundColor: Colors.white // menu, icons, balance (dashboard page) - ), - // display4 -> headline1 - headline1: TextStyle( - color: PaletteDark.deepVioletBlue, // switch background (settings page) - backgroundColor: Colors.white, // icon color on support page (moonpay, github) - decorationColor: PaletteDark.lightBlueGrey // hint text (exchange page) - ), - // body1 -> bodyText2 - bodyText2: TextStyle( + decorationColor: + PaletteDark.darkGrey, // underline (new wallet page) + backgroundColor: + Colors.white // menu, icons, balance (dashboard page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( + color: + PaletteDark.deepVioletBlue, // switch background (settings page) + backgroundColor: + Colors.white, // icon color on support page (moonpay, github) + decorationColor: + PaletteDark.lightBlueGrey // hint text (exchange page) + ), + // body1 -> bodyMedium + bodyMedium: TextStyle( color: PaletteDark.indicatorVioletBlue, // indicators (PIN code) decorationColor: PaletteDark.lightPurpleBlue, // switch (PIN code) backgroundColor: PaletteDark.darkNightBlue // alert right button - ), - // body2 -> bodyText1 - bodyText1: TextStyle( + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( color: Palette.blueCraiola, // primary buttons decorationColor: PaletteDark.darkNightBlue, // alert left button backgroundColor: PaletteDark.granite // keyboard bar color ), ), cardColor: PaletteDark.darkNightBlue // bottom button (action list) - ); -} \ No newline at end of file + ); + + @override + ThemeData get themeData => theme.copyWith( + colorScheme: theme.colorScheme.copyWith( + background: PaletteDark.backgroundColor, + secondary: PaletteDark.backgroundColor)); +} diff --git a/lib/themes/light_theme.dart b/lib/themes/light_theme.dart index dda9032da..ad572c13f 100644 --- a/lib/themes/light_theme.dart +++ b/lib/themes/light_theme.dart @@ -12,78 +12,82 @@ class LightTheme extends ThemeBase { @override ThemeType get type => ThemeType.light; - @override - ThemeData get themeData => ThemeData( + ThemeData theme = ThemeData( fontFamily: 'Lato', brightness: Brightness.light, - backgroundColor: Colors.white, - accentColor: Colors.white, // first gradient color scaffoldBackgroundColor: Colors.white, // second gradient color primaryColor: Colors.white, // third gradient color - buttonColor: Palette.blueAlice, // action buttons on dashboard page - indicatorColor: PaletteDark.darkCyanBlue.withOpacity(0.67), // page indicator + indicatorColor: + PaletteDark.darkCyanBlue.withOpacity(0.67), // page indicator hoverColor: Palette.darkBlueCraiola, // amount hint text (receive page) dividerColor: Palette.paleBlue, hintColor: Palette.gray, textTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> titleLarge + titleLarge: TextStyle( color: Palette.darkBlueCraiola, // sync_indicator text backgroundColor: Palette.blueAlice, // synced sync_indicator decorationColor: Palette.blueAlice.withOpacity(0.75), // not synced sync_indicator ), - caption: TextStyle( + bodySmall: TextStyle( color: Palette.shineOrange, // not synced light decorationColor: PaletteDark.wildBlue, // filter icon ), - overline: TextStyle( + labelSmall: TextStyle( color: Palette.blueAlice, // filter button backgroundColor: PaletteDark.darkCyanBlue, // date section row - decorationColor: Palette.blueAlice // icons (transaction and trade rows) - ), - // subhead -> subtitle1 - subtitle1: TextStyle( + decorationColor: + Palette.blueAlice // icons (transaction and trade rows) + ), + // subhead -> titleMedium + titleMedium: TextStyle( color: Palette.blueAlice, // address button border decorationColor: PaletteDark.lightBlueGrey, // copy button (qr widget) ), - // headline -> headline5 - headline5: TextStyle( + // headline -> headlineSmall + headlineSmall: TextStyle( color: Colors.white, // qr code decorationColor: Palette.darkBlueCraiola, // bottom border of amount (receive page) ), - // display1 -> headline4 - headline4: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( color: PaletteDark.lightBlueGrey, // icons color (receive page) decorationColor: Palette.moderateLavender, // icons background (receive page) ), - // display2 -> headline3 - headline3: TextStyle( - color: Palette.darkBlueCraiola, // text color of tiles (receive page) - decorationColor: Palette.blueAlice // background of tiles (receive page) - ), - // display3 -> headline2 - headline2: TextStyle( + // display2 -> headldisplaySmalline3 + displaySmall: TextStyle( + color: + Palette.darkBlueCraiola, // text color of tiles (receive page) + decorationColor: + Palette.blueAlice // background of tiles (receive page) + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: Colors.white, // text color of current tile (receive page), //decorationColor: Palette.blueCraiola // background of current tile (receive page) - decorationColor: Palette.blueCraiola // background of current tile (receive page) - ), - // display4 -> headline1 - headline1: TextStyle( + decorationColor: Palette + .blueCraiola // background of current tile (receive page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: Palette.violetBlue, // text color of tiles (account list) - decorationColor: Colors.white // background of tiles (account list) - ), - // subtitle -> subtitle2 - subtitle2: TextStyle( - color: Palette.protectiveBlue, // text color of current tile (account list) - decorationColor: Colors.white // background of current tile (account list) - ), - // body -> bodyText2 - bodyText2: TextStyle( + decorationColor: + Colors.white // background of tiles (account list) + ), + // subtitle -> titleSmall + titleSmall: TextStyle( + color: Palette + .protectiveBlue, // text color of current tile (account list) + decorationColor: + Colors.white // background of current tile (account list) + ), + // body -> bodyMedium + bodyMedium: TextStyle( color: Palette.moderatePurpleBlue, // scrollbar thumb decorationColor: Palette.periwinkleCraiola // scrollbar background - ), - // body2 -> bodyText1 - bodyText1: TextStyle( + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( color: Palette.moderateLavender, // menu header decorationColor: Colors.white, // menu background ) @@ -93,146 +97,179 @@ class LightTheme extends ThemeBase { trackColor: MaterialStateProperty.all(Palette.periwinkleCraiola), radius: Radius.circular(3), thickness: MaterialStateProperty.all(6), - isAlwaysShown: true, + thumbVisibility: MaterialStateProperty.all(true), crossAxisMargin: 6, ), primaryTextTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> titleLarge + titleLarge: TextStyle( color: Palette.darkBlueCraiola, // title color backgroundColor: Palette.wildPeriwinkle // textfield underline - ), - caption: TextStyle( + ), + bodySmall: TextStyle( color: PaletteDark.pigeonBlue, // secondary text decorationColor: Palette.wildLavender // menu divider - ), - overline: TextStyle( + ), + labelSmall: TextStyle( color: Palette.darkGray, // transaction/trade details titles decorationColor: PaletteDark.darkCyanBlue, // placeholder ), - // subhead -> subtitle1 - subtitle1: TextStyle( + // subhead -> titleMedium + titleMedium: TextStyle( color: Palette.blueCraiola, // first gradient color (send page) - decorationColor: Palette.blueGreyCraiola // second gradient color (send page) + decorationColor: + Palette.blueGreyCraiola // second gradient color (send page) + ), + // headline -> headlineSmall + headlineSmall: TextStyle( + color: Colors.white + .withOpacity(0.5), // text field border color (send page) + decorationColor: Colors.white + .withOpacity(0.5), // text field hint color (send page) ), - // headline -> headline5 - headline5: TextStyle( - color: Colors.white.withOpacity(0.5), // text field border color (send page) - decorationColor: Colors.white.withOpacity(0.5), // text field hint color (send page) - ), - // display1 -> headline4 - headline4: TextStyle( - color: Colors.white.withOpacity(0.2), // text field button color (send page) - decorationColor: Colors.white // text field button icon color (send page) - ), - // display2 -> headline3 - headline3: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( + color: Colors.white + .withOpacity(0.2), // text field button color (send page) + decorationColor: + Colors.white // text field button icon color (send page) + ), + // display2 -> displaySmall + displaySmall: TextStyle( color: Colors.white.withOpacity(0.5), // estimated fee (send page) - backgroundColor: PaletteDark.darkCyanBlue.withOpacity(0.67), // dot color for indicator on send page - decorationColor: Palette.moderateLavender // template dotted border (send page) - ), - // display3 -> headline2 - headline2: TextStyle( + backgroundColor: PaletteDark.darkCyanBlue + .withOpacity(0.67), // dot color for indicator on send page + decorationColor: + Palette.moderateLavender // template dotted border (send page) + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: Palette.darkBlueCraiola, // template new text (send page) - backgroundColor: PaletteDark.darkNightBlue, // active dot color for indicator on send page - decorationColor: Palette.blueAlice // template background color (send page) - ), - // display4 -> headline1 - headline1: TextStyle( + backgroundColor: PaletteDark + .darkNightBlue, // active dot color for indicator on send page + decorationColor: + Palette.blueAlice // template background color (send page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: Palette.darkBlueCraiola, // template title (send page) - backgroundColor: Colors.black, // icon color on order row (moonpay) - decorationColor: Palette.niagara // receive amount text (exchange page) - ), - // subtitle -> subtitle2 - subtitle2: TextStyle( - color: Palette.blueCraiola, // first gradient color top panel (exchange page) - decorationColor: Palette.blueGreyCraiola // second gradient color top panel (exchange page) - ), - // body -> bodyText2 - bodyText2: TextStyle( - color: Palette.blueCraiola.withOpacity(0.7), // first gradient color bottom panel (exchange page) - decorationColor: Palette.blueGreyCraiola.withOpacity(0.7), // second gradient color bottom panel (exchange page) + backgroundColor: + Colors.black, // icon color on order row (moonpay) + decorationColor: + Palette.niagara // receive amount text (exchange page) + ), + // subtitle -> titleSmall + titleSmall: TextStyle( + color: Palette + .blueCraiola, // first gradient color top panel (exchange page) + decorationColor: Palette + .blueGreyCraiola // second gradient color top panel (exchange page) + ), + // body -> bodyMedium + bodyMedium: TextStyle( + color: Palette.blueCraiola.withOpacity( + 0.7), // first gradient color bottom panel (exchange page) + decorationColor: Palette.blueGreyCraiola.withOpacity( + 0.7), // second gradient color bottom panel (exchange page) backgroundColor: Palette.protectiveBlue // alert right button text - ), - // body2 -> bodyText1 - bodyText1: TextStyle( - color: Colors.white.withOpacity(0.5), // text field border on top panel (exchange page) - decorationColor: Colors.white.withOpacity(0.5), // text field border on bottom panel (exchange page) + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( + color: Colors.white.withOpacity( + 0.5), // text field border on top panel (exchange page) + decorationColor: Colors.white.withOpacity( + 0.5), // text field border on bottom panel (exchange page) backgroundColor: Palette.brightOrange // alert left button text ) ), focusColor: Colors.white.withOpacity(0.2), // text field button (exchange page) accentTextTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> headlititleLargene6 + titleLarge: TextStyle( color: Colors.white, // picker background backgroundColor: Palette.periwinkleCraiola, // picker divider decorationColor: Colors.white // dialog background - ), - caption: TextStyle( + ), + bodySmall: TextStyle( color: Palette.blueAlice, // container (confirm exchange) backgroundColor: Palette.blueAlice, // button background (confirm exchange) decorationColor: Palette.darkBlueCraiola, // text color (information page) ), - // subtitle -> subtitle2 - subtitle2: TextStyle( + // subtitle -> titleSmall + titleSmall: TextStyle( color: Palette.darkBlueCraiola, // QR code (exchange trade page) - backgroundColor: Palette.wildPeriwinkle, // divider (exchange trade page) - decorationColor: Palette.protectiveBlue // crete new wallet button background (wallet list page) - ), - // headline -> headline5 - headline5: TextStyle( - color: Palette.moderateLavender, // first gradient color of wallet action buttons (wallet list page) - backgroundColor: Palette.moderateLavender, // second gradient color of wallet action buttons (wallet list page) - decorationColor: Colors.white // restore wallet button text color (wallet list page) - ), - // subhead -> subtitle1 - subtitle1: TextStyle( + backgroundColor: + Palette.wildPeriwinkle, // divider (exchange trade page) + decorationColor: Palette + .protectiveBlue // crete new wallet button background (wallet list page) + ), + // headline -> headlineSmall + headlineSmall: TextStyle( + color: Palette + .moderateLavender, // first gradient color of wallet action buttons (wallet list page) + backgroundColor: Palette + .moderateLavender, // second gradient color of wallet action buttons (wallet list page) + decorationColor: Colors + .white // restore wallet button text color (wallet list page) + ), + // subhead -> titleMedium + titleMedium: TextStyle( color: Palette.darkGray, // titles color (filter widget) backgroundColor: Palette.periwinkle, // divider color (filter widget) decorationColor: Colors.white // checkbox background (filter widget) - ), - overline: TextStyle( + ), + labelSmall: TextStyle( color: Palette.wildPeriwinkle, // checkbox bounds (filter widget) decorationColor: Colors.white, // menu subname ), - // display1 -> headline4 - headline4: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( color: Palette.blueCraiola, // first gradient color (menu header) decorationColor: Palette.blueGreyCraiola, // second gradient color(menu header) backgroundColor: PaletteDark.darkNightBlue // active dot color - ), - // display2 -> headline3 - headline3: TextStyle( - color: Palette.shadowWhite, // action button color (address text field) + ), + // display2 -> displaySmall + displaySmall: TextStyle( + color: + Palette.shadowWhite, // action button color (address text field) decorationColor: Palette.darkGray, // hint text (seed widget) - backgroundColor: Palette.darkBlueCraiola.withOpacity(0.67) // text on balance page - ), - // display3 -> headline2 - headline2: TextStyle( + backgroundColor: Palette.darkBlueCraiola + .withOpacity(0.67) // text on balance page + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: Palette.darkGray, // hint text (new wallet page) - decorationColor: Palette.periwinkleCraiola, // underline (new wallet page) - backgroundColor: Palette.darkBlueCraiola // menu, icons, balance (dashboard page) - ), - // display4 -> headline1 - headline1: TextStyle( + decorationColor: + Palette.periwinkleCraiola, // underline (new wallet page) + backgroundColor: + Palette.darkBlueCraiola // menu, icons, balance (dashboard page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: Palette.darkGray, // switch background (settings page) - backgroundColor: Colors.black, // icon color on support page (moonpay, github) - decorationColor: Colors.white.withOpacity(0.4) // hint text (exchange page) - ), - // body -> bodyText2 - bodyText2: TextStyle( + backgroundColor: + Colors.black, // icon color on support page (moonpay, github) + decorationColor: + Colors.white.withOpacity(0.4) // hint text (exchange page) + ), + // body -> bodyMedium + bodyMedium: TextStyle( color: Palette.darkGray, // indicators (PIN code) decorationColor: Palette.darkGray, // switch (PIN code) backgroundColor: Colors.white // alert right button - ), - // body2 -> bodyText1 - bodyText1: TextStyle( + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( color: Palette.protectiveBlue, // primary buttons decorationColor: Colors.white, // alert left button, backgroundColor: Palette.dullGray // keyboard bar color ), ), cardColor: Palette.protectiveBlue // bottom button (action list) - ); -} \ No newline at end of file + ); + + @override + ThemeData get themeData => theme.copyWith( + colorScheme: theme.colorScheme + .copyWith(background: Colors.white, secondary: Colors.white)); +}