Cw 363 back button on receive screen in bright theme is white (#910)
* feat: Add missing title on wallet_list_page.dart * feat: add bool lightTitleColor value when theme needs lighter color title, instead of hardcoding to Colors.white - Light color theme taken from Share button from receive page * fix: revert changes & use currentTheme.type to use proper theme style * fix: use share button color logic also on overriden leading Widget on address_page * refactor: remove unnecessary titleColor
Rafael Saes committed
May 3, 2023 at 21:33 UTC
f012aaebf479309fac1a19daddac73eed6175625
3 files changed
+11
-8
lib/src/screens/dashboard/widgets/address_page.dart
+6
-7
@@ -59,17 +59,16 @@ class AddressPage extends BasePage {
59
60
bool effectsInstalled = false;
61
62
- @override
63
- Color get titleColor => Colors.white;
64
-
62
@override
63
Widget? leading(BuildContext context) {
67
- final _backButton = Icon(Icons.arrow_back_ios,
68
- color: titleColor,
64
+ final _backButton = Icon(
65
+ Icons.arrow_back_ios,
66
+ color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
67
size: 16,
68
);
69
final _closeButton = currentTheme.type == ThemeType.dark
72
- ? closeButtonImageDarkTheme : closeButtonImage;
70
+ ? closeButtonImageDarkTheme
71
+ : closeButtonImage;
72
73
bool isMobileView = ResponsiveLayoutUtil.instance.isMobile(context);
74
@@ -84,7 +83,7 @@ class AddressPage extends BasePage {
83
child: TextButton(
84
style: ButtonStyle(
85
overlayColor: MaterialStateColor.resolveWith(
87
- (states) => Colors.transparent),
86
+ (states) => Colors.transparent),
87
),
88
onPressed: () => onClose(context),
89
child: !isMobileView ? _closeButton : _backButton,
lib/src/screens/receive/receive_page.dart
+2
-1
@@ -53,7 +53,8 @@ class ReceivePage extends BasePage {
53
final FocusNode _cryptoAmountFocus;
54
55
@override
56
- Color get titleColor => Colors.white;
56
+ Color? get titleColor =>
57
+ currentTheme.type == ThemeType.bright ? Colors.white : null;
58
59
@override
60
Widget middle(BuildContext context) {
lib/src/screens/wallet_list/wallet_list_page.dart
+3
@@ -24,6 +24,9 @@ class WalletListPage extends BasePage {
24
final WalletListViewModel walletListViewModel;
25
final AuthService authService;
26
27
+ @override
28
+ String get title => S.current.wallets;
29
+
30
@override
31
Widget body(BuildContext context) =>
32
WalletListBody(walletListViewModel: walletListViewModel, authService: authService);