mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2025-03-22 15:19:11 +00:00
fix: added new color to fix orange theme issue
This commit is contained in:
parent
7aeab97151
commit
9764ad0d14
4 changed files with 591 additions and 461 deletions
|
@ -794,6 +794,15 @@ class StackTheme {
|
||||||
Color? _bottomNavIconIcon;
|
Color? _bottomNavIconIcon;
|
||||||
final int bottomNavIconIconInt;
|
final int bottomNavIconIconInt;
|
||||||
|
|
||||||
|
// ==== bottomNavIconIcon highlighted =====================================================
|
||||||
|
|
||||||
|
@ignore
|
||||||
|
Color get bottomNavIconIconHighlighted =>
|
||||||
|
_bottomNavIconIconHighlighted ??= Color(bottomNavIconIconHighlightedInt);
|
||||||
|
@ignore
|
||||||
|
Color? _bottomNavIconIconHighlighted;
|
||||||
|
final int bottomNavIconIconHighlightedInt;
|
||||||
|
|
||||||
// ==== topNavIconPrimary =====================================================
|
// ==== topNavIconPrimary =====================================================
|
||||||
|
|
||||||
@ignore
|
@ignore
|
||||||
|
@ -1556,6 +1565,7 @@ class StackTheme {
|
||||||
required this.snackBarTextInfoInt,
|
required this.snackBarTextInfoInt,
|
||||||
required this.bottomNavIconBackInt,
|
required this.bottomNavIconBackInt,
|
||||||
required this.bottomNavIconIconInt,
|
required this.bottomNavIconIconInt,
|
||||||
|
required this.bottomNavIconIconHighlightedInt,
|
||||||
required this.topNavIconPrimaryInt,
|
required this.topNavIconPrimaryInt,
|
||||||
required this.topNavIconGreenInt,
|
required this.topNavIconGreenInt,
|
||||||
required this.topNavIconYellowInt,
|
required this.topNavIconYellowInt,
|
||||||
|
@ -1795,6 +1805,8 @@ class StackTheme {
|
||||||
parseColor(json["colors"]["bottom_nav_icon_back"] as String),
|
parseColor(json["colors"]["bottom_nav_icon_back"] as String),
|
||||||
bottomNavIconIconInt:
|
bottomNavIconIconInt:
|
||||||
parseColor(json["colors"]["bottom_nav_icon_icon"] as String),
|
parseColor(json["colors"]["bottom_nav_icon_icon"] as String),
|
||||||
|
bottomNavIconIconHighlightedInt: parseColor(
|
||||||
|
json["colors"]["bottom_nav_icon_icon_highlighted"] as String),
|
||||||
topNavIconPrimaryInt:
|
topNavIconPrimaryInt:
|
||||||
parseColor(json["colors"]["top_nav_icon_primary"] as String),
|
parseColor(json["colors"]["top_nav_icon_primary"] as String),
|
||||||
topNavIconGreenInt:
|
topNavIconGreenInt:
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -103,6 +103,7 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
// icons
|
// icons
|
||||||
final Color bottomNavIconBack;
|
final Color bottomNavIconBack;
|
||||||
final Color bottomNavIconIcon;
|
final Color bottomNavIconIcon;
|
||||||
|
final Color bottomNavIconIconHighlighted;
|
||||||
final Color topNavIconPrimary;
|
final Color topNavIconPrimary;
|
||||||
final Color topNavIconGreen;
|
final Color topNavIconGreen;
|
||||||
final Color topNavIconYellow;
|
final Color topNavIconYellow;
|
||||||
|
@ -281,6 +282,7 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
required this.snackBarTextInfo,
|
required this.snackBarTextInfo,
|
||||||
required this.bottomNavIconBack,
|
required this.bottomNavIconBack,
|
||||||
required this.bottomNavIconIcon,
|
required this.bottomNavIconIcon,
|
||||||
|
required this.bottomNavIconIconHighlighted,
|
||||||
required this.topNavIconPrimary,
|
required this.topNavIconPrimary,
|
||||||
required this.topNavIconGreen,
|
required this.topNavIconGreen,
|
||||||
required this.topNavIconYellow,
|
required this.topNavIconYellow,
|
||||||
|
@ -441,6 +443,7 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
snackBarTextInfo: colorTheme.snackBarTextInfo,
|
snackBarTextInfo: colorTheme.snackBarTextInfo,
|
||||||
bottomNavIconBack: colorTheme.bottomNavIconBack,
|
bottomNavIconBack: colorTheme.bottomNavIconBack,
|
||||||
bottomNavIconIcon: colorTheme.bottomNavIconIcon,
|
bottomNavIconIcon: colorTheme.bottomNavIconIcon,
|
||||||
|
bottomNavIconIconHighlighted: colorTheme.bottomNavIconIconHighlighted,
|
||||||
topNavIconPrimary: colorTheme.topNavIconPrimary,
|
topNavIconPrimary: colorTheme.topNavIconPrimary,
|
||||||
topNavIconGreen: colorTheme.topNavIconGreen,
|
topNavIconGreen: colorTheme.topNavIconGreen,
|
||||||
topNavIconYellow: colorTheme.topNavIconYellow,
|
topNavIconYellow: colorTheme.topNavIconYellow,
|
||||||
|
@ -603,6 +606,7 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
Color? snackBarTextInfo,
|
Color? snackBarTextInfo,
|
||||||
Color? bottomNavIconBack,
|
Color? bottomNavIconBack,
|
||||||
Color? bottomNavIconIcon,
|
Color? bottomNavIconIcon,
|
||||||
|
Color? bottomNavIconIconHighlighted,
|
||||||
Color? topNavIconPrimary,
|
Color? topNavIconPrimary,
|
||||||
Color? topNavIconGreen,
|
Color? topNavIconGreen,
|
||||||
Color? topNavIconYellow,
|
Color? topNavIconYellow,
|
||||||
|
@ -776,6 +780,8 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
snackBarTextInfo: snackBarTextInfo ?? this.snackBarTextInfo,
|
snackBarTextInfo: snackBarTextInfo ?? this.snackBarTextInfo,
|
||||||
bottomNavIconBack: bottomNavIconBack ?? this.bottomNavIconBack,
|
bottomNavIconBack: bottomNavIconBack ?? this.bottomNavIconBack,
|
||||||
bottomNavIconIcon: bottomNavIconIcon ?? this.bottomNavIconIcon,
|
bottomNavIconIcon: bottomNavIconIcon ?? this.bottomNavIconIcon,
|
||||||
|
bottomNavIconIconHighlighted:
|
||||||
|
bottomNavIconIconHighlighted ?? this.bottomNavIconIconHighlighted,
|
||||||
topNavIconPrimary: topNavIconPrimary ?? this.topNavIconPrimary,
|
topNavIconPrimary: topNavIconPrimary ?? this.topNavIconPrimary,
|
||||||
topNavIconGreen: topNavIconGreen ?? this.topNavIconGreen,
|
topNavIconGreen: topNavIconGreen ?? this.topNavIconGreen,
|
||||||
topNavIconYellow: topNavIconYellow ?? this.topNavIconYellow,
|
topNavIconYellow: topNavIconYellow ?? this.topNavIconYellow,
|
||||||
|
@ -1279,6 +1285,11 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
other.bottomNavIconIcon,
|
other.bottomNavIconIcon,
|
||||||
t,
|
t,
|
||||||
)!,
|
)!,
|
||||||
|
bottomNavIconIconHighlighted: Color.lerp(
|
||||||
|
bottomNavIconIconHighlighted,
|
||||||
|
other.bottomNavIconIconHighlighted,
|
||||||
|
t,
|
||||||
|
)!,
|
||||||
topNavIconPrimary: Color.lerp(
|
topNavIconPrimary: Color.lerp(
|
||||||
topNavIconPrimary,
|
topNavIconPrimary,
|
||||||
other.topNavIconPrimary,
|
other.topNavIconPrimary,
|
||||||
|
|
|
@ -175,7 +175,7 @@ class _WalletNavigationBarState extends ConsumerState<WalletNavigationBar> {
|
||||||
height: 20,
|
height: 20,
|
||||||
color: Theme.of(context)
|
color: Theme.of(context)
|
||||||
.extension<StackColors>()!
|
.extension<StackColors>()!
|
||||||
.infoItemIcons,
|
.bottomNavIconIconHighlighted,
|
||||||
),
|
),
|
||||||
crossFadeState: ref
|
crossFadeState: ref
|
||||||
.watch(walletNavBarMore.state)
|
.watch(walletNavBarMore.state)
|
||||||
|
@ -191,9 +191,9 @@ class _WalletNavigationBarState extends ConsumerState<WalletNavigationBar> {
|
||||||
STextStyles.buttonSmall(context)
|
STextStyles.buttonSmall(context)
|
||||||
.copyWith(
|
.copyWith(
|
||||||
color: Theme.of(context)
|
color: Theme.of(context)
|
||||||
.extension<
|
.extension<StackColors>()!
|
||||||
StackColors>()!
|
.bottomNavText,
|
||||||
.bottomNavText),
|
),
|
||||||
),
|
),
|
||||||
secondChild: Text(
|
secondChild: Text(
|
||||||
"More",
|
"More",
|
||||||
|
@ -202,7 +202,7 @@ class _WalletNavigationBarState extends ConsumerState<WalletNavigationBar> {
|
||||||
.copyWith(
|
.copyWith(
|
||||||
color: Theme.of(context)
|
color: Theme.of(context)
|
||||||
.extension<StackColors>()!
|
.extension<StackColors>()!
|
||||||
.infoItemIcons,
|
.bottomNavIconIconHighlighted,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
crossFadeState: ref
|
crossFadeState: ref
|
||||||
|
|
Loading…
Reference in a new issue