Skip to content

Commit 2b25096

Browse files
authored
Merge pull request #463 from cypherstack/ui-fixes
UI fixes
2 parents 32c7aa1 + 81009d0 commit 2b25096

File tree

5 files changed

+14
-6
lines changed

5 files changed

+14
-6
lines changed

lib/utilities/theme/forest_colors.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class ForestColors extends StackColorTheme {
107107
@override
108108
Color get numpadTextDefault => const Color(0xFFFFFFFF);
109109
@override
110-
Color get bottomNavText => const Color(0xFF232323);
110+
Color get bottomNavText => const Color(0xFF22867A);
111111
@override
112112
Color get customTextButtonEnabledText => infoItemIcons;
113113
@override

lib/utilities/theme/ocean_breeze_colors.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class OceanBreezeColors extends StackColorTheme {
114114
@override
115115
Color get numpadTextDefault => const Color(0xFFFFFFFF);
116116
@override
117-
Color get bottomNavText => const Color(0xFF232323);
117+
Color get bottomNavText => const Color(0xFF227386);
118118
@override
119119
Color get customTextButtonEnabledText => buttonTextBorderless;
120120
@override

lib/utilities/theme/orange_colors.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class OrangeColors extends StackColorTheme {
107107
@override
108108
Color get numpadTextDefault => const Color(0xFFFFFFFF);
109109
@override
110-
Color get bottomNavText => const Color(0xFF232323);
110+
Color get bottomNavText => const Color(0xFFFFFFFF);
111111
@override
112112
Color get customTextButtonEnabledText => buttonTextBorderless;
113113
@override

lib/widgets/wallet_navigation_bar/components/wallet_navigation_bar_item.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ class WalletNavigationBarItem extends ConsumerWidget {
6767
data.overrideText ??
6868
Text(
6969
data.label ?? "",
70-
style: STextStyles.buttonSmall(context),
70+
style: STextStyles.buttonSmall(context).copyWith(
71+
color: Theme.of(context)
72+
.extension<StackColors>()!
73+
.bottomNavText),
7174
),
7275
],
7376
),

lib/widgets/wallet_navigation_bar/wallet_navigation_bar.dart

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,13 @@ class _WalletNavigationBarState extends ConsumerState<WalletNavigationBar> {
187187
overrideText: AnimatedCrossFade(
188188
firstChild: Text(
189189
"More",
190-
style: STextStyles.buttonSmall(
191-
context),
190+
style:
191+
STextStyles.buttonSmall(context)
192+
.copyWith(
193+
color: Theme.of(context)
194+
.extension<
195+
StackColors>()!
196+
.bottomNavText),
192197
),
193198
secondChild: Text(
194199
"More",

0 commit comments

Comments
 (0)