Merge remote-tracking branch 'origin/paynyms' into ui-fixes

lib/pages/intro_view.dart

@@ -54,7 +54,7 @@ class _IntroViewState extends State<IntroView> {
                         ),
                         child: Image(
                           image: AssetImage(
-                            Assets.png.stack,
+                            Assets.png.stack(context),
                           ),
                         ),
                       ),

lib/pages/settings_views/sub_widgets/settings_list_button.dart

@@ -72,7 +72,7 @@ class SettingsListButton extends StatelessWidget {
                 style: STextStyles.smallMed14(context).copyWith(
                   color: Theme.of(context)
                       .extension<StackColors>()!
-                      .accentColorDark,
+                      .textDark,
                 ),
               ),
             ),

lib/pages/wallets_view/sub_widgets/empty_wallets.dart

@@ -31,7 +31,7 @@ class EmptyWallets extends StatelessWidget {
               ),
               Image(
                 image: AssetImage(
-                  Assets.png.stack,
+                  Assets.png.stack(context),
                 ),
                 width: isDesktop ? 324 : MediaQuery.of(context).size.width / 3,
               ),

lib/utilities/theme/color_theme.dart

@@ -105,6 +105,8 @@ abstract class StackColorTheme {
   Color get numberTextDefault;
   Color get numpadTextDefault;
   Color get bottomNavText;
+  Color get customTextButtonEnabledText;
+  Color get customTextButtonDisabledText;
 
 // switch background
   Color get switchBGOn;

lib/utilities/theme/dark_colors.dart

@@ -106,6 +106,10 @@ class DarkColors extends StackColorTheme {
   Color get numpadTextDefault => const Color(0xFFFFFFFF);
   @override
   Color get bottomNavText => const Color(0xFFFFFFFF);
+  @override
+  Color get customTextButtonEnabledText => buttonTextBorderless;
+  @override
+  Color get customTextButtonDisabledText => textSubtitle1;
 
   // switch
   @override

lib/utilities/theme/forest_colors.dart

@@ -106,6 +106,10 @@ class ForestColors extends StackColorTheme {
   Color get numpadTextDefault => const Color(0xFFFFFFFF);
   @override
   Color get bottomNavText => const Color(0xFF232323);
+  @override
+  Color get customTextButtonEnabledText => infoItemIcons;
+  @override
+  Color get customTextButtonDisabledText => textSubtitle1;
 
   // switch
   @override

lib/utilities/theme/fruit_sorbet_colors.dart

@@ -82,6 +82,10 @@ class FruitSorbetColors extends StackColorTheme {
   Color get numpadBackDefault => const Color(0xFFF95369);
   @override
   Color get bottomNavBack => const Color(0xFFFFFFFF);
+  @override
+  Color get customTextButtonEnabledText => buttonTextBorderless;
+  @override
+  Color get customTextButtonDisabledText => textSubtitle1;
 
   // button text/element
   @override

lib/utilities/theme/light_colors.dart

@@ -106,6 +106,10 @@ class LightColors extends StackColorTheme {
   Color get numpadTextDefault => const Color(0xFFFFFFFF);
   @override
   Color get bottomNavText => const Color(0xFF232323);
+  @override
+  Color get customTextButtonEnabledText => buttonTextBorderless;
+  @override
+  Color get customTextButtonDisabledText => textSubtitle1;
 
   // switch
   @override

lib/utilities/theme/ocean_breeze_colors.dart

@@ -113,6 +113,10 @@ class OceanBreezeColors extends StackColorTheme {
   Color get numpadTextDefault => const Color(0xFFFFFFFF);
   @override
   Color get bottomNavText => const Color(0xFF232323);
+  @override
+  Color get customTextButtonEnabledText => buttonTextBorderless;
+  @override
+  Color get customTextButtonDisabledText => textSubtitle1;
 
   // switch
   @override

lib/utilities/theme/oled_black_colors.dart

@@ -107,6 +107,10 @@ class OledBlackColors extends StackColorTheme {
   Color get numpadTextDefault => const Color(0xFF000000);
   @override
   Color get bottomNavText => const Color(0xFFDEDEDE);
+  @override
+  Color get customTextButtonEnabledText => buttonTextBorderless;
+  @override
+  Color get customTextButtonDisabledText => textSubtitle1;
 
   // switch
   @override

lib/utilities/theme/stack_colors.dart

@@ -59,6 +59,8 @@ class StackColors extends ThemeExtension<StackColors> {
   final Color numberTextDefault;
   final Color numpadTextDefault;
   final Color bottomNavText;
+  final Color customTextButtonEnabledText;
+  final Color customTextButtonDisabledText;
 
 // switch background
   final Color switchBGOn;
@@ -235,6 +237,8 @@ class StackColors extends ThemeExtension<StackColors> {
     required this.numberTextDefault,
     required this.numpadTextDefault,
     required this.bottomNavText,
+    required this.customTextButtonEnabledText,
+    required this.customTextButtonDisabledText,
     required this.switchBGOn,
     required this.switchBGOff,
     required this.switchBGDisabled,
@@ -383,6 +387,8 @@ class StackColors extends ThemeExtension<StackColors> {
       numberTextDefault: colorTheme.numberTextDefault,
       numpadTextDefault: colorTheme.numpadTextDefault,
       bottomNavText: colorTheme.bottomNavText,
+      customTextButtonEnabledText: colorTheme.customTextButtonEnabledText,
+      customTextButtonDisabledText: colorTheme.customTextButtonDisabledText,
       switchBGOn: colorTheme.switchBGOn,
       switchBGOff: colorTheme.switchBGOff,
       switchBGDisabled: colorTheme.switchBGDisabled,
@@ -533,6 +539,8 @@ class StackColors extends ThemeExtension<StackColors> {
     Color? numberTextDefault,
     Color? numpadTextDefault,
     Color? bottomNavText,
+    Color? customTextButtonEnabledText,
+    Color? customTextButtonDisabledText,
     Color? switchBGOn,
     Color? switchBGOff,
     Color? switchBGDisabled,
@@ -686,6 +694,10 @@ class StackColors extends ThemeExtension<StackColors> {
       numberTextDefault: numberTextDefault ?? this.numberTextDefault,
       numpadTextDefault: numpadTextDefault ?? this.numpadTextDefault,
       bottomNavText: bottomNavText ?? this.bottomNavText,
+      customTextButtonEnabledText:
+          customTextButtonEnabledText ?? this.customTextButtonEnabledText,
+      customTextButtonDisabledText:
+          customTextButtonDisabledText ?? this.customTextButtonDisabledText,
       switchBGOn: switchBGOn ?? this.switchBGOn,
       switchBGOff: switchBGOff ?? this.switchBGOff,
       switchBGDisabled: switchBGDisabled ?? this.switchBGDisabled,
@@ -1061,6 +1073,16 @@ class StackColors extends ThemeExtension<StackColors> {
         other.bottomNavText,
         t,
       )!,
+      customTextButtonEnabledText: Color.lerp(
+        customTextButtonEnabledText,
+        other.customTextButtonEnabledText,
+        t,
+      )!,
+      customTextButtonDisabledText: Color.lerp(
+        customTextButtonDisabledText,
+        other.customTextButtonDisabledText,
+        t,
+      )!,
       switchBGOn: Color.lerp(
         switchBGOn,
         other.switchBGOn,

lib/widgets/custom_buttons/blue_text_button.dart

@@ -134,9 +134,12 @@ class CustomTextButton extends StatelessWidget {
     return _CustomTextButton(
       key: UniqueKey(),
       text: text,
-      enabledColor:
+      enabledColor: Theme.of(context)
-          Theme.of(context).extension<StackColors>()!.buttonTextBorderless,
+          .extension<StackColors>()!
-      disabledColor: Theme.of(context).extension<StackColors>()!.textSubtitle1,
+          .customTextButtonEnabledText,
+      disabledColor: Theme.of(context)
+          .extension<StackColors>()!
+          .customTextButtonDisabledText,
       enabled: enabled,
       textSize: textSize,
       onTap: onTap,