Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2024-12-23 03:49:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: added new color to fix orange theme issue

Browse source
This commit is contained in:
julian 2023-05-15 09:40:55 -06:00
parent 7aeab97151
commit 9764ad0d14
4 changed files with 591 additions and 461 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/models/isar/stack_theme.dart
View file

@ -794,6 +794,15 @@ class StackTheme {
Color? _bottomNavIconIcon;
final int bottomNavIconIconInt;
// ==== bottomNavIconIcon highlighted =====================================================
@ignore
Color get bottomNavIconIconHighlighted =>
_bottomNavIconIconHighlighted ??= Color(bottomNavIconIconHighlightedInt);
@ignore
Color? _bottomNavIconIconHighlighted;
final int bottomNavIconIconHighlightedInt;
// ==== topNavIconPrimary =====================================================
@ignore
@ -1556,6 +1565,7 @@ class StackTheme {
required this.snackBarTextInfoInt,
required this.bottomNavIconBackInt,
required this.bottomNavIconIconInt,
required this.bottomNavIconIconHighlightedInt,
required this.topNavIconPrimaryInt,
required this.topNavIconGreenInt,
required this.topNavIconYellowInt,
@ -1795,6 +1805,8 @@ class StackTheme {
parseColor(json["colors"]["bottom_nav_icon_back"] as String),
bottomNavIconIconInt:
parseColor(json["colors"]["bottom_nav_icon_icon"] as String),
bottomNavIconIconHighlightedInt: parseColor(
json["colors"]["bottom_nav_icon_icon_highlighted"] as String),
topNavIconPrimaryInt:
parseColor(json["colors"]["top_nav_icon_primary"] as String),
topNavIconGreenInt:

1017
lib/models/isar/stack_theme.g.dart
View file

File diff suppressed because it is too large Load diff

11
lib/themes/stack_colors.dart
View file

@ -103,6 +103,7 @@ class StackColors extends ThemeExtension<StackColors> {
// icons
final Color bottomNavIconBack;
final Color bottomNavIconIcon;
final Color bottomNavIconIconHighlighted;
final Color topNavIconPrimary;
final Color topNavIconGreen;
final Color topNavIconYellow;
@ -281,6 +282,7 @@ class StackColors extends ThemeExtension<StackColors> {
required this.snackBarTextInfo,
required this.bottomNavIconBack,
required this.bottomNavIconIcon,
required this.bottomNavIconIconHighlighted,
required this.topNavIconPrimary,
required this.topNavIconGreen,
required this.topNavIconYellow,
@ -441,6 +443,7 @@ class StackColors extends ThemeExtension<StackColors> {
snackBarTextInfo: colorTheme.snackBarTextInfo,
bottomNavIconBack: colorTheme.bottomNavIconBack,
bottomNavIconIcon: colorTheme.bottomNavIconIcon,
bottomNavIconIconHighlighted: colorTheme.bottomNavIconIconHighlighted,
topNavIconPrimary: colorTheme.topNavIconPrimary,
topNavIconGreen: colorTheme.topNavIconGreen,
topNavIconYellow: colorTheme.topNavIconYellow,
@ -603,6 +606,7 @@ class StackColors extends ThemeExtension<StackColors> {
Color? snackBarTextInfo,
Color? bottomNavIconBack,
Color? bottomNavIconIcon,
Color? bottomNavIconIconHighlighted,
Color? topNavIconPrimary,
Color? topNavIconGreen,
Color? topNavIconYellow,
@ -776,6 +780,8 @@ class StackColors extends ThemeExtension<StackColors> {
snackBarTextInfo: snackBarTextInfo ?? this.snackBarTextInfo,
bottomNavIconBack: bottomNavIconBack ?? this.bottomNavIconBack,
bottomNavIconIcon: bottomNavIconIcon ?? this.bottomNavIconIcon,
bottomNavIconIconHighlighted:
bottomNavIconIconHighlighted ?? this.bottomNavIconIconHighlighted,
topNavIconPrimary: topNavIconPrimary ?? this.topNavIconPrimary,
topNavIconGreen: topNavIconGreen ?? this.topNavIconGreen,
topNavIconYellow: topNavIconYellow ?? this.topNavIconYellow,
@ -1279,6 +1285,11 @@ class StackColors extends ThemeExtension<StackColors> {
other.bottomNavIconIcon,
t,
)!,
bottomNavIconIconHighlighted: Color.lerp(
bottomNavIconIconHighlighted,
other.bottomNavIconIconHighlighted,
t,
)!,
topNavIconPrimary: Color.lerp(
topNavIconPrimary,
other.topNavIconPrimary,

12
lib/widgets/wallet_navigation_bar/wallet_navigation_bar.dart
View file

@ -175,7 +175,7 @@ class _WalletNavigationBarState extends ConsumerState<WalletNavigationBar> {
height: 20,
color: Theme.of(context)
.extension<StackColors>()!
.infoItemIcons,
.bottomNavIconIconHighlighted,
),
crossFadeState: ref
.watch(walletNavBarMore.state)
@ -190,10 +190,10 @@ class _WalletNavigationBarState extends ConsumerState<WalletNavigationBar> {
style:
STextStyles.buttonSmall(context)
.copyWith(
color: Theme.of(context)
.extension<
StackColors>()!
.bottomNavText),
color: Theme.of(context)
.extension<StackColors>()!
.bottomNavText,
),
),
secondChild: Text(
"More",
@ -202,7 +202,7 @@ class _WalletNavigationBarState extends ConsumerState<WalletNavigationBar> {
.copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.infoItemIcons,
.bottomNavIconIconHighlighted,
),
),
crossFadeState: ref