Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-01-10 21:04:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CAKE-39 | changed buttons color on base send widget, base exchange widget, exchange confirm page, exchange trade page, node create or edit page, contact page, seed widget, restore wallet from seed details page, restore wallet from keys page, wallet seed page, template tile

Browse source
This commit is contained in:
OleksandrSobol 2020-09-10 13:33:34 +03:00
parent 844847f703
commit 163700bcd8
12 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -115,7 +115,7 @@ class ContactPage extends BasePage {
_addressController.text = ''; _addressController.text = '';
}, },
text: S.of(context).reset, text: S.of(context).reset,
color: Colors.red, color: Colors.orange,
textColor: Colors.white), textColor: Colors.white),
), ),
SizedBox(width: 20), SizedBox(width: 20),
@ -130,7 +130,7 @@ class ContactPage extends BasePage {
await contactViewModel.save(); await contactViewModel.save();
}, },
text: S.of(context).save, text: S.of(context).save,
color: Palette.blueCraiola, color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white, textColor: Colors.white,
isDisabled: !contactViewModel.isReady))) isDisabled: !contactViewModel.isReady)))
], ],

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

@ -1,5 +1,4 @@
import 'dart:ui'; import 'dart:ui';
import 'package:cake_wallet/palette.dart';
import 'package:cake_wallet/src/domain/exchange/exchange_template.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/alert_with_two_actions.dart';
import 'package:cake_wallet/src/widgets/template_tile.dart'; import 'package:cake_wallet/src/widgets/template_tile.dart';
@ -356,7 +355,7 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
exchangeViewModel.createTrade(); exchangeViewModel.createTrade();
} }
}, },
color: Palette.blueCraiola, color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white, textColor: Colors.white,
isLoading: exchangeViewModel.tradeState is TradeIsCreating, 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/widgets/primary_button.dart';
import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/src/screens/base_page.dart';
import 'package:cake_wallet/src/domain/exchange/trade.dart'; import 'package:cake_wallet/src/domain/exchange/trade.dart';
import 'package:cake_wallet/palette.dart';
class ExchangeConfirmPage extends BasePage { class ExchangeConfirmPage extends BasePage {
ExchangeConfirmPage({@required this.tradesStore}) : trade = tradesStore.trade; ExchangeConfirmPage({@required this.tradesStore}) : trade = tradesStore.trade;
@ -115,7 +114,7 @@ class ExchangeConfirmPage extends BasePage {
onPressed: () => Navigator.of(context) onPressed: () => Navigator.of(context)
.pushReplacementNamed(Routes.exchangeTrade), .pushReplacementNamed(Routes.exchangeTrade),
text: S.of(context).saved_the_trade_id, text: S.of(context).saved_the_trade_id,
color: Palette.blueCraiola, color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white) 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( bottomSection: PrimaryButton(
onPressed: () {}, onPressed: () {},
text: S.of(context).confirm, text: S.of(context).confirm,
color: Palette.blueCraiola, color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white textColor: Colors.white
) )
/*Observer( /*Observer(

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/material.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:flutter_mobx/flutter_mobx.dart';
@ -137,7 +136,7 @@ class NodeCreateOrEditPage extends BasePage {
child: PrimaryButton( child: PrimaryButton(
onPressed: () => nodeCreateOrEditViewModel.reset(), onPressed: () => nodeCreateOrEditViewModel.reset(),
text: S.of(context).reset, text: S.of(context).reset,
color: Colors.red, color: Colors.orange,
textColor: Colors.white), textColor: Colors.white),
)), )),
Flexible( Flexible(
@ -153,7 +152,7 @@ class NodeCreateOrEditPage extends BasePage {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
text: S.of(context).save, text: S.of(context).save,
color: Palette.blueCraiola, color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white, textColor: Colors.white,
isDisabled: !nodeCreateOrEditViewModel.isReady, isDisabled: !nodeCreateOrEditViewModel.isReady,
), ),

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

@ -189,7 +189,7 @@ class _RestoreFromKeysFromState extends State<RestoreFromKeysFrom> {
} }
}, },
text: S.of(context).restore_recover, text: S.of(context).restore_recover,
color: Palette.blueCraiola, color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white, textColor: Colors.white,
//isDisabled: walletRestorationStore.disabledState, //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:mobx/mobx.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:flutter_mobx/flutter_mobx.dart';
@ -121,7 +120,7 @@ class _RestoreFromSeedDetailsFormState
isLoading: isLoading:
widget.walletRestorationFromSeedVM.state is WalletCreating, widget.walletRestorationFromSeedVM.state is WalletCreating,
text: S.of(context).restore_recover, text: S.of(context).restore_recover,
color: Palette.blueCraiola, color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white, textColor: Colors.white,
isDisabled: _nameController.text.isNotEmpty, 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/widgets/seed_widget.dart';
import 'package:cake_wallet/src/domain/common/wallet_type.dart'; import 'package:cake_wallet/src/domain/common/wallet_type.dart';
import 'package:cake_wallet/core/seed_validator.dart'; import 'package:cake_wallet/core/seed_validator.dart';
import 'package:cake_wallet/palette.dart';
import 'package:cake_wallet/core/mnemonic_length.dart'; import 'package:cake_wallet/core/mnemonic_length.dart';
class RestoreWalletFromSeedPage extends BasePage { class RestoreWalletFromSeedPage extends BasePage {

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

@ -141,7 +141,7 @@ class WalletSeedPage extends BasePage {
); );
}, },
text: S.of(context).copy, text: S.of(context).copy,
color: Colors.blue, color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white)), 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/services.dart';
import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:mobx/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/src/widgets/address_text_field.dart';
import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/src/widgets/top_panel.dart'; import 'package:cake_wallet/src/widgets/top_panel.dart';
@ -436,7 +435,7 @@ class BaseSendWidget extends StatelessWidget {
} }
}, },
text: S.of(context).send, text: S.of(context).send,
color: Palette.blueCraiola, color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white, textColor: Colors.white,
isLoading: sendViewModel.state is TransactionIsCreating || isLoading: sendViewModel.state is TransactionIsCreating ||
sendViewModel.state is TransactionCommitting, sendViewModel.state is TransactionCommitting,

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

@ -393,7 +393,7 @@ class SeedWidgetState extends State<SeedWidget> {
child: PrimaryButton( child: PrimaryButton(
onPressed: clear, onPressed: clear,
text: S.of(context).clear, text: S.of(context).clear,
color: Colors.red, color: Colors.orange,
textColor: Colors.white, textColor: Colors.white,
isDisabled: items.isEmpty, isDisabled: items.isEmpty,
), ),
@ -408,7 +408,7 @@ class SeedWidgetState extends State<SeedWidget> {
onPressed: () => widget.onFinish != null onPressed: () => widget.onFinish != null
? widget.onFinish() ? widget.onFinish()
: null, : null,
color: Palette.blueCraiola, color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white) textColor: Colors.white)
: PrimaryButton( : PrimaryButton(
text: selectedItem != null text: selectedItem != null
@ -419,7 +419,7 @@ class SeedWidgetState extends State<SeedWidget> {
: null, : null,
onDisabledPressed: () => showErrorIfExist(), onDisabledPressed: () => showErrorIfExist(),
isDisabled: !isCurrentMnemonicValid, isDisabled: !isCurrentMnemonicValid,
color: Palette.blueCraiola, color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white), textColor: Colors.white),
), ),
) )

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

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