From dd122e3610ef3822b071295b251bd80f5863bf50 Mon Sep 17 00:00:00 2001 From: julian Date: Thu, 22 Sep 2022 14:27:13 -0600 Subject: [PATCH] A few more color fixes --- .../restore_wallet_view/restore_wallet_view.dart | 4 +++- .../delete_wallet_recovery_phrase_view.dart | 1 + .../transaction_views/transaction_details_view.dart | 4 ++-- .../transaction_views/transaction_search_filter_view.dart | 3 +++ lib/utilities/theme/color_theme.dart | 1 + lib/utilities/theme/dark_colors.dart | 4 +++- lib/utilities/theme/light_colors.dart | 4 +++- lib/widgets/address_book_card.dart | 4 +++- 8 files changed, 19 insertions(+), 6 deletions(-) diff --git a/lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart b/lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart index 59ce94874..1d7d50ee1 100644 --- a/lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart +++ b/lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart @@ -653,7 +653,9 @@ class _RestoreWalletViewState extends ConsumerState { } }, controller: _controllers[i - 1], - style: STextStyles.field, + style: STextStyles.field.copyWith( + color: StackTheme.instance.color.overlay, + ), ), ), if (_inputStatuses[i - 1] == diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_recovery_phrase_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_recovery_phrase_view.dart index a28f1ea16..5789c131f 100644 --- a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_recovery_phrase_view.dart +++ b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_recovery_phrase_view.dart @@ -74,6 +74,7 @@ class _DeleteWalletRecoveryPhraseViewState Assets.svg.copy, width: 20, height: 20, + color: StackTheme.instance.color.topNavIconPrimary, ), onPressed: () async { final words = await _manager.mnemonic; diff --git a/lib/pages/wallet_view/transaction_views/transaction_details_view.dart b/lib/pages/wallet_view/transaction_views/transaction_details_view.dart index 87969020a..552e17a31 100644 --- a/lib/pages/wallet_view/transaction_views/transaction_details_view.dart +++ b/lib/pages/wallet_view/transaction_views/transaction_details_view.dart @@ -553,8 +553,8 @@ class _TransactionDetailsViewState .read(prefsChangeNotifierProvider) .hideBlockExplorerWarning == false) { - final shouldContinue = - await showExplorerWarning(uri.host); + final shouldContinue = await showExplorerWarning( + "${uri.scheme}://${uri.host}"); if (!shouldContinue) { return; diff --git a/lib/pages/wallet_view/transaction_views/transaction_search_filter_view.dart b/lib/pages/wallet_view/transaction_views/transaction_search_filter_view.dart index cfe511b43..509c064de 100644 --- a/lib/pages/wallet_view/transaction_views/transaction_search_filter_view.dart +++ b/lib/pages/wallet_view/transaction_views/transaction_search_filter_view.dart @@ -119,6 +119,8 @@ class _TransactionSearchViewState MaterialRoundedDatePickerStyle _buildDatePickerStyle() { return MaterialRoundedDatePickerStyle( + backgroundPicker: StackTheme.instance.color.popupBG, + // backgroundHeader: StackTheme.instance.color.textSubtitle2, paddingMonthHeader: const EdgeInsets.only(top: 11), colorArrowNext: StackTheme.instance.color.textSubtitle1, colorArrowPrevious: StackTheme.instance.color.textSubtitle1, @@ -156,6 +158,7 @@ class _TransactionSearchViewState MaterialRoundedYearPickerStyle _buildYearPickerStyle() { return MaterialRoundedYearPickerStyle( + backgroundPicker: StackTheme.instance.color.popupBG, textStyleYear: _datePickerTextStyleBase.copyWith( color: StackTheme.instance.color.textSubtitle2, fontWeight: FontWeight.w600, diff --git a/lib/utilities/theme/color_theme.dart b/lib/utilities/theme/color_theme.dart index 3601cb844..4e0c82ad4 100644 --- a/lib/utilities/theme/color_theme.dart +++ b/lib/utilities/theme/color_theme.dart @@ -170,6 +170,7 @@ abstract class StackColorTheme { Color get warningBackground; Color get loadingOverlayTextColor; + Color get myStackContactIconBG; } class CoinThemeColor { diff --git a/lib/utilities/theme/dark_colors.dart b/lib/utilities/theme/dark_colors.dart index 3fdedce4f..7b8007e17 100644 --- a/lib/utilities/theme/dark_colors.dart +++ b/lib/utilities/theme/dark_colors.dart @@ -185,7 +185,7 @@ class DarkColors extends StackColorTheme { @override Color get textFieldErrorBG => const Color(0xFFFFB4A9); @override - Color get textFieldSuccessBG => const Color(0xFFB9E9D4); + Color get textFieldSuccessBG => const Color(0xFF8EF5C3); @override Color get textFieldActiveSearchIconLeft => const Color(0xFFA9ACAC); @@ -294,4 +294,6 @@ class DarkColors extends StackColorTheme { Color get warningBackground => const Color(0xFFFFB4A9); @override Color get loadingOverlayTextColor => const Color(0xFFF7F7F7); + @override + Color get myStackContactIconBG => const Color(0x88747778); } diff --git a/lib/utilities/theme/light_colors.dart b/lib/utilities/theme/light_colors.dart index 7123ca076..8e835164d 100644 --- a/lib/utilities/theme/light_colors.dart +++ b/lib/utilities/theme/light_colors.dart @@ -83,7 +83,7 @@ class LightColors extends StackColorTheme { @override Color get buttonTextDisabled => const Color(0xFFB6B6B6); @override - Color get buttonTextBorderless => const Color(0xFF232323); + Color get buttonTextBorderless => const Color(0xFF0052DF); @override Color get buttonTextBorderlessDisabled => const Color(0xFFB6B6B6); @override @@ -294,4 +294,6 @@ class LightColors extends StackColorTheme { Color get warningBackground => const Color(0xFFFFDAD3); @override Color get loadingOverlayTextColor => const Color(0xFFF7F7F7); + @override + Color get myStackContactIconBG => textFieldDefaultBG; } diff --git a/lib/widgets/address_book_card.dart b/lib/widgets/address_book_card.dart index c310d786a..9a4a2bc35 100644 --- a/lib/widgets/address_book_card.dart +++ b/lib/widgets/address_book_card.dart @@ -80,7 +80,9 @@ class _AddressBookCardState extends ConsumerState { width: 32, height: 32, decoration: BoxDecoration( - color: StackTheme.instance.color.textFieldDefaultBG, + color: contact.id == "default" + ? StackTheme.instance.color.myStackContactIconBG + : StackTheme.instance.color.textFieldDefaultBG, borderRadius: BorderRadius.circular(32), ), child: contact.id == "default"