diff --git a/lib/src/screens/contact/contact_page.dart b/lib/src/screens/contact/contact_page.dart index 67f83cb66..3670af7d9 100644 --- a/lib/src/screens/contact/contact_page.dart +++ b/lib/src/screens/contact/contact_page.dart @@ -115,7 +115,7 @@ class ContactPage extends BasePage { _addressController.text = ''; }, text: S.of(context).reset, - color: Colors.red, + color: Colors.orange, textColor: Colors.white), ), SizedBox(width: 20), @@ -130,7 +130,7 @@ class ContactPage extends BasePage { await contactViewModel.save(); }, text: S.of(context).save, - color: Palette.blueCraiola, + color: Theme.of(context).accentTextTheme.body2.color, textColor: Colors.white, isDisabled: !contactViewModel.isReady))) ], diff --git a/lib/src/screens/exchange/widgets/base_exchange_widget.dart b/lib/src/screens/exchange/widgets/base_exchange_widget.dart index 46a6d4cb8..a09181e2f 100644 --- a/lib/src/screens/exchange/widgets/base_exchange_widget.dart +++ b/lib/src/screens/exchange/widgets/base_exchange_widget.dart @@ -1,5 +1,4 @@ import 'dart:ui'; -import 'package:cake_wallet/palette.dart'; import 'package:cake_wallet/src/domain/exchange/exchange_template.dart'; import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart'; import 'package:cake_wallet/src/widgets/template_tile.dart'; @@ -356,7 +355,7 @@ class BaseExchangeWidgetState extends State { exchangeViewModel.createTrade(); } }, - color: Palette.blueCraiola, + color: Theme.of(context).accentTextTheme.body2.color, textColor: Colors.white, isLoading: exchangeViewModel.tradeState is TradeIsCreating, )), diff --git a/lib/src/screens/exchange_trade/exchange_confirm_page.dart b/lib/src/screens/exchange_trade/exchange_confirm_page.dart index 7cdb61c47..a5569453c 100644 --- a/lib/src/screens/exchange_trade/exchange_confirm_page.dart +++ b/lib/src/screens/exchange_trade/exchange_confirm_page.dart @@ -7,7 +7,6 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/src/widgets/primary_button.dart'; import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/src/domain/exchange/trade.dart'; -import 'package:cake_wallet/palette.dart'; class ExchangeConfirmPage extends BasePage { ExchangeConfirmPage({@required this.tradesStore}) : trade = tradesStore.trade; @@ -115,7 +114,7 @@ class ExchangeConfirmPage extends BasePage { onPressed: () => Navigator.of(context) .pushReplacementNamed(Routes.exchangeTrade), text: S.of(context).saved_the_trade_id, - color: Palette.blueCraiola, + color: Theme.of(context).accentTextTheme.body2.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 61b1b024d..cc295a9ca 100644 --- a/lib/src/screens/exchange_trade/exchange_trade_page.dart +++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart @@ -220,7 +220,7 @@ class ExchangeTradeState extends State { bottomSection: PrimaryButton( onPressed: () {}, text: S.of(context).confirm, - color: Palette.blueCraiola, + color: Theme.of(context).accentTextTheme.body2.color, textColor: Colors.white ) /*Observer( 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 d4b4a5e01..ee13984c5 100644 --- a/lib/src/screens/nodes/node_create_or_edit_page.dart +++ b/lib/src/screens/nodes/node_create_or_edit_page.dart @@ -1,4 +1,3 @@ -import 'package:cake_wallet/palette.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; @@ -137,7 +136,7 @@ class NodeCreateOrEditPage extends BasePage { child: PrimaryButton( onPressed: () => nodeCreateOrEditViewModel.reset(), text: S.of(context).reset, - color: Colors.red, + color: Colors.orange, textColor: Colors.white), )), Flexible( @@ -153,7 +152,7 @@ class NodeCreateOrEditPage extends BasePage { Navigator.of(context).pop(); }, text: S.of(context).save, - color: Palette.blueCraiola, + color: Theme.of(context).accentTextTheme.body2.color, textColor: Colors.white, isDisabled: !nodeCreateOrEditViewModel.isReady, ), diff --git a/lib/src/screens/restore/restore_wallet_from_keys_page.dart b/lib/src/screens/restore/restore_wallet_from_keys_page.dart index 6f950f6e4..e205423fb 100644 --- a/lib/src/screens/restore/restore_wallet_from_keys_page.dart +++ b/lib/src/screens/restore/restore_wallet_from_keys_page.dart @@ -189,7 +189,7 @@ class _RestoreFromKeysFromState extends State { } }, text: S.of(context).restore_recover, - color: Palette.blueCraiola, + color: Theme.of(context).accentTextTheme.body2.color, textColor: Colors.white, //isDisabled: walletRestorationStore.disabledState, ); 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 3225be9e7..f55d14583 100644 --- a/lib/src/screens/restore/restore_wallet_from_seed_details.dart +++ b/lib/src/screens/restore/restore_wallet_from_seed_details.dart @@ -1,4 +1,3 @@ -import 'package:cake_wallet/palette.dart'; import 'package:mobx/mobx.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; @@ -121,7 +120,7 @@ class _RestoreFromSeedDetailsFormState isLoading: widget.walletRestorationFromSeedVM.state is WalletCreating, text: S.of(context).restore_recover, - color: Palette.blueCraiola, + color: Theme.of(context).accentTextTheme.body2.color, textColor: Colors.white, isDisabled: _nameController.text.isNotEmpty, ); diff --git a/lib/src/screens/restore/restore_wallet_from_seed_page.dart b/lib/src/screens/restore/restore_wallet_from_seed_page.dart index bc30a48d8..2920818f6 100644 --- a/lib/src/screens/restore/restore_wallet_from_seed_page.dart +++ b/lib/src/screens/restore/restore_wallet_from_seed_page.dart @@ -6,7 +6,6 @@ import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/src/widgets/seed_widget.dart'; import 'package:cake_wallet/src/domain/common/wallet_type.dart'; import 'package:cake_wallet/core/seed_validator.dart'; -import 'package:cake_wallet/palette.dart'; import 'package:cake_wallet/core/mnemonic_length.dart'; class RestoreWalletFromSeedPage extends BasePage { diff --git a/lib/src/screens/seed/wallet_seed_page.dart b/lib/src/screens/seed/wallet_seed_page.dart index cde60f5b0..5c5e06b70 100644 --- a/lib/src/screens/seed/wallet_seed_page.dart +++ b/lib/src/screens/seed/wallet_seed_page.dart @@ -141,7 +141,7 @@ class WalletSeedPage extends BasePage { ); }, text: S.of(context).copy, - color: Colors.blue, + color: Theme.of(context).accentTextTheme.body2.color, textColor: Colors.white)), )) ], diff --git a/lib/src/screens/send/widgets/base_send_widget.dart b/lib/src/screens/send/widgets/base_send_widget.dart index 0aa8c0b3a..b87cd920c 100644 --- a/lib/src/screens/send/widgets/base_send_widget.dart +++ b/lib/src/screens/send/widgets/base_send_widget.dart @@ -6,7 +6,6 @@ import 'package:cake_wallet/view_model/send_view_model.dart'; import 'package:flutter/services.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:mobx/mobx.dart'; -import 'package:cake_wallet/palette.dart'; import 'package:cake_wallet/src/widgets/address_text_field.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/src/widgets/top_panel.dart'; @@ -436,7 +435,7 @@ class BaseSendWidget extends StatelessWidget { } }, text: S.of(context).send, - color: Palette.blueCraiola, + color: Theme.of(context).accentTextTheme.body2.color, textColor: Colors.white, isLoading: sendViewModel.state is TransactionIsCreating || sendViewModel.state is TransactionCommitting, diff --git a/lib/src/widgets/seed_widget.dart b/lib/src/widgets/seed_widget.dart index 5da136c74..7ffe3f609 100644 --- a/lib/src/widgets/seed_widget.dart +++ b/lib/src/widgets/seed_widget.dart @@ -393,7 +393,7 @@ class SeedWidgetState extends State { child: PrimaryButton( onPressed: clear, text: S.of(context).clear, - color: Colors.red, + color: Colors.orange, textColor: Colors.white, isDisabled: items.isEmpty, ), @@ -408,7 +408,7 @@ class SeedWidgetState extends State { onPressed: () => widget.onFinish != null ? widget.onFinish() : null, - color: Palette.blueCraiola, + color: Theme.of(context).accentTextTheme.body2.color, textColor: Colors.white) : PrimaryButton( text: selectedItem != null @@ -419,7 +419,7 @@ class SeedWidgetState extends State { : null, onDisabledPressed: () => showErrorIfExist(), isDisabled: !isCurrentMnemonicValid, - color: Palette.blueCraiola, + color: Theme.of(context).accentTextTheme.body2.color, textColor: Colors.white), ), ) diff --git a/lib/src/widgets/template_tile.dart b/lib/src/widgets/template_tile.dart index fbff8b6c1..8ec355d68 100644 --- a/lib/src/widgets/template_tile.dart +++ b/lib/src/widgets/template_tile.dart @@ -128,7 +128,7 @@ class TemplateTileState extends State { child: Container( height: 40, padding: EdgeInsets.only(left: 24, right: 10), - color: Colors.red, + color: Colors.orange, child: content, ), ),