From 68ad1dfb2b9a94719c1c1dc70df407c9ca4fae19 Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Tue, 25 Apr 2023 16:07:28 -0600 Subject: [PATCH] replace stackIcon asset images --- .../subviews/contact_popup.dart | 10 +++++++--- lib/pages/home_view/home_view.dart | 6 +++++- lib/pages/intro_view.dart | 14 +++++++++---- .../subwidgets/desktop_contact_details.dart | 8 ++++++-- .../desktop_menu_item.dart | 7 ++++++- .../my_stack_view/my_stack_view.dart | 12 +++++++---- .../delete_password_warning_view.dart | 8 ++++++-- .../password/desktop_login_view.dart | 7 ++++++- .../forgot_password_desktop_view.dart | 16 ++++++++++----- lib/widgets/address_book_card.dart | 8 +++++++- lib/widgets/desktop/living_stack_icon.dart | 20 +++++++++++++------ 11 files changed, 86 insertions(+), 30 deletions(-) diff --git a/lib/pages/address_book_views/subviews/contact_popup.dart b/lib/pages/address_book_views/subviews/contact_popup.dart index e9dca9385..47f8d573e 100644 --- a/lib/pages/address_book_views/subviews/contact_popup.dart +++ b/lib/pages/address_book_views/subviews/contact_popup.dart @@ -7,13 +7,12 @@ import 'package:stackwallet/notifications/show_flush_bar.dart'; import 'package:stackwallet/pages/address_book_views/subviews/contact_details_view.dart'; import 'package:stackwallet/pages/exchange_view/exchange_step_views/step_2_view.dart'; import 'package:stackwallet/pages/send_view/send_view.dart'; -import 'package:stackwallet/providers/exchange/exchange_flow_is_active_state_provider.dart'; import 'package:stackwallet/providers/global/address_book_service_provider.dart'; import 'package:stackwallet/providers/providers.dart'; +import 'package:stackwallet/themes/theme_providers.dart'; import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/clipboard_interface.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart'; -import 'package:stackwallet/utilities/enums/flush_bar_type.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/theme/stack_colors.dart'; import 'package:stackwallet/widgets/rounded_container.dart'; @@ -111,7 +110,12 @@ class ContactPopUp extends ConsumerWidget { child: contact.id == "default" ? Center( child: SvgPicture.asset( - Assets.svg.stackIcon(context), + ref.watch( + themeProvider.select( + (value) => + value.assets.stackIcon, + ), + ), width: 20, ), ) diff --git a/lib/pages/home_view/home_view.dart b/lib/pages/home_view/home_view.dart index fab91ac9b..7d70b0b6c 100644 --- a/lib/pages/home_view/home_view.dart +++ b/lib/pages/home_view/home_view.dart @@ -164,7 +164,11 @@ class _HomeViewState extends ConsumerState { onTap: _hiddenOptions, child: RotateIcon( icon: SvgPicture.asset( - Assets.svg.stackIcon(context), + ref.watch( + themeProvider.select( + (value) => value.assets.stackIcon, + ), + ), width: 24, height: 24, ), diff --git a/lib/pages/intro_view.dart b/lib/pages/intro_view.dart index 0883a5405..909feb6f4 100644 --- a/lib/pages/intro_view.dart +++ b/lib/pages/intro_view.dart @@ -1,8 +1,10 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; import 'package:stackwallet/pages/stack_privacy_calls.dart'; import 'package:stackwallet/pages_desktop_specific/password/create_password_view.dart'; +import 'package:stackwallet/themes/theme_providers.dart'; import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/prefs.dart'; import 'package:stackwallet/utilities/text_styles.dart'; @@ -12,16 +14,16 @@ import 'package:stackwallet/widgets/background.dart'; import 'package:stackwallet/widgets/desktop/secondary_button.dart'; import 'package:url_launcher/url_launcher.dart'; -class IntroView extends StatefulWidget { +class IntroView extends ConsumerStatefulWidget { const IntroView({Key? key}) : super(key: key); static const String routeName = "/introView"; @override - State createState() => _IntroViewState(); + ConsumerState createState() => _IntroViewState(); } -class _IntroViewState extends State { +class _IntroViewState extends ConsumerState { late final bool isDesktop; @override @@ -116,7 +118,11 @@ class _IntroViewState extends State { width: 130, height: 130, child: SvgPicture.asset( - Assets.svg.stackIcon(context), + ref.watch( + themeProvider.select( + (value) => value.assets.stackIcon, + ), + ), ), ), const Spacer( diff --git a/lib/pages_desktop_specific/address_book_view/subwidgets/desktop_contact_details.dart b/lib/pages_desktop_specific/address_book_view/subwidgets/desktop_contact_details.dart index 6544e1acd..c612fefad 100644 --- a/lib/pages_desktop_specific/address_book_view/subwidgets/desktop_contact_details.dart +++ b/lib/pages_desktop_specific/address_book_view/subwidgets/desktop_contact_details.dart @@ -3,7 +3,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:isar/isar.dart'; import 'package:stackwallet/models/contact.dart'; -import 'package:stackwallet/models/isar/models/blockchain_data/transaction.dart'; import 'package:stackwallet/models/isar/models/isar_models.dart'; import 'package:stackwallet/pages/address_book_views/subviews/add_new_contact_address_view.dart'; import 'package:stackwallet/pages_desktop_specific/address_book_view/subwidgets/desktop_address_card.dart'; @@ -12,6 +11,7 @@ import 'package:stackwallet/providers/global/address_book_service_provider.dart' import 'package:stackwallet/providers/global/wallets_provider.dart'; import 'package:stackwallet/providers/ui/address_book_providers/address_entry_data_provider.dart'; import 'package:stackwallet/services/coins/manager.dart'; +import 'package:stackwallet/themes/theme_providers.dart'; import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/theme/stack_colors.dart'; @@ -120,7 +120,11 @@ class _DesktopContactDetailsState extends ConsumerState { child: contact.id == "default" ? Center( child: SvgPicture.asset( - Assets.svg.stackIcon(context), + ref.watch( + themeProvider.select( + (value) => value.assets.stackIcon, + ), + ), width: 32, ), ) diff --git a/lib/pages_desktop_specific/desktop_menu_item.dart b/lib/pages_desktop_specific/desktop_menu_item.dart index 5a00bbe95..eedaea60c 100644 --- a/lib/pages_desktop_specific/desktop_menu_item.dart +++ b/lib/pages_desktop_specific/desktop_menu_item.dart @@ -4,6 +4,7 @@ import 'package:flutter_svg/svg.dart'; import 'package:stackwallet/pages_desktop_specific/desktop_menu.dart'; import 'package:stackwallet/providers/desktop/current_desktop_menu_item.dart'; import 'package:stackwallet/providers/global/notifications_provider.dart'; +import 'package:stackwallet/themes/theme_providers.dart'; import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/theme/stack_colors.dart'; @@ -83,7 +84,11 @@ class DesktopNotificationsIcon extends ConsumerWidget { return SvgPicture.asset( ref.watch(notificationsProvider .select((value) => value.hasUnreadNotifications)) - ? Assets.svg.bellNew(context) + ? ref.watch( + themeProvider.select( + (value) => value.assets.bellNew, + ), + ) : Assets.svg.bell, width: 20, height: 20, diff --git a/lib/pages_desktop_specific/my_stack_view/my_stack_view.dart b/lib/pages_desktop_specific/my_stack_view/my_stack_view.dart index 47ffdf4fe..1b327ccea 100644 --- a/lib/pages_desktop_specific/my_stack_view/my_stack_view.dart +++ b/lib/pages_desktop_specific/my_stack_view/my_stack_view.dart @@ -4,7 +4,7 @@ import 'package:flutter_svg/flutter_svg.dart'; import 'package:stackwallet/pages/wallets_view/sub_widgets/empty_wallets.dart'; import 'package:stackwallet/pages_desktop_specific/my_stack_view/my_wallets.dart'; import 'package:stackwallet/providers/global/wallets_provider.dart'; -import 'package:stackwallet/utilities/assets.dart'; +import 'package:stackwallet/themes/theme_providers.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/widgets/background.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; @@ -40,11 +40,11 @@ class _MyStackViewState extends ConsumerState { } } -class DesktopMyStackTitle extends StatelessWidget { +class DesktopMyStackTitle extends ConsumerWidget { const DesktopMyStackTitle({Key? key}) : super(key: key); @override - Widget build(BuildContext context) { + Widget build(BuildContext context, WidgetRef ref) { return Row( children: [ const SizedBox( @@ -54,7 +54,11 @@ class DesktopMyStackTitle extends StatelessWidget { width: 32, height: 32, child: SvgPicture.asset( - Assets.svg.stackIcon(context), + ref.watch( + themeProvider.select( + (value) => value.assets.stackIcon, + ), + ), ), ), const SizedBox( diff --git a/lib/pages_desktop_specific/password/delete_password_warning_view.dart b/lib/pages_desktop_specific/password/delete_password_warning_view.dart index 700754efd..3187eebc0 100644 --- a/lib/pages_desktop_specific/password/delete_password_warning_view.dart +++ b/lib/pages_desktop_specific/password/delete_password_warning_view.dart @@ -8,7 +8,7 @@ import 'package:hive/hive.dart'; import 'package:stackwallet/db/hive/db.dart'; import 'package:stackwallet/notifications/show_flush_bar.dart'; import 'package:stackwallet/pages/intro_view.dart'; -import 'package:stackwallet/utilities/assets.dart'; +import 'package:stackwallet/themes/theme_providers.dart'; import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/stack_file_system.dart'; import 'package:stackwallet/utilities/text_styles.dart'; @@ -95,7 +95,11 @@ class _ForgotPasswordDesktopViewState mainAxisSize: MainAxisSize.min, children: [ SvgPicture.asset( - Assets.svg.stackIcon(context), + ref.watch( + themeProvider.select( + (value) => value.assets.stackIcon, + ), + ), width: 100, ), const SizedBox( diff --git a/lib/pages_desktop_specific/password/desktop_login_view.dart b/lib/pages_desktop_specific/password/desktop_login_view.dart index bb2390bfe..cb7239ad1 100644 --- a/lib/pages_desktop_specific/password/desktop_login_view.dart +++ b/lib/pages_desktop_specific/password/desktop_login_view.dart @@ -8,6 +8,7 @@ import 'package:stackwallet/pages_desktop_specific/desktop_home_view.dart'; import 'package:stackwallet/pages_desktop_specific/password/forgot_password_desktop_view.dart'; import 'package:stackwallet/providers/desktop/storage_crypto_handler_provider.dart'; import 'package:stackwallet/providers/global/secure_store_provider.dart'; +import 'package:stackwallet/themes/theme_providers.dart'; import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'; @@ -165,7 +166,11 @@ class _DesktopLoginViewState extends ConsumerState { mainAxisSize: MainAxisSize.min, children: [ SvgPicture.asset( - Assets.svg.stackIcon(context), + ref.watch( + themeProvider.select( + (value) => value.assets.stackIcon, + ), + ), width: 100, ), const SizedBox( diff --git a/lib/pages_desktop_specific/password/forgot_password_desktop_view.dart b/lib/pages_desktop_specific/password/forgot_password_desktop_view.dart index db3e40a16..1a5f6788d 100644 --- a/lib/pages_desktop_specific/password/forgot_password_desktop_view.dart +++ b/lib/pages_desktop_specific/password/forgot_password_desktop_view.dart @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; import 'package:stackwallet/pages_desktop_specific/password/delete_password_warning_view.dart'; -import 'package:stackwallet/utilities/assets.dart'; +import 'package:stackwallet/themes/theme_providers.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/theme/stack_colors.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; @@ -10,7 +11,7 @@ import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; import 'package:stackwallet/widgets/desktop/secondary_button.dart'; -class ForgotPasswordDesktopView extends StatefulWidget { +class ForgotPasswordDesktopView extends ConsumerStatefulWidget { const ForgotPasswordDesktopView({ Key? key, }) : super(key: key); @@ -18,11 +19,12 @@ class ForgotPasswordDesktopView extends StatefulWidget { static const String routeName = "/forgotPasswordDesktop"; @override - State createState() => + ConsumerState createState() => _ForgotPasswordDesktopViewState(); } -class _ForgotPasswordDesktopViewState extends State { +class _ForgotPasswordDesktopViewState + extends ConsumerState { @override Widget build(BuildContext context) { return DesktopScaffold( @@ -46,7 +48,11 @@ class _ForgotPasswordDesktopViewState extends State { mainAxisSize: MainAxisSize.min, children: [ SvgPicture.asset( - Assets.svg.stackIcon(context), + ref.watch( + themeProvider.select( + (value) => value.assets.stackIcon, + ), + ), width: 100, ), const SizedBox( diff --git a/lib/widgets/address_book_card.dart b/lib/widgets/address_book_card.dart index dfa655f86..49d1a75af 100644 --- a/lib/widgets/address_book_card.dart +++ b/lib/widgets/address_book_card.dart @@ -14,6 +14,8 @@ import 'package:stackwallet/widgets/conditional_parent.dart'; import 'package:stackwallet/widgets/expandable.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart'; +import '../themes/theme_providers.dart'; + class AddressBookCard extends ConsumerStatefulWidget { const AddressBookCard({ Key? key, @@ -91,7 +93,11 @@ class _AddressBookCardState extends ConsumerState { child: contact.id == "default" ? Center( child: SvgPicture.asset( - Assets.svg.stackIcon(context), + ref.watch( + themeProvider.select( + (value) => value.assets.stackIcon, + ), + ), width: 20, ), ) diff --git a/lib/widgets/desktop/living_stack_icon.dart b/lib/widgets/desktop/living_stack_icon.dart index 7afc8f8d2..a5c17108a 100644 --- a/lib/widgets/desktop/living_stack_icon.dart +++ b/lib/widgets/desktop/living_stack_icon.dart @@ -1,17 +1,21 @@ import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:stackwallet/utilities/assets.dart'; +import 'package:stackwallet/themes/theme_providers.dart'; -class LivingStackIcon extends StatefulWidget { - const LivingStackIcon({Key? key, this.onPressed,}) : super(key: key); +class LivingStackIcon extends ConsumerStatefulWidget { + const LivingStackIcon({ + Key? key, + this.onPressed, + }) : super(key: key); final VoidCallback? onPressed; @override - State createState() => _LivingStackIconState(); + ConsumerState createState() => _LivingStackIconState(); } -class _LivingStackIconState extends State { +class _LivingStackIconState extends ConsumerState { bool _hovering = false; late final VoidCallback? onPressed; @@ -44,7 +48,11 @@ class _LivingStackIconState extends State { duration: const Duration(milliseconds: 200), scale: _hovering ? 1.2 : 1, child: SvgPicture.asset( - Assets.svg.stackIcon(context), + ref.watch( + themeProvider.select( + (value) => value.assets.stackIcon, + ), + ), ), ), ),