From 05eb6bd20da09edb04326a69b1e2aefe25bc1c65 Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Wed, 5 Apr 2023 16:58:27 -0600 Subject: [PATCH 1/2] set text color for wallet nav --- lib/utilities/theme/orange_colors.dart | 2 +- .../components/wallet_navigation_bar_item.dart | 5 ++++- .../wallet_navigation_bar/wallet_navigation_bar.dart | 9 +++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/utilities/theme/orange_colors.dart b/lib/utilities/theme/orange_colors.dart index b8c766bdb..eeac65b89 100644 --- a/lib/utilities/theme/orange_colors.dart +++ b/lib/utilities/theme/orange_colors.dart @@ -107,7 +107,7 @@ class OrangeColors extends StackColorTheme { @override Color get numpadTextDefault => const Color(0xFFFFFFFF); @override - Color get bottomNavText => const Color(0xFF232323); + Color get bottomNavText => const Color(0xFFFFFFFF); @override Color get customTextButtonEnabledText => buttonTextBorderless; @override diff --git a/lib/widgets/wallet_navigation_bar/components/wallet_navigation_bar_item.dart b/lib/widgets/wallet_navigation_bar/components/wallet_navigation_bar_item.dart index 8f1cade50..bbe54c0dc 100644 --- a/lib/widgets/wallet_navigation_bar/components/wallet_navigation_bar_item.dart +++ b/lib/widgets/wallet_navigation_bar/components/wallet_navigation_bar_item.dart @@ -67,7 +67,10 @@ class WalletNavigationBarItem extends ConsumerWidget { data.overrideText ?? Text( data.label ?? "", - style: STextStyles.buttonSmall(context), + style: STextStyles.buttonSmall(context).copyWith( + color: Theme.of(context) + .extension()! + .bottomNavText), ), ], ), diff --git a/lib/widgets/wallet_navigation_bar/wallet_navigation_bar.dart b/lib/widgets/wallet_navigation_bar/wallet_navigation_bar.dart index d8f58450f..d8e311de6 100644 --- a/lib/widgets/wallet_navigation_bar/wallet_navigation_bar.dart +++ b/lib/widgets/wallet_navigation_bar/wallet_navigation_bar.dart @@ -187,8 +187,13 @@ class _WalletNavigationBarState extends ConsumerState { overrideText: AnimatedCrossFade( firstChild: Text( "More", - style: STextStyles.buttonSmall( - context), + style: + STextStyles.buttonSmall(context) + .copyWith( + color: Theme.of(context) + .extension< + StackColors>()! + .bottomNavText), ), secondChild: Text( "More", From 81009d00232fc09f90e095dc48e5d7a40ec5f997 Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Wed, 5 Apr 2023 17:03:18 -0600 Subject: [PATCH 2/2] corrected nav text colors --- lib/utilities/theme/forest_colors.dart | 2 +- lib/utilities/theme/ocean_breeze_colors.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/utilities/theme/forest_colors.dart b/lib/utilities/theme/forest_colors.dart index b3f46adc6..ff553f436 100644 --- a/lib/utilities/theme/forest_colors.dart +++ b/lib/utilities/theme/forest_colors.dart @@ -107,7 +107,7 @@ class ForestColors extends StackColorTheme { @override Color get numpadTextDefault => const Color(0xFFFFFFFF); @override - Color get bottomNavText => const Color(0xFF232323); + Color get bottomNavText => const Color(0xFF22867A); @override Color get customTextButtonEnabledText => infoItemIcons; @override diff --git a/lib/utilities/theme/ocean_breeze_colors.dart b/lib/utilities/theme/ocean_breeze_colors.dart index 9390c55b5..1b528d6a1 100644 --- a/lib/utilities/theme/ocean_breeze_colors.dart +++ b/lib/utilities/theme/ocean_breeze_colors.dart @@ -114,7 +114,7 @@ class OceanBreezeColors extends StackColorTheme { @override Color get numpadTextDefault => const Color(0xFFFFFFFF); @override - Color get bottomNavText => const Color(0xFF232323); + Color get bottomNavText => const Color(0xFF227386); @override Color get customTextButtonEnabledText => buttonTextBorderless; @override