From 93c9fab78dab8b9a8d90b73dfb83b0d81a10c6f7 Mon Sep 17 00:00:00 2001 From: Erdem Yerebasmaz Date: Tue, 24 Oct 2023 01:39:09 +0300 Subject: [PATCH] Optimize imports and reformat code --- lib/background/breez_message_handler.dart | 2 +- lib/bloc/account/credentials_manager.dart | 2 +- lib/bloc/backup/backup_bloc.dart | 2 +- lib/bloc/buy_bitcoin/moonpay/moonpay_bloc.dart | 2 +- lib/bloc/connectivity/connectivity_bloc.dart | 2 +- lib/bloc/csv_exporter.dart | 2 +- lib/bloc/fee_options/fee_options_bloc.dart | 2 +- lib/bloc/network/network_settings_bloc.dart | 2 +- lib/bloc/payment_options/payment_options_bloc.dart | 2 +- lib/bloc/refund/refund_bloc.dart | 2 +- lib/bloc/rev_swap_in_progress/rev_swap_in_progress_bloc.dart | 2 +- lib/bloc/reverse_swap/reverse_swap_bloc.dart | 2 +- lib/bloc/security/security_bloc.dart | 2 +- lib/bloc/swap_in_progress/swap_in_progress_bloc.dart | 2 +- lib/bloc/sweep/sweep_bloc.dart | 2 +- lib/bloc/user_profile/user_profile_bloc.dart | 2 +- lib/handlers/connectivity_handler.dart | 2 +- lib/handlers/payment_result_handler.dart | 2 +- lib/models/payment_minutiae.dart | 2 +- lib/routes/buy_bitcoin/moonpay/moonpay_webview.dart | 2 +- lib/routes/create_invoice/create_invoice_page.dart | 4 ++-- lib/routes/create_invoice/qr_code_dialog.dart | 2 +- .../create_invoice/widgets/expiry_and_fee_message.dart | 2 +- lib/routes/dev/command_line_interface.dart | 2 +- lib/routes/dev/developers_view.dart | 1 - lib/routes/home/account_page.dart | 2 +- .../bottom_actions_bar/enter_payment_info_dialog.dart | 2 +- .../widgets/payments_filter/payment_filter_exporter.dart | 2 +- .../home/widgets/payments_list/payment_details_dialog.dart | 2 +- lib/routes/home/widgets/qr_action_button.dart | 2 +- lib/routes/lnurl/auth/lnurl_auth_handler.dart | 2 +- lib/routes/lnurl/payment/lnurl_payment_dialog.dart | 2 +- lib/routes/lnurl/payment/lnurl_payment_handler.dart | 2 +- lib/routes/lnurl/payment/lnurl_payment_page.dart | 5 ++--- lib/routes/lnurl/withdraw/lnurl_withdraw_dialog.dart | 2 +- lib/routes/lnurl/withdraw/lnurl_withdraw_handler.dart | 2 +- lib/routes/lsp/widgets/lsp_list_widget.dart | 2 +- lib/routes/network/widget/mempool_settings_widget.dart | 2 +- lib/routes/payment_options/widget/actions_fee.dart | 2 +- lib/routes/payment_options/widget/exempt_fee_widget.dart | 2 +- lib/routes/payment_options/widget/override_fee.dart | 2 +- .../payment_options/widget/proportional_fee_widget.dart | 2 +- lib/routes/payment_options/widget/save_dialog.dart | 2 +- lib/routes/qr_scan/widgets/qr_scan.dart | 2 +- lib/routes/security/secured_page.dart | 2 +- lib/routes/security/widget/digit_button_widget.dart | 2 +- lib/routes/subswap/swap/get_refund/widgets/refund_item.dart | 3 +-- .../subswap/swap/get_refund/widgets/refund_item_action.dart | 2 +- .../subswap/swap/get_refund/widgets/send_onchain_form.dart | 2 +- .../confirmation_page/reverse_swap_confirmation_page.dart | 2 +- lib/routes/withdraw/reverse_swap/reverse_swap_page.dart | 2 +- .../sweep/confirmation_page/sweep_confirmation_page.dart | 2 +- lib/routes/withdraw/sweep/sweep_page.dart | 2 +- .../withdraw/widgets/bitcoin_address_text_form_field.dart | 2 +- .../widgets/withdraw_funds_amount_text_form_field.dart | 2 +- .../withdraw/widgets/withdraw_funds_available_btc.dart | 2 +- lib/services/deep_links.dart | 2 +- lib/services/device.dart | 2 +- lib/services/notifications.dart | 2 +- lib/user_app.dart | 2 +- lib/utils/exceptions.dart | 2 +- lib/utils/external_browser.dart | 2 +- lib/widgets/amount_form_field/breez_dropdown.dart | 2 +- 63 files changed, 64 insertions(+), 67 deletions(-) diff --git a/lib/background/breez_message_handler.dart b/lib/background/breez_message_handler.dart index 83fa9f9af..ee5b9c53e 100644 --- a/lib/background/breez_message_handler.dart +++ b/lib/background/breez_message_handler.dart @@ -2,8 +2,8 @@ import 'dart:io'; import 'package:c_breez/background/breez_service_initializer.dart'; import 'package:c_breez/main.dart'; -import 'package:logging/logging.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; +import 'package:logging/logging.dart'; import 'package:workmanager/workmanager.dart'; final _log = Logger("BreezMessageHandler"); diff --git a/lib/bloc/account/credentials_manager.dart b/lib/bloc/account/credentials_manager.dart index 17626e78b..aa18c4977 100644 --- a/lib/bloc/account/credentials_manager.dart +++ b/lib/bloc/account/credentials_manager.dart @@ -1,11 +1,11 @@ import 'dart:io'; import 'package:breez_sdk/bridge_generated.dart' as sdk; +import 'package:c_breez/config.dart'; import 'package:c_breez/services/injector.dart'; import 'package:c_breez/services/keychain.dart'; import 'package:logging/logging.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:c_breez/config.dart'; class CredentialsManager { final _log = Logger("CredentialsManager"); diff --git a/lib/bloc/backup/backup_bloc.dart b/lib/bloc/backup/backup_bloc.dart index 1f5f15694..e3de8fd41 100644 --- a/lib/bloc/backup/backup_bloc.dart +++ b/lib/bloc/backup/backup_bloc.dart @@ -1,8 +1,8 @@ import 'package:breez_sdk/breez_sdk.dart'; import 'package:breez_sdk/bridge_generated.dart' as sdk; import 'package:c_breez/bloc/backup/backup_state.dart'; -import 'package:logging/logging.dart'; import 'package:hydrated_bloc/hydrated_bloc.dart'; +import 'package:logging/logging.dart'; class BackupBloc extends Cubit { final _log = Logger("BackupBloc"); diff --git a/lib/bloc/buy_bitcoin/moonpay/moonpay_bloc.dart b/lib/bloc/buy_bitcoin/moonpay/moonpay_bloc.dart index 76afffe9c..3f8ff925e 100644 --- a/lib/bloc/buy_bitcoin/moonpay/moonpay_bloc.dart +++ b/lib/bloc/buy_bitcoin/moonpay/moonpay_bloc.dart @@ -5,8 +5,8 @@ import 'package:c_breez/bloc/buy_bitcoin/moonpay/moonpay_state.dart'; import 'package:c_breez/config.dart'; import 'package:c_breez/utils/exceptions.dart'; import 'package:c_breez/utils/preferences.dart'; -import 'package:logging/logging.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("MoonPayBloc"); diff --git a/lib/bloc/connectivity/connectivity_bloc.dart b/lib/bloc/connectivity/connectivity_bloc.dart index cc0e5d1fc..8ef254888 100644 --- a/lib/bloc/connectivity/connectivity_bloc.dart +++ b/lib/bloc/connectivity/connectivity_bloc.dart @@ -2,9 +2,9 @@ import 'dart:async'; import 'dart:io'; import 'package:connectivity_plus/connectivity_plus.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; import 'connectivity_state.dart'; diff --git a/lib/bloc/csv_exporter.dart b/lib/bloc/csv_exporter.dart index 50c07d66c..9f5a8e4b1 100644 --- a/lib/bloc/csv_exporter.dart +++ b/lib/bloc/csv_exporter.dart @@ -7,8 +7,8 @@ import 'package:c_breez/bloc/account/payment_filters.dart'; import 'package:c_breez/models/payment_minutiae.dart'; import 'package:c_breez/utils/date.dart'; import 'package:csv/csv.dart'; -import 'package:logging/logging.dart'; import 'package:intl/intl.dart'; +import 'package:logging/logging.dart'; import 'package:path_provider/path_provider.dart'; final _log = Logger("CsvExporter"); diff --git a/lib/bloc/fee_options/fee_options_bloc.dart b/lib/bloc/fee_options/fee_options_bloc.dart index 5f5bfada5..bf0ec2ff0 100644 --- a/lib/bloc/fee_options/fee_options_bloc.dart +++ b/lib/bloc/fee_options/fee_options_bloc.dart @@ -6,8 +6,8 @@ import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/bloc/fee_options/fee_option.dart'; import 'package:c_breez/bloc/fee_options/fee_options_state.dart'; import 'package:c_breez/utils/exceptions.dart'; -import 'package:logging/logging.dart'; import 'package:hydrated_bloc/hydrated_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("FeeOptionsBloc"); diff --git a/lib/bloc/network/network_settings_bloc.dart b/lib/bloc/network/network_settings_bloc.dart index c17855f9f..3e2cc030d 100644 --- a/lib/bloc/network/network_settings_bloc.dart +++ b/lib/bloc/network/network_settings_bloc.dart @@ -5,9 +5,9 @@ import 'package:c_breez/config.dart'; import 'package:c_breez/services/injector.dart'; import 'package:c_breez/utils/blockchain_explorer_utils.dart'; import 'package:c_breez/utils/preferences.dart'; -import 'package:logging/logging.dart'; import 'package:http/http.dart' as http; import 'package:hydrated_bloc/hydrated_bloc.dart'; +import 'package:logging/logging.dart'; class NetworkSettingsBloc extends Cubit with HydratedMixin { final Preferences _preferences; diff --git a/lib/bloc/payment_options/payment_options_bloc.dart b/lib/bloc/payment_options/payment_options_bloc.dart index c0214b73e..b91398e87 100644 --- a/lib/bloc/payment_options/payment_options_bloc.dart +++ b/lib/bloc/payment_options/payment_options_bloc.dart @@ -1,7 +1,7 @@ import 'package:c_breez/bloc/payment_options/payment_options_state.dart'; import 'package:c_breez/utils/preferences.dart'; -import 'package:logging/logging.dart'; import 'package:hydrated_bloc/hydrated_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("PaymentOptionsBloc"); diff --git a/lib/bloc/refund/refund_bloc.dart b/lib/bloc/refund/refund_bloc.dart index dcbf30139..bc35f7b72 100644 --- a/lib/bloc/refund/refund_bloc.dart +++ b/lib/bloc/refund/refund_bloc.dart @@ -3,8 +3,8 @@ import 'dart:async'; import 'package:breez_sdk/breez_sdk.dart'; import 'package:breez_sdk/bridge_generated.dart'; import 'package:c_breez/bloc/refund/refund_state.dart'; -import 'package:logging/logging.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("RefundBloc"); diff --git a/lib/bloc/rev_swap_in_progress/rev_swap_in_progress_bloc.dart b/lib/bloc/rev_swap_in_progress/rev_swap_in_progress_bloc.dart index 2d006cbb7..9b62552b2 100644 --- a/lib/bloc/rev_swap_in_progress/rev_swap_in_progress_bloc.dart +++ b/lib/bloc/rev_swap_in_progress/rev_swap_in_progress_bloc.dart @@ -4,8 +4,8 @@ import 'package:breez_sdk/breez_sdk.dart'; import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/bloc/rev_swap_in_progress/rev_swap_in_progress_state.dart'; import 'package:c_breez/utils/exceptions.dart'; -import 'package:logging/logging.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("RevSwapsInProgressBloc"); diff --git a/lib/bloc/reverse_swap/reverse_swap_bloc.dart b/lib/bloc/reverse_swap/reverse_swap_bloc.dart index 8dcae73e8..d88d54a72 100644 --- a/lib/bloc/reverse_swap/reverse_swap_bloc.dart +++ b/lib/bloc/reverse_swap/reverse_swap_bloc.dart @@ -5,8 +5,8 @@ import 'package:breez_sdk/bridge_generated.dart'; import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/bloc/reverse_swap/reverse_swap_state.dart'; import 'package:c_breez/utils/exceptions.dart'; -import 'package:logging/logging.dart'; import 'package:hydrated_bloc/hydrated_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("ReverseSwapBloc"); diff --git a/lib/bloc/security/security_bloc.dart b/lib/bloc/security/security_bloc.dart index 14833f8f2..75b68496f 100644 --- a/lib/bloc/security/security_bloc.dart +++ b/lib/bloc/security/security_bloc.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'dart:io'; import 'package:c_breez/bloc/security/security_state.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/services.dart'; import 'package:flutter_fgbg/flutter_fgbg.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; @@ -10,6 +9,7 @@ import 'package:hydrated_bloc/hydrated_bloc.dart'; import 'package:local_auth/local_auth.dart'; import 'package:local_auth_android/local_auth_android.dart'; import 'package:local_auth_ios/types/auth_messages_ios.dart'; +import 'package:logging/logging.dart'; class SecurityBloc extends Cubit with HydratedMixin { final _log = Logger("LocalAuthenticationService"); diff --git a/lib/bloc/swap_in_progress/swap_in_progress_bloc.dart b/lib/bloc/swap_in_progress/swap_in_progress_bloc.dart index 773387cf4..9dc78f586 100644 --- a/lib/bloc/swap_in_progress/swap_in_progress_bloc.dart +++ b/lib/bloc/swap_in_progress/swap_in_progress_bloc.dart @@ -5,8 +5,8 @@ import 'package:breez_sdk/bridge_generated.dart'; import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/bloc/swap_in_progress/swap_in_progress_state.dart'; import 'package:c_breez/utils/exceptions.dart'; -import 'package:logging/logging.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("SwapInProgressBloc"); diff --git a/lib/bloc/sweep/sweep_bloc.dart b/lib/bloc/sweep/sweep_bloc.dart index 999946f21..a036de542 100644 --- a/lib/bloc/sweep/sweep_bloc.dart +++ b/lib/bloc/sweep/sweep_bloc.dart @@ -5,8 +5,8 @@ import 'package:breez_sdk/bridge_generated.dart'; import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/bloc/sweep/sweep_state.dart'; import 'package:c_breez/utils/exceptions.dart'; -import 'package:logging/logging.dart'; import 'package:hydrated_bloc/hydrated_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("SweepBloc"); diff --git a/lib/bloc/user_profile/user_profile_bloc.dart b/lib/bloc/user_profile/user_profile_bloc.dart index 975bd6fb6..f45bb7baf 100644 --- a/lib/bloc/user_profile/user_profile_bloc.dart +++ b/lib/bloc/user_profile/user_profile_bloc.dart @@ -7,8 +7,8 @@ import 'package:c_breez/bloc/user_profile/user_profile_state.dart'; import 'package:c_breez/models/user_profile.dart'; import 'package:c_breez/services/breez_server.dart'; import 'package:c_breez/services/notifications.dart'; -import 'package:logging/logging.dart'; import 'package:hydrated_bloc/hydrated_bloc.dart'; +import 'package:logging/logging.dart'; import 'package:path_provider/path_provider.dart'; const PROFILE_DATA_FOLDER_PATH = "profile"; diff --git a/lib/handlers/connectivity_handler.dart b/lib/handlers/connectivity_handler.dart index 42b2d24c5..71ab2e094 100644 --- a/lib/handlers/connectivity_handler.dart +++ b/lib/handlers/connectivity_handler.dart @@ -8,9 +8,9 @@ import 'package:c_breez/handlers/handler.dart'; import 'package:c_breez/handlers/handler_context_provider.dart'; import 'package:c_breez/theme/theme_provider.dart' as theme; import 'package:connectivity_plus/connectivity_plus.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("ConnectivityHandler"); diff --git a/lib/handlers/payment_result_handler.dart b/lib/handlers/payment_result_handler.dart index c3e6ef457..542413f23 100644 --- a/lib/handlers/payment_result_handler.dart +++ b/lib/handlers/payment_result_handler.dart @@ -7,9 +7,9 @@ import 'package:c_breez/bloc/account/payment_result.dart'; import 'package:c_breez/handlers/handler.dart'; import 'package:c_breez/handlers/handler_context_provider.dart'; import 'package:c_breez/widgets/flushbar.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; final _log = Logger("PaymentResultHandler"); diff --git a/lib/models/payment_minutiae.dart b/lib/models/payment_minutiae.dart index f167f330e..79b31f621 100644 --- a/lib/models/payment_minutiae.dart +++ b/lib/models/payment_minutiae.dart @@ -4,8 +4,8 @@ import 'dart:typed_data'; import 'package:breez_sdk/bridge_generated.dart'; import 'package:breez_translations/generated/breez_translations.dart'; import 'package:c_breez/utils/extensions/breez_pos_message_extractor.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; +import 'package:logging/logging.dart'; final _log = Logger("PaymentDetails"); diff --git a/lib/routes/buy_bitcoin/moonpay/moonpay_webview.dart b/lib/routes/buy_bitcoin/moonpay/moonpay_webview.dart index 0d8de8b11..217933a5b 100644 --- a/lib/routes/buy_bitcoin/moonpay/moonpay_webview.dart +++ b/lib/routes/buy_bitcoin/moonpay/moonpay_webview.dart @@ -1,10 +1,10 @@ import 'package:c_breez/bloc/buy_bitcoin/moonpay/moonpay_bloc.dart'; import 'package:c_breez/bloc/buy_bitcoin/moonpay/moonpay_state.dart'; import 'package:c_breez/routes/buy_bitcoin/moonpay/moonpay_loading.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; +import 'package:logging/logging.dart'; final _log = Logger("MoonpayWebView"); diff --git a/lib/routes/create_invoice/create_invoice_page.dart b/lib/routes/create_invoice/create_invoice_page.dart index e9389714c..edfbbb98d 100644 --- a/lib/routes/create_invoice/create_invoice_page.dart +++ b/lib/routes/create_invoice/create_invoice_page.dart @@ -21,10 +21,10 @@ import 'package:c_breez/widgets/keyboard_done_action.dart'; import 'package:c_breez/widgets/receivable_btc_box.dart'; import 'package:c_breez/widgets/single_button_bottom_bar.dart'; import 'package:c_breez/widgets/transparent_page_route.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("CreateInvoicePage"); @@ -36,7 +36,7 @@ class CreateInvoicePage extends StatefulWidget { super.key, this.requestData, this.onFinish, - }) : assert( + }) : assert( requestData == null || (onFinish != null), "If you are using LNURL withdraw, you must provide an onFinish callback.", ); diff --git a/lib/routes/create_invoice/qr_code_dialog.dart b/lib/routes/create_invoice/qr_code_dialog.dart index b66489461..cdb5cc66b 100644 --- a/lib/routes/create_invoice/qr_code_dialog.dart +++ b/lib/routes/create_invoice/qr_code_dialog.dart @@ -10,9 +10,9 @@ import 'package:c_breez/routes/create_invoice/widgets/loading_or_error.dart'; import 'package:c_breez/services/injector.dart'; import 'package:c_breez/utils/exceptions.dart'; import 'package:c_breez/widgets/flushbar.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; import 'package:share_plus/share_plus.dart'; final _log = Logger("QrCodeDialog"); diff --git a/lib/routes/create_invoice/widgets/expiry_and_fee_message.dart b/lib/routes/create_invoice/widgets/expiry_and_fee_message.dart index 7c7d7941f..f07deeaad 100644 --- a/lib/routes/create_invoice/widgets/expiry_and_fee_message.dart +++ b/lib/routes/create_invoice/widgets/expiry_and_fee_message.dart @@ -3,9 +3,9 @@ import 'package:c_breez/bloc/currency/currency_bloc.dart'; import 'package:c_breez/bloc/currency/currency_state.dart'; import 'package:c_breez/theme/theme_extensions.dart'; import 'package:c_breez/widgets/warning_box.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final log = Logger("ExpiryAndFeeMessage"); diff --git a/lib/routes/dev/command_line_interface.dart b/lib/routes/dev/command_line_interface.dart index 4e4531cf1..eceed0103 100644 --- a/lib/routes/dev/command_line_interface.dart +++ b/lib/routes/dev/command_line_interface.dart @@ -4,8 +4,8 @@ import 'dart:io'; import 'package:c_breez/routes/dev/widget/command_list.dart'; import 'package:c_breez/services/injector.dart'; import 'package:c_breez/theme/theme_provider.dart' as theme; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; +import 'package:logging/logging.dart'; import 'package:path_provider/path_provider.dart'; import 'package:share_plus/share_plus.dart'; diff --git a/lib/routes/dev/developers_view.dart b/lib/routes/dev/developers_view.dart index 670b199dd..59eef5797 100644 --- a/lib/routes/dev/developers_view.dart +++ b/lib/routes/dev/developers_view.dart @@ -13,7 +13,6 @@ import 'package:c_breez/widgets/route.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; - import 'package:path/path.dart'; import 'package:path_provider/path_provider.dart'; import 'package:share_plus/share_plus.dart'; diff --git a/lib/routes/home/account_page.dart b/lib/routes/home/account_page.dart index 0085b5449..9c65add60 100644 --- a/lib/routes/home/account_page.dart +++ b/lib/routes/home/account_page.dart @@ -15,9 +15,9 @@ import 'package:c_breez/routes/home/widgets/payments_filter/payments_filter_sliv import 'package:c_breez/routes/home/widgets/payments_list/payments_list.dart'; import 'package:c_breez/routes/home/widgets/status_text.dart'; import 'package:c_breez/theme/theme_provider.dart' as theme; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; const _kFilterMaxSize = 64.0; const _kPaymentListItemHeight = 72.0; diff --git a/lib/routes/home/widgets/bottom_actions_bar/enter_payment_info_dialog.dart b/lib/routes/home/widgets/bottom_actions_bar/enter_payment_info_dialog.dart index 69c67c0fb..6efb5020f 100644 --- a/lib/routes/home/widgets/bottom_actions_bar/enter_payment_info_dialog.dart +++ b/lib/routes/home/widgets/bottom_actions_bar/enter_payment_info_dialog.dart @@ -5,9 +5,9 @@ import 'package:c_breez/bloc/input/input_source.dart'; import 'package:c_breez/theme/theme_provider.dart' as theme; import 'package:c_breez/widgets/flushbar.dart'; import 'package:c_breez/widgets/loader.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("EnterPaymentInfoDialog"); diff --git a/lib/routes/home/widgets/payments_filter/payment_filter_exporter.dart b/lib/routes/home/widgets/payments_filter/payment_filter_exporter.dart index 36963252c..57af5d8e8 100644 --- a/lib/routes/home/widgets/payments_filter/payment_filter_exporter.dart +++ b/lib/routes/home/widgets/payments_filter/payment_filter_exporter.dart @@ -7,9 +7,9 @@ import 'package:c_breez/bloc/currency/currency_bloc.dart'; import 'package:c_breez/theme/theme_provider.dart'; import 'package:c_breez/widgets/flushbar.dart'; import 'package:c_breez/widgets/loader.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; import 'package:share_plus/share_plus.dart'; class PaymentmentFilterExporter extends StatelessWidget { diff --git a/lib/routes/home/widgets/payments_list/payment_details_dialog.dart b/lib/routes/home/widgets/payments_list/payment_details_dialog.dart index 8d12739bc..a84627360 100644 --- a/lib/routes/home/widgets/payments_list/payment_details_dialog.dart +++ b/lib/routes/home/widgets/payments_list/payment_details_dialog.dart @@ -12,8 +12,8 @@ import 'package:c_breez/routes/home/widgets/payments_list/dialog/payment_details import 'package:c_breez/routes/home/widgets/payments_list/dialog/payment_details_dialog_preimage.dart'; import 'package:c_breez/routes/home/widgets/payments_list/dialog/payment_details_dialog_success_action.dart'; import 'package:c_breez/routes/home/widgets/payments_list/dialog/payment_details_dialog_title.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; +import 'package:logging/logging.dart'; final AutoSizeGroup _labelGroup = AutoSizeGroup(); final AutoSizeGroup _valueGroup = AutoSizeGroup(); diff --git a/lib/routes/home/widgets/qr_action_button.dart b/lib/routes/home/widgets/qr_action_button.dart index 076baad67..88cc1295a 100644 --- a/lib/routes/home/widgets/qr_action_button.dart +++ b/lib/routes/home/widgets/qr_action_button.dart @@ -5,10 +5,10 @@ import 'package:c_breez/bloc/lsp/lsp_bloc.dart'; import 'package:c_breez/bloc/lsp/lsp_state.dart'; import 'package:c_breez/theme/theme_provider.dart' as theme; import 'package:c_breez/widgets/flushbar.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_svg/svg.dart'; +import 'package:logging/logging.dart'; final _log = Logger("QrActionButton"); diff --git a/lib/routes/lnurl/auth/lnurl_auth_handler.dart b/lib/routes/lnurl/auth/lnurl_auth_handler.dart index 8fe78033e..220cade52 100644 --- a/lib/routes/lnurl/auth/lnurl_auth_handler.dart +++ b/lib/routes/lnurl/auth/lnurl_auth_handler.dart @@ -5,9 +5,9 @@ import 'package:c_breez/routes/lnurl/auth/login_text.dart'; import 'package:c_breez/routes/lnurl/widgets/lnurl_page_result.dart'; import 'package:c_breez/widgets/error_dialog.dart'; import 'package:c_breez/widgets/loader.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("HandleLNURLAuthRequest"); diff --git a/lib/routes/lnurl/payment/lnurl_payment_dialog.dart b/lib/routes/lnurl/payment/lnurl_payment_dialog.dart index b4518a61d..1cb5b2d01 100644 --- a/lib/routes/lnurl/payment/lnurl_payment_dialog.dart +++ b/lib/routes/lnurl/payment/lnurl_payment_dialog.dart @@ -6,9 +6,9 @@ import 'package:c_breez/bloc/currency/currency_bloc.dart'; import 'package:c_breez/models/currency.dart'; import 'package:c_breez/routes/lnurl/payment/lnurl_payment_info.dart'; import 'package:c_breez/utils/fiat_conversion.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("LNURLPaymentDialog"); diff --git a/lib/routes/lnurl/payment/lnurl_payment_handler.dart b/lib/routes/lnurl/payment/lnurl_payment_handler.dart index 574e8e905..97c202163 100644 --- a/lib/routes/lnurl/payment/lnurl_payment_handler.dart +++ b/lib/routes/lnurl/payment/lnurl_payment_handler.dart @@ -7,9 +7,9 @@ import 'package:c_breez/routes/lnurl/payment/success_action/success_action_dialo import 'package:c_breez/routes/lnurl/widgets/lnurl_page_result.dart'; import 'package:c_breez/widgets/payment_dialogs/processing_payment_dialog.dart'; import 'package:c_breez/widgets/route.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("HandleLNURLPayRequest"); diff --git a/lib/routes/lnurl/payment/lnurl_payment_page.dart b/lib/routes/lnurl/payment/lnurl_payment_page.dart index cab185a6e..a742dcf9e 100644 --- a/lib/routes/lnurl/payment/lnurl_payment_page.dart +++ b/lib/routes/lnurl/payment/lnurl_payment_page.dart @@ -12,12 +12,11 @@ import 'package:c_breez/utils/payment_validator.dart'; import 'package:c_breez/widgets/amount_form_field/amount_form_field.dart'; import 'package:c_breez/widgets/back_button.dart' as back_button; import 'package:c_breez/widgets/single_button_bottom_bar.dart'; -import 'package:flutter/gestures.dart'; -// import 'package:email_validator/email_validator.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +// import 'package:email_validator/email_validator.dart'; +import 'package:logging/logging.dart'; final _log = Logger("LNURLPaymentPage"); diff --git a/lib/routes/lnurl/withdraw/lnurl_withdraw_dialog.dart b/lib/routes/lnurl/withdraw/lnurl_withdraw_dialog.dart index 6b107a345..90d3baad6 100644 --- a/lib/routes/lnurl/withdraw/lnurl_withdraw_dialog.dart +++ b/lib/routes/lnurl/withdraw/lnurl_withdraw_dialog.dart @@ -5,9 +5,9 @@ import 'package:c_breez/routes/lnurl/widgets/lnurl_page_result.dart'; import 'package:c_breez/theme/theme_provider.dart' as theme; import 'package:c_breez/utils/exceptions.dart'; import 'package:c_breez/widgets/loading_animated_text.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("LNURLWithdrawDialog"); diff --git a/lib/routes/lnurl/withdraw/lnurl_withdraw_handler.dart b/lib/routes/lnurl/withdraw/lnurl_withdraw_handler.dart index 30fa29755..b39f94395 100644 --- a/lib/routes/lnurl/withdraw/lnurl_withdraw_handler.dart +++ b/lib/routes/lnurl/withdraw/lnurl_withdraw_handler.dart @@ -7,8 +7,8 @@ import 'package:c_breez/routes/create_invoice/widgets/successful_payment.dart'; import 'package:c_breez/routes/lnurl/widgets/lnurl_page_result.dart'; import 'package:c_breez/widgets/error_dialog.dart'; import 'package:c_breez/widgets/transparent_page_route.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; +import 'package:logging/logging.dart'; final _log = Logger("HandleLNURLWithdrawPageResult"); diff --git a/lib/routes/lsp/widgets/lsp_list_widget.dart b/lib/routes/lsp/widgets/lsp_list_widget.dart index d8e98832e..a1fbb4b19 100644 --- a/lib/routes/lsp/widgets/lsp_list_widget.dart +++ b/lib/routes/lsp/widgets/lsp_list_widget.dart @@ -3,9 +3,9 @@ import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/bloc/lsp/lsp_bloc.dart'; import 'package:c_breez/routes/lsp/widgets/lsp_list.dart'; import 'package:c_breez/widgets/loader.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; class LspListWidget extends StatefulWidget { final LspInformation? selectedLsp; diff --git a/lib/routes/network/widget/mempool_settings_widget.dart b/lib/routes/network/widget/mempool_settings_widget.dart index bf931cba4..3d73563a0 100644 --- a/lib/routes/network/widget/mempool_settings_widget.dart +++ b/lib/routes/network/widget/mempool_settings_widget.dart @@ -1,9 +1,9 @@ import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/bloc/network/network_settings_bloc.dart'; import 'package:c_breez/bloc/network/network_settings_state.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("MempoolSettingsWidget"); diff --git a/lib/routes/payment_options/widget/actions_fee.dart b/lib/routes/payment_options/widget/actions_fee.dart index 4ebb97323..319dbfde1 100644 --- a/lib/routes/payment_options/widget/actions_fee.dart +++ b/lib/routes/payment_options/widget/actions_fee.dart @@ -2,9 +2,9 @@ import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/bloc/payment_options/payment_options_bloc.dart'; import 'package:c_breez/bloc/payment_options/payment_options_state.dart'; import 'package:c_breez/routes/payment_options/widget/save_dialog.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("ActionsFee"); diff --git a/lib/routes/payment_options/widget/exempt_fee_widget.dart b/lib/routes/payment_options/widget/exempt_fee_widget.dart index 494c443d0..29280cd4d 100644 --- a/lib/routes/payment_options/widget/exempt_fee_widget.dart +++ b/lib/routes/payment_options/widget/exempt_fee_widget.dart @@ -4,10 +4,10 @@ import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/bloc/payment_options/form_validator.dart'; import 'package:c_breez/bloc/payment_options/payment_options_bloc.dart'; import 'package:c_breez/bloc/payment_options/payment_options_state.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; final _log = Logger("ExemptfeeMsatWidget"); diff --git a/lib/routes/payment_options/widget/override_fee.dart b/lib/routes/payment_options/widget/override_fee.dart index 13c3b4c46..23ee5af20 100644 --- a/lib/routes/payment_options/widget/override_fee.dart +++ b/lib/routes/payment_options/widget/override_fee.dart @@ -1,9 +1,9 @@ import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/bloc/payment_options/payment_options_bloc.dart'; import 'package:c_breez/bloc/payment_options/payment_options_state.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("OverrideFee"); diff --git a/lib/routes/payment_options/widget/proportional_fee_widget.dart b/lib/routes/payment_options/widget/proportional_fee_widget.dart index c049cf418..f9b32ee2d 100644 --- a/lib/routes/payment_options/widget/proportional_fee_widget.dart +++ b/lib/routes/payment_options/widget/proportional_fee_widget.dart @@ -4,11 +4,11 @@ import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/bloc/payment_options/form_validator.dart'; import 'package:c_breez/bloc/payment_options/payment_options_bloc.dart'; import 'package:c_breez/bloc/payment_options/payment_options_state.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; final _log = Logger("ProportionalFeeWidget"); diff --git a/lib/routes/payment_options/widget/save_dialog.dart b/lib/routes/payment_options/widget/save_dialog.dart index 8d1cd4833..4950c985b 100644 --- a/lib/routes/payment_options/widget/save_dialog.dart +++ b/lib/routes/payment_options/widget/save_dialog.dart @@ -1,8 +1,8 @@ import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/bloc/payment_options/payment_options_bloc.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("SaveDialog"); diff --git a/lib/routes/qr_scan/widgets/qr_scan.dart b/lib/routes/qr_scan/widgets/qr_scan.dart index 9fe3342fc..9c6388e79 100644 --- a/lib/routes/qr_scan/widgets/qr_scan.dart +++ b/lib/routes/qr_scan/widgets/qr_scan.dart @@ -1,10 +1,10 @@ import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/routes/qr_scan/scan_overlay.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:image_picker/image_picker.dart'; +import 'package:logging/logging.dart'; import 'package:mobile_scanner/mobile_scanner.dart'; final _log = Logger("QRScan"); diff --git a/lib/routes/security/secured_page.dart b/lib/routes/security/secured_page.dart index afbaa5cb2..58149d5f7 100644 --- a/lib/routes/security/secured_page.dart +++ b/lib/routes/security/secured_page.dart @@ -2,9 +2,9 @@ import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/bloc/security/security_bloc.dart'; import 'package:c_breez/bloc/security/security_state.dart'; import 'package:c_breez/routes/security/widget/pin_code_widget.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("SecuredPage"); diff --git a/lib/routes/security/widget/digit_button_widget.dart b/lib/routes/security/widget/digit_button_widget.dart index 6a0041e34..790fe5e4c 100644 --- a/lib/routes/security/widget/digit_button_widget.dart +++ b/lib/routes/security/widget/digit_button_widget.dart @@ -13,7 +13,7 @@ class DigitButtonWidget extends StatelessWidget { this.icon, this.foregroundColor = Colors.white, this.onPressed, - }) : assert(digit != null || icon != null, "Either digit or icon must be provided"); + }) : assert(digit != null || icon != null, "Either digit or icon must be provided"); @override Widget build(BuildContext context) { diff --git a/lib/routes/subswap/swap/get_refund/widgets/refund_item.dart b/lib/routes/subswap/swap/get_refund/widgets/refund_item.dart index aa2914508..133155ce3 100644 --- a/lib/routes/subswap/swap/get_refund/widgets/refund_item.dart +++ b/lib/routes/subswap/swap/get_refund/widgets/refund_item.dart @@ -31,8 +31,7 @@ class RefundItem extends StatelessWidget { class _RefundItemAmount extends StatelessWidget { final int confirmedSats; - const _RefundItemAmount( - this.confirmedSats); + const _RefundItemAmount(this.confirmedSats); @override Widget build(BuildContext context) { diff --git a/lib/routes/subswap/swap/get_refund/widgets/refund_item_action.dart b/lib/routes/subswap/swap/get_refund/widgets/refund_item_action.dart index 7dc32556e..f54a3be22 100644 --- a/lib/routes/subswap/swap/get_refund/widgets/refund_item_action.dart +++ b/lib/routes/subswap/swap/get_refund/widgets/refund_item_action.dart @@ -4,8 +4,8 @@ import 'package:c_breez/routes/subswap/swap/get_refund/send_onchain.dart'; import 'package:c_breez/routes/subswap/swap/get_refund/wait_broadcast_dialog.dart'; import 'package:c_breez/widgets/route.dart'; import 'package:c_breez/widgets/single_button_bottom_bar.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; +import 'package:logging/logging.dart'; final _log = Logger("RefundItemAction"); diff --git a/lib/routes/subswap/swap/get_refund/widgets/send_onchain_form.dart b/lib/routes/subswap/swap/get_refund/widgets/send_onchain_form.dart index c941ae6e1..c673fdb52 100644 --- a/lib/routes/subswap/swap/get_refund/widgets/send_onchain_form.dart +++ b/lib/routes/subswap/swap/get_refund/widgets/send_onchain_form.dart @@ -7,10 +7,10 @@ import 'package:c_breez/theme/theme_provider.dart' as theme; import 'package:c_breez/utils/validator_holder.dart'; import 'package:c_breez/widgets/flushbar.dart'; import 'package:c_breez/widgets/keyboard_done_action.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("SendOnchainForm"); diff --git a/lib/routes/withdraw/reverse_swap/confirmation_page/reverse_swap_confirmation_page.dart b/lib/routes/withdraw/reverse_swap/confirmation_page/reverse_swap_confirmation_page.dart index c6ef3723f..04d2968b4 100644 --- a/lib/routes/withdraw/reverse_swap/confirmation_page/reverse_swap_confirmation_page.dart +++ b/lib/routes/withdraw/reverse_swap/confirmation_page/reverse_swap_confirmation_page.dart @@ -1,6 +1,6 @@ import 'package:breez_translations/breez_translations_locales.dart'; -import 'package:c_breez/bloc/fee_options/fee_options_bloc.dart'; import 'package:c_breez/bloc/fee_options/fee_option.dart'; +import 'package:c_breez/bloc/fee_options/fee_options_bloc.dart'; import 'package:c_breez/routes/withdraw/reverse_swap/confirmation_page/widgets/reverse_swap_button.dart'; import 'package:c_breez/routes/withdraw/widgets/fee_chooser/fee_chooser.dart'; import 'package:c_breez/widgets/loader.dart'; diff --git a/lib/routes/withdraw/reverse_swap/reverse_swap_page.dart b/lib/routes/withdraw/reverse_swap/reverse_swap_page.dart index b47396ec0..96f9e2ace 100644 --- a/lib/routes/withdraw/reverse_swap/reverse_swap_page.dart +++ b/lib/routes/withdraw/reverse_swap/reverse_swap_page.dart @@ -18,9 +18,9 @@ import 'package:c_breez/widgets/back_button.dart' as back_button; import 'package:c_breez/widgets/loader.dart'; import 'package:c_breez/widgets/route.dart'; import 'package:c_breez/widgets/single_button_bottom_bar.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("ReverseSwapPage"); diff --git a/lib/routes/withdraw/sweep/confirmation_page/sweep_confirmation_page.dart b/lib/routes/withdraw/sweep/confirmation_page/sweep_confirmation_page.dart index ea1a2f1f5..61139be2e 100644 --- a/lib/routes/withdraw/sweep/confirmation_page/sweep_confirmation_page.dart +++ b/lib/routes/withdraw/sweep/confirmation_page/sweep_confirmation_page.dart @@ -1,6 +1,6 @@ import 'package:breez_translations/breez_translations_locales.dart'; -import 'package:c_breez/bloc/fee_options/fee_options_bloc.dart'; import 'package:c_breez/bloc/fee_options/fee_option.dart'; +import 'package:c_breez/bloc/fee_options/fee_options_bloc.dart'; import 'package:c_breez/routes/withdraw/sweep/confirmation_page/widgets/sweep_button.dart'; import 'package:c_breez/routes/withdraw/widgets/fee_chooser/fee_chooser.dart'; import 'package:c_breez/widgets/loader.dart'; diff --git a/lib/routes/withdraw/sweep/sweep_page.dart b/lib/routes/withdraw/sweep/sweep_page.dart index 0f81b916b..817d5169c 100644 --- a/lib/routes/withdraw/sweep/sweep_page.dart +++ b/lib/routes/withdraw/sweep/sweep_page.dart @@ -12,9 +12,9 @@ import 'package:c_breez/widgets/back_button.dart' as back_button; import 'package:c_breez/widgets/route.dart'; import 'package:c_breez/widgets/single_button_bottom_bar.dart'; import 'package:c_breez/widgets/warning_box.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("SweepPage"); diff --git a/lib/routes/withdraw/widgets/bitcoin_address_text_form_field.dart b/lib/routes/withdraw/widgets/bitcoin_address_text_form_field.dart index 70155fb86..b4cb28c98 100644 --- a/lib/routes/withdraw/widgets/bitcoin_address_text_form_field.dart +++ b/lib/routes/withdraw/widgets/bitcoin_address_text_form_field.dart @@ -4,9 +4,9 @@ import 'package:c_breez/models/bitcoin_address_info.dart'; import 'package:c_breez/theme/theme_provider.dart' as theme; import 'package:c_breez/utils/validator_holder.dart'; import 'package:c_breez/widgets/flushbar.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("BitcoinAddressTextFormField"); diff --git a/lib/routes/withdraw/widgets/withdraw_funds_amount_text_form_field.dart b/lib/routes/withdraw/widgets/withdraw_funds_amount_text_form_field.dart index ebead2562..f1ee569a3 100644 --- a/lib/routes/withdraw/widgets/withdraw_funds_amount_text_form_field.dart +++ b/lib/routes/withdraw/widgets/withdraw_funds_amount_text_form_field.dart @@ -4,9 +4,9 @@ import 'package:c_breez/bloc/lsp/lsp_bloc.dart'; import 'package:c_breez/routes/withdraw/model/withdraw_funds_model.dart'; import 'package:c_breez/utils/payment_validator.dart'; import 'package:c_breez/widgets/amount_form_field/amount_form_field.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("WithdrawFundsAmountTextFormField"); diff --git a/lib/routes/withdraw/widgets/withdraw_funds_available_btc.dart b/lib/routes/withdraw/widgets/withdraw_funds_available_btc.dart index c742a7af6..aeb0c93b5 100644 --- a/lib/routes/withdraw/widgets/withdraw_funds_available_btc.dart +++ b/lib/routes/withdraw/widgets/withdraw_funds_available_btc.dart @@ -4,9 +4,9 @@ import 'package:c_breez/bloc/account/account_state.dart'; import 'package:c_breez/bloc/currency/currency_bloc.dart'; import 'package:c_breez/bloc/currency/currency_state.dart'; import 'package:c_breez/theme/theme_provider.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; final _log = Logger("WithdrawFundsAvailableBtc"); diff --git a/lib/services/deep_links.dart b/lib/services/deep_links.dart index 10d09ce0c..9eb937e2b 100644 --- a/lib/services/deep_links.dart +++ b/lib/services/deep_links.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:logging/logging.dart'; import 'package:firebase_dynamic_links/firebase_dynamic_links.dart'; +import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; class DeepLinksService { diff --git a/lib/services/device.dart b/lib/services/device.dart index 1bca99223..8c8924898 100644 --- a/lib/services/device.dart +++ b/lib/services/device.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:clipboard_watcher/clipboard_watcher.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/services.dart'; +import 'package:logging/logging.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:rxdart/rxdart.dart'; import 'package:share_plus/share_plus.dart'; diff --git a/lib/services/notifications.dart b/lib/services/notifications.dart index 71e2ab98c..8d5e18192 100644 --- a/lib/services/notifications.dart +++ b/lib/services/notifications.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:convert'; -import 'package:logging/logging.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; +import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; abstract class Notifications { diff --git a/lib/user_app.dart b/lib/user_app.dart index 752b3884e..eb5b47596 100644 --- a/lib/user_app.dart +++ b/lib/user_app.dart @@ -35,10 +35,10 @@ import 'package:c_breez/theme/breez_dark_theme.dart'; import 'package:c_breez/theme/breez_light_theme.dart'; import 'package:c_breez/widgets/route.dart'; import 'package:c_breez/widgets/transparent_page_route.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:logging/logging.dart'; import 'package:theme_provider/theme_provider.dart'; const String THEME_ID_PREFERENCE_KEY = "themeID"; diff --git a/lib/utils/exceptions.dart b/lib/utils/exceptions.dart index 1fa27765e..a3b38a4f1 100644 --- a/lib/utils/exceptions.dart +++ b/lib/utils/exceptions.dart @@ -1,6 +1,6 @@ import 'package:breez_translations/generated/breez_translations.dart'; -import 'package:logging/logging.dart'; import "package:flutter_rust_bridge/flutter_rust_bridge.dart"; +import 'package:logging/logging.dart'; final _log = Logger("Exceptions"); diff --git a/lib/utils/external_browser.dart b/lib/utils/external_browser.dart index 07ce15bc8..f068f6224 100644 --- a/lib/utils/external_browser.dart +++ b/lib/utils/external_browser.dart @@ -1,8 +1,8 @@ import 'package:breez_translations/breez_translations_locales.dart'; import 'package:c_breez/widgets/loader.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/material.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; +import 'package:logging/logging.dart'; import 'package:url_launcher/url_launcher_string.dart'; final _log = Logger("ExternalBrowser"); diff --git a/lib/widgets/amount_form_field/breez_dropdown.dart b/lib/widgets/amount_form_field/breez_dropdown.dart index 9b333f90c..d735ac2f7 100644 --- a/lib/widgets/amount_form_field/breez_dropdown.dart +++ b/lib/widgets/amount_form_field/breez_dropdown.dart @@ -546,7 +546,7 @@ class BreezDropdownButton extends StatefulWidget { this.iconSize = 24.0, this.isDense = false, this.isExpanded = false, - }) : assert(items.isEmpty || + }) : assert(items.isEmpty || value == null || items.where((DropdownMenuItem item) => item.value == value).length == 1);