diff --git a/lib/pages/add_wallet_views/frost_ms/new/confirm_new_frost_ms_wallet_creation_view.dart b/lib/pages/add_wallet_views/frost_ms/new/confirm_new_frost_ms_wallet_creation_view.dart index ffd1127b6..fad725653 100644 --- a/lib/pages/add_wallet_views/frost_ms/new/confirm_new_frost_ms_wallet_creation_view.dart +++ b/lib/pages/add_wallet_views/frost_ms/new/confirm_new_frost_ms_wallet_creation_view.dart @@ -4,7 +4,6 @@ import 'dart:typed_data'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:stackwallet/notifications/show_flush_bar.dart'; -import 'package:stackwallet/pages/frost_mascot.dart'; import 'package:stackwallet/pages/home_view/home_view.dart'; import 'package:stackwallet/pages/wallet_view/transaction_views/transaction_details_view.dart'; import 'package:stackwallet/pages_desktop_specific/desktop_home_view.dart'; @@ -21,6 +20,7 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/util.dart'; +import 'package:stackwallet/wallets/isar/models/wallet_info.dart'; import 'package:stackwallet/wallets/wallet/impl/bitcoin_frost_wallet.dart'; import 'package:stackwallet/wallets/wallet/wallet.dart'; import 'package:stackwallet/widgets/background.dart'; @@ -32,10 +32,9 @@ import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; import 'package:stackwallet/widgets/detail_item.dart'; import 'package:stackwallet/widgets/dialogs/frost_interruption_dialog.dart'; +import 'package:stackwallet/widgets/frost_mascot.dart'; import 'package:stackwallet/widgets/loading_indicator.dart'; -import 'package:stackwallet/wallets/isar/models/wallet_info.dart'; - class ConfirmNewFrostMSWalletCreationView extends ConsumerStatefulWidget { const ConfirmNewFrostMSWalletCreationView({ super.key, @@ -105,7 +104,8 @@ class _ConfirmNewFrostMSWalletCreationViewState ), trailing: FrostMascot( title: 'Lorem ipsum', - body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', + body: + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', ), ), body: SizedBox( diff --git a/lib/pages/add_wallet_views/frost_ms/new/create_new_frost_ms_wallet_view.dart b/lib/pages/add_wallet_views/frost_ms/new/create_new_frost_ms_wallet_view.dart index 9f42a3fa6..c9995dfde 100644 --- a/lib/pages/add_wallet_views/frost_ms/new/create_new_frost_ms_wallet_view.dart +++ b/lib/pages/add_wallet_views/frost_ms/new/create_new_frost_ms_wallet_view.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:stackwallet/pages/frost_mascot.dart'; import 'package:stackwallet/pages/add_wallet_views/frost_ms/new/share_new_multisig_config_view.dart'; import 'package:stackwallet/providers/frost_wallet/frost_wallet_providers.dart'; import 'package:stackwallet/services/frost.dart'; @@ -15,6 +14,7 @@ import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; +import 'package:stackwallet/widgets/frost_mascot.dart'; import 'package:stackwallet/widgets/stack_dialog.dart'; class CreateNewFrostMsWalletView extends ConsumerStatefulWidget { @@ -123,7 +123,8 @@ class _NewFrostMsWalletViewState leading: AppBarBackButton(), trailing: FrostMascot( title: 'Lorem ipsum', - body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', + body: + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', ), ), body: SizedBox( diff --git a/lib/pages/add_wallet_views/frost_ms/new/frost_share_commitments_view.dart b/lib/pages/add_wallet_views/frost_ms/new/frost_share_commitments_view.dart index 1234dbf8a..3e8d28518 100644 --- a/lib/pages/add_wallet_views/frost_ms/new/frost_share_commitments_view.dart +++ b/lib/pages/add_wallet_views/frost_ms/new/frost_share_commitments_view.dart @@ -3,7 +3,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:qr_flutter/qr_flutter.dart'; -import 'package:stackwallet/pages/frost_mascot.dart'; import 'package:stackwallet/pages/add_wallet_views/frost_ms/new/frost_share_shares_view.dart'; import 'package:stackwallet/pages/home_view/home_view.dart'; import 'package:stackwallet/pages/wallet_view/transaction_views/transaction_details_view.dart'; @@ -25,6 +24,7 @@ import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; import 'package:stackwallet/widgets/detail_item.dart'; import 'package:stackwallet/widgets/dialogs/frost_interruption_dialog.dart'; +import 'package:stackwallet/widgets/frost_mascot.dart'; import 'package:stackwallet/widgets/icon_widgets/clipboard_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/qrcode_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; @@ -123,7 +123,8 @@ class _FrostShareCommitmentsViewState ), trailing: FrostMascot( title: 'Lorem ipsum', - body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', + body: + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', ), ), body: SizedBox( diff --git a/lib/pages/add_wallet_views/frost_ms/new/frost_share_shares_view.dart b/lib/pages/add_wallet_views/frost_ms/new/frost_share_shares_view.dart index 20ac39c03..97e9898bd 100644 --- a/lib/pages/add_wallet_views/frost_ms/new/frost_share_shares_view.dart +++ b/lib/pages/add_wallet_views/frost_ms/new/frost_share_shares_view.dart @@ -3,7 +3,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:qr_flutter/qr_flutter.dart'; -import 'package:stackwallet/pages/frost_mascot.dart'; import 'package:stackwallet/pages/add_wallet_views/frost_ms/new/confirm_new_frost_ms_wallet_creation_view.dart'; import 'package:stackwallet/pages/home_view/home_view.dart'; import 'package:stackwallet/pages/wallet_view/transaction_views/transaction_details_view.dart'; @@ -25,6 +24,7 @@ import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; import 'package:stackwallet/widgets/detail_item.dart'; import 'package:stackwallet/widgets/dialogs/frost_interruption_dialog.dart'; +import 'package:stackwallet/widgets/frost_mascot.dart'; import 'package:stackwallet/widgets/icon_widgets/clipboard_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/qrcode_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; @@ -122,7 +122,8 @@ class _FrostShareSharesViewState extends ConsumerState { ), trailing: FrostMascot( title: 'Lorem ipsum', - body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', + body: + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', ), ), body: SizedBox( diff --git a/lib/pages/add_wallet_views/frost_ms/new/import_new_frost_ms_wallet_view.dart b/lib/pages/add_wallet_views/frost_ms/new/import_new_frost_ms_wallet_view.dart index 4eeb3a045..ef1af8180 100644 --- a/lib/pages/add_wallet_views/frost_ms/new/import_new_frost_ms_wallet_view.dart +++ b/lib/pages/add_wallet_views/frost_ms/new/import_new_frost_ms_wallet_view.dart @@ -17,6 +17,7 @@ import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; +import 'package:stackwallet/widgets/frost_mascot.dart'; import 'package:stackwallet/widgets/icon_widgets/clipboard_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/qrcode_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; @@ -24,8 +25,6 @@ import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_text_field.dart'; import 'package:stackwallet/widgets/textfield_icon_button.dart'; -import 'package:stackwallet/pages/frost_mascot.dart'; - class ImportNewFrostMsWalletView extends ConsumerStatefulWidget { const ImportNewFrostMsWalletView({ super.key, @@ -79,7 +78,8 @@ class _ImportNewFrostMsWalletViewState leading: AppBarBackButton(), trailing: FrostMascot( title: 'Lorem ipsum', - body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', + body: + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', ), ), body: SizedBox( diff --git a/lib/pages/add_wallet_views/frost_ms/new/share_new_multisig_config_view.dart b/lib/pages/add_wallet_views/frost_ms/new/share_new_multisig_config_view.dart index 7d463c4ca..348792306 100644 --- a/lib/pages/add_wallet_views/frost_ms/new/share_new_multisig_config_view.dart +++ b/lib/pages/add_wallet_views/frost_ms/new/share_new_multisig_config_view.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:qr_flutter/qr_flutter.dart'; -import 'package:stackwallet/pages/frost_mascot.dart'; import 'package:stackwallet/pages/add_wallet_views/frost_ms/new/frost_share_commitments_view.dart'; import 'package:stackwallet/pages/wallet_view/transaction_views/transaction_details_view.dart'; import 'package:stackwallet/providers/frost_wallet/frost_wallet_providers.dart'; @@ -18,6 +17,7 @@ import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; import 'package:stackwallet/widgets/detail_item.dart'; +import 'package:stackwallet/widgets/frost_mascot.dart'; class ShareNewMultisigConfigView extends ConsumerStatefulWidget { const ShareNewMultisigConfigView({ @@ -49,7 +49,8 @@ class _ShareNewMultisigConfigViewState leading: AppBarBackButton(), trailing: FrostMascot( title: 'Lorem ipsum', - body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', + body: + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', ), ), body: SizedBox( diff --git a/lib/pages/add_wallet_views/frost_ms/restore/restore_frost_ms_wallet_view.dart b/lib/pages/add_wallet_views/frost_ms/restore/restore_frost_ms_wallet_view.dart index 08f36ebde..118ff60bb 100644 --- a/lib/pages/add_wallet_views/frost_ms/restore/restore_frost_ms_wallet_view.dart +++ b/lib/pages/add_wallet_views/frost_ms/restore/restore_frost_ms_wallet_view.dart @@ -8,7 +8,6 @@ import 'package:frostdart/frostdart.dart' as frost; import 'package:stackwallet/notifications/show_flush_bar.dart'; import 'package:stackwallet/pages/home_view/home_view.dart'; import 'package:stackwallet/pages_desktop_specific/desktop_home_view.dart'; -import 'package:stackwallet/pages_desktop_specific/my_stack_view/exit_to_my_stack_button.dart'; import 'package:stackwallet/providers/db/main_db_provider.dart'; import 'package:stackwallet/providers/global/node_service_provider.dart'; import 'package:stackwallet/providers/global/prefs_provider.dart'; @@ -33,6 +32,7 @@ import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; +import 'package:stackwallet/widgets/frost_mascot.dart'; import 'package:stackwallet/widgets/icon_widgets/clipboard_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/qrcode_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; @@ -40,8 +40,6 @@ import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_text_field.dart'; import 'package:stackwallet/widgets/textfield_icon_button.dart'; -import 'package:stackwallet/pages/frost_mascot.dart'; - class RestoreFrostMsWalletView extends ConsumerStatefulWidget { const RestoreFrostMsWalletView({ super.key, @@ -215,13 +213,13 @@ class _RestoreFrostMsWalletViewState builder: (child) => DesktopScaffold( background: Theme.of(context).extension()!.background, appBar: DesktopAppBar( - isCompactHeight: false, - leading: AppBarBackButton(), - trailing: FrostMascot( - title: 'Lorem ipsum', - body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', - ) - ), + isCompactHeight: false, + leading: AppBarBackButton(), + trailing: FrostMascot( + title: 'Lorem ipsum', + body: + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', + )), body: SizedBox( width: 480, child: child, diff --git a/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/finish_resharing_view.dart b/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/finish_resharing_view.dart index 5ff5c815d..a0ba76770 100644 --- a/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/finish_resharing_view.dart +++ b/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/finish_resharing_view.dart @@ -26,6 +26,7 @@ import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; import 'package:stackwallet/widgets/detail_item.dart'; +import 'package:stackwallet/widgets/frost_mascot.dart'; import 'package:stackwallet/widgets/icon_widgets/clipboard_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/qrcode_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; @@ -33,8 +34,6 @@ import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_text_field.dart'; import 'package:stackwallet/widgets/textfield_icon_button.dart'; -import 'package:stackwallet/pages/frost_mascot.dart'; - class FinishResharingView extends ConsumerStatefulWidget { const FinishResharingView({ super.key, @@ -186,7 +185,8 @@ class _FinishResharingViewState extends ConsumerState { leading: AppBarBackButton(), trailing: FrostMascot( title: 'Lorem ipsum', - body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', + body: + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', ), ), body: SizedBox( diff --git a/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/new/new_continue_sharing_view.dart b/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/new/new_continue_sharing_view.dart index 5e4ed4762..f365667a2 100644 --- a/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/new/new_continue_sharing_view.dart +++ b/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/new/new_continue_sharing_view.dart @@ -18,8 +18,7 @@ import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; import 'package:stackwallet/widgets/detail_item.dart'; import 'package:stackwallet/widgets/dialogs/frost_interruption_dialog.dart'; - -import 'package:stackwallet/pages/frost_mascot.dart'; +import 'package:stackwallet/widgets/frost_mascot.dart'; class NewContinueSharingView extends ConsumerStatefulWidget { const NewContinueSharingView({ @@ -71,7 +70,8 @@ class _NewContinueSharingViewState ), trailing: FrostMascot( title: 'Lorem ipsum', - body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', + body: + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', ), ), body: SizedBox( diff --git a/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/new/new_import_resharer_config_view.dart b/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/new/new_import_resharer_config_view.dart index 698363923..fd96236cb 100644 --- a/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/new/new_import_resharer_config_view.dart +++ b/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/new/new_import_resharer_config_view.dart @@ -3,7 +3,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:stackwallet/pages/settings_views/wallet_settings_view/frost_ms/resharing/new/new_start_resharing_view.dart'; -import 'package:stackwallet/pages_desktop_specific/my_stack_view/exit_to_my_stack_button.dart'; import 'package:stackwallet/providers/frost_wallet/frost_wallet_providers.dart'; import 'package:stackwallet/themes/stack_colors.dart'; import 'package:stackwallet/utilities/constants.dart'; @@ -20,6 +19,7 @@ import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; +import 'package:stackwallet/widgets/frost_mascot.dart'; import 'package:stackwallet/widgets/icon_widgets/clipboard_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/qrcode_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; @@ -27,8 +27,6 @@ import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_text_field.dart'; import 'package:stackwallet/widgets/textfield_icon_button.dart'; -import 'package:stackwallet/pages/frost_mascot.dart'; - class NewImportResharerConfigView extends ConsumerStatefulWidget { const NewImportResharerConfigView({ super.key, @@ -96,7 +94,8 @@ class _NewImportResharerConfigViewState leading: AppBarBackButton(), trailing: FrostMascot( title: 'Lorem ipsum', - body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', + body: + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', ), ), body: SizedBox( diff --git a/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/new/new_start_resharing_view.dart b/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/new/new_start_resharing_view.dart index 7173eff3d..5feda5742 100644 --- a/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/new/new_start_resharing_view.dart +++ b/lib/pages/settings_views/wallet_settings_view/frost_ms/resharing/new/new_start_resharing_view.dart @@ -19,6 +19,7 @@ import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; import 'package:stackwallet/widgets/dialogs/frost_interruption_dialog.dart'; +import 'package:stackwallet/widgets/frost_mascot.dart'; import 'package:stackwallet/widgets/icon_widgets/clipboard_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/qrcode_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; @@ -26,8 +27,6 @@ import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_text_field.dart'; import 'package:stackwallet/widgets/textfield_icon_button.dart'; -import 'package:stackwallet/pages/frost_mascot.dart'; - class NewStartResharingView extends ConsumerStatefulWidget { const NewStartResharingView({ super.key, @@ -149,7 +148,8 @@ class _NewStartResharingViewState extends ConsumerState { ), trailing: FrostMascot( title: 'Lorem ipsum', - body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', + body: + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam est justo, ', ), ), body: SizedBox( diff --git a/lib/pages/frost_mascot.dart b/lib/widgets/frost_mascot.dart similarity index 81% rename from lib/pages/frost_mascot.dart rename to lib/widgets/frost_mascot.dart index 3f6c0562d..6be496272 100644 --- a/lib/pages/frost_mascot.dart +++ b/lib/widgets/frost_mascot.dart @@ -15,9 +15,11 @@ import 'package:stackwallet/utilities/assets.dart'; class FrostMascot extends StatelessWidget { final String title; final String body; - FrostMascot({ + const FrostMascot({ super.key, - this.onPressed, required this.title, required this.body, + this.onPressed, + required this.title, + required this.body, }); final VoidCallback? onPressed; @@ -32,8 +34,10 @@ class FrostMascot extends StatelessWidget { onTap: () async { await showDialog( context: context, - builder: (context) => - FrostStepExplanationDialog(title: title, body: body), + builder: (context) => FrostStepExplanationDialog( + title: title, + body: body, + ), ); }, child: Image(