Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-09-29 18:01:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #104 from cake-tech/CAKE-39-change-buttons-color

Browse source 
Cake 39 change buttons color
This commit is contained in:
Oleksandr Sobol 2020-09-14 20:36:25 +03:00 committed by GitHub
commit f64cf0e89b
21 changed files with 43 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
assets/images/monero_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 KiB

2
lib/palette.dart
View file

@ -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);

2
lib/src/screens/contact/contact_list_page.dart
View file

@ -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);

4
lib/src/screens/contact/contact_page.dart
View file

@ -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)))
],

3
lib/src/screens/exchange/widgets/base_exchange_widget.dart
View file

@ -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<BaseExchangeWidget> {
exchangeViewModel.createTrade();
}
},
color: Palette.blueCraiola,
color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white,
isLoading: exchangeViewModel.tradeState is TradeIsCreating,
)),

3
lib/src/screens/exchange_trade/exchange_confirm_page.dart
View file

@ -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)
],
),

2
lib/src/screens/exchange_trade/exchange_trade_page.dart
View file

@ -220,7 +220,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
bottomSection: PrimaryButton(
onPressed: () {},
text: S.of(context).confirm,
color: Palette.blueCraiola,
color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white
)
/*Observer(

2
lib/src/screens/monero_accounts/monero_account_list_page.dart
View file

@ -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(

2
lib/src/screens/new_wallet/new_wallet_type_page.dart
View file

@ -38,7 +38,7 @@ class WalletTypeFormState extends State<WalletTypeForm> {
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');

5
lib/src/screens/nodes/node_create_or_edit_page.dart
View file

@ -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,
),

2
lib/src/screens/restore/restore_wallet_from_keys_page.dart
View file

@ -201,7 +201,7 @@ class _RestoreFromKeysFromState extends State<RestoreFromKeysFrom> {
}
},
text: S.of(context).restore_recover,
color: Palette.blueCraiola,
color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white,
//isDisabled: walletRestorationStore.disabledState,
);

3
lib/src/screens/restore/restore_wallet_from_seed_details.dart
View file

@ -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,
);

1
lib/src/screens/restore/restore_wallet_from_seed_page.dart
View file

@ -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 {

4
lib/src/screens/seed/wallet_seed_page.dart
View file

@ -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)),
))
],

3
lib/src/screens/send/widgets/base_send_widget.dart
View file

@ -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,

2
lib/src/screens/wallet_list/wallet_list_page.dart
View file

@ -33,7 +33,7 @@ class WalletListBody extends StatefulWidget {
class WalletListBodyState extends State<WalletListBody> {
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();

3
lib/src/widgets/alert_with_one_action.dart
View file

@ -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(

4
lib/src/widgets/base_alert_dialog.dart
View file

@ -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(

6
lib/src/widgets/seed_widget.dart
View file

@ -393,7 +393,7 @@ class SeedWidgetState extends State<SeedWidget> {
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<SeedWidget> {
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<SeedWidget> {
: null,
onDisabledPressed: () => showErrorIfExist(),
isDisabled: !isCurrentMnemonicValid,
color: Palette.blueCraiola,
color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white),
),
)

2
lib/src/widgets/template_tile.dart
View file

@ -128,7 +128,7 @@ class TemplateTileState extends State<TemplateTile> {
child: Container(
height: 40,
padding: EdgeInsets.only(left: 24, right: 10),
color: Colors.red,
color: Colors.orange,
child: content,
),
),

24
lib/themes.dart
View file

@ -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)
);
}