mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-01-08 20:09:24 +00:00
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
This commit is contained in:
parent
f47f690803
commit
f012aaebf4
3 changed files with 11 additions and 8 deletions
|
@ -59,17 +59,16 @@ class AddressPage extends BasePage {
|
|||
|
||||
bool effectsInstalled = false;
|
||||
|
||||
@override
|
||||
Color get titleColor => Colors.white;
|
||||
|
||||
@override
|
||||
Widget? leading(BuildContext context) {
|
||||
final _backButton = Icon(Icons.arrow_back_ios,
|
||||
color: titleColor,
|
||||
final _backButton = Icon(
|
||||
Icons.arrow_back_ios,
|
||||
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
|
||||
size: 16,
|
||||
);
|
||||
final _closeButton = currentTheme.type == ThemeType.dark
|
||||
? closeButtonImageDarkTheme : closeButtonImage;
|
||||
? closeButtonImageDarkTheme
|
||||
: closeButtonImage;
|
||||
|
||||
bool isMobileView = ResponsiveLayoutUtil.instance.isMobile(context);
|
||||
|
||||
|
@ -84,7 +83,7 @@ class AddressPage extends BasePage {
|
|||
child: TextButton(
|
||||
style: ButtonStyle(
|
||||
overlayColor: MaterialStateColor.resolveWith(
|
||||
(states) => Colors.transparent),
|
||||
(states) => Colors.transparent),
|
||||
),
|
||||
onPressed: () => onClose(context),
|
||||
child: !isMobileView ? _closeButton : _backButton,
|
||||
|
|
|
@ -53,7 +53,8 @@ class ReceivePage extends BasePage {
|
|||
final FocusNode _cryptoAmountFocus;
|
||||
|
||||
@override
|
||||
Color get titleColor => Colors.white;
|
||||
Color? get titleColor =>
|
||||
currentTheme.type == ThemeType.bright ? Colors.white : null;
|
||||
|
||||
@override
|
||||
Widget middle(BuildContext context) {
|
||||
|
|
|
@ -24,6 +24,9 @@ class WalletListPage extends BasePage {
|
|||
final WalletListViewModel walletListViewModel;
|
||||
final AuthService authService;
|
||||
|
||||
@override
|
||||
String get title => S.current.wallets;
|
||||
|
||||
@override
|
||||
Widget body(BuildContext context) =>
|
||||
WalletListBody(walletListViewModel: walletListViewModel, authService: authService);
|
||||
|
|
Loading…
Reference in a new issue