CAKE-219 | changed buttons color for dark mode on send and wallet list pages; change button text color on send template page
OleksandrSobol committed
Dec 18, 2020 at 15:21 UTC
572948d17636b7b456ddc3aeae23a3910911a4f2
3 files changed
+6
-16
lib/src/screens/send/send_page.dart
+2
-8
@@ -496,14 +496,8 @@ class SendPage extends BasePage {
496
}
497
},
498
text: S.of(context).send,
499
- color: Theme.of(context)
500
- .accentTextTheme
501
- .subtitle
502
- .decorationColor,
503
- textColor: Theme.of(context)
504
- .accentTextTheme
505
- .headline
506
- .decorationColor,
499
+ color: Theme.of(context).accentTextTheme.body2.color,
500
+ textColor: Colors.white,
501
isLoading: sendViewModel.state is IsExecutingState ||
502
sendViewModel.state is TransactionCommitting,
503
isDisabled:
lib/src/screens/send/send_template_page.dart
+1
-2
@@ -246,8 +246,7 @@ class SendTemplatePage extends BasePage {
246
},
247
text: S.of(context).save,
248
color: Colors.green,
249
- textColor:
250
- Theme.of(context).accentTextTheme.headline.decorationColor,
249
+ textColor: Colors.white,
250
),
251
),
252
));
lib/src/screens/wallet_list/wallet_list_page.dart
+3
-6
@@ -1,5 +1,4 @@
1
import 'package:cake_wallet/src/screens/auth/auth_page.dart';
2
-import 'package:cake_wallet/src/screens/wallet_list/widgets/wallet_menu_alert.dart';
2
import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
3
import 'package:cake_wallet/utils/show_bar.dart';
4
import 'package:cake_wallet/utils/show_pop_up.dart';
@@ -15,7 +14,6 @@ import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
14
import 'package:cake_wallet/src/widgets/primary_button.dart';
15
import 'package:cake_wallet/src/screens/base_page.dart';
16
import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
18
-import 'package:cake_wallet/src/screens/wallet_list/wallet_menu.dart';
17
import 'package:flutter_slidable/flutter_slidable.dart';
18
19
class WalletListPage extends BasePage {
@@ -51,7 +49,7 @@ class WalletListBodyState extends State<WalletListBody> {
49
final newWalletImage = Image.asset('assets/images/new_wallet.png',
50
height: 12,
51
width: 12,
54
- color: Theme.of(context).accentTextTheme.headline.decorationColor);
52
+ color: Colors.white);
53
final restoreWalletImage = Image.asset('assets/images/restore_wallet.png',
54
height: 12,
55
width: 12,
@@ -168,9 +166,8 @@ class WalletListBodyState extends State<WalletListBody> {
166
onPressed: () => _generateNewWallet(),
167
image: newWalletImage,
168
text: S.of(context).wallet_list_create_new_wallet,
171
- color: Theme.of(context).accentTextTheme.subtitle.decorationColor,
172
- textColor:
173
- Theme.of(context).accentTextTheme.headline.decorationColor,
169
+ color: Theme.of(context).accentTextTheme.body2.color,
170
+ textColor: Colors.white,
171
),
172
SizedBox(height: 10.0),
173
PrimaryImageButton(