diff --git a/assets/images/monero_logo.png b/assets/images/monero_logo.png new file mode 100644 index 000000000..d1ebfc0d8 Binary files /dev/null and b/assets/images/monero_logo.png differ diff --git a/lib/palette.dart b/lib/palette.dart index 3988a53ef..f9d0a1e3c 100644 --- a/lib/palette.dart +++ b/lib/palette.dart @@ -41,6 +41,8 @@ class Palette { static const Color shadowWhite = Color.fromRGBO(242, 245, 255, 1.0); static const Color niagara = Color.fromRGBO(152, 172, 201, 1.0); static const Color alizarinRed = Color.fromRGBO(233, 45, 45, 1.0); + static const Color moderateSlateBlue = Color.fromRGBO(129, 93, 251, 1.0); + static const Color brightOrange = Color.fromRGBO(255, 102, 0, 1.0); // FIXME: Rename. static const Color eee = Color.fromRGBO(236, 239, 245, 1.0); diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart index c8757e9b7..874cb71e0 100644 --- a/lib/src/screens/contact/contact_list_page.dart +++ b/lib/src/screens/contact/contact_list_page.dart @@ -197,7 +197,7 @@ class ContactListPage extends BasePage { Image image; switch (currency) { case CryptoCurrency.xmr: - image = Image.asset('assets/images/monero.png', height: 24, width: 24); + image = Image.asset('assets/images/monero_logo.png', height: 24, width: 24); break; case CryptoCurrency.ada: image = Image.asset('assets/images/ada.png', height: 24, width: 24); 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/monero_accounts/monero_account_list_page.dart b/lib/src/screens/monero_accounts/monero_account_list_page.dart index 0f4d493fe..ab662629b 100644 --- a/lib/src/screens/monero_accounts/monero_account_list_page.dart +++ b/lib/src/screens/monero_accounts/monero_account_list_page.dart @@ -123,7 +123,7 @@ class MoneroAccountListPage extends StatelessWidget { .pushNamed(Routes.accountCreation), child: Container( height: 62, - color: Theme.of(context).textTheme.subtitle.decorationColor, + color: Theme.of(context).cardColor, padding: EdgeInsets.only(left: 24, right: 24), child: Center( child: Row( 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 673bd9478..0eacbc7b7 100644 --- a/lib/src/screens/new_wallet/new_wallet_type_page.dart +++ b/lib/src/screens/new_wallet/new_wallet_type_page.dart @@ -38,7 +38,7 @@ class WalletTypeFormState extends State { static const aspectRatioImage = 1.22; final moneroIcon = - Image.asset('assets/images/monero.png', height: 24, width: 24); + Image.asset('assets/images/monero_logo.png', height: 24, width: 24); final bitcoinIcon = Image.asset('assets/images/bitcoin.png', height: 24, width: 24); final walletTypeImage = Image.asset('assets/images/wallet_type.png'); 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 62e25f0a6..f0e17ccf0 100644 --- a/lib/src/screens/restore/restore_wallet_from_keys_page.dart +++ b/lib/src/screens/restore/restore_wallet_from_keys_page.dart @@ -201,7 +201,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 3815c09d7..79b238411 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'; @@ -134,7 +133,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 5b3933cff..29401cdc0 100644 --- a/lib/src/screens/seed/wallet_seed_page.dart +++ b/lib/src/screens/seed/wallet_seed_page.dart @@ -102,7 +102,7 @@ class WalletSeedPage extends BasePage { fontWeight: FontWeight.normal, color: Theme.of(context) .primaryTextTheme - .overline + .caption .color), ), ) @@ -162,7 +162,7 @@ class WalletSeedPage extends BasePage { ); }, text: S.of(context).copy, - color: Palette.blueCraiola, + 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/screens/wallet_list/wallet_list_page.dart b/lib/src/screens/wallet_list/wallet_list_page.dart index bac8e0990..5539ec3e4 100644 --- a/lib/src/screens/wallet_list/wallet_list_page.dart +++ b/lib/src/screens/wallet_list/wallet_list_page.dart @@ -33,7 +33,7 @@ class WalletListBody extends StatefulWidget { class WalletListBodyState extends State { final moneroIcon = - Image.asset('assets/images/monero.png', height: 24, width: 24); + Image.asset('assets/images/monero_logo.png', height: 24, width: 24); final bitcoinIcon = Image.asset('assets/images/bitcoin.png', height: 24, width: 24); final scrollController = ScrollController(); diff --git a/lib/src/widgets/alert_with_one_action.dart b/lib/src/widgets/alert_with_one_action.dart index e7f1a0d15..5a39adbc5 100644 --- a/lib/src/widgets/alert_with_one_action.dart +++ b/lib/src/widgets/alert_with_one_action.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:cake_wallet/src/widgets/base_alert_dialog.dart'; -import 'package:cake_wallet/palette.dart'; class AlertWithOneAction extends BaseAlertDialog { AlertWithOneAction({ @@ -32,7 +31,7 @@ class AlertWithOneAction extends BaseAlertDialog { width: 300, height: 52, padding: EdgeInsets.only(left: 12, right: 12), - color: Palette.blueCraiola, + color: Theme.of(context).accentTextTheme.body2.color, child: ButtonTheme( minWidth: double.infinity, child: FlatButton( diff --git a/lib/src/widgets/base_alert_dialog.dart b/lib/src/widgets/base_alert_dialog.dart index 7cfafe284..b2ac36940 100644 --- a/lib/src/widgets/base_alert_dialog.dart +++ b/lib/src/widgets/base_alert_dialog.dart @@ -47,7 +47,7 @@ class BaseAlertDialog extends StatelessWidget { child: Container( height: 52, padding: EdgeInsets.only(left: 6, right: 6), - color: Palette.alizarinRed, + color: Theme.of(context).accentTextTheme.body2.decorationColor, child: ButtonTheme( minWidth: double.infinity, child: FlatButton( @@ -72,7 +72,7 @@ class BaseAlertDialog extends StatelessWidget { child: Container( height: 52, padding: EdgeInsets.only(left: 6, right: 6), - color: Palette.blueCraiola, + color: Theme.of(context).accentTextTheme.body2.color, child: ButtonTheme( minWidth: double.infinity, child: FlatButton( 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, ), ), diff --git a/lib/themes.dart b/lib/themes.dart index e9d074f47..0decf9777 100644 --- a/lib/themes.dart +++ b/lib/themes.dart @@ -48,15 +48,16 @@ class Themes { ), display3: 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) + decorationColor: Palette.moderateSlateBlue // background of current tile (receive page) ), display4: TextStyle( color: Palette.violetBlue, // text color of tiles (account list) decorationColor: Colors.white // background of tiles (account list) ), subtitle: TextStyle( - color: Colors.white, // text color of current tile (account list) - decorationColor: Palette.blueCraiola // background of current tile (account list) + color: Palette.moderateSlateBlue, // text color of current tile (account list) + decorationColor: Colors.white // background of current tile (account list) ), body1: TextStyle( color: Palette.moderatePurpleBlue, // scrollbar thumb @@ -132,7 +133,8 @@ class Themes { subtitle: 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.blueCraiola // crete new wallet button background (wallet list page) + decorationColor: Palette.moderateSlateBlue // crete new wallet button background (wallet list page) ), headline: TextStyle( color: Palette.moderateLavender, // first gradient color of wallet action buttons (wallet list page) @@ -166,8 +168,13 @@ class Themes { body1: TextStyle( color: Palette.darkGray, // indicators (PIN code) decorationColor: Palette.darkGray // switch (PIN code) - ) + ), + body2: TextStyle( + color: Palette.moderateSlateBlue, // primary buttons, alert right buttons + decorationColor: Palette.brightOrange // alert left button + ), ), + cardColor: Palette.moderateSlateBlue // bottom button (action list) ); @@ -334,7 +341,12 @@ class Themes { body1: TextStyle( color: PaletteDark.indicatorVioletBlue, // indicators (PIN code) decorationColor: PaletteDark.lightPurpleBlue // switch (PIN code) - ) + ), + body2: TextStyle( + color: Palette.blueCraiola, // primary buttons, alert right buttons + decorationColor: Palette.alizarinRed // alert left button + ), ), + cardColor: PaletteDark.darkNightBlue // bottom button (action list) ); } \ No newline at end of file