diff --git a/lib/src/screens/send/send_template_page.dart b/lib/src/screens/send/send_template_page.dart index d570d9f85..2c618ed40 100644 --- a/lib/src/screens/send/send_template_page.dart +++ b/lib/src/screens/send/send_template_page.dart @@ -39,6 +39,9 @@ class SendTemplatePage extends BasePage { @override bool get extendBodyBehindAppBar => true; + @override + bool get gradientAll => true; + @override AppBarStyle get appBarStyle => AppBarStyle.transparent; @@ -221,7 +224,7 @@ class SendTemplatePage extends BasePage { } }, text: S.of(context).save, - color: Colors.green, + color: Theme.of(context).primaryColor, textColor: Colors.white, ), ), diff --git a/lib/src/screens/send/widgets/prefix_currency_icon_widget.dart b/lib/src/screens/send/widgets/prefix_currency_icon_widget.dart index 0a684a7df..f4dc19cdd 100644 --- a/lib/src/screens/send/widgets/prefix_currency_icon_widget.dart +++ b/lib/src/screens/send/widgets/prefix_currency_icon_widget.dart @@ -1,3 +1,4 @@ +import 'package:cake_wallet/themes/extensions/send_page_theme.dart'; import 'package:flutter/material.dart'; class PrefixCurrencyIcon extends StatelessWidget { @@ -18,13 +19,21 @@ class PrefixCurrencyIcon extends StatelessWidget { padding: EdgeInsets.symmetric(vertical: 4, horizontal: 8), decoration: BoxDecoration( borderRadius: BorderRadius.circular(26), - color: isSelected ? Colors.green : Colors.transparent, + color: isSelected + ? Theme.of(context) + .extension()! + .templateSelectedCurrencyBackgroundColor + : Colors.transparent, ), child: Text(title + ':', style: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Colors.white, + color: isSelected + ? Theme.of(context) + .extension()! + .templateSelectedCurrencyTitleColor + : Colors.white, )), ) ])); diff --git a/lib/themes/dark_theme.dart b/lib/themes/dark_theme.dart index 1011275fa..6df33e308 100644 --- a/lib/themes/dark_theme.dart +++ b/lib/themes/dark_theme.dart @@ -155,6 +155,8 @@ class DarkTheme extends ThemeBase { templateBackgroundColor: PaletteDark.darkVioletBlue, templateNewTextColor: PaletteDark.darkCyanBlue, templateDottedBorderColor: PaletteDark.darkCyanBlue, + templateSelectedCurrencyBackgroundColor: primaryColor, + templateSelectedCurrencyTitleColor: Colors.white, estimatedFeeColor: Colors.white, textFieldButtonIconColor: PaletteDark.gray, textFieldButtonColor: PaletteDark.buttonNightBlue, diff --git a/lib/themes/extensions/send_page_theme.dart b/lib/themes/extensions/send_page_theme.dart index 637738e79..79aca77f9 100644 --- a/lib/themes/extensions/send_page_theme.dart +++ b/lib/themes/extensions/send_page_theme.dart @@ -4,6 +4,8 @@ class SendPageTheme extends ThemeExtension { final Color templateTitleColor; final Color templateBackgroundColor; final Color templateNewTextColor; + final Color templateSelectedCurrencyBackgroundColor; + final Color templateSelectedCurrencyTitleColor; final Color templateDottedBorderColor; final Color estimatedFeeColor; final Color textFieldButtonIconColor; @@ -18,6 +20,8 @@ class SendPageTheme extends ThemeExtension { {required this.templateTitleColor, required this.templateBackgroundColor, required this.templateNewTextColor, + required this.templateSelectedCurrencyBackgroundColor, + required this.templateSelectedCurrencyTitleColor, required this.templateDottedBorderColor, required this.estimatedFeeColor, required this.textFieldButtonIconColor, @@ -33,6 +37,8 @@ class SendPageTheme extends ThemeExtension { {Color? templateTitleColor, Color? templateBackgroundColor, Color? templateNewTextColor, + Color? templateSelectedCurrencyBackgroundColor, + Color? templateSelectedCurrencyTitleColor, Color? templateDottedBorderColor, Color? estimatedFeeColor, Color? textFieldButtonIconColor, @@ -48,6 +54,12 @@ class SendPageTheme extends ThemeExtension { templateBackgroundColor ?? this.templateBackgroundColor, templateNewTextColor: templateNewTextColor ?? this.templateNewTextColor, + templateSelectedCurrencyBackgroundColor: + templateSelectedCurrencyBackgroundColor ?? + this.templateSelectedCurrencyBackgroundColor, + templateSelectedCurrencyTitleColor: + templateSelectedCurrencyTitleColor ?? + this.templateSelectedCurrencyTitleColor, templateDottedBorderColor: templateDottedBorderColor ?? this.templateDottedBorderColor, estimatedFeeColor: estimatedFeeColor ?? this.estimatedFeeColor, @@ -75,6 +87,14 @@ class SendPageTheme extends ThemeExtension { templateBackgroundColor, other.templateBackgroundColor, t)!, templateNewTextColor: Color.lerp(templateNewTextColor, other.templateNewTextColor, t)!, + templateSelectedCurrencyBackgroundColor: Color.lerp( + templateSelectedCurrencyBackgroundColor, + other.templateSelectedCurrencyBackgroundColor, + t)!, + templateSelectedCurrencyTitleColor: Color.lerp( + templateSelectedCurrencyTitleColor, + other.templateSelectedCurrencyTitleColor, + t)!, templateDottedBorderColor: Color.lerp( templateDottedBorderColor, other.templateDottedBorderColor, t)!, estimatedFeeColor: diff --git a/lib/themes/light_theme.dart b/lib/themes/light_theme.dart index cf1a4e7eb..d5f51e022 100644 --- a/lib/themes/light_theme.dart +++ b/lib/themes/light_theme.dart @@ -155,6 +155,8 @@ class LightTheme extends ThemeBase { templateBackgroundColor: Palette.blueAlice, templateNewTextColor: Palette.darkBlueCraiola, templateDottedBorderColor: Palette.moderateLavender, + templateSelectedCurrencyBackgroundColor: Colors.white, + templateSelectedCurrencyTitleColor: primaryColor, estimatedFeeColor: Colors.white.withOpacity(0.5), textFieldButtonIconColor: Colors.white, textFieldButtonColor: Colors.white.withOpacity(0.2), diff --git a/lib/themes/monero_dark_theme.dart b/lib/themes/monero_dark_theme.dart index 31995c8eb..317ee1b6a 100644 --- a/lib/themes/monero_dark_theme.dart +++ b/lib/themes/monero_dark_theme.dart @@ -129,6 +129,7 @@ class MoneroDarkTheme extends DarkTheme { templateNewTextColor: dashboardPageTheme.indicatorDotTheme.activeIndicatorColor, templateDottedBorderColor: colorScheme.primaryContainer, + templateSelectedCurrencyTitleColor: Colors.black, textFieldButtonIconColor: colorScheme.inverseSurface, textFieldButtonColor: colorScheme.onInverseSurface, textFieldHintColor: Colors.grey.withOpacity(0.5),