mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-01-27 04:56:02 +00:00
fix: send template page missing new colors
This commit is contained in:
parent
67ce2ed38e
commit
69c68b3e30
6 changed files with 40 additions and 3 deletions
|
@ -39,6 +39,9 @@ class SendTemplatePage extends BasePage {
|
||||||
@override
|
@override
|
||||||
bool get extendBodyBehindAppBar => true;
|
bool get extendBodyBehindAppBar => true;
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool get gradientAll => true;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
AppBarStyle get appBarStyle => AppBarStyle.transparent;
|
AppBarStyle get appBarStyle => AppBarStyle.transparent;
|
||||||
|
|
||||||
|
@ -221,7 +224,7 @@ class SendTemplatePage extends BasePage {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
text: S.of(context).save,
|
text: S.of(context).save,
|
||||||
color: Colors.green,
|
color: Theme.of(context).primaryColor,
|
||||||
textColor: Colors.white,
|
textColor: Colors.white,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
class PrefixCurrencyIcon extends StatelessWidget {
|
class PrefixCurrencyIcon extends StatelessWidget {
|
||||||
|
@ -18,13 +19,21 @@ class PrefixCurrencyIcon extends StatelessWidget {
|
||||||
padding: EdgeInsets.symmetric(vertical: 4, horizontal: 8),
|
padding: EdgeInsets.symmetric(vertical: 4, horizontal: 8),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
borderRadius: BorderRadius.circular(26),
|
borderRadius: BorderRadius.circular(26),
|
||||||
color: isSelected ? Colors.green : Colors.transparent,
|
color: isSelected
|
||||||
|
? Theme.of(context)
|
||||||
|
.extension<SendPageTheme>()!
|
||||||
|
.templateSelectedCurrencyBackgroundColor
|
||||||
|
: Colors.transparent,
|
||||||
),
|
),
|
||||||
child: Text(title + ':',
|
child: Text(title + ':',
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.white,
|
color: isSelected
|
||||||
|
? Theme.of(context)
|
||||||
|
.extension<SendPageTheme>()!
|
||||||
|
.templateSelectedCurrencyTitleColor
|
||||||
|
: Colors.white,
|
||||||
)),
|
)),
|
||||||
)
|
)
|
||||||
]));
|
]));
|
||||||
|
|
|
@ -155,6 +155,8 @@ class DarkTheme extends ThemeBase {
|
||||||
templateBackgroundColor: PaletteDark.darkVioletBlue,
|
templateBackgroundColor: PaletteDark.darkVioletBlue,
|
||||||
templateNewTextColor: PaletteDark.darkCyanBlue,
|
templateNewTextColor: PaletteDark.darkCyanBlue,
|
||||||
templateDottedBorderColor: PaletteDark.darkCyanBlue,
|
templateDottedBorderColor: PaletteDark.darkCyanBlue,
|
||||||
|
templateSelectedCurrencyBackgroundColor: primaryColor,
|
||||||
|
templateSelectedCurrencyTitleColor: Colors.white,
|
||||||
estimatedFeeColor: Colors.white,
|
estimatedFeeColor: Colors.white,
|
||||||
textFieldButtonIconColor: PaletteDark.gray,
|
textFieldButtonIconColor: PaletteDark.gray,
|
||||||
textFieldButtonColor: PaletteDark.buttonNightBlue,
|
textFieldButtonColor: PaletteDark.buttonNightBlue,
|
||||||
|
|
|
@ -4,6 +4,8 @@ class SendPageTheme extends ThemeExtension<SendPageTheme> {
|
||||||
final Color templateTitleColor;
|
final Color templateTitleColor;
|
||||||
final Color templateBackgroundColor;
|
final Color templateBackgroundColor;
|
||||||
final Color templateNewTextColor;
|
final Color templateNewTextColor;
|
||||||
|
final Color templateSelectedCurrencyBackgroundColor;
|
||||||
|
final Color templateSelectedCurrencyTitleColor;
|
||||||
final Color templateDottedBorderColor;
|
final Color templateDottedBorderColor;
|
||||||
final Color estimatedFeeColor;
|
final Color estimatedFeeColor;
|
||||||
final Color textFieldButtonIconColor;
|
final Color textFieldButtonIconColor;
|
||||||
|
@ -18,6 +20,8 @@ class SendPageTheme extends ThemeExtension<SendPageTheme> {
|
||||||
{required this.templateTitleColor,
|
{required this.templateTitleColor,
|
||||||
required this.templateBackgroundColor,
|
required this.templateBackgroundColor,
|
||||||
required this.templateNewTextColor,
|
required this.templateNewTextColor,
|
||||||
|
required this.templateSelectedCurrencyBackgroundColor,
|
||||||
|
required this.templateSelectedCurrencyTitleColor,
|
||||||
required this.templateDottedBorderColor,
|
required this.templateDottedBorderColor,
|
||||||
required this.estimatedFeeColor,
|
required this.estimatedFeeColor,
|
||||||
required this.textFieldButtonIconColor,
|
required this.textFieldButtonIconColor,
|
||||||
|
@ -33,6 +37,8 @@ class SendPageTheme extends ThemeExtension<SendPageTheme> {
|
||||||
{Color? templateTitleColor,
|
{Color? templateTitleColor,
|
||||||
Color? templateBackgroundColor,
|
Color? templateBackgroundColor,
|
||||||
Color? templateNewTextColor,
|
Color? templateNewTextColor,
|
||||||
|
Color? templateSelectedCurrencyBackgroundColor,
|
||||||
|
Color? templateSelectedCurrencyTitleColor,
|
||||||
Color? templateDottedBorderColor,
|
Color? templateDottedBorderColor,
|
||||||
Color? estimatedFeeColor,
|
Color? estimatedFeeColor,
|
||||||
Color? textFieldButtonIconColor,
|
Color? textFieldButtonIconColor,
|
||||||
|
@ -48,6 +54,12 @@ class SendPageTheme extends ThemeExtension<SendPageTheme> {
|
||||||
templateBackgroundColor ?? this.templateBackgroundColor,
|
templateBackgroundColor ?? this.templateBackgroundColor,
|
||||||
templateNewTextColor:
|
templateNewTextColor:
|
||||||
templateNewTextColor ?? this.templateNewTextColor,
|
templateNewTextColor ?? this.templateNewTextColor,
|
||||||
|
templateSelectedCurrencyBackgroundColor:
|
||||||
|
templateSelectedCurrencyBackgroundColor ??
|
||||||
|
this.templateSelectedCurrencyBackgroundColor,
|
||||||
|
templateSelectedCurrencyTitleColor:
|
||||||
|
templateSelectedCurrencyTitleColor ??
|
||||||
|
this.templateSelectedCurrencyTitleColor,
|
||||||
templateDottedBorderColor:
|
templateDottedBorderColor:
|
||||||
templateDottedBorderColor ?? this.templateDottedBorderColor,
|
templateDottedBorderColor ?? this.templateDottedBorderColor,
|
||||||
estimatedFeeColor: estimatedFeeColor ?? this.estimatedFeeColor,
|
estimatedFeeColor: estimatedFeeColor ?? this.estimatedFeeColor,
|
||||||
|
@ -75,6 +87,14 @@ class SendPageTheme extends ThemeExtension<SendPageTheme> {
|
||||||
templateBackgroundColor, other.templateBackgroundColor, t)!,
|
templateBackgroundColor, other.templateBackgroundColor, t)!,
|
||||||
templateNewTextColor:
|
templateNewTextColor:
|
||||||
Color.lerp(templateNewTextColor, other.templateNewTextColor, t)!,
|
Color.lerp(templateNewTextColor, other.templateNewTextColor, t)!,
|
||||||
|
templateSelectedCurrencyBackgroundColor: Color.lerp(
|
||||||
|
templateSelectedCurrencyBackgroundColor,
|
||||||
|
other.templateSelectedCurrencyBackgroundColor,
|
||||||
|
t)!,
|
||||||
|
templateSelectedCurrencyTitleColor: Color.lerp(
|
||||||
|
templateSelectedCurrencyTitleColor,
|
||||||
|
other.templateSelectedCurrencyTitleColor,
|
||||||
|
t)!,
|
||||||
templateDottedBorderColor: Color.lerp(
|
templateDottedBorderColor: Color.lerp(
|
||||||
templateDottedBorderColor, other.templateDottedBorderColor, t)!,
|
templateDottedBorderColor, other.templateDottedBorderColor, t)!,
|
||||||
estimatedFeeColor:
|
estimatedFeeColor:
|
||||||
|
|
|
@ -155,6 +155,8 @@ class LightTheme extends ThemeBase {
|
||||||
templateBackgroundColor: Palette.blueAlice,
|
templateBackgroundColor: Palette.blueAlice,
|
||||||
templateNewTextColor: Palette.darkBlueCraiola,
|
templateNewTextColor: Palette.darkBlueCraiola,
|
||||||
templateDottedBorderColor: Palette.moderateLavender,
|
templateDottedBorderColor: Palette.moderateLavender,
|
||||||
|
templateSelectedCurrencyBackgroundColor: Colors.white,
|
||||||
|
templateSelectedCurrencyTitleColor: primaryColor,
|
||||||
estimatedFeeColor: Colors.white.withOpacity(0.5),
|
estimatedFeeColor: Colors.white.withOpacity(0.5),
|
||||||
textFieldButtonIconColor: Colors.white,
|
textFieldButtonIconColor: Colors.white,
|
||||||
textFieldButtonColor: Colors.white.withOpacity(0.2),
|
textFieldButtonColor: Colors.white.withOpacity(0.2),
|
||||||
|
|
|
@ -129,6 +129,7 @@ class MoneroDarkTheme extends DarkTheme {
|
||||||
templateNewTextColor:
|
templateNewTextColor:
|
||||||
dashboardPageTheme.indicatorDotTheme.activeIndicatorColor,
|
dashboardPageTheme.indicatorDotTheme.activeIndicatorColor,
|
||||||
templateDottedBorderColor: colorScheme.primaryContainer,
|
templateDottedBorderColor: colorScheme.primaryContainer,
|
||||||
|
templateSelectedCurrencyTitleColor: Colors.black,
|
||||||
textFieldButtonIconColor: colorScheme.inverseSurface,
|
textFieldButtonIconColor: colorScheme.inverseSurface,
|
||||||
textFieldButtonColor: colorScheme.onInverseSurface,
|
textFieldButtonColor: colorScheme.onInverseSurface,
|
||||||
textFieldHintColor: Colors.grey.withOpacity(0.5),
|
textFieldHintColor: Colors.grey.withOpacity(0.5),
|
||||||
|
|
Loading…
Reference in a new issue