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
OleksandrSobol committed
Sep 10, 2020 at 13:33 UTC
163700bcd853cf7470c9accf31faa74bfa814981
12 files changed
+15
-21
lib/src/screens/contact/contact_page.dart
+2
-2
@@ -115,7 +115,7 @@ class ContactPage extends BasePage {
115
_addressController.text = '';
116
},
117
text: S.of(context).reset,
118
- color: Colors.red,
118
+ color: Colors.orange,
119
textColor: Colors.white),
120
),
121
SizedBox(width: 20),
@@ -130,7 +130,7 @@ class ContactPage extends BasePage {
130
await contactViewModel.save();
131
},
132
text: S.of(context).save,
133
- color: Palette.blueCraiola,
133
+ color: Theme.of(context).accentTextTheme.body2.color,
134
textColor: Colors.white,
135
isDisabled: !contactViewModel.isReady)))
136
],
lib/src/screens/exchange/widgets/base_exchange_widget.dart
+1
-2
@@ -1,5 +1,4 @@
1
import 'dart:ui';
2
-import 'package:cake_wallet/palette.dart';
2
import 'package:cake_wallet/src/domain/exchange/exchange_template.dart';
3
import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
4
import 'package:cake_wallet/src/widgets/template_tile.dart';
@@ -356,7 +355,7 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
355
exchangeViewModel.createTrade();
356
}
357
},
359
- color: Palette.blueCraiola,
358
+ color: Theme.of(context).accentTextTheme.body2.color,
359
textColor: Colors.white,
360
isLoading: exchangeViewModel.tradeState is TradeIsCreating,
361
)),
lib/src/screens/exchange_trade/exchange_confirm_page.dart
+1
-2
@@ -7,7 +7,6 @@ import 'package:cake_wallet/generated/i18n.dart';
7
import 'package:cake_wallet/src/widgets/primary_button.dart';
8
import 'package:cake_wallet/src/screens/base_page.dart';
9
import 'package:cake_wallet/src/domain/exchange/trade.dart';
10
-import 'package:cake_wallet/palette.dart';
10
11
class ExchangeConfirmPage extends BasePage {
12
ExchangeConfirmPage({@required this.tradesStore}) : trade = tradesStore.trade;
@@ -115,7 +114,7 @@ class ExchangeConfirmPage extends BasePage {
114
onPressed: () => Navigator.of(context)
115
.pushReplacementNamed(Routes.exchangeTrade),
116
text: S.of(context).saved_the_trade_id,
118
- color: Palette.blueCraiola,
117
+ color: Theme.of(context).accentTextTheme.body2.color,
118
textColor: Colors.white)
119
],
120
),
lib/src/screens/exchange_trade/exchange_trade_page.dart
+1
-1
@@ -220,7 +220,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
220
bottomSection: PrimaryButton(
221
onPressed: () {},
222
text: S.of(context).confirm,
223
- color: Palette.blueCraiola,
223
+ color: Theme.of(context).accentTextTheme.body2.color,
224
textColor: Colors.white
225
)
226
/*Observer(
lib/src/screens/nodes/node_create_or_edit_page.dart
+2
-3
@@ -1,4 +1,3 @@
1
-import 'package:cake_wallet/palette.dart';
1
import 'package:flutter/material.dart';
2
import 'package:flutter/cupertino.dart';
3
import 'package:flutter_mobx/flutter_mobx.dart';
@@ -137,7 +136,7 @@ class NodeCreateOrEditPage extends BasePage {
136
child: PrimaryButton(
137
onPressed: () => nodeCreateOrEditViewModel.reset(),
138
text: S.of(context).reset,
140
- color: Colors.red,
139
+ color: Colors.orange,
140
textColor: Colors.white),
141
)),
142
Flexible(
@@ -153,7 +152,7 @@ class NodeCreateOrEditPage extends BasePage {
152
Navigator.of(context).pop();
153
},
154
text: S.of(context).save,
156
- color: Palette.blueCraiola,
155
+ color: Theme.of(context).accentTextTheme.body2.color,
156
textColor: Colors.white,
157
isDisabled: !nodeCreateOrEditViewModel.isReady,
158
),
lib/src/screens/restore/restore_wallet_from_keys_page.dart
+1
-1
@@ -189,7 +189,7 @@ class _RestoreFromKeysFromState extends State<RestoreFromKeysFrom> {
189
}
190
},
191
text: S.of(context).restore_recover,
192
- color: Palette.blueCraiola,
192
+ color: Theme.of(context).accentTextTheme.body2.color,
193
textColor: Colors.white,
194
//isDisabled: walletRestorationStore.disabledState,
195
);
lib/src/screens/restore/restore_wallet_from_seed_details.dart
+1
-2
@@ -1,4 +1,3 @@
1
-import 'package:cake_wallet/palette.dart';
1
import 'package:mobx/mobx.dart';
2
import 'package:flutter/material.dart';
3
import 'package:flutter_mobx/flutter_mobx.dart';
@@ -121,7 +120,7 @@ class _RestoreFromSeedDetailsFormState
120
isLoading:
121
widget.walletRestorationFromSeedVM.state is WalletCreating,
122
text: S.of(context).restore_recover,
124
- color: Palette.blueCraiola,
123
+ color: Theme.of(context).accentTextTheme.body2.color,
124
textColor: Colors.white,
125
isDisabled: _nameController.text.isNotEmpty,
126
);
lib/src/screens/restore/restore_wallet_from_seed_page.dart
-1
@@ -6,7 +6,6 @@ import 'package:cake_wallet/src/screens/base_page.dart';
6
import 'package:cake_wallet/src/widgets/seed_widget.dart';
7
import 'package:cake_wallet/src/domain/common/wallet_type.dart';
8
import 'package:cake_wallet/core/seed_validator.dart';
9
-import 'package:cake_wallet/palette.dart';
9
import 'package:cake_wallet/core/mnemonic_length.dart';
10
11
class RestoreWalletFromSeedPage extends BasePage {
lib/src/screens/seed/wallet_seed_page.dart
+1
-1
@@ -141,7 +141,7 @@ class WalletSeedPage extends BasePage {
141
);
142
},
143
text: S.of(context).copy,
144
- color: Colors.blue,
144
+ color: Theme.of(context).accentTextTheme.body2.color,
145
textColor: Colors.white)),
146
))
147
],
lib/src/screens/send/widgets/base_send_widget.dart
+1
-2
@@ -6,7 +6,6 @@ import 'package:cake_wallet/view_model/send_view_model.dart';
6
import 'package:flutter/services.dart';
7
import 'package:flutter_mobx/flutter_mobx.dart';
8
import 'package:mobx/mobx.dart';
9
-import 'package:cake_wallet/palette.dart';
9
import 'package:cake_wallet/src/widgets/address_text_field.dart';
10
import 'package:cake_wallet/generated/i18n.dart';
11
import 'package:cake_wallet/src/widgets/top_panel.dart';
@@ -436,7 +435,7 @@ class BaseSendWidget extends StatelessWidget {
435
}
436
},
437
text: S.of(context).send,
439
- color: Palette.blueCraiola,
438
+ color: Theme.of(context).accentTextTheme.body2.color,
439
textColor: Colors.white,
440
isLoading: sendViewModel.state is TransactionIsCreating ||
441
sendViewModel.state is TransactionCommitting,
lib/src/widgets/seed_widget.dart
+3
-3
@@ -393,7 +393,7 @@ class SeedWidgetState extends State<SeedWidget> {
393
child: PrimaryButton(
394
onPressed: clear,
395
text: S.of(context).clear,
396
- color: Colors.red,
396
+ color: Colors.orange,
397
textColor: Colors.white,
398
isDisabled: items.isEmpty,
399
),
@@ -408,7 +408,7 @@ class SeedWidgetState extends State<SeedWidget> {
408
onPressed: () => widget.onFinish != null
409
? widget.onFinish()
410
: null,
411
- color: Palette.blueCraiola,
411
+ color: Theme.of(context).accentTextTheme.body2.color,
412
textColor: Colors.white)
413
: PrimaryButton(
414
text: selectedItem != null
@@ -419,7 +419,7 @@ class SeedWidgetState extends State<SeedWidget> {
419
: null,
420
onDisabledPressed: () => showErrorIfExist(),
421
isDisabled: !isCurrentMnemonicValid,
422
- color: Palette.blueCraiola,
422
+ color: Theme.of(context).accentTextTheme.body2.color,
423
textColor: Colors.white),
424
),
425
)
lib/src/widgets/template_tile.dart
+1
-1
@@ -128,7 +128,7 @@ class TemplateTileState extends State<TemplateTile> {
128
child: Container(
129
height: 40,
130
padding: EdgeInsets.only(left: 24, right: 10),
131
- color: Colors.red,
131
+ color: Colors.orange,
132
child: content,
133
),
134
),