diff --git a/assets/svg/themed/orange/stack-icon1.svg b/assets/svg/themed/orange/stack-icon1.svg new file mode 100644 index 000000000..f316012d7 --- /dev/null +++ b/assets/svg/themed/orange/stack-icon1.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero index 5bcbe75b8..d91086cce 160000 --- a/crypto_plugins/flutter_libmonero +++ b/crypto_plugins/flutter_libmonero @@ -1 +1 @@ -Subproject commit 5bcbe75b8712cd16f977b5acd2b364b29fdbf80c +Subproject commit d91086cced36ac9c0497d2959eb92b4be9aaec47 diff --git a/lib/services/coins/epiccash/epiccash_wallet.dart b/lib/services/coins/epiccash/epiccash_wallet.dart index 61682b7e1..972601f9b 100644 --- a/lib/services/coins/epiccash/epiccash_wallet.dart +++ b/lib/services/coins/epiccash/epiccash_wallet.dart @@ -40,7 +40,7 @@ import 'package:stackwallet/utilities/test_epic_box_connection.dart'; import 'package:tuple/tuple.dart'; import 'package:websocket_universal/websocket_universal.dart'; -const int MINIMUM_CONFIRMATIONS = 10; +const int MINIMUM_CONFIRMATIONS = 3; const String GENESIS_HASH_MAINNET = ""; const String GENESIS_HASH_TESTNET = ""; diff --git a/lib/utilities/theme/color_theme.dart b/lib/utilities/theme/color_theme.dart index a8e17bb2d..eaa3d702b 100644 --- a/lib/utilities/theme/color_theme.dart +++ b/lib/utilities/theme/color_theme.dart @@ -39,7 +39,7 @@ extension ThemeTypeExt on ThemeType { case "oledBlack": return ThemeType.oledBlack; case "orange": - return ThemeType.oledBlack; + return ThemeType.orange; case "fruitSorbet": return ThemeType.fruitSorbet; case "forest": diff --git a/lib/utilities/theme/forest_colors.dart b/lib/utilities/theme/forest_colors.dart index 176b74e50..8d66befda 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 @@ -177,7 +177,7 @@ class ForestColors extends StackColorTheme { @override Color get bottomNavIconBack => const Color(0xFFA7C7CF); @override - Color get bottomNavIconIcon => accentColorDark; //const Color(0xFF227386); + Color get bottomNavIconIcon => const Color(0xFF22867A); @override Color get topNavIconPrimary => accentColorDark; //const Color(0xFF227386); 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 diff --git a/lib/utilities/theme/orange_colors.dart b/lib/utilities/theme/orange_colors.dart index 48074c94f..eeac65b89 100644 --- a/lib/utilities/theme/orange_colors.dart +++ b/lib/utilities/theme/orange_colors.dart @@ -83,7 +83,7 @@ class OrangeColors extends StackColorTheme { @override Color get numpadBackDefault => const Color(0xFFF36B43); @override - Color get bottomNavBack => const Color(0xFFFFFFFF); + Color get bottomNavBack => const Color(0xFFF36B43); // button text/element @override @@ -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/icons/receive_nav_icon.dart b/lib/widgets/wallet_navigation_bar/components/icons/receive_nav_icon.dart index 54420543f..62c9aae63 100644 --- a/lib/widgets/wallet_navigation_bar/components/icons/receive_nav_icon.dart +++ b/lib/widgets/wallet_navigation_bar/components/icons/receive_nav_icon.dart @@ -12,7 +12,7 @@ class ReceiveNavIcon extends StatelessWidget { decoration: BoxDecoration( color: Theme.of(context) .extension()! - .accentColorDark + .bottomNavIconIcon .withOpacity(0.4), borderRadius: BorderRadius.circular( 24, @@ -24,7 +24,7 @@ class ReceiveNavIcon extends StatelessWidget { Assets.svg.arrowDownLeft, width: 12, height: 12, - color: Theme.of(context).extension()!.accentColorDark, + color: Theme.of(context).extension()!.bottomNavIconIcon, ), ), ); diff --git a/lib/widgets/wallet_navigation_bar/components/icons/send_nav_icon.dart b/lib/widgets/wallet_navigation_bar/components/icons/send_nav_icon.dart index 7b7da5799..cbffa3396 100644 --- a/lib/widgets/wallet_navigation_bar/components/icons/send_nav_icon.dart +++ b/lib/widgets/wallet_navigation_bar/components/icons/send_nav_icon.dart @@ -12,7 +12,7 @@ class SendNavIcon extends StatelessWidget { decoration: BoxDecoration( color: Theme.of(context) .extension()! - .accentColorDark + .bottomNavIconIcon .withOpacity(0.4), borderRadius: BorderRadius.circular( 24, @@ -24,7 +24,7 @@ class SendNavIcon extends StatelessWidget { Assets.svg.arrowUpRight, width: 12, height: 12, - color: Theme.of(context).extension()!.accentColorDark, + color: Theme.of(context).extension()!.bottomNavIconIcon, ), ), ); 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", diff --git a/pubspec.yaml b/pubspec.yaml index ffce0cb32..90e91884a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: Stack Wallet # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.6.7+149 +version: 1.6.8+151 environment: sdk: ">=2.17.0 <3.0.0"