diff --git a/packages/espressocash_app/analysis_options.yaml b/packages/espressocash_app/analysis_options.yaml index 4cd2d318c..7d172bf49 100644 --- a/packages/espressocash_app/analysis_options.yaml +++ b/packages/espressocash_app/analysis_options.yaml @@ -25,25 +25,25 @@ dart_code_metrics: avoid-banned-imports: severity: error entries: - - paths: [".*/lib/.+\\.dart"] - deny: ["[^./]+/src/.*"] - message: "Do not import from src directory outside of the module" + - paths: [".*/models/.+\\.dart"] + deny: [".*/(data|services|widgets|screens|ui|l10n)/.*"] + message: "Do not import data|services|widgets|screens|ui|l10n from models" - - paths: [".*/lib/core/.+\\.dart"] - deny: ["/(app|data|features|storybook)/"] - message: "Core should not depend on these modules" + - paths: [".*/data/.+\\.dart"] + deny: [".*/(services|widgets|screens|ui|l10n)/.*"] + message: "Do not import services|widgets|screens|ui|l10n from data" - - paths: [".*/lib/data/.+\\.dart"] - deny: ["/(app|storybook|ui)/"] - message: "Data should not depend on these modules" + - paths: [".*/services/.+\\.dart"] + deny: [".*/(widgets|screens|ui|l10n)/.*"] + message: "Do not import widgets|screens|ui|l10n from services" - - paths: [".*/lib/features/.+\\.dart"] - deny: ["/(app|storybook)/"] - message: "Features should not depend on these modules" + - paths: [".*/widgets/.+\\.dart"] + deny: [".*/screens/.*"] + message: "Do not import screens from widgets" - - paths: [".*/lib/ui/.+\\.dart"] - deny: ["/(app|data|features|storybook)/"] - message: "UI should not depend on these modules" + - paths: [".*/ui/.+\\.dart"] + deny: [".*/features/.*"] + message: "Do not import features from ui" rules-exclude: - "**/*.gr.dart" diff --git a/packages/espressocash_app/integration_test/app_test.dart b/packages/espressocash_app/integration_test/app_test.dart index 0f2810a9f..aa7b958c9 100644 --- a/packages/espressocash_app/integration_test/app_test.dart +++ b/packages/espressocash_app/integration_test/app_test.dart @@ -1,5 +1,5 @@ -import 'package:espressocash_app/app/screens/authenticated/investments/investments_screen.dart'; -import 'package:espressocash_app/features/sign_in/src/widgets/get_started_screen.dart'; +import 'package:espressocash_app/features/investments/screens/investments_screen.dart'; +import 'package:espressocash_app/features/sign_in/screens/get_started_screen.dart'; import 'package:espressocash_app/main.dart' as app; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; diff --git a/packages/espressocash_app/lib/app/app.dart b/packages/espressocash_app/lib/app.dart similarity index 87% rename from packages/espressocash_app/lib/app/app.dart rename to packages/espressocash_app/lib/app.dart index e486ac4de..d88845949 100644 --- a/packages/espressocash_app/lib/app/app.dart +++ b/packages/espressocash_app/lib/app.dart @@ -4,14 +4,14 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_gen/gen_l10n/localizely_localizations.dart'; import 'package:provider/provider.dart'; -import '../core/accounts/bl/accounts_bloc.dart'; -import '../core/analytics/analytics_manager.dart'; -import '../di.dart'; -import '../features/app_lock/module.dart'; -import '../l10n/localizely_updater.dart'; -import '../routes.dart'; -import '../routes.gr.dart'; -import '../ui/theme.dart'; +import 'core/analytics/analytics_manager.dart'; +import 'di.dart'; +import 'features/accounts/services/accounts_bloc.dart'; +import 'features/app_lock/module.dart'; +import 'l10n/localizely_updater.dart'; +import 'routes.dart'; +import 'routes.gr.dart'; +import 'ui/theme.dart'; class CryptopleaseApp extends StatefulWidget { const CryptopleaseApp({super.key}); diff --git a/packages/espressocash_app/lib/core/presentation/format_amount.dart b/packages/espressocash_app/lib/core/presentation/format_amount.dart index 57025b0d9..858c44331 100644 --- a/packages/espressocash_app/lib/core/presentation/format_amount.dart +++ b/packages/espressocash_app/lib/core/presentation/format_amount.dart @@ -2,9 +2,9 @@ import 'package:decimal/decimal.dart'; import 'package:flutter/widgets.dart'; import 'package:intl/intl.dart'; +import '../../features/conversion_rates/widgets/context_ext.dart'; import '../../l10n/device_locale.dart'; import '../amount.dart'; -import '../conversion_rates/context_ext.dart'; import '../currency.dart'; extension FormatAmountWithFiatExt on CryptoAmount { diff --git a/packages/espressocash_app/lib/core/wallet.dart b/packages/espressocash_app/lib/core/wallet.dart index 1a4986890..01987dea9 100644 --- a/packages/espressocash_app/lib/core/wallet.dart +++ b/packages/espressocash_app/lib/core/wallet.dart @@ -4,7 +4,7 @@ import 'package:solana/encoder.dart'; import 'package:solana/solana.dart'; import 'package:solana_seed_vault/solana_seed_vault.dart'; -import 'accounts/bl/ec_wallet.dart'; +import '../features/accounts/models/ec_wallet.dart'; import 'extensions.dart'; Future createLocalWallet({required String mnemonic}) async { diff --git a/packages/espressocash_app/lib/data/db/db.dart b/packages/espressocash_app/lib/data/db/db.dart index 97ac5ce95..d2fa17deb 100644 --- a/packages/espressocash_app/lib/data/db/db.dart +++ b/packages/espressocash_app/lib/data/db/db.dart @@ -1,16 +1,16 @@ import 'package:drift/drift.dart'; import 'package:injectable/injectable.dart'; -import '../../core/transactions/tx_sender.dart'; -import '../../features/activities/db.dart'; +import '../../features/activities/data/tx_updater_repository.dart'; import '../../features/activities/models/transaction.dart'; -import '../../features/favorite_tokens/db.dart'; -import '../../features/incoming_split_key_payments/db.dart'; -import '../../features/outgoing_direct_payments/db.dart'; -import '../../features/outgoing_split_key_payments/db.dart'; -import '../../features/payment_request/db.dart'; -import '../../features/popular_tokens/db.dart'; -import '../../features/swap/db.dart'; +import '../../features/favorite_tokens/data/repository.dart'; +import '../../features/incoming_split_key_payments/data/iskp_repository.dart'; +import '../../features/outgoing_direct_payments/data/repository.dart'; +import '../../features/outgoing_split_key_payments/data/repository.dart'; +import '../../features/payment_request/data/repository.dart'; +import '../../features/popular_tokens/data/popular_token_cache.dart'; +import '../../features/swap/data/swap_repository.dart'; +import '../../features/transactions/models/tx_sender.dart'; import 'deprecated.dart'; import 'open_connection.dart'; diff --git a/packages/espressocash_app/lib/data/db/deprecated.dart b/packages/espressocash_app/lib/data/db/deprecated.dart index 3310ecdf2..82e1bb537 100644 --- a/packages/espressocash_app/lib/data/db/deprecated.dart +++ b/packages/espressocash_app/lib/data/db/deprecated.dart @@ -1,7 +1,7 @@ import 'package:drift/drift.dart'; -import '../../core/transactions/tx_sender.dart'; -import '../../features/outgoing_split_key_payments/db.dart'; +import '../../features/outgoing_split_key_payments/data/repository.dart'; +import '../../features/transactions/models/tx_sender.dart'; import 'mixins.dart'; class ITRows extends Table with EntityMixin { diff --git a/packages/espressocash_app/lib/data/db/mixins.dart b/packages/espressocash_app/lib/data/db/mixins.dart index e7621c540..9e1c0a3ef 100644 --- a/packages/espressocash_app/lib/data/db/mixins.dart +++ b/packages/espressocash_app/lib/data/db/mixins.dart @@ -1,6 +1,6 @@ import 'package:drift/drift.dart'; -import '../../core/transactions/tx_sender.dart'; +import '../../features/transactions/models/tx_sender.dart'; mixin AmountMixin on Table { IntColumn get amount => integer()(); diff --git a/packages/espressocash_app/lib/core/accounts/bl/account.dart b/packages/espressocash_app/lib/features/accounts/models/account.dart similarity index 100% rename from packages/espressocash_app/lib/core/accounts/bl/account.dart rename to packages/espressocash_app/lib/features/accounts/models/account.dart diff --git a/packages/espressocash_app/lib/core/accounts/bl/ec_wallet.dart b/packages/espressocash_app/lib/features/accounts/models/ec_wallet.dart similarity index 100% rename from packages/espressocash_app/lib/core/accounts/bl/ec_wallet.dart rename to packages/espressocash_app/lib/features/accounts/models/ec_wallet.dart diff --git a/packages/espressocash_app/lib/core/accounts/bl/mnemonic.dart b/packages/espressocash_app/lib/features/accounts/models/mnemonic.dart similarity index 100% rename from packages/espressocash_app/lib/core/accounts/bl/mnemonic.dart rename to packages/espressocash_app/lib/features/accounts/models/mnemonic.dart diff --git a/packages/espressocash_app/lib/core/accounts/module.dart b/packages/espressocash_app/lib/features/accounts/module.dart similarity index 94% rename from packages/espressocash_app/lib/core/accounts/module.dart rename to packages/espressocash_app/lib/features/accounts/module.dart index b94e8edc4..31fac36fd 100644 --- a/packages/espressocash_app/lib/core/accounts/module.dart +++ b/packages/espressocash_app/lib/features/accounts/module.dart @@ -6,12 +6,12 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:nested/nested.dart'; import 'package:solana_seed_vault/solana_seed_vault.dart'; +import '../../core/callback.dart'; +import '../../core/extensions.dart'; import '../../di.dart'; -import '../callback.dart'; -import '../extensions.dart'; -import 'bl/account.dart'; -import 'bl/accounts_bloc.dart'; -import 'bl/ec_wallet.dart'; +import 'models/account.dart'; +import 'models/ec_wallet.dart'; +import 'services/accounts_bloc.dart'; class AccountsModule extends SingleChildStatelessWidget { const AccountsModule({super.key, super.child}); diff --git a/packages/espressocash_app/lib/core/accounts/bl/accounts_bloc.dart b/packages/espressocash_app/lib/features/accounts/services/accounts_bloc.dart similarity index 96% rename from packages/espressocash_app/lib/core/accounts/bl/accounts_bloc.dart rename to packages/espressocash_app/lib/features/accounts/services/accounts_bloc.dart index 7aed7f41e..5cfdfa9df 100644 --- a/packages/espressocash_app/lib/core/accounts/bl/accounts_bloc.dart +++ b/packages/espressocash_app/lib/features/accounts/services/accounts_bloc.dart @@ -9,11 +9,11 @@ import 'package:injectable/injectable.dart'; import 'package:path/path.dart'; import 'package:solana_seed_vault/solana_seed_vault.dart'; -import '../../file_manager.dart'; -import '../../wallet.dart'; -import 'account.dart'; -import 'ec_wallet.dart'; -import 'mnemonic.dart'; +import '../../../core/file_manager.dart'; +import '../../../core/wallet.dart'; +import '../models/account.dart'; +import '../models/ec_wallet.dart'; +import '../models/mnemonic.dart'; part 'accounts_bloc.freezed.dart'; part 'accounts_event.dart'; diff --git a/packages/espressocash_app/lib/core/accounts/bl/accounts_event.dart b/packages/espressocash_app/lib/features/accounts/services/accounts_event.dart similarity index 100% rename from packages/espressocash_app/lib/core/accounts/bl/accounts_event.dart rename to packages/espressocash_app/lib/features/accounts/services/accounts_event.dart diff --git a/packages/espressocash_app/lib/core/accounts/bl/accounts_state.dart b/packages/espressocash_app/lib/features/accounts/services/accounts_state.dart similarity index 100% rename from packages/espressocash_app/lib/core/accounts/bl/accounts_state.dart rename to packages/espressocash_app/lib/features/accounts/services/accounts_state.dart diff --git a/packages/espressocash_app/lib/features/activities/src/activity_builder.dart b/packages/espressocash_app/lib/features/activities/data/activity_builder.dart similarity index 80% rename from packages/espressocash_app/lib/features/activities/src/activity_builder.dart rename to packages/espressocash_app/lib/features/activities/data/activity_builder.dart index 16a872a8a..91e60d712 100644 --- a/packages/espressocash_app/lib/features/activities/src/activity_builder.dart +++ b/packages/espressocash_app/lib/features/activities/data/activity_builder.dart @@ -1,9 +1,9 @@ import '../../../core/tokens/token_list.dart'; import '../../../data/db/db.dart'; -import '../../outgoing_direct_payments/db.dart'; -import '../../outgoing_split_key_payments/db.dart'; -import '../../swap/db.dart'; -import 'activity.dart'; +import '../../outgoing_direct_payments/data/repository.dart'; +import '../../outgoing_split_key_payments/data/repository.dart'; +import '../../swap/data/swap_repository.dart'; +import '../models/activity.dart'; extension PaymentRequestRowToActivityExt on PaymentRequestRow { Activity toActivity() => Activity.outgoingPaymentRequest( diff --git a/packages/espressocash_app/lib/features/activities/src/pending_activities_repository.dart b/packages/espressocash_app/lib/features/activities/data/pending_activities_repository.dart similarity index 87% rename from packages/espressocash_app/lib/features/activities/src/pending_activities_repository.dart rename to packages/espressocash_app/lib/features/activities/data/pending_activities_repository.dart index ab9734a05..af40713e8 100644 --- a/packages/espressocash_app/lib/features/activities/src/pending_activities_repository.dart +++ b/packages/espressocash_app/lib/features/activities/data/pending_activities_repository.dart @@ -6,11 +6,11 @@ import 'package:rxdart/rxdart.dart'; import '../../../core/tokens/token_list.dart'; import '../../../data/db/db.dart'; -import '../../outgoing_direct_payments/db.dart'; -import '../../outgoing_split_key_payments/db.dart'; -import '../../payment_request/db.dart'; -import '../../swap/db.dart'; -import 'activity.dart'; +import '../../outgoing_direct_payments/data/repository.dart'; +import '../../outgoing_split_key_payments/data/repository.dart'; +import '../../payment_request/data/repository.dart'; +import '../../swap/data/swap_repository.dart'; +import '../models/activity.dart'; import 'activity_builder.dart'; @injectable diff --git a/packages/espressocash_app/lib/features/activities/src/transaction_repository.dart b/packages/espressocash_app/lib/features/activities/data/transaction_repository.dart similarity index 91% rename from packages/espressocash_app/lib/features/activities/src/transaction_repository.dart rename to packages/espressocash_app/lib/features/activities/data/transaction_repository.dart index f284044a5..daf4fc1d9 100644 --- a/packages/espressocash_app/lib/features/activities/src/transaction_repository.dart +++ b/packages/espressocash_app/lib/features/activities/data/transaction_repository.dart @@ -10,14 +10,14 @@ import 'package:solana/solana.dart'; import '../../../core/tokens/token_list.dart'; import '../../../data/db/db.dart'; -import '../../outgoing_direct_payments/db.dart'; -import '../../outgoing_split_key_payments/db.dart'; -import '../../payment_request/db.dart'; -import '../../swap/db.dart'; +import '../../outgoing_direct_payments/data/repository.dart'; +import '../../outgoing_split_key_payments/data/repository.dart'; +import '../../payment_request/data/repository.dart'; +import '../../swap/data/swap_repository.dart'; +import '../models/activity.dart'; import '../models/transaction.dart'; -import 'activity.dart'; import 'activity_builder.dart'; -import 'updater/tx_updater_repository.dart'; +import 'tx_updater_repository.dart'; @injectable class TransactionRepository { diff --git a/packages/espressocash_app/lib/features/activities/src/updater/tx_updater_repository.dart b/packages/espressocash_app/lib/features/activities/data/tx_updater_repository.dart similarity index 97% rename from packages/espressocash_app/lib/features/activities/src/updater/tx_updater_repository.dart rename to packages/espressocash_app/lib/features/activities/data/tx_updater_repository.dart index 67cc8ad2d..f90669438 100644 --- a/packages/espressocash_app/lib/features/activities/src/updater/tx_updater_repository.dart +++ b/packages/espressocash_app/lib/features/activities/data/tx_updater_repository.dart @@ -5,8 +5,8 @@ import 'package:solana/dto.dart'; import 'package:solana/encoder.dart'; import 'package:solana/solana.dart'; -import '../../../../data/db/db.dart'; -import '../../models/transaction.dart'; +import '../../../data/db/db.dart'; +import '../models/transaction.dart'; @injectable class TxUpdaterRepository { diff --git a/packages/espressocash_app/lib/features/activities/db.dart b/packages/espressocash_app/lib/features/activities/db.dart deleted file mode 100644 index 4165bfc67..000000000 --- a/packages/espressocash_app/lib/features/activities/db.dart +++ /dev/null @@ -1 +0,0 @@ -export 'src/updater/tx_updater_repository.dart' show TransactionRows; diff --git a/packages/espressocash_app/lib/features/activities/src/activity.dart b/packages/espressocash_app/lib/features/activities/models/activity.dart similarity index 100% rename from packages/espressocash_app/lib/features/activities/src/activity.dart rename to packages/espressocash_app/lib/features/activities/models/activity.dart diff --git a/packages/espressocash_app/lib/features/activities/models/transaction.dart b/packages/espressocash_app/lib/features/activities/models/transaction.dart index bd6eff036..862b5626b 100644 --- a/packages/espressocash_app/lib/features/activities/models/transaction.dart +++ b/packages/espressocash_app/lib/features/activities/models/transaction.dart @@ -1,7 +1,7 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:solana/encoder.dart'; -import '../src/activity.dart'; +import 'activity.dart'; part 'transaction.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/activities/module.dart b/packages/espressocash_app/lib/features/activities/module.dart index 2686a1a4e..e5c58681f 100644 --- a/packages/espressocash_app/lib/features/activities/module.dart +++ b/packages/espressocash_app/lib/features/activities/module.dart @@ -3,10 +3,10 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:nested/nested.dart'; import 'package:provider/provider.dart'; -import '../../core/accounts/bl/account.dart'; -import '../../core/accounts/module.dart'; import '../../di.dart'; -import 'src/updater/bloc.dart'; +import '../accounts/models/account.dart'; +import '../accounts/module.dart'; +import 'services/bloc.dart'; class ActivitiesModule extends SingleChildStatelessWidget { const ActivitiesModule({super.key, super.child}); diff --git a/packages/espressocash_app/lib/app/screens/authenticated/activities/activities_screen.dart b/packages/espressocash_app/lib/features/activities/screens/activities_screen.dart similarity index 84% rename from packages/espressocash_app/lib/app/screens/authenticated/activities/activities_screen.dart rename to packages/espressocash_app/lib/features/activities/screens/activities_screen.dart index 65814ddc5..d6cc1c870 100644 --- a/packages/espressocash_app/lib/app/screens/authenticated/activities/activities_screen.dart +++ b/packages/espressocash_app/lib/features/activities/screens/activities_screen.dart @@ -1,12 +1,12 @@ import 'package:auto_route/annotations.dart'; import 'package:flutter/material.dart' hide Notification; -import '../../../../core/presentation/page_fade_wrapper.dart'; -import '../../../../features/activities/widgets/pending_activities_list.dart'; -import '../../../../features/activities/widgets/transaction_list.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/app_bar.dart'; -import '../../../../ui/tab_bar.dart'; +import '../../../core/presentation/page_fade_wrapper.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/app_bar.dart'; +import '../../../ui/tab_bar.dart'; +import '../widgets/pending_activities_list.dart'; +import '../widgets/transaction_list.dart'; @RoutePage() class ActivitiesScreen extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/activities/src/updater/bloc.dart b/packages/espressocash_app/lib/features/activities/services/bloc.dart similarity index 93% rename from packages/espressocash_app/lib/features/activities/src/updater/bloc.dart rename to packages/espressocash_app/lib/features/activities/services/bloc.dart index 92fa7d52b..65a3cf7dd 100644 --- a/packages/espressocash_app/lib/features/activities/src/updater/bloc.dart +++ b/packages/espressocash_app/lib/features/activities/services/bloc.dart @@ -4,9 +4,9 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; import 'package:rxdart/rxdart.dart'; -import '../../../../core/accounts/bl/ec_wallet.dart'; -import '../../../../core/processing_state.dart'; -import 'tx_updater_repository.dart'; +import '../../../core/processing_state.dart'; +import '../../accounts/models/ec_wallet.dart'; +import '../data/tx_updater_repository.dart'; part 'bloc.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/activities/src/widgets/common_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/common_tile.dart similarity index 88% rename from packages/espressocash_app/lib/features/activities/src/widgets/common_tile.dart rename to packages/espressocash_app/lib/features/activities/widgets/common_tile.dart index 39970b3b4..43d25a9ea 100644 --- a/packages/espressocash_app/lib/features/activities/src/widgets/common_tile.dart +++ b/packages/espressocash_app/lib/features/activities/widgets/common_tile.dart @@ -3,10 +3,10 @@ import 'package:flutter/material.dart'; import '../../../../core/presentation/format_date.dart'; import '../../../../core/presentation/utils.dart'; -import '../../../../core/transactions/create_transaction_link.dart'; import '../../../../gen/assets.gen.dart'; import '../../../../ui/activity_tile.dart'; -import '../../models/transaction.dart'; +import '../../transactions/services/create_transaction_link.dart'; +import '../models/transaction.dart'; class CommonTile extends StatelessWidget { const CommonTile({ diff --git a/packages/espressocash_app/lib/features/activities/src/widgets/no_activity.dart b/packages/espressocash_app/lib/features/activities/widgets/no_activity.dart similarity index 100% rename from packages/espressocash_app/lib/features/activities/src/widgets/no_activity.dart rename to packages/espressocash_app/lib/features/activities/widgets/no_activity.dart diff --git a/packages/espressocash_app/lib/features/activities/src/widgets/odp_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/odp_tile.dart similarity index 97% rename from packages/espressocash_app/lib/features/activities/src/widgets/odp_tile.dart rename to packages/espressocash_app/lib/features/activities/widgets/odp_tile.dart index 8fa5f6899..84e2772e6 100644 --- a/packages/espressocash_app/lib/features/activities/src/widgets/odp_tile.dart +++ b/packages/espressocash_app/lib/features/activities/widgets/odp_tile.dart @@ -9,7 +9,7 @@ import '../../../../l10n/device_locale.dart'; import '../../../../l10n/l10n.dart'; import '../../../../routes.gr.dart'; import '../../../../ui/activity_tile.dart'; -import '../activity.dart'; +import '../models/activity.dart'; class ODPTile extends StatelessWidget { const ODPTile({super.key, required this.activity}); diff --git a/packages/espressocash_app/lib/features/activities/src/widgets/oskp_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/oskp_tile.dart similarity index 97% rename from packages/espressocash_app/lib/features/activities/src/widgets/oskp_tile.dart rename to packages/espressocash_app/lib/features/activities/widgets/oskp_tile.dart index 9391eb411..e4b27167f 100644 --- a/packages/espressocash_app/lib/features/activities/src/widgets/oskp_tile.dart +++ b/packages/espressocash_app/lib/features/activities/widgets/oskp_tile.dart @@ -9,7 +9,7 @@ import '../../../../l10n/device_locale.dart'; import '../../../../l10n/l10n.dart'; import '../../../../routes.gr.dart'; import '../../../../ui/activity_tile.dart'; -import '../activity.dart'; +import '../models/activity.dart'; class OSKPTile extends StatelessWidget { const OSKPTile({super.key, required this.activity}); diff --git a/packages/espressocash_app/lib/features/activities/src/widgets/payment_request_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/payment_request_tile.dart similarity index 88% rename from packages/espressocash_app/lib/features/activities/src/widgets/payment_request_tile.dart rename to packages/espressocash_app/lib/features/activities/widgets/payment_request_tile.dart index 0d2daf6a9..4587b7b9c 100644 --- a/packages/espressocash_app/lib/features/activities/src/widgets/payment_request_tile.dart +++ b/packages/espressocash_app/lib/features/activities/widgets/payment_request_tile.dart @@ -8,10 +8,10 @@ import '../../../../l10n/device_locale.dart'; import '../../../../l10n/l10n.dart'; import '../../../../routes.gr.dart'; import '../../../../ui/activity_tile.dart'; -import '../../../payment_request/formatted_amount.dart'; -import '../../../payment_request/models/payment_request.dart'; -import '../../../payment_request/watch_payment_request.dart'; -import '../../../payment_request/widgets/payment_request_verifier.dart'; +import '../../payment_request/data/watch_payment_request.dart'; +import '../../payment_request/models/payment_request.dart'; +import '../../payment_request/widgets/formatted_amount.dart'; +import '../../payment_request/widgets/payment_request_verifier.dart'; class PaymentRequestTile extends StatefulWidget { const PaymentRequestTile({ diff --git a/packages/espressocash_app/lib/features/activities/widgets/pending_activities_list.dart b/packages/espressocash_app/lib/features/activities/widgets/pending_activities_list.dart index 0481c5e7f..e4e6b45b3 100644 --- a/packages/espressocash_app/lib/features/activities/widgets/pending_activities_list.dart +++ b/packages/espressocash_app/lib/features/activities/widgets/pending_activities_list.dart @@ -2,13 +2,13 @@ import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:flutter/material.dart' hide Notification; import '../../../di.dart'; -import '../src/activity.dart'; -import '../src/pending_activities_repository.dart'; -import '../src/widgets/no_activity.dart'; -import '../src/widgets/odp_tile.dart'; -import '../src/widgets/oskp_tile.dart'; -import '../src/widgets/payment_request_tile.dart'; -import '../src/widgets/swap_tile.dart'; +import '../data/pending_activities_repository.dart'; +import '../models/activity.dart'; +import 'no_activity.dart'; +import 'odp_tile.dart'; +import 'oskp_tile.dart'; +import 'payment_request_tile.dart'; +import 'swap_tile.dart'; class PendingActivitiesList extends StatefulWidget { const PendingActivitiesList({ diff --git a/packages/espressocash_app/lib/features/activities/src/widgets/styles.dart b/packages/espressocash_app/lib/features/activities/widgets/styles.dart similarity index 100% rename from packages/espressocash_app/lib/features/activities/src/widgets/styles.dart rename to packages/espressocash_app/lib/features/activities/widgets/styles.dart diff --git a/packages/espressocash_app/lib/features/activities/src/widgets/swap_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/swap_tile.dart similarity index 98% rename from packages/espressocash_app/lib/features/activities/src/widgets/swap_tile.dart rename to packages/espressocash_app/lib/features/activities/widgets/swap_tile.dart index 744b6d407..69881c370 100644 --- a/packages/espressocash_app/lib/features/activities/src/widgets/swap_tile.dart +++ b/packages/espressocash_app/lib/features/activities/widgets/swap_tile.dart @@ -10,7 +10,7 @@ import '../../../../l10n/l10n.dart'; import '../../../../routes.gr.dart'; import '../../../../ui/activity_tile.dart'; import '../../../../ui/token_icon.dart'; -import '../activity.dart'; +import '../models/activity.dart'; class SwapTile extends StatelessWidget { const SwapTile({super.key, required this.activity}); diff --git a/packages/espressocash_app/lib/features/activities/src/widgets/transaction_item.dart b/packages/espressocash_app/lib/features/activities/widgets/transaction_item.dart similarity index 95% rename from packages/espressocash_app/lib/features/activities/src/widgets/transaction_item.dart rename to packages/espressocash_app/lib/features/activities/widgets/transaction_item.dart index c4fa1d15d..cdc30f21a 100644 --- a/packages/espressocash_app/lib/features/activities/src/widgets/transaction_item.dart +++ b/packages/espressocash_app/lib/features/activities/widgets/transaction_item.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import '../../../../di.dart'; -import '../../models/transaction.dart'; -import '../transaction_repository.dart'; +import '../data/transaction_repository.dart'; +import '../models/transaction.dart'; import 'common_tile.dart'; import 'odp_tile.dart'; import 'oskp_tile.dart'; diff --git a/packages/espressocash_app/lib/features/activities/widgets/transaction_list.dart b/packages/espressocash_app/lib/features/activities/widgets/transaction_list.dart index df69512c0..5afabde3c 100644 --- a/packages/espressocash_app/lib/features/activities/widgets/transaction_list.dart +++ b/packages/espressocash_app/lib/features/activities/widgets/transaction_list.dart @@ -4,10 +4,10 @@ import 'package:provider/provider.dart'; import '../../../di.dart'; import '../../../ui/loader.dart'; -import '../src/transaction_repository.dart'; -import '../src/updater/bloc.dart'; -import '../src/widgets/no_activity.dart'; -import '../src/widgets/transaction_item.dart'; +import '../data/transaction_repository.dart'; +import '../services/bloc.dart'; +import 'no_activity.dart'; +import 'transaction_item.dart'; class TransactionList extends StatefulWidget { const TransactionList({ diff --git a/packages/espressocash_app/lib/features/app_lock/module.dart b/packages/espressocash_app/lib/features/app_lock/module.dart index 731d6fb63..4c4f77b99 100644 --- a/packages/espressocash_app/lib/features/app_lock/module.dart +++ b/packages/espressocash_app/lib/features/app_lock/module.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:nested/nested.dart'; -import '../../core/accounts/bl/accounts_bloc.dart'; import '../../di.dart'; -import 'src/bl/app_lock_bloc.dart'; -import 'src/widgets/app_lock_screen.dart'; +import '../accounts/services/accounts_bloc.dart'; +import 'screens/app_lock_screen.dart'; +import 'services/app_lock_bloc.dart'; class AppLockModule extends SingleChildStatelessWidget { const AppLockModule({super.key, super.child}); diff --git a/packages/espressocash_app/lib/features/app_lock/src/widgets/app_lock_disable_screen.dart b/packages/espressocash_app/lib/features/app_lock/screens/app_lock_disable_screen.dart similarity index 84% rename from packages/espressocash_app/lib/features/app_lock/src/widgets/app_lock_disable_screen.dart rename to packages/espressocash_app/lib/features/app_lock/screens/app_lock_disable_screen.dart index e3dae8874..f48f02eaf 100644 --- a/packages/espressocash_app/lib/features/app_lock/src/widgets/app_lock_disable_screen.dart +++ b/packages/espressocash_app/lib/features/app_lock/screens/app_lock_disable_screen.dart @@ -2,12 +2,12 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/back_button.dart'; -import '../../../../ui/decorated_window/decorated_window.dart'; -import '../bl/app_lock_bloc.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/back_button.dart'; +import '../../../ui/decorated_window/decorated_window.dart'; +import '../services/app_lock_bloc.dart'; +import '../widgets/pin_input_display_widget.dart'; import 'app_lock_setup_flow_screen.dart'; -import 'components/pin_input_display_widget.dart'; @RoutePage() class AppLockDisableScreen extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/app_lock/src/widgets/app_lock_enable_screen.dart b/packages/espressocash_app/lib/features/app_lock/screens/app_lock_enable_screen.dart similarity index 87% rename from packages/espressocash_app/lib/features/app_lock/src/widgets/app_lock_enable_screen.dart rename to packages/espressocash_app/lib/features/app_lock/screens/app_lock_enable_screen.dart index e62c1d875..d59bf8e8a 100644 --- a/packages/espressocash_app/lib/features/app_lock/src/widgets/app_lock_enable_screen.dart +++ b/packages/espressocash_app/lib/features/app_lock/screens/app_lock_enable_screen.dart @@ -2,11 +2,11 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/back_button.dart'; -import '../../../../ui/decorated_window/decorated_window.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/back_button.dart'; +import '../../../ui/decorated_window/decorated_window.dart'; +import '../widgets/pin_input_display_widget.dart'; import 'app_lock_setup_flow_screen.dart'; -import 'components/pin_input_display_widget.dart'; @RoutePage() class AppLockEnableScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/app_lock/src/widgets/app_lock_screen.dart b/packages/espressocash_app/lib/features/app_lock/screens/app_lock_screen.dart similarity index 83% rename from packages/espressocash_app/lib/features/app_lock/src/widgets/app_lock_screen.dart rename to packages/espressocash_app/lib/features/app_lock/screens/app_lock_screen.dart index dfad673bc..0c484694d 100644 --- a/packages/espressocash_app/lib/features/app_lock/src/widgets/app_lock_screen.dart +++ b/packages/espressocash_app/lib/features/app_lock/screens/app_lock_screen.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/decorated_window/decorated_window.dart'; -import '../bl/app_lock_bloc.dart'; -import 'components/pin_input_display_widget.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/decorated_window/decorated_window.dart'; +import '../services/app_lock_bloc.dart'; +import '../widgets/pin_input_display_widget.dart'; class AppLockScreen extends StatelessWidget { const AppLockScreen({super.key}); diff --git a/packages/espressocash_app/lib/features/app_lock/src/widgets/app_lock_setup_flow_screen.dart b/packages/espressocash_app/lib/features/app_lock/screens/app_lock_setup_flow_screen.dart similarity index 94% rename from packages/espressocash_app/lib/features/app_lock/src/widgets/app_lock_setup_flow_screen.dart rename to packages/espressocash_app/lib/features/app_lock/screens/app_lock_setup_flow_screen.dart index 6335342ff..8a1838210 100644 --- a/packages/espressocash_app/lib/features/app_lock/src/widgets/app_lock_setup_flow_screen.dart +++ b/packages/espressocash_app/lib/features/app_lock/screens/app_lock_setup_flow_screen.dart @@ -2,8 +2,8 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../../../../routes.gr.dart'; -import '../bl/app_lock_bloc.dart'; +import '../../../routes.gr.dart'; +import '../services/app_lock_bloc.dart'; @RoutePage() class AppLockSetupFlowScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/app_lock/src/bl/app_lock_bloc.dart b/packages/espressocash_app/lib/features/app_lock/services/app_lock_bloc.dart similarity index 100% rename from packages/espressocash_app/lib/features/app_lock/src/bl/app_lock_bloc.dart rename to packages/espressocash_app/lib/features/app_lock/services/app_lock_bloc.dart diff --git a/packages/espressocash_app/lib/features/app_lock/src/bl/app_lock_event.dart b/packages/espressocash_app/lib/features/app_lock/services/app_lock_event.dart similarity index 100% rename from packages/espressocash_app/lib/features/app_lock/src/bl/app_lock_event.dart rename to packages/espressocash_app/lib/features/app_lock/services/app_lock_event.dart diff --git a/packages/espressocash_app/lib/features/app_lock/src/bl/app_lock_state.dart b/packages/espressocash_app/lib/features/app_lock/services/app_lock_state.dart similarity index 100% rename from packages/espressocash_app/lib/features/app_lock/src/bl/app_lock_state.dart rename to packages/espressocash_app/lib/features/app_lock/services/app_lock_state.dart diff --git a/packages/espressocash_app/lib/features/app_lock/widgets/app_lock_menu_item.dart b/packages/espressocash_app/lib/features/app_lock/widgets/app_lock_menu_item.dart index a76f23ed2..83ed8f669 100644 --- a/packages/espressocash_app/lib/features/app_lock/widgets/app_lock_menu_item.dart +++ b/packages/espressocash_app/lib/features/app_lock/widgets/app_lock_menu_item.dart @@ -5,7 +5,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import '../../../l10n/l10n.dart'; import '../../../routes.gr.dart'; import '../../../ui/profile_switch.dart'; -import '../src/bl/app_lock_bloc.dart'; +import '../services/app_lock_bloc.dart'; class AppLockMenuItem extends StatelessWidget { const AppLockMenuItem({super.key}); diff --git a/packages/espressocash_app/lib/features/app_lock/src/widgets/components/pin_display.dart b/packages/espressocash_app/lib/features/app_lock/widgets/pin_display.dart similarity index 100% rename from packages/espressocash_app/lib/features/app_lock/src/widgets/components/pin_display.dart rename to packages/espressocash_app/lib/features/app_lock/widgets/pin_display.dart diff --git a/packages/espressocash_app/lib/features/app_lock/src/widgets/components/pin_input_display_widget.dart b/packages/espressocash_app/lib/features/app_lock/widgets/pin_input_display_widget.dart similarity index 100% rename from packages/espressocash_app/lib/features/app_lock/src/widgets/components/pin_input_display_widget.dart rename to packages/espressocash_app/lib/features/app_lock/widgets/pin_input_display_widget.dart diff --git a/packages/espressocash_app/lib/features/app_lock/src/widgets/components/pin_keypad.dart b/packages/espressocash_app/lib/features/app_lock/widgets/pin_keypad.dart similarity index 96% rename from packages/espressocash_app/lib/features/app_lock/src/widgets/components/pin_keypad.dart rename to packages/espressocash_app/lib/features/app_lock/widgets/pin_keypad.dart index fd610aba4..05c25b489 100644 --- a/packages/espressocash_app/lib/features/app_lock/src/widgets/components/pin_keypad.dart +++ b/packages/espressocash_app/lib/features/app_lock/widgets/pin_keypad.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import '../../../../../ui/amount_keypad/keypad_key.dart'; +import '../../../ui/amount_keypad/keypad_key.dart'; class PinKeypad extends StatelessWidget { const PinKeypad({ diff --git a/packages/espressocash_app/lib/features/app_lock/src/widgets/components/switch.dart b/packages/espressocash_app/lib/features/app_lock/widgets/switch.dart similarity index 93% rename from packages/espressocash_app/lib/features/app_lock/src/widgets/components/switch.dart rename to packages/espressocash_app/lib/features/app_lock/widgets/switch.dart index de8fcf75e..6bd0b72ba 100644 --- a/packages/espressocash_app/lib/features/app_lock/src/widgets/components/switch.dart +++ b/packages/espressocash_app/lib/features/app_lock/widgets/switch.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import '../../../../../gen/assets.gen.dart'; -import '../../../../../ui/switch.dart'; +import '../../../gen/assets.gen.dart'; +import '../../../ui/switch.dart'; class MenuSwitch extends StatelessWidget { const MenuSwitch({ diff --git a/packages/espressocash_app/lib/app/screens/authenticated/authenticated_flow_screen.dart b/packages/espressocash_app/lib/features/authenticated/screens/authenticated_flow_screen.dart similarity index 75% rename from packages/espressocash_app/lib/app/screens/authenticated/authenticated_flow_screen.dart rename to packages/espressocash_app/lib/features/authenticated/screens/authenticated_flow_screen.dart index f4f31b1b8..026a05613 100644 --- a/packages/espressocash_app/lib/app/screens/authenticated/authenticated_flow_screen.dart +++ b/packages/espressocash_app/lib/features/authenticated/screens/authenticated_flow_screen.dart @@ -5,25 +5,25 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:provider/provider.dart'; -import '../../../core/accounts/bl/account.dart'; -import '../../../core/accounts/bl/accounts_bloc.dart'; -import '../../../core/balances/bl/balances_bloc.dart'; -import '../../../core/conversion_rates/bl/conversion_rates_bloc.dart'; -import '../../../core/conversion_rates/module.dart'; import '../../../core/user_preferences.dart'; import '../../../di.dart'; -import '../../../features/activities/module.dart'; -import '../../../features/backup_phrase/module.dart'; -import '../../../features/favorite_tokens/module.dart'; -import '../../../features/incoming_split_key_payments/module.dart'; -import '../../../features/investments/module.dart'; -import '../../../features/mobile_wallet/module.dart'; -import '../../../features/onboarding/module.dart'; -import '../../../features/outgoing_direct_payments/module.dart'; -import '../../../features/outgoing_split_key_payments/module.dart'; -import '../../../features/payment_request/module.dart'; -import '../../../features/popular_tokens/module.dart'; -import '../../../features/swap/module.dart'; +import '../../accounts/models/account.dart'; +import '../../accounts/services/accounts_bloc.dart'; +import '../../activities/module.dart'; +import '../../backup_phrase/module.dart'; +import '../../balances/services/balances_bloc.dart'; +import '../../conversion_rates/module.dart'; +import '../../conversion_rates/services/conversion_rates_bloc.dart'; +import '../../favorite_tokens/module.dart'; +import '../../incoming_split_key_payments/module.dart'; +import '../../investments/module.dart'; +import '../../mobile_wallet/module.dart'; +import '../../onboarding/module.dart'; +import '../../outgoing_direct_payments/module.dart'; +import '../../outgoing_split_key_payments/module.dart'; +import '../../payment_request/module.dart'; +import '../../popular_tokens/module.dart'; +import '../../swap/module.dart'; @immutable class HomeRouterKey { diff --git a/packages/espressocash_app/lib/app/screens/authenticated/home_screen.dart b/packages/espressocash_app/lib/features/authenticated/screens/home_screen.dart similarity index 100% rename from packages/espressocash_app/lib/app/screens/authenticated/home_screen.dart rename to packages/espressocash_app/lib/features/authenticated/screens/home_screen.dart diff --git a/packages/espressocash_app/lib/features/backup_phrase/mnemonic_getter.dart b/packages/espressocash_app/lib/features/backup_phrase/data/mnemonic_getter.dart similarity index 100% rename from packages/espressocash_app/lib/features/backup_phrase/mnemonic_getter.dart rename to packages/espressocash_app/lib/features/backup_phrase/data/mnemonic_getter.dart diff --git a/packages/espressocash_app/lib/features/backup_phrase/module.dart b/packages/espressocash_app/lib/features/backup_phrase/module.dart index f07c5b10a..7441f8089 100644 --- a/packages/espressocash_app/lib/features/backup_phrase/module.dart +++ b/packages/espressocash_app/lib/features/backup_phrase/module.dart @@ -4,12 +4,12 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:nested/nested.dart'; import 'package:provider/provider.dart'; -import '../../core/accounts/bl/account.dart'; -import '../../core/accounts/bl/accounts_bloc.dart'; import '../../di.dart'; import '../../routes.gr.dart'; -import 'mnemonic_getter.dart'; -import 'src/bl/puzzle_reminder_bloc.dart'; +import '../accounts/models/account.dart'; +import '../accounts/services/accounts_bloc.dart'; +import 'data/mnemonic_getter.dart'; +import 'services/puzzle_reminder_bloc.dart'; class BackupPhraseModule extends SingleChildStatelessWidget { const BackupPhraseModule({ diff --git a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/backup_confirm_phrase_screen.dart b/packages/espressocash_app/lib/features/backup_phrase/screens/backup_confirm_phrase_screen.dart similarity index 98% rename from packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/backup_confirm_phrase_screen.dart rename to packages/espressocash_app/lib/features/backup_phrase/screens/backup_confirm_phrase_screen.dart index 58e437315..1de1fc2da 100644 --- a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/backup_confirm_phrase_screen.dart +++ b/packages/espressocash_app/lib/features/backup_phrase/screens/backup_confirm_phrase_screen.dart @@ -8,8 +8,8 @@ import '../../../../../ui/back_button.dart'; import '../../../../../ui/onboarding_screen.dart'; import '../../../../../ui/recovery_phrase_text_view.dart'; import '../../../../../ui/theme.dart'; +import '../widgets/grid_phrase.dart'; import 'backup_phrase_flow_screen.dart'; -import 'components/grid_phrase.dart'; @RoutePage() class BackupConfirmPhraseScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/backup_phrase_flow_screen.dart b/packages/espressocash_app/lib/features/backup_phrase/screens/backup_phrase_flow_screen.dart similarity index 96% rename from packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/backup_phrase_flow_screen.dart rename to packages/espressocash_app/lib/features/backup_phrase/screens/backup_phrase_flow_screen.dart index bdfbd1564..7ce59e06e 100644 --- a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/backup_phrase_flow_screen.dart +++ b/packages/espressocash_app/lib/features/backup_phrase/screens/backup_phrase_flow_screen.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import '../../../../../routes.gr.dart'; -import '../../bl/puzzle_reminder_bloc.dart'; +import '../services/puzzle_reminder_bloc.dart'; @RoutePage() class BackupPhraseFlowScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/backup_phrase_screen.dart b/packages/espressocash_app/lib/features/backup_phrase/screens/backup_phrase_screen.dart similarity index 97% rename from packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/backup_phrase_screen.dart rename to packages/espressocash_app/lib/features/backup_phrase/screens/backup_phrase_screen.dart index 266694ada..7c1794e30 100644 --- a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/backup_phrase_screen.dart +++ b/packages/espressocash_app/lib/features/backup_phrase/screens/backup_phrase_screen.dart @@ -8,7 +8,7 @@ import '../../../../../ui/back_button.dart'; import '../../../../../ui/onboarding_screen.dart'; import '../../../../../ui/recovery_phrase_text_view.dart'; import '../../../../../ui/theme.dart'; -import '../../../mnemonic_getter.dart'; +import '../data/mnemonic_getter.dart'; import 'backup_phrase_flow_screen.dart'; @RoutePage() diff --git a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/backup_phrase_success_screen.dart b/packages/espressocash_app/lib/features/backup_phrase/screens/backup_phrase_success_screen.dart similarity index 100% rename from packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/backup_phrase_success_screen.dart rename to packages/espressocash_app/lib/features/backup_phrase/screens/backup_phrase_success_screen.dart diff --git a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/backup_warning_screen.dart b/packages/espressocash_app/lib/features/backup_phrase/screens/backup_warning_screen.dart similarity index 100% rename from packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/backup_warning_screen.dart rename to packages/espressocash_app/lib/features/backup_phrase/screens/backup_warning_screen.dart diff --git a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/puzzle_reminder/puzzle_reminder_message_screen.dart b/packages/espressocash_app/lib/features/backup_phrase/screens/puzzle_reminder_message_screen.dart similarity index 90% rename from packages/espressocash_app/lib/features/backup_phrase/src/widgets/puzzle_reminder/puzzle_reminder_message_screen.dart rename to packages/espressocash_app/lib/features/backup_phrase/screens/puzzle_reminder_message_screen.dart index 45c11e080..3ed0f4963 100644 --- a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/puzzle_reminder/puzzle_reminder_message_screen.dart +++ b/packages/espressocash_app/lib/features/backup_phrase/screens/puzzle_reminder_message_screen.dart @@ -1,11 +1,11 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../routes.gr.dart'; -import '../../../../../ui/button.dart'; -import '../../../../../ui/message_info_widget.dart'; -import 'components/puzzle_screen.dart'; +import '../../../l10n/l10n.dart'; +import '../../../routes.gr.dart'; +import '../../../ui/button.dart'; +import '../../../ui/message_info_widget.dart'; +import '../widgets/puzzle_screen.dart'; @RoutePage() class PuzzleReminderMessageScreen extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/puzzle_reminder/puzzle_reminder_setup_screen.dart b/packages/espressocash_app/lib/features/backup_phrase/screens/puzzle_reminder_setup_screen.dart similarity index 95% rename from packages/espressocash_app/lib/features/backup_phrase/src/widgets/puzzle_reminder/puzzle_reminder_setup_screen.dart rename to packages/espressocash_app/lib/features/backup_phrase/screens/puzzle_reminder_setup_screen.dart index ad6f80101..b1e05778d 100644 --- a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/puzzle_reminder/puzzle_reminder_setup_screen.dart +++ b/packages/espressocash_app/lib/features/backup_phrase/screens/puzzle_reminder_setup_screen.dart @@ -2,13 +2,13 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../ui/back_button.dart'; -import '../../../../../ui/button.dart'; -import '../../../../../ui/colors.dart'; -import '../../../../../ui/message_info_widget.dart'; -import '../../bl/puzzle_reminder_bloc.dart'; -import 'components/puzzle_screen.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/back_button.dart'; +import '../../../ui/button.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/message_info_widget.dart'; +import '../services/puzzle_reminder_bloc.dart'; +import '../widgets/puzzle_screen.dart'; @RoutePage(name: 'PuzzleReminderRoute') class PuzzleReminderRouteScreen extends AutoRouter { diff --git a/packages/espressocash_app/lib/features/backup_phrase/src/bl/puzzle_reminder_bloc.dart b/packages/espressocash_app/lib/features/backup_phrase/services/puzzle_reminder_bloc.dart similarity index 97% rename from packages/espressocash_app/lib/features/backup_phrase/src/bl/puzzle_reminder_bloc.dart rename to packages/espressocash_app/lib/features/backup_phrase/services/puzzle_reminder_bloc.dart index c14ccf3e2..c83c5ef3a 100644 --- a/packages/espressocash_app/lib/features/backup_phrase/src/bl/puzzle_reminder_bloc.dart +++ b/packages/espressocash_app/lib/features/backup_phrase/services/puzzle_reminder_bloc.dart @@ -6,8 +6,8 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import '../../../../core/accounts/bl/account.dart'; -import '../../../../core/accounts/bl/ec_wallet.dart'; +import '../../accounts/models/account.dart'; +import '../../accounts/models/ec_wallet.dart'; part 'puzzle_reminder_bloc.freezed.dart'; part 'puzzle_reminder_bloc.g.dart'; diff --git a/packages/espressocash_app/lib/features/backup_phrase/src/bl/puzzle_reminder_event.dart b/packages/espressocash_app/lib/features/backup_phrase/services/puzzle_reminder_event.dart similarity index 100% rename from packages/espressocash_app/lib/features/backup_phrase/src/bl/puzzle_reminder_event.dart rename to packages/espressocash_app/lib/features/backup_phrase/services/puzzle_reminder_event.dart diff --git a/packages/espressocash_app/lib/features/backup_phrase/src/bl/puzzle_reminder_state.dart b/packages/espressocash_app/lib/features/backup_phrase/services/puzzle_reminder_state.dart similarity index 100% rename from packages/espressocash_app/lib/features/backup_phrase/src/bl/puzzle_reminder_state.dart rename to packages/espressocash_app/lib/features/backup_phrase/services/puzzle_reminder_state.dart diff --git a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/components/grid_phrase.dart b/packages/espressocash_app/lib/features/backup_phrase/widgets/grid_phrase.dart similarity index 97% rename from packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/components/grid_phrase.dart rename to packages/espressocash_app/lib/features/backup_phrase/widgets/grid_phrase.dart index c4fd0a09b..2a1886e38 100644 --- a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/backup_phrase_flow/components/grid_phrase.dart +++ b/packages/espressocash_app/lib/features/backup_phrase/widgets/grid_phrase.dart @@ -2,7 +2,7 @@ import 'package:dfunc/dfunc.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:flutter/material.dart'; -import '../../../../../../ui/button.dart'; +import '../../../ui/button.dart'; class GridPhrase extends StatefulWidget { const GridPhrase({ diff --git a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/puzzle_reminder/components/puzzle_screen.dart b/packages/espressocash_app/lib/features/backup_phrase/widgets/puzzle_screen.dart similarity index 87% rename from packages/espressocash_app/lib/features/backup_phrase/src/widgets/puzzle_reminder/components/puzzle_screen.dart rename to packages/espressocash_app/lib/features/backup_phrase/widgets/puzzle_screen.dart index e4a30318a..942bd94a6 100644 --- a/packages/espressocash_app/lib/features/backup_phrase/src/widgets/puzzle_reminder/components/puzzle_screen.dart +++ b/packages/espressocash_app/lib/features/backup_phrase/widgets/puzzle_screen.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import '../../../../../../ui/app_bar.dart'; -import '../../../../../../ui/decorated_window/decorated_window_header.dart'; -import '../../../../../../ui/theme.dart'; +import '../../../ui/app_bar.dart'; +import '../../../ui/decorated_window/decorated_window_header.dart'; +import '../../../ui/theme.dart'; class PuzzleScreen extends StatelessWidget { const PuzzleScreen({ diff --git a/packages/espressocash_app/lib/core/balances/module.dart b/packages/espressocash_app/lib/features/balances/module.dart similarity index 91% rename from packages/espressocash_app/lib/core/balances/module.dart rename to packages/espressocash_app/lib/features/balances/module.dart index 0ed9e0239..af0bfa2d0 100644 --- a/packages/espressocash_app/lib/core/balances/module.dart +++ b/packages/espressocash_app/lib/features/balances/module.dart @@ -3,7 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:nested/nested.dart'; import '../../di.dart'; -import 'bl/balances_bloc.dart'; +import 'services/balances_bloc.dart'; class BalancesModule extends SingleChildStatelessWidget { const BalancesModule({super.key, super.child}); diff --git a/packages/espressocash_app/lib/core/balances/bl/balances_bloc.dart b/packages/espressocash_app/lib/features/balances/services/balances_bloc.dart similarity index 95% rename from packages/espressocash_app/lib/core/balances/bl/balances_bloc.dart rename to packages/espressocash_app/lib/features/balances/services/balances_bloc.dart index c6ae28efa..f7d774e18 100644 --- a/packages/espressocash_app/lib/core/balances/bl/balances_bloc.dart +++ b/packages/espressocash_app/lib/features/balances/services/balances_bloc.dart @@ -9,11 +9,11 @@ import 'package:logging/logging.dart'; import 'package:solana/dto.dart'; import 'package:solana/solana.dart'; -import '../../amount.dart'; -import '../../processing_state.dart'; -import '../../solana_helpers.dart'; -import '../../tokens/token.dart'; -import '../../tokens/token_list.dart'; +import '../../../core/amount.dart'; +import '../../../core/processing_state.dart'; +import '../../../core/solana_helpers.dart'; +import '../../../core/tokens/token.dart'; +import '../../../core/tokens/token_list.dart'; part 'balances_bloc.freezed.dart'; part 'balances_event.dart'; diff --git a/packages/espressocash_app/lib/core/balances/bl/balances_event.dart b/packages/espressocash_app/lib/features/balances/services/balances_event.dart similarity index 100% rename from packages/espressocash_app/lib/core/balances/bl/balances_event.dart rename to packages/espressocash_app/lib/features/balances/services/balances_event.dart diff --git a/packages/espressocash_app/lib/core/balances/bl/balances_state.dart b/packages/espressocash_app/lib/features/balances/services/balances_state.dart similarity index 100% rename from packages/espressocash_app/lib/core/balances/bl/balances_state.dart rename to packages/espressocash_app/lib/features/balances/services/balances_state.dart diff --git a/packages/espressocash_app/lib/core/balances/context_ext.dart b/packages/espressocash_app/lib/features/balances/widgets/context_ext.dart similarity index 78% rename from packages/espressocash_app/lib/core/balances/context_ext.dart rename to packages/espressocash_app/lib/features/balances/widgets/context_ext.dart index 899f90b3a..3b7f5052e 100644 --- a/packages/espressocash_app/lib/core/balances/context_ext.dart +++ b/packages/espressocash_app/lib/features/balances/widgets/context_ext.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../accounts/bl/account.dart'; -import 'bl/balances_bloc.dart'; +import '../../accounts/models/account.dart'; +import '../services/balances_bloc.dart'; extension BalancesExt on BuildContext { void notifyBalanceAffected() { diff --git a/packages/espressocash_app/lib/core/balances/presentation/refresh_balance_wrapper.dart b/packages/espressocash_app/lib/features/balances/widgets/refresh_balance_wrapper.dart similarity index 93% rename from packages/espressocash_app/lib/core/balances/presentation/refresh_balance_wrapper.dart rename to packages/espressocash_app/lib/features/balances/widgets/refresh_balance_wrapper.dart index ad7a88bbf..c7d7c0829 100644 --- a/packages/espressocash_app/lib/core/balances/presentation/refresh_balance_wrapper.dart +++ b/packages/espressocash_app/lib/features/balances/widgets/refresh_balance_wrapper.dart @@ -4,14 +4,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:logging/logging.dart'; +import '../../../core/processing_state.dart'; +import '../../../core/user_preferences.dart'; import '../../../gen/assets.gen.dart'; import '../../../l10n/l10n.dart'; import '../../../ui/snackbar.dart'; -import '../../accounts/bl/account.dart'; -import '../../conversion_rates/bl/conversion_rates_bloc.dart'; -import '../../processing_state.dart'; -import '../../user_preferences.dart'; -import '../bl/balances_bloc.dart'; +import '../../accounts/models/account.dart'; +import '../../conversion_rates/services/conversion_rates_bloc.dart'; +import '../services/balances_bloc.dart'; final _logger = Logger('RefreshBalanceWrapper'); diff --git a/packages/espressocash_app/lib/core/balances/presentation/watch_balance.dart b/packages/espressocash_app/lib/features/balances/widgets/watch_balance.dart similarity index 80% rename from packages/espressocash_app/lib/core/balances/presentation/watch_balance.dart rename to packages/espressocash_app/lib/features/balances/widgets/watch_balance.dart index ab7cdf466..3336d9c1c 100644 --- a/packages/espressocash_app/lib/core/balances/presentation/watch_balance.dart +++ b/packages/espressocash_app/lib/features/balances/widgets/watch_balance.dart @@ -1,12 +1,12 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../amount.dart'; -import '../../conversion_rates/context_ext.dart'; -import '../../currency.dart'; -import '../../tokens/token.dart'; -import '../../user_preferences.dart'; -import '../bl/balances_bloc.dart'; +import '../../../core/amount.dart'; +import '../../../core/currency.dart'; +import '../../../core/tokens/token.dart'; +import '../../../core/user_preferences.dart'; +import '../../conversion_rates/widgets/context_ext.dart'; +import '../services/balances_bloc.dart'; extension WatchBalance on BuildContext { Amount watchUserCryptoBalance(Token token) => diff --git a/packages/espressocash_app/lib/core/conversion_rates/bl/conversion_rates_client.dart b/packages/espressocash_app/lib/features/conversion_rates/data/conversion_rates_client.dart similarity index 95% rename from packages/espressocash_app/lib/core/conversion_rates/bl/conversion_rates_client.dart rename to packages/espressocash_app/lib/features/conversion_rates/data/conversion_rates_client.dart index cdb0f4f47..3dac0ff9d 100644 --- a/packages/espressocash_app/lib/core/conversion_rates/bl/conversion_rates_client.dart +++ b/packages/espressocash_app/lib/features/conversion_rates/data/conversion_rates_client.dart @@ -6,8 +6,8 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; import 'package:retrofit/retrofit.dart'; -import '../../coingecko_client.dart'; -import '../../currency.dart'; +import '../../../core/coingecko_client.dart'; +import '../../../core/currency.dart'; part 'conversion_rates_client.freezed.dart'; part 'conversion_rates_client.g.dart'; diff --git a/packages/espressocash_app/lib/core/conversion_rates/bl/repository.dart b/packages/espressocash_app/lib/features/conversion_rates/data/repository.dart similarity index 95% rename from packages/espressocash_app/lib/core/conversion_rates/bl/repository.dart rename to packages/espressocash_app/lib/features/conversion_rates/data/repository.dart index 7589a4e02..6637d409a 100644 --- a/packages/espressocash_app/lib/core/conversion_rates/bl/repository.dart +++ b/packages/espressocash_app/lib/features/conversion_rates/data/repository.dart @@ -5,9 +5,9 @@ import 'package:flutter/material.dart'; import 'package:injectable/injectable.dart'; import 'package:rxdart/rxdart.dart'; -import '../../currency.dart'; -import '../../tokens/token.dart'; -import '../../tokens/token_list.dart'; +import '../../../core/currency.dart'; +import '../../../core/tokens/token.dart'; +import '../../../core/tokens/token_list.dart'; import 'conversion_rates_client.dart'; @lazySingleton diff --git a/packages/espressocash_app/lib/core/conversion_rates/module.dart b/packages/espressocash_app/lib/features/conversion_rates/module.dart similarity index 89% rename from packages/espressocash_app/lib/core/conversion_rates/module.dart rename to packages/espressocash_app/lib/features/conversion_rates/module.dart index 6dcda28be..189fb68ac 100644 --- a/packages/espressocash_app/lib/core/conversion_rates/module.dart +++ b/packages/espressocash_app/lib/features/conversion_rates/module.dart @@ -4,8 +4,8 @@ import 'package:nested/nested.dart'; import 'package:provider/provider.dart'; import '../../di.dart'; -import 'bl/conversion_rates_bloc.dart'; -import 'bl/repository.dart'; +import 'data/repository.dart'; +import 'services/conversion_rates_bloc.dart'; class ConversionRatesModule extends SingleChildStatelessWidget { const ConversionRatesModule({super.key, super.child}); diff --git a/packages/espressocash_app/lib/core/conversion_rates/amount_ext.dart b/packages/espressocash_app/lib/features/conversion_rates/services/amount_ext.dart similarity index 85% rename from packages/espressocash_app/lib/core/conversion_rates/amount_ext.dart rename to packages/espressocash_app/lib/features/conversion_rates/services/amount_ext.dart index 490d409f0..ce33e2b08 100644 --- a/packages/espressocash_app/lib/core/conversion_rates/amount_ext.dart +++ b/packages/espressocash_app/lib/features/conversion_rates/services/amount_ext.dart @@ -1,9 +1,9 @@ import 'package:decimal/decimal.dart'; -import '../amount.dart'; -import '../currency.dart'; -import '../tokens/token.dart'; -import 'bl/repository.dart'; +import '../../../core/amount.dart'; +import '../../../core/currency.dart'; +import '../../../core/tokens/token.dart'; +import '../data/repository.dart'; extension CryptoAmountExt on CryptoAmount { FiatAmount? toFiatAmount( diff --git a/packages/espressocash_app/lib/core/conversion_rates/bl/conversion_rates_bloc.dart b/packages/espressocash_app/lib/features/conversion_rates/services/conversion_rates_bloc.dart similarity index 93% rename from packages/espressocash_app/lib/core/conversion_rates/bl/conversion_rates_bloc.dart rename to packages/espressocash_app/lib/features/conversion_rates/services/conversion_rates_bloc.dart index 52f39e169..a8be893dd 100644 --- a/packages/espressocash_app/lib/core/conversion_rates/bl/conversion_rates_bloc.dart +++ b/packages/espressocash_app/lib/features/conversion_rates/services/conversion_rates_bloc.dart @@ -7,10 +7,10 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; import 'package:logging/logging.dart'; -import '../../currency.dart'; -import '../../processing_state.dart'; -import '../../tokens/token.dart'; -import 'repository.dart'; +import '../../../core/currency.dart'; +import '../../../core/processing_state.dart'; +import '../../../core/tokens/token.dart'; +import '../data/repository.dart'; part 'conversion_rates_bloc.freezed.dart'; diff --git a/packages/espressocash_app/lib/ui/amount_with_equivalent.dart b/packages/espressocash_app/lib/features/conversion_rates/widgets/amount_with_equivalent.dart similarity index 90% rename from packages/espressocash_app/lib/ui/amount_with_equivalent.dart rename to packages/espressocash_app/lib/features/conversion_rates/widgets/amount_with_equivalent.dart index 1b157cb07..9227cf2d4 100644 --- a/packages/espressocash_app/lib/ui/amount_with_equivalent.dart +++ b/packages/espressocash_app/lib/features/conversion_rates/widgets/amount_with_equivalent.dart @@ -2,19 +2,19 @@ import 'package:dfunc/dfunc.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../core/amount.dart'; -import '../core/conversion_rates/amount_ext.dart'; -import '../core/conversion_rates/bl/repository.dart'; -import '../core/currency.dart'; -import '../core/presentation/format_amount.dart'; -import '../core/tokens/token.dart'; -import '../l10n/decimal_separator.dart'; -import '../l10n/device_locale.dart'; -import '../l10n/l10n.dart'; -import 'chip.dart'; -import 'colors.dart'; -import 'number_formatter.dart'; -import 'shake.dart'; +import '../../../core/amount.dart'; +import '../../../core/currency.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../core/tokens/token.dart'; +import '../../../l10n/decimal_separator.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/chip.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/number_formatter.dart'; +import '../../../ui/shake.dart'; +import '../data/repository.dart'; +import '../services/amount_ext.dart'; class AmountWithEquivalent extends StatelessWidget { const AmountWithEquivalent({ diff --git a/packages/espressocash_app/lib/core/conversion_rates/context_ext.dart b/packages/espressocash_app/lib/features/conversion_rates/widgets/context_ext.dart similarity index 86% rename from packages/espressocash_app/lib/core/conversion_rates/context_ext.dart rename to packages/espressocash_app/lib/features/conversion_rates/widgets/context_ext.dart index 7d8c1e3ac..5ebfa1ad4 100644 --- a/packages/espressocash_app/lib/core/conversion_rates/context_ext.dart +++ b/packages/espressocash_app/lib/features/conversion_rates/widgets/context_ext.dart @@ -2,10 +2,10 @@ import 'package:decimal/decimal.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../amount.dart'; -import '../currency.dart'; -import '../tokens/token.dart'; -import 'bl/repository.dart'; +import '../../../core/amount.dart'; +import '../../../core/currency.dart'; +import '../../../core/tokens/token.dart'; +import '../data/repository.dart'; extension ConversionRates on BuildContext { Decimal? watchConversionRate({ diff --git a/packages/espressocash_app/lib/core/conversion_rates/widgets/token_rate_text.dart b/packages/espressocash_app/lib/features/conversion_rates/widgets/token_rate_text.dart similarity index 78% rename from packages/espressocash_app/lib/core/conversion_rates/widgets/token_rate_text.dart rename to packages/espressocash_app/lib/features/conversion_rates/widgets/token_rate_text.dart index 7120199d2..fbeed142c 100644 --- a/packages/espressocash_app/lib/core/conversion_rates/widgets/token_rate_text.dart +++ b/packages/espressocash_app/lib/features/conversion_rates/widgets/token_rate_text.dart @@ -2,12 +2,12 @@ import 'package:dfunc/dfunc.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import '../../../core/amount.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../core/tokens/token.dart'; +import '../../../core/user_preferences.dart'; import '../../../l10n/device_locale.dart'; -import '../../amount.dart'; -import '../../presentation/format_amount.dart'; -import '../../tokens/token.dart'; -import '../../user_preferences.dart'; -import '../context_ext.dart'; +import 'context_ext.dart'; class TokenRateText extends StatelessWidget { const TokenRateText({super.key, required this.token, this.style}); diff --git a/packages/espressocash_app/lib/features/favorite_tokens/src/bl/repository.dart b/packages/espressocash_app/lib/features/favorite_tokens/data/repository.dart similarity index 94% rename from packages/espressocash_app/lib/features/favorite_tokens/src/bl/repository.dart rename to packages/espressocash_app/lib/features/favorite_tokens/data/repository.dart index 4d3d2e02a..1770e7fad 100644 --- a/packages/espressocash_app/lib/features/favorite_tokens/src/bl/repository.dart +++ b/packages/espressocash_app/lib/features/favorite_tokens/data/repository.dart @@ -1,9 +1,9 @@ import 'package:drift/drift.dart'; import 'package:injectable/injectable.dart'; -import '../../../../core/tokens/token.dart'; -import '../../../../core/tokens/token_list.dart'; -import '../../../../data/db/db.dart'; +import '../../../core/tokens/token.dart'; +import '../../../core/tokens/token_list.dart'; +import '../../../data/db/db.dart'; @injectable class FavoriteTokenRepository { diff --git a/packages/espressocash_app/lib/features/favorite_tokens/db.dart b/packages/espressocash_app/lib/features/favorite_tokens/db.dart deleted file mode 100644 index 52888608c..000000000 --- a/packages/espressocash_app/lib/features/favorite_tokens/db.dart +++ /dev/null @@ -1 +0,0 @@ -export 'src/bl/repository.dart' show FavoriteTokenRows; diff --git a/packages/espressocash_app/lib/features/favorite_tokens/module.dart b/packages/espressocash_app/lib/features/favorite_tokens/module.dart index b1b6d2643..efb87b0b7 100644 --- a/packages/espressocash_app/lib/features/favorite_tokens/module.dart +++ b/packages/espressocash_app/lib/features/favorite_tokens/module.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:nested/nested.dart'; -import '../../core/accounts/module.dart'; import '../../di.dart'; -import 'src/bl/bloc.dart'; -import 'src/bl/repository.dart'; +import '../accounts/module.dart'; +import 'data/repository.dart'; +import 'services/bloc.dart'; class FavoriteTokensModule extends SingleChildStatelessWidget { const FavoriteTokensModule({super.key, super.child}); diff --git a/packages/espressocash_app/lib/features/favorite_tokens/src/bl/bloc.dart b/packages/espressocash_app/lib/features/favorite_tokens/services/bloc.dart similarity index 95% rename from packages/espressocash_app/lib/features/favorite_tokens/src/bl/bloc.dart rename to packages/espressocash_app/lib/features/favorite_tokens/services/bloc.dart index 5647c54b5..8134948b3 100644 --- a/packages/espressocash_app/lib/features/favorite_tokens/src/bl/bloc.dart +++ b/packages/espressocash_app/lib/features/favorite_tokens/services/bloc.dart @@ -6,10 +6,10 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; -import '../../../../core/conversion_rates/bl/repository.dart'; import '../../../../core/currency.dart'; import '../../../../core/processing_state.dart'; -import 'repository.dart'; +import '../../conversion_rates/data/repository.dart'; +import '../data/repository.dart'; part 'bloc.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/favorite_tokens/widgets/extensions.dart b/packages/espressocash_app/lib/features/favorite_tokens/widgets/extensions.dart index 669f105c6..68aad2961 100644 --- a/packages/espressocash_app/lib/features/favorite_tokens/widgets/extensions.dart +++ b/packages/espressocash_app/lib/features/favorite_tokens/widgets/extensions.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../src/bl/bloc.dart'; +import '../services/bloc.dart'; extension BuildContextExt on BuildContext { Future refreshFavorites() => read().refresh(); diff --git a/packages/espressocash_app/lib/features/favorite_tokens/widgets/favorite_button.dart b/packages/espressocash_app/lib/features/favorite_tokens/widgets/favorite_button.dart index c66537f31..c646463d0 100644 --- a/packages/espressocash_app/lib/features/favorite_tokens/widgets/favorite_button.dart +++ b/packages/espressocash_app/lib/features/favorite_tokens/widgets/favorite_button.dart @@ -4,8 +4,8 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import '../../../core/tokens/token.dart'; import '../../../di.dart'; import '../../../gen/assets.gen.dart'; -import '../src/bl/bloc.dart'; -import '../src/bl/repository.dart'; +import '../data/repository.dart'; +import '../services/bloc.dart'; enum FavoriteButtonVariant { dark, diff --git a/packages/espressocash_app/lib/features/favorite_tokens/widgets/favorite_tokens_list.dart b/packages/espressocash_app/lib/features/favorite_tokens/widgets/favorite_tokens_list.dart index 24fa4e171..aef63c49a 100644 --- a/packages/espressocash_app/lib/features/favorite_tokens/widgets/favorite_tokens_list.dart +++ b/packages/espressocash_app/lib/features/favorite_tokens/widgets/favorite_tokens_list.dart @@ -8,15 +8,15 @@ import '../../../../../core/tokens/token.dart'; import '../../../../../routes.gr.dart'; import '../../../../../ui/colors.dart'; import '../../../../../ui/token_icon.dart'; -import '../../../core/conversion_rates/context_ext.dart'; import '../../../core/presentation/extensions.dart'; import '../../../core/user_preferences.dart'; import '../../../di.dart'; import '../../../l10n/device_locale.dart'; import '../../../l10n/l10n.dart'; import '../../../ui/theme.dart'; -import '../src/bl/bloc.dart'; -import '../src/bl/repository.dart'; +import '../../conversion_rates/widgets/context_ext.dart'; +import '../data/repository.dart'; +import '../services/bloc.dart'; class FavoriteTokenList extends StatefulWidget { const FavoriteTokenList({super.key}); diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/iskp_repository.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/data/iskp_repository.dart similarity index 95% rename from packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/iskp_repository.dart rename to packages/espressocash_app/lib/features/incoming_split_key_payments/data/iskp_repository.dart index 0743cdbae..4417253ae 100644 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/iskp_repository.dart +++ b/packages/espressocash_app/lib/features/incoming_split_key_payments/data/iskp_repository.dart @@ -8,12 +8,12 @@ import 'package:sentry_flutter/sentry_flutter.dart'; import 'package:solana/base58.dart'; import 'package:solana/encoder.dart'; -import '../../../../core/api_version.dart'; -import '../../../../core/escrow_private_key.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../../../data/db/db.dart'; -import '../../../../data/db/mixins.dart'; -import 'incoming_split_key_payment.dart'; +import '../../../core/api_version.dart'; +import '../../../core/escrow_private_key.dart'; +import '../../../data/db/db.dart'; +import '../../../data/db/mixins.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../models/incoming_split_key_payment.dart'; @injectable class ISKPRepository { diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/pending_iskp_repository.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/data/pending_iskp_repository.dart similarity index 94% rename from packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/pending_iskp_repository.dart rename to packages/espressocash_app/lib/features/incoming_split_key_payments/data/pending_iskp_repository.dart index 24af5e792..91dfa1826 100644 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/pending_iskp_repository.dart +++ b/packages/espressocash_app/lib/features/incoming_split_key_payments/data/pending_iskp_repository.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:injectable/injectable.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import '../../../../core/split_key_payments.dart'; +import '../../../core/split_key_payments.dart'; @injectable class PendingISKPRepository { diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/db.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/db.dart deleted file mode 100644 index bb05c73be..000000000 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/db.dart +++ /dev/null @@ -1,2 +0,0 @@ -export 'src/bl/iskp_repository.dart' - show ISKPRows, ISKPStatusDto, IskpApiVersionDto; diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/incoming_split_key_payment.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/models/incoming_split_key_payment.dart similarity index 88% rename from packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/incoming_split_key_payment.dart rename to packages/espressocash_app/lib/features/incoming_split_key_payments/models/incoming_split_key_payment.dart index 60658858f..1bf2661cc 100644 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/incoming_split_key_payment.dart +++ b/packages/espressocash_app/lib/features/incoming_split_key_payments/models/incoming_split_key_payment.dart @@ -1,9 +1,9 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:solana/encoder.dart'; -import '../../../../core/api_version.dart'; -import '../../../../core/escrow_private_key.dart'; -import '../../../../core/transactions/tx_sender.dart'; +import '../../../core/api_version.dart'; +import '../../../core/escrow_private_key.dart'; +import '../../transactions/models/tx_sender.dart'; part 'incoming_split_key_payment.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/module.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/module.dart index 51ff5f27b..7658f8a1f 100644 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/module.dart +++ b/packages/espressocash_app/lib/features/incoming_split_key_payments/module.dart @@ -2,13 +2,13 @@ import 'package:flutter/material.dart'; import 'package:nested/nested.dart'; import 'package:provider/provider.dart'; -import '../../core/accounts/module.dart'; -import '../../core/balances/context_ext.dart'; import '../../di.dart'; -import 'src/bl/iskp_repository.dart'; -import 'src/bl/tx_created_watcher.dart'; -import 'src/bl/tx_sent_watcher.dart'; -import 'src/widgets/pending_iskp_listener.dart'; +import '../accounts/module.dart'; +import '../balances/widgets/context_ext.dart'; +import 'data/iskp_repository.dart'; +import 'services/pending_iskp_listener.dart'; +import 'services/tx_created_watcher.dart'; +import 'services/tx_sent_watcher.dart'; class ISKPModule extends SingleChildStatelessWidget { const ISKPModule({super.key, super.child}); diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/first_part_qr_screen.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/screens/first_part_qr_screen.dart similarity index 91% rename from packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/first_part_qr_screen.dart rename to packages/espressocash_app/lib/features/incoming_split_key_payments/screens/first_part_qr_screen.dart index c77dbff96..c9a877100 100644 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/first_part_qr_screen.dart +++ b/packages/espressocash_app/lib/features/incoming_split_key_payments/screens/first_part_qr_screen.dart @@ -1,17 +1,17 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; -import '../../../../core/wallet.dart'; -import '../../../../gen/assets.gen.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../routes.gr.dart'; -import '../../../../ui/bullet_item.dart'; -import '../../../../ui/button.dart'; -import '../../../../ui/colors.dart'; -import '../../../../ui/theme.dart'; -import '../../../qr_scanner/models/qr_scanner_request.dart'; -import '../../extensions.dart'; -import 'components/terms_disclaimer.dart'; +import '../../../core/wallet.dart'; +import '../../../gen/assets.gen.dart'; +import '../../../l10n/l10n.dart'; +import '../../../routes.gr.dart'; +import '../../../ui/bullet_item.dart'; +import '../../../ui/button.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/theme.dart'; +import '../../qr_scanner/models/qr_scanner_request.dart'; +import '../widgets/extensions.dart'; +import '../widgets/terms_disclaimer.dart'; @RoutePage() class FirstPartQrScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/first_part_ready_screen.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/screens/first_part_ready_screen.dart similarity index 89% rename from packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/first_part_ready_screen.dart rename to packages/espressocash_app/lib/features/incoming_split_key_payments/screens/first_part_ready_screen.dart index 0a5145579..b92df0e0d 100644 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/first_part_ready_screen.dart +++ b/packages/espressocash_app/lib/features/incoming_split_key_payments/screens/first_part_ready_screen.dart @@ -3,22 +3,22 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../../../../core/analytics/analytics_manager.dart'; -import '../../../../core/dynamic_links_notifier.dart'; -import '../../../../core/split_key_payments.dart'; -import '../../../../core/wallet.dart'; -import '../../../../di.dart'; -import '../../../../gen/assets.gen.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../routes.gr.dart'; -import '../../../../ui/bullet_item.dart'; -import '../../../../ui/button.dart'; -import '../../../../ui/colors.dart'; -import '../../../../ui/dialogs.dart'; -import '../../../../ui/theme.dart'; -import '../../../legal/flow.dart'; -import '../../extensions.dart'; -import '../bl/pending_iskp_repository.dart'; +import '../../../core/analytics/analytics_manager.dart'; +import '../../../core/dynamic_links_notifier.dart'; +import '../../../core/split_key_payments.dart'; +import '../../../core/wallet.dart'; +import '../../../di.dart'; +import '../../../gen/assets.gen.dart'; +import '../../../l10n/l10n.dart'; +import '../../../routes.gr.dart'; +import '../../../ui/bullet_item.dart'; +import '../../../ui/button.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/dialogs.dart'; +import '../../../ui/theme.dart'; +import '../../legal/flow.dart'; +import '../data/pending_iskp_repository.dart'; +import '../widgets/extensions.dart'; @RoutePage() class FirstPartReadyScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/incoming_split_key_payment_screen.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/screens/incoming_split_key_payment_screen.dart similarity index 78% rename from packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/incoming_split_key_payment_screen.dart rename to packages/espressocash_app/lib/features/incoming_split_key_payments/screens/incoming_split_key_payment_screen.dart index a21c63551..cae8c4992 100644 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/incoming_split_key_payment_screen.dart +++ b/packages/espressocash_app/lib/features/incoming_split_key_payments/screens/incoming_split_key_payment_screen.dart @@ -1,16 +1,16 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../../../di.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/transfer_status/transfer_error.dart'; -import '../../../../ui/transfer_status/transfer_progress.dart'; -import '../../../../ui/transfer_status/transfer_success.dart'; -import '../../extensions.dart'; -import '../../widgets/invalid_escrow_error_widget.dart'; -import '../bl/incoming_split_key_payment.dart'; -import '../bl/iskp_repository.dart'; +import '../../../di.dart'; +import '../../../l10n/l10n.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../../transactions/widgets/transfer_error.dart'; +import '../../transactions/widgets/transfer_progress.dart'; +import '../../transactions/widgets/transfer_success.dart'; +import '../data/iskp_repository.dart'; +import '../models/incoming_split_key_payment.dart'; +import '../widgets/extensions.dart'; +import '../widgets/invalid_escrow_error_widget.dart'; @RoutePage() class IncomingSplitKeyPaymentScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/iskp_service.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/services/iskp_service.dart similarity index 86% rename from packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/iskp_service.dart rename to packages/espressocash_app/lib/features/incoming_split_key_payments/services/iskp_service.dart index 2bb8e5233..4b4d8782c 100644 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/iskp_service.dart +++ b/packages/espressocash_app/lib/features/incoming_split_key_payments/services/iskp_service.dart @@ -6,15 +6,15 @@ import 'package:solana/encoder.dart'; import 'package:solana/solana.dart'; import 'package:uuid/uuid.dart'; -import '../../../../config.dart'; -import '../../../../core/accounts/bl/ec_wallet.dart'; -import '../../../../core/api_version.dart'; -import '../../../../core/escrow_private_key.dart'; -import '../../../../core/extensions.dart'; -import '../../../../core/transactions/resign_tx.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import 'incoming_split_key_payment.dart'; -import 'iskp_repository.dart'; +import '../../../config.dart'; +import '../../../core/api_version.dart'; +import '../../../core/escrow_private_key.dart'; +import '../../../core/extensions.dart'; +import '../../accounts/models/ec_wallet.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../../transactions/services/resign_tx.dart'; +import '../data/iskp_repository.dart'; +import '../models/incoming_split_key_payment.dart'; @injectable class ISKPService { diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/payment_watcher.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/services/payment_watcher.dart similarity index 93% rename from packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/payment_watcher.dart rename to packages/espressocash_app/lib/features/incoming_split_key_payments/services/payment_watcher.dart index 2d98c3712..a7b70862e 100644 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/payment_watcher.dart +++ b/packages/espressocash_app/lib/features/incoming_split_key_payments/services/payment_watcher.dart @@ -5,9 +5,9 @@ import 'package:dfunc/dfunc.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:flutter/foundation.dart'; -import '../../../../core/cancelable_job.dart'; -import 'incoming_split_key_payment.dart'; -import 'iskp_repository.dart'; +import '../../../core/cancelable_job.dart'; +import '../data/iskp_repository.dart'; +import '../models/incoming_split_key_payment.dart'; abstract class PaymentWatcher { PaymentWatcher(this._repository); diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/pending_iskp_listener.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/services/pending_iskp_listener.dart similarity index 85% rename from packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/pending_iskp_listener.dart rename to packages/espressocash_app/lib/features/incoming_split_key_payments/services/pending_iskp_listener.dart index 6c90c3829..890722b72 100644 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/pending_iskp_listener.dart +++ b/packages/espressocash_app/lib/features/incoming_split_key_payments/services/pending_iskp_listener.dart @@ -2,12 +2,12 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../../../core/analytics/analytics_manager.dart'; -import '../../../../core/dynamic_links_notifier.dart'; -import '../../../../core/split_key_payments.dart'; -import '../../../../di.dart'; -import '../../../../routes.gr.dart'; -import '../bl/pending_iskp_repository.dart'; +import '../../../core/analytics/analytics_manager.dart'; +import '../../../core/dynamic_links_notifier.dart'; +import '../../../core/split_key_payments.dart'; +import '../../../di.dart'; +import '../../../routes.gr.dart'; +import '../data/pending_iskp_repository.dart'; class PendingISKPListener extends StatefulWidget { const PendingISKPListener({super.key, required this.child}); diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/tx_created_watcher.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/services/tx_created_watcher.dart similarity index 88% rename from packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/tx_created_watcher.dart rename to packages/espressocash_app/lib/features/incoming_split_key_payments/services/tx_created_watcher.dart index ef002fe4d..d9d127009 100644 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/tx_created_watcher.dart +++ b/packages/espressocash_app/lib/features/incoming_split_key_payments/services/tx_created_watcher.dart @@ -4,10 +4,11 @@ import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; -import '../../../../core/cancelable_job.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import 'incoming_split_key_payment.dart'; -import 'iskp_repository.dart'; +import '../../../core/cancelable_job.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../../transactions/services/tx_sender.dart'; +import '../data/iskp_repository.dart'; +import '../models/incoming_split_key_payment.dart'; import 'payment_watcher.dart'; /// Watches for [ISKPStatus.txCreated] payments and and sends the tx. diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/tx_sent_watcher.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/services/tx_sent_watcher.dart similarity index 86% rename from packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/tx_sent_watcher.dart rename to packages/espressocash_app/lib/features/incoming_split_key_payments/services/tx_sent_watcher.dart index ee34513a3..62f61c86d 100644 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/bl/tx_sent_watcher.dart +++ b/packages/espressocash_app/lib/features/incoming_split_key_payments/services/tx_sent_watcher.dart @@ -4,10 +4,11 @@ import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; -import '../../../../core/cancelable_job.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import 'incoming_split_key_payment.dart'; -import 'iskp_repository.dart'; +import '../../../core/cancelable_job.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../../transactions/services/tx_sender.dart'; +import '../data/iskp_repository.dart'; +import '../models/incoming_split_key_payment.dart'; import 'payment_watcher.dart'; /// Watches for [ISKPStatus.txSent] payments and waits for the tx to be diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/extensions.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/widgets/extensions.dart similarity index 75% rename from packages/espressocash_app/lib/features/incoming_split_key_payments/extensions.dart rename to packages/espressocash_app/lib/features/incoming_split_key_payments/widgets/extensions.dart index 422f57717..5d5275a27 100644 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/extensions.dart +++ b/packages/espressocash_app/lib/features/incoming_split_key_payments/widgets/extensions.dart @@ -2,12 +2,12 @@ import 'package:flutter/widgets.dart'; import 'package:provider/provider.dart'; import 'package:solana/solana.dart'; -import '../../../../core/api_version.dart'; -import '../../core/accounts/bl/account.dart'; -import '../../di.dart'; -import '../../ui/loader.dart'; -import 'src/bl/incoming_split_key_payment.dart'; -import 'src/bl/iskp_service.dart'; +import '../../../../../core/api_version.dart'; +import '../../../di.dart'; +import '../../../ui/loader.dart'; +import '../../accounts/models/account.dart'; +import '../models/incoming_split_key_payment.dart'; +import '../services/iskp_service.dart'; extension ISKPExt on BuildContext { Future createISKP({ diff --git a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/components/terms_disclaimer.dart b/packages/espressocash_app/lib/features/incoming_split_key_payments/widgets/terms_disclaimer.dart similarity index 90% rename from packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/components/terms_disclaimer.dart rename to packages/espressocash_app/lib/features/incoming_split_key_payments/widgets/terms_disclaimer.dart index 7b2cf7e80..4d74cb1ea 100644 --- a/packages/espressocash_app/lib/features/incoming_split_key_payments/src/widgets/components/terms_disclaimer.dart +++ b/packages/espressocash_app/lib/features/incoming_split_key_payments/widgets/terms_disclaimer.dart @@ -1,9 +1,9 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../ui/colors.dart'; -import '../../../../legal/flow.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/colors.dart'; +import '../../legal/flow.dart'; class TermsDisclaimer extends StatelessWidget { const TermsDisclaimer({super.key}); diff --git a/packages/espressocash_app/lib/features/investments/src/data/repository.dart b/packages/espressocash_app/lib/features/investments/data/repository.dart similarity index 100% rename from packages/espressocash_app/lib/features/investments/src/data/repository.dart rename to packages/espressocash_app/lib/features/investments/data/repository.dart diff --git a/packages/espressocash_app/lib/features/investments/module.dart b/packages/espressocash_app/lib/features/investments/module.dart index af809659e..b5cc5876e 100644 --- a/packages/espressocash_app/lib/features/investments/module.dart +++ b/packages/espressocash_app/lib/features/investments/module.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:nested/nested.dart'; import 'package:provider/provider.dart'; -import '../../core/accounts/module.dart'; import '../../di.dart'; -import 'src/data/repository.dart'; +import '../accounts/module.dart'; +import 'data/repository.dart'; class InvestmentModule extends SingleChildStatelessWidget { const InvestmentModule({super.key, super.child}); diff --git a/packages/espressocash_app/lib/app/screens/authenticated/investments/investments_screen.dart b/packages/espressocash_app/lib/features/investments/screens/investments_screen.dart similarity index 79% rename from packages/espressocash_app/lib/app/screens/authenticated/investments/investments_screen.dart rename to packages/espressocash_app/lib/features/investments/screens/investments_screen.dart index 83462cb22..ef66ccbce 100644 --- a/packages/espressocash_app/lib/app/screens/authenticated/investments/investments_screen.dart +++ b/packages/espressocash_app/lib/features/investments/screens/investments_screen.dart @@ -3,24 +3,24 @@ import 'dart:math'; import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; -import '../../../../core/balances/presentation/refresh_balance_wrapper.dart'; -import '../../../../core/currency.dart'; -import '../../../../core/presentation/page_fade_wrapper.dart'; -import '../../../../features/favorite_tokens/widgets/extensions.dart'; -import '../../../../features/favorite_tokens/widgets/favorite_tokens_list.dart'; -import '../../../../features/investments/widgets/crypto_investments.dart'; -import '../../../../features/onboarding/widgets/onboarding_notice.dart'; -import '../../../../features/popular_tokens/widgets/extensions.dart'; -import '../../../../features/popular_tokens/widgets/popular_token_list.dart'; -import '../../../../features/qr_scanner/widgets/build_context_ext.dart'; -import '../../../../gen/assets.gen.dart'; -import '../../../../routes.gr.dart'; -import '../../../../ui/colors.dart'; -import '../../../../ui/icon_button.dart'; -import '../../../../ui/navigation_bar/navigation_bar.dart'; -import 'components/investment_header.dart'; -import 'components/popular_crypto_header.dart'; -import 'components/start_investing_header.dart'; +import '../../../core/currency.dart'; +import '../../../core/presentation/page_fade_wrapper.dart'; +import '../../../gen/assets.gen.dart'; +import '../../../routes.gr.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/icon_button.dart'; +import '../../../ui/navigation_bar/navigation_bar.dart'; +import '../../balances/widgets/refresh_balance_wrapper.dart'; +import '../../favorite_tokens/widgets/extensions.dart'; +import '../../favorite_tokens/widgets/favorite_tokens_list.dart'; +import '../../onboarding/widgets/onboarding_notice.dart'; +import '../../popular_tokens/widgets/extensions.dart'; +import '../../popular_tokens/widgets/popular_token_list.dart'; +import '../../qr_scanner/widgets/build_context_ext.dart'; +import '../widgets/crypto_investments.dart'; +import '../widgets/investment_header.dart'; +import '../widgets/popular_crypto_header.dart'; +import '../widgets/start_investing_header.dart'; @RoutePage(name: 'InvestmentsRouter') class InvestmentsRouterScreen extends AutoRouter { diff --git a/packages/espressocash_app/lib/app/screens/authenticated/investments/components/context_ext.dart b/packages/espressocash_app/lib/features/investments/widgets/context_ext.dart similarity index 70% rename from packages/espressocash_app/lib/app/screens/authenticated/investments/components/context_ext.dart rename to packages/espressocash_app/lib/features/investments/widgets/context_ext.dart index 3d74236fb..31349652d 100644 --- a/packages/espressocash_app/lib/app/screens/authenticated/investments/components/context_ext.dart +++ b/packages/espressocash_app/lib/features/investments/widgets/context_ext.dart @@ -3,9 +3,9 @@ import 'package:dfunc/dfunc.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../../../../core/balances/presentation/watch_balance.dart'; -import '../../../../../core/tokens/token.dart'; -import '../../../../../core/user_preferences.dart'; +import '../../../core/tokens/token.dart'; +import '../../../core/user_preferences.dart'; +import '../../balances/widgets/watch_balance.dart'; extension InvestmentExt on BuildContext { bool userHasInvestments() => watchUserTotalFiatBalance( diff --git a/packages/espressocash_app/lib/features/investments/widgets/crypto_investments.dart b/packages/espressocash_app/lib/features/investments/widgets/crypto_investments.dart index 593c35ee5..8b3196ca8 100644 --- a/packages/espressocash_app/lib/features/investments/widgets/crypto_investments.dart +++ b/packages/espressocash_app/lib/features/investments/widgets/crypto_investments.dart @@ -6,8 +6,6 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:sliver_tools/sliver_tools.dart'; import '../../../core/amount.dart'; -import '../../../core/balances/bl/balances_bloc.dart'; -import '../../../core/balances/presentation/watch_balance.dart'; import '../../../core/presentation/format_amount.dart'; import '../../../core/tokens/token.dart'; import '../../../core/user_preferences.dart'; @@ -15,7 +13,9 @@ import '../../../l10n/device_locale.dart'; import '../../../l10n/l10n.dart'; import '../../../ui/colors.dart'; import '../../../ui/theme.dart'; -import '../src/data/repository.dart'; +import '../../balances/services/balances_bloc.dart'; +import '../../balances/widgets/watch_balance.dart'; +import '../data/repository.dart'; import 'portfolio_widget.dart'; class CryptoInvestments extends StatelessWidget { diff --git a/packages/espressocash_app/lib/app/screens/authenticated/investments/components/investment_header.dart b/packages/espressocash_app/lib/features/investments/widgets/investment_header.dart similarity index 92% rename from packages/espressocash_app/lib/app/screens/authenticated/investments/components/investment_header.dart rename to packages/espressocash_app/lib/features/investments/widgets/investment_header.dart index d13a53a7f..b37eb6dd0 100644 --- a/packages/espressocash_app/lib/app/screens/authenticated/investments/components/investment_header.dart +++ b/packages/espressocash_app/lib/features/investments/widgets/investment_header.dart @@ -3,21 +3,21 @@ import 'package:decimal/decimal.dart'; import 'package:dfunc/dfunc.dart'; import 'package:flutter/material.dart'; -import '../../../../../core/amount.dart'; -import '../../../../../core/balances/presentation/watch_balance.dart'; -import '../../../../../core/currency.dart'; -import '../../../../../core/presentation/format_amount.dart'; -import '../../../../../core/tokens/token.dart'; -import '../../../../../features/ramp/widgets/ramp_buttons.dart'; -import '../../../../../gen/assets.gen.dart'; -import '../../../../../l10n/device_locale.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../routes.gr.dart'; -import '../../../../../ui/button.dart'; -import '../../../../../ui/colors.dart'; -import '../../../../../ui/info_icon.dart'; -import '../../../../../ui/info_widget.dart'; -import '../../../../../ui/token_icon.dart'; +import '../../../core/amount.dart'; +import '../../../core/currency.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../core/tokens/token.dart'; +import '../../../gen/assets.gen.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; +import '../../../routes.gr.dart'; +import '../../../ui/button.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/info_icon.dart'; +import '../../../ui/info_widget.dart'; +import '../../../ui/token_icon.dart'; +import '../../balances/widgets/watch_balance.dart'; +import '../../ramp/widgets/ramp_buttons.dart'; class InvestmentHeader extends StatelessWidget { const InvestmentHeader({super.key}); diff --git a/packages/espressocash_app/lib/features/investments/widgets/investments_zero_balance_switch.dart b/packages/espressocash_app/lib/features/investments/widgets/investments_zero_balance_switch.dart index ad603015e..a9e2ecefe 100644 --- a/packages/espressocash_app/lib/features/investments/widgets/investments_zero_balance_switch.dart +++ b/packages/espressocash_app/lib/features/investments/widgets/investments_zero_balance_switch.dart @@ -3,7 +3,7 @@ import 'package:provider/provider.dart'; import '../../../l10n/l10n.dart'; import '../../../ui/profile_switch.dart'; -import '../src/data/repository.dart'; +import '../data/repository.dart'; class InvestmentsZeroBalanceSwitch extends StatelessWidget { const InvestmentsZeroBalanceSwitch({super.key}); diff --git a/packages/espressocash_app/lib/app/screens/authenticated/investments/components/popular_crypto_header.dart b/packages/espressocash_app/lib/features/investments/widgets/popular_crypto_header.dart similarity index 85% rename from packages/espressocash_app/lib/app/screens/authenticated/investments/components/popular_crypto_header.dart rename to packages/espressocash_app/lib/features/investments/widgets/popular_crypto_header.dart index b936fe81b..bc2abf69c 100644 --- a/packages/espressocash_app/lib/app/screens/authenticated/investments/components/popular_crypto_header.dart +++ b/packages/espressocash_app/lib/features/investments/widgets/popular_crypto_header.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../ui/crypto_header.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/crypto_header.dart'; import 'context_ext.dart'; class PopularCryptoHeader extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/investments/widgets/portfolio_widget.dart b/packages/espressocash_app/lib/features/investments/widgets/portfolio_widget.dart index 38d3298db..4b2ab2c36 100644 --- a/packages/espressocash_app/lib/features/investments/widgets/portfolio_widget.dart +++ b/packages/espressocash_app/lib/features/investments/widgets/portfolio_widget.dart @@ -3,13 +3,13 @@ import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:flutter/material.dart'; import 'package:sliver_tools/sliver_tools.dart'; -import '../../../../../core/balances/presentation/watch_balance.dart'; import '../../../../../core/presentation/format_amount.dart'; import '../../../../../core/tokens/token.dart'; import '../../../../../l10n/device_locale.dart'; import '../../../../../routes.gr.dart'; import '../../../../../ui/colors.dart'; import '../../../../../ui/token_icon.dart'; +import '../../balances/widgets/watch_balance.dart'; class PortfolioWidget extends StatelessWidget { const PortfolioWidget({super.key, required this.tokens}); diff --git a/packages/espressocash_app/lib/app/screens/authenticated/investments/components/start_investing_header.dart b/packages/espressocash_app/lib/features/investments/widgets/start_investing_header.dart similarity index 80% rename from packages/espressocash_app/lib/app/screens/authenticated/investments/components/start_investing_header.dart rename to packages/espressocash_app/lib/features/investments/widgets/start_investing_header.dart index a8cbd222b..5c9213b82 100644 --- a/packages/espressocash_app/lib/app/screens/authenticated/investments/components/start_investing_header.dart +++ b/packages/espressocash_app/lib/features/investments/widgets/start_investing_header.dart @@ -1,10 +1,10 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; -import '../../../../../features/token_search/widgets/discover_header.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../routes.gr.dart'; -import '../../../../../ui/crypto_header.dart'; +import '../../../l10n/l10n.dart'; +import '../../../routes.gr.dart'; +import '../../../ui/crypto_header.dart'; +import '../../token_search/widgets/discover_header.dart'; import 'context_ext.dart'; class StartInvestingHeader extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/mobile_wallet/src/repository.dart b/packages/espressocash_app/lib/features/mobile_wallet/data/repository.dart similarity index 97% rename from packages/espressocash_app/lib/features/mobile_wallet/src/repository.dart rename to packages/espressocash_app/lib/features/mobile_wallet/data/repository.dart index 0614661d1..8ff519b6c 100644 --- a/packages/espressocash_app/lib/features/mobile_wallet/src/repository.dart +++ b/packages/espressocash_app/lib/features/mobile_wallet/data/repository.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:injectable/injectable.dart'; -import 'models/notification.dart'; +import '../models/notification.dart'; typedef NotificationHanlder = FutureOr Function( MobileWalletNotification notification, diff --git a/packages/espressocash_app/lib/features/mobile_wallet/src/models/notification.dart b/packages/espressocash_app/lib/features/mobile_wallet/models/notification.dart similarity index 100% rename from packages/espressocash_app/lib/features/mobile_wallet/src/models/notification.dart rename to packages/espressocash_app/lib/features/mobile_wallet/models/notification.dart diff --git a/packages/espressocash_app/lib/features/mobile_wallet/src/models/remote_request.dart b/packages/espressocash_app/lib/features/mobile_wallet/models/remote_request.dart similarity index 100% rename from packages/espressocash_app/lib/features/mobile_wallet/src/models/remote_request.dart rename to packages/espressocash_app/lib/features/mobile_wallet/models/remote_request.dart diff --git a/packages/espressocash_app/lib/features/mobile_wallet/module.dart b/packages/espressocash_app/lib/features/mobile_wallet/module.dart index 536e99ba3..cbe3ed0fb 100644 --- a/packages/espressocash_app/lib/features/mobile_wallet/module.dart +++ b/packages/espressocash_app/lib/features/mobile_wallet/module.dart @@ -7,8 +7,8 @@ import 'package:provider/provider.dart'; import '../../di.dart'; import '../../routes.gr.dart'; -import 'src/repository.dart'; -import 'src/scenario_handler.dart'; +import 'data/repository.dart'; +import 'services/scenario_handler.dart'; class MobileWalletModule extends SingleChildStatelessWidget { const MobileWalletModule({ diff --git a/packages/espressocash_app/lib/features/mobile_wallet/src/widgets/mobile_wallet_flow.dart b/packages/espressocash_app/lib/features/mobile_wallet/screens/mobile_wallet_flow.dart similarity index 96% rename from packages/espressocash_app/lib/features/mobile_wallet/src/widgets/mobile_wallet_flow.dart rename to packages/espressocash_app/lib/features/mobile_wallet/screens/mobile_wallet_flow.dart index c2c5339c1..49e21d6e8 100644 --- a/packages/espressocash_app/lib/features/mobile_wallet/src/widgets/mobile_wallet_flow.dart +++ b/packages/espressocash_app/lib/features/mobile_wallet/screens/mobile_wallet_flow.dart @@ -4,14 +4,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:solana_mobile_wallet/solana_mobile_wallet.dart'; -import '../../../../core/accounts/bl/account.dart'; -import '../../../../di.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/app_bar.dart'; -import '../../../../ui/button.dart'; -import '../../../../ui/theme.dart'; -import '../bl/bloc.dart'; +import '../../../di.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/app_bar.dart'; +import '../../../ui/button.dart'; +import '../../../ui/theme.dart'; +import '../../accounts/models/account.dart'; import '../models/remote_request.dart'; +import '../services/bloc.dart'; @RoutePage() class RemoteRequestScreen extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/mobile_wallet/src/bl/bloc.dart b/packages/espressocash_app/lib/features/mobile_wallet/services/bloc.dart similarity index 96% rename from packages/espressocash_app/lib/features/mobile_wallet/src/bl/bloc.dart rename to packages/espressocash_app/lib/features/mobile_wallet/services/bloc.dart index fcdae7ca9..ed0b53ef9 100644 --- a/packages/espressocash_app/lib/features/mobile_wallet/src/bl/bloc.dart +++ b/packages/espressocash_app/lib/features/mobile_wallet/services/bloc.dart @@ -10,10 +10,10 @@ import 'package:injectable/injectable.dart'; import 'package:solana/encoder.dart'; import 'package:solana_mobile_wallet/solana_mobile_wallet.dart'; -import '../../../../config.dart'; -import '../../../../core/accounts/bl/account.dart'; -import '../../../../core/transactions/resign_tx.dart'; -import '../../../../core/transactions/tx_sender.dart'; +import '../../../config.dart'; +import '../../accounts/models/account.dart'; +import '../../transactions/services/resign_tx.dart'; +import '../../transactions/services/tx_sender.dart'; import '../models/remote_request.dart'; part 'bloc.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/mobile_wallet/src/bl/event.dart b/packages/espressocash_app/lib/features/mobile_wallet/services/event.dart similarity index 100% rename from packages/espressocash_app/lib/features/mobile_wallet/src/bl/event.dart rename to packages/espressocash_app/lib/features/mobile_wallet/services/event.dart diff --git a/packages/espressocash_app/lib/features/mobile_wallet/src/scenario_handler.dart b/packages/espressocash_app/lib/features/mobile_wallet/services/scenario_handler.dart similarity index 96% rename from packages/espressocash_app/lib/features/mobile_wallet/src/scenario_handler.dart rename to packages/espressocash_app/lib/features/mobile_wallet/services/scenario_handler.dart index a06976835..e44a52999 100644 --- a/packages/espressocash_app/lib/features/mobile_wallet/src/scenario_handler.dart +++ b/packages/espressocash_app/lib/features/mobile_wallet/services/scenario_handler.dart @@ -4,9 +4,9 @@ import 'package:injectable/injectable.dart'; import 'package:solana_mobile_wallet/solana_mobile_wallet.dart'; import '../../../config.dart'; -import 'models/notification.dart'; -import 'models/remote_request.dart'; -import 'repository.dart'; +import '../data/repository.dart'; +import '../models/notification.dart'; +import '../models/remote_request.dart'; @injectable class ScenarioHandler implements ScenarioCallbacks { diff --git a/packages/espressocash_app/lib/features/mobile_wallet/src/bl/state.dart b/packages/espressocash_app/lib/features/mobile_wallet/services/state.dart similarity index 100% rename from packages/espressocash_app/lib/features/mobile_wallet/src/bl/state.dart rename to packages/espressocash_app/lib/features/mobile_wallet/services/state.dart diff --git a/packages/espressocash_app/lib/features/onboarding/module.dart b/packages/espressocash_app/lib/features/onboarding/module.dart index e87bee449..169dc1634 100644 --- a/packages/espressocash_app/lib/features/onboarding/module.dart +++ b/packages/espressocash_app/lib/features/onboarding/module.dart @@ -4,10 +4,10 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:nested/nested.dart'; import 'package:provider/provider.dart'; -import '../../core/accounts/bl/accounts_bloc.dart'; import '../../di.dart'; -import '../backup_phrase/mnemonic_getter.dart'; -import 'src/bl/onboarding_bloc.dart'; +import '../accounts/services/accounts_bloc.dart'; +import '../backup_phrase/data/mnemonic_getter.dart'; +import 'services/onboarding_bloc.dart'; class OnboardingModule extends SingleChildStatelessWidget { const OnboardingModule({ diff --git a/packages/espressocash_app/lib/features/onboarding/src/widgets/create_profile_screen.dart b/packages/espressocash_app/lib/features/onboarding/screens/create_profile_screen.dart similarity index 86% rename from packages/espressocash_app/lib/features/onboarding/src/widgets/create_profile_screen.dart rename to packages/espressocash_app/lib/features/onboarding/screens/create_profile_screen.dart index 896a31d9b..90fca1526 100644 --- a/packages/espressocash_app/lib/features/onboarding/src/widgets/create_profile_screen.dart +++ b/packages/espressocash_app/lib/features/onboarding/screens/create_profile_screen.dart @@ -2,8 +2,8 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../widgets/create_profile.dart'; -import '../bl/onboarding_bloc.dart'; +import '../services/onboarding_bloc.dart'; +import '../widgets/create_profile.dart'; @RoutePage() class CreateProfileScreen extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/onboarding/src/widgets/create_recovery_phrase_screen.dart b/packages/espressocash_app/lib/features/onboarding/screens/create_recovery_phrase_screen.dart similarity index 84% rename from packages/espressocash_app/lib/features/onboarding/src/widgets/create_recovery_phrase_screen.dart rename to packages/espressocash_app/lib/features/onboarding/screens/create_recovery_phrase_screen.dart index 7be77e1a8..5f473ebdf 100644 --- a/packages/espressocash_app/lib/features/onboarding/src/widgets/create_recovery_phrase_screen.dart +++ b/packages/espressocash_app/lib/features/onboarding/screens/create_recovery_phrase_screen.dart @@ -2,12 +2,12 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/app_bar.dart'; -import '../../../../ui/onboarding_screen.dart'; -import '../../../../ui/recovery_phrase_text_view.dart'; -import '../../../../ui/theme.dart'; -import '../../../backup_phrase/mnemonic_getter.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/app_bar.dart'; +import '../../../ui/onboarding_screen.dart'; +import '../../../ui/recovery_phrase_text_view.dart'; +import '../../../ui/theme.dart'; +import '../../backup_phrase/data/mnemonic_getter.dart'; import 'onboarding_flow_screen.dart'; @RoutePage() diff --git a/packages/espressocash_app/lib/features/onboarding/src/widgets/no_email_and_password_screen.dart b/packages/espressocash_app/lib/features/onboarding/screens/no_email_and_password_screen.dart similarity index 82% rename from packages/espressocash_app/lib/features/onboarding/src/widgets/no_email_and_password_screen.dart rename to packages/espressocash_app/lib/features/onboarding/screens/no_email_and_password_screen.dart index a3b318214..a36b9fe82 100644 --- a/packages/espressocash_app/lib/features/onboarding/src/widgets/no_email_and_password_screen.dart +++ b/packages/espressocash_app/lib/features/onboarding/screens/no_email_and_password_screen.dart @@ -1,12 +1,12 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/app_bar.dart'; -import '../../../../ui/back_button.dart'; -import '../../../../ui/info_widget.dart'; -import '../../../../ui/onboarding_screen.dart'; -import '../../../../ui/theme.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/app_bar.dart'; +import '../../../ui/back_button.dart'; +import '../../../ui/info_widget.dart'; +import '../../../ui/onboarding_screen.dart'; +import '../../../ui/theme.dart'; import 'onboarding_flow_screen.dart'; @RoutePage() diff --git a/packages/espressocash_app/lib/features/onboarding/src/widgets/onboarding_flow_screen.dart b/packages/espressocash_app/lib/features/onboarding/screens/onboarding_flow_screen.dart similarity index 88% rename from packages/espressocash_app/lib/features/onboarding/src/widgets/onboarding_flow_screen.dart rename to packages/espressocash_app/lib/features/onboarding/screens/onboarding_flow_screen.dart index 687f981e0..f9999fa6c 100644 --- a/packages/espressocash_app/lib/features/onboarding/src/widgets/onboarding_flow_screen.dart +++ b/packages/espressocash_app/lib/features/onboarding/screens/onboarding_flow_screen.dart @@ -5,12 +5,12 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:provider/provider.dart'; -import '../../../../core/accounts/bl/accounts_bloc.dart'; -import '../../../../core/accounts/bl/ec_wallet.dart'; -import '../../../../routes.gr.dart'; -import '../../../../ui/dialogs.dart'; -import '../../../../ui/loader.dart'; -import '../bl/onboarding_bloc.dart'; +import '../../../routes.gr.dart'; +import '../../../ui/dialogs.dart'; +import '../../../ui/loader.dart'; +import '../../accounts/models/ec_wallet.dart'; +import '../../accounts/services/accounts_bloc.dart'; +import '../services/onboarding_bloc.dart'; @RoutePage() class OnboardingFlowScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/onboarding/src/bl/onboarding_bloc.dart b/packages/espressocash_app/lib/features/onboarding/services/onboarding_bloc.dart similarity index 94% rename from packages/espressocash_app/lib/features/onboarding/src/bl/onboarding_bloc.dart rename to packages/espressocash_app/lib/features/onboarding/services/onboarding_bloc.dart index 3151520e8..00752657d 100644 --- a/packages/espressocash_app/lib/features/onboarding/src/bl/onboarding_bloc.dart +++ b/packages/espressocash_app/lib/features/onboarding/services/onboarding_bloc.dart @@ -6,8 +6,8 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; -import '../../../../core/file_manager.dart'; -import '../../../../core/flow.dart'; +import '../../../core/file_manager.dart'; +import '../../../core/flow.dart'; part 'onboarding_bloc.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/onboarding/widgets/onboarding_notice.dart b/packages/espressocash_app/lib/features/onboarding/widgets/onboarding_notice.dart index d01d71a0d..02f198faf 100644 --- a/packages/espressocash_app/lib/features/onboarding/widgets/onboarding_notice.dart +++ b/packages/espressocash_app/lib/features/onboarding/widgets/onboarding_notice.dart @@ -2,11 +2,11 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../../core/accounts/bl/accounts_bloc.dart'; import '../../../gen/assets.gen.dart'; import '../../../l10n/l10n.dart'; import '../../../routes.gr.dart'; import '../../../ui/button.dart'; +import '../../accounts/services/accounts_bloc.dart'; class OnboardingNotice extends StatelessWidget { const OnboardingNotice({super.key}); diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/repository.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/data/repository.dart similarity index 94% rename from packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/repository.dart rename to packages/espressocash_app/lib/features/outgoing_direct_payments/data/repository.dart index 28acfc343..57d8f2e16 100644 --- a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/repository.dart +++ b/packages/espressocash_app/lib/features/outgoing_direct_payments/data/repository.dart @@ -8,13 +8,13 @@ import 'package:sentry_flutter/sentry_flutter.dart'; import 'package:solana/encoder.dart'; import 'package:solana/solana.dart'; -import '../../../../core/amount.dart'; -import '../../../../core/currency.dart'; -import '../../../../core/tokens/token_list.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../../../data/db/db.dart'; -import '../../../../data/db/mixins.dart'; -import '../../models/outgoing_direct_payment.dart'; +import '../../../core/amount.dart'; +import '../../../core/currency.dart'; +import '../../../core/tokens/token_list.dart'; +import '../../../data/db/db.dart'; +import '../../../data/db/mixins.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../models/outgoing_direct_payment.dart'; @injectable class ODPRepository { diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/db.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/db.dart deleted file mode 100644 index fe98bc7c2..000000000 --- a/packages/espressocash_app/lib/features/outgoing_direct_payments/db.dart +++ /dev/null @@ -1 +0,0 @@ -export 'src/bl/repository.dart' show ODPRowExt, ODPRows, ODPStatusDto; diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/models/outgoing_direct_payment.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/models/outgoing_direct_payment.dart index 9f60e69f0..46ab44dcc 100644 --- a/packages/espressocash_app/lib/features/outgoing_direct_payments/models/outgoing_direct_payment.dart +++ b/packages/espressocash_app/lib/features/outgoing_direct_payments/models/outgoing_direct_payment.dart @@ -3,7 +3,7 @@ import 'package:solana/encoder.dart'; import 'package:solana/solana.dart'; import '../../../core/amount.dart'; -import '../../../core/transactions/tx_sender.dart'; +import '../../transactions/models/tx_sender.dart'; part 'outgoing_direct_payment.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/module.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/module.dart index 86c7fa80b..af0b9702e 100644 --- a/packages/espressocash_app/lib/features/outgoing_direct_payments/module.dart +++ b/packages/espressocash_app/lib/features/outgoing_direct_payments/module.dart @@ -2,13 +2,13 @@ import 'package:flutter/material.dart'; import 'package:nested/nested.dart'; import 'package:provider/provider.dart'; -import '../../core/accounts/module.dart'; -import '../../core/balances/context_ext.dart'; import '../../di.dart'; -import 'src/bl/repository.dart'; -import 'src/bl/tx_created_watcher.dart'; -import 'src/bl/tx_sent_watcher.dart'; -import 'src/widgets/link_listener.dart'; +import '../accounts/module.dart'; +import '../balances/widgets/context_ext.dart'; +import 'data/repository.dart'; +import 'services/tx_created_watcher.dart'; +import 'services/tx_sent_watcher.dart'; +import 'widgets/link_listener.dart'; class ODPModule extends SingleChildStatelessWidget { const ODPModule({super.key, super.child}); diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/widgets/odp_confirmation_screen.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/screens/odp_confirmation_screen.dart similarity index 87% rename from packages/espressocash_app/lib/features/outgoing_direct_payments/src/widgets/odp_confirmation_screen.dart rename to packages/espressocash_app/lib/features/outgoing_direct_payments/screens/odp_confirmation_screen.dart index 12772b3c6..d653d52a7 100644 --- a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/widgets/odp_confirmation_screen.dart +++ b/packages/espressocash_app/lib/features/outgoing_direct_payments/screens/odp_confirmation_screen.dart @@ -4,18 +4,18 @@ import 'package:dfunc/dfunc.dart'; import 'package:flutter/material.dart'; import 'package:solana/solana.dart'; -import '../../../../core/fee_label.dart'; -import '../../../../core/tokens/token.dart'; -import '../../../../l10n/device_locale.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/amount_keypad/amount_keypad.dart'; -import '../../../../ui/amount_with_equivalent.dart'; -import '../../../../ui/app_bar.dart'; -import '../../../../ui/bordered_row.dart'; -import '../../../../ui/button.dart'; -import '../../../../ui/dialogs.dart'; -import '../../../../ui/number_formatter.dart'; -import '../../../../ui/theme.dart'; +import '../../../core/fee_label.dart'; +import '../../../core/tokens/token.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/amount_keypad/amount_keypad.dart'; +import '../../../ui/app_bar.dart'; +import '../../../ui/bordered_row.dart'; +import '../../../ui/button.dart'; +import '../../../ui/dialogs.dart'; +import '../../../ui/number_formatter.dart'; +import '../../../ui/theme.dart'; +import '../../conversion_rates/widgets/amount_with_equivalent.dart'; @RoutePage() class ODPConfirmationScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/widgets/odp_details_screen.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/screens/odp_details_screen.dart similarity index 79% rename from packages/espressocash_app/lib/features/outgoing_direct_payments/src/widgets/odp_details_screen.dart rename to packages/espressocash_app/lib/features/outgoing_direct_payments/screens/odp_details_screen.dart index 3c2196b9f..7cc4e0eb7 100644 --- a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/widgets/odp_details_screen.dart +++ b/packages/espressocash_app/lib/features/outgoing_direct_payments/screens/odp_details_screen.dart @@ -2,20 +2,20 @@ import 'package:auto_route/auto_route.dart'; import 'package:dfunc/dfunc.dart'; import 'package:flutter/material.dart'; -import '../../../../core/presentation/format_amount.dart'; -import '../../../../core/presentation/format_date.dart'; -import '../../../../core/presentation/utils.dart'; -import '../../../../core/transactions/create_transaction_link.dart'; -import '../../../../di.dart'; -import '../../../../l10n/device_locale.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/timeline.dart'; -import '../../../../ui/transfer_status/transfer_error.dart'; -import '../../../../ui/transfer_status/transfer_progress.dart'; -import '../../../../ui/transfer_status/transfer_success.dart'; -import '../../models/outgoing_direct_payment.dart'; -import '../../widgets/extensions.dart'; -import '../bl/repository.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../core/presentation/format_date.dart'; +import '../../../core/presentation/utils.dart'; +import '../../../di.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/timeline.dart'; +import '../../transactions/services/create_transaction_link.dart'; +import '../../transactions/widgets/transfer_error.dart'; +import '../../transactions/widgets/transfer_progress.dart'; +import '../../transactions/widgets/transfer_success.dart'; +import '../data/repository.dart'; +import '../models/outgoing_direct_payment.dart'; +import '../widgets/extensions.dart'; @RoutePage() class ODPDetailsScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/fee.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/services/fee.dart similarity index 66% rename from packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/fee.dart rename to packages/espressocash_app/lib/features/outgoing_direct_payments/services/fee.dart index bd32eda7d..557dcc2b8 100644 --- a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/fee.dart +++ b/packages/espressocash_app/lib/features/outgoing_direct_payments/services/fee.dart @@ -1,5 +1,5 @@ -import '../../../../core/amount.dart'; -import '../../../../core/currency.dart'; +import '../../../core/amount.dart'; +import '../../../core/currency.dart'; /// Maximum fee to pay for the direct outgoing payment, 0.10 USDC. const CryptoAmount maxFee = diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/odp_service.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/services/odp_service.dart similarity index 88% rename from packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/odp_service.dart rename to packages/espressocash_app/lib/features/outgoing_direct_payments/services/odp_service.dart index 5f163a74a..088fd21c1 100644 --- a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/odp_service.dart +++ b/packages/espressocash_app/lib/features/outgoing_direct_payments/services/odp_service.dart @@ -5,13 +5,13 @@ import 'package:solana/encoder.dart'; import 'package:solana/solana.dart'; import 'package:uuid/uuid.dart'; -import '../../../../config.dart'; -import '../../../../core/accounts/bl/ec_wallet.dart'; -import '../../../../core/amount.dart'; -import '../../../../core/transactions/resign_tx.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../models/outgoing_direct_payment.dart'; -import 'repository.dart'; +import '../../../config.dart'; +import '../../../core/amount.dart'; +import '../../accounts/models/ec_wallet.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../../transactions/services/resign_tx.dart'; +import '../data/repository.dart'; +import '../models/outgoing_direct_payment.dart'; @injectable class ODPService { diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/payment_watcher.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/services/payment_watcher.dart similarity index 93% rename from packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/payment_watcher.dart rename to packages/espressocash_app/lib/features/outgoing_direct_payments/services/payment_watcher.dart index feb52e1c6..d6f369bd0 100644 --- a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/payment_watcher.dart +++ b/packages/espressocash_app/lib/features/outgoing_direct_payments/services/payment_watcher.dart @@ -5,9 +5,9 @@ import 'package:dfunc/dfunc.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:flutter/foundation.dart'; -import '../../../../core/cancelable_job.dart'; -import '../../models/outgoing_direct_payment.dart'; -import 'repository.dart'; +import '../../../core/cancelable_job.dart'; +import '../data/repository.dart'; +import '../models/outgoing_direct_payment.dart'; abstract class PaymentWatcher { PaymentWatcher(this._repository); diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/tx_created_watcher.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/services/tx_created_watcher.dart similarity index 87% rename from packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/tx_created_watcher.dart rename to packages/espressocash_app/lib/features/outgoing_direct_payments/services/tx_created_watcher.dart index 86693fef9..81696c6ed 100644 --- a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/tx_created_watcher.dart +++ b/packages/espressocash_app/lib/features/outgoing_direct_payments/services/tx_created_watcher.dart @@ -3,11 +3,12 @@ import 'dart:async'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; -import '../../../../core/cancelable_job.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../models/outgoing_direct_payment.dart'; +import '../../../core/cancelable_job.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../../transactions/services/tx_sender.dart'; +import '../data/repository.dart'; +import '../models/outgoing_direct_payment.dart'; import 'payment_watcher.dart'; -import 'repository.dart'; /// Watches for [ODPStatus.txCreated] payments and and sends the tx. /// diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/tx_sent_watcher.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/services/tx_sent_watcher.dart similarity index 88% rename from packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/tx_sent_watcher.dart rename to packages/espressocash_app/lib/features/outgoing_direct_payments/services/tx_sent_watcher.dart index 917f7f920..1d925f3a3 100644 --- a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/bl/tx_sent_watcher.dart +++ b/packages/espressocash_app/lib/features/outgoing_direct_payments/services/tx_sent_watcher.dart @@ -3,11 +3,11 @@ import 'dart:async'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; -import '../../../../core/cancelable_job.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../models/outgoing_direct_payment.dart'; +import '../../../core/cancelable_job.dart'; +import '../../transactions/services/tx_sender.dart'; +import '../data/repository.dart'; +import '../models/outgoing_direct_payment.dart'; import 'payment_watcher.dart'; -import 'repository.dart'; /// Watches for [ODPStatus.txSent] payments and waits for the tx to be /// confirmed. diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/widgets/extensions.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/widgets/extensions.dart index 6635ec209..bacfbd8d7 100644 --- a/packages/espressocash_app/lib/features/outgoing_direct_payments/widgets/extensions.dart +++ b/packages/espressocash_app/lib/features/outgoing_direct_payments/widgets/extensions.dart @@ -3,14 +3,14 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:solana/solana.dart'; -import '../../../core/accounts/bl/account.dart'; import '../../../core/amount.dart'; import '../../../core/analytics/analytics_manager.dart'; import '../../../core/currency.dart'; import '../../../di.dart'; import '../../../ui/loader.dart'; +import '../../accounts/models/account.dart'; import '../models/outgoing_direct_payment.dart'; -import '../src/bl/odp_service.dart'; +import '../services/odp_service.dart'; extension BuildContextExt on BuildContext { Future createODP({ diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/widgets/link_listener.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/widgets/link_listener.dart similarity index 86% rename from packages/espressocash_app/lib/features/outgoing_direct_payments/src/widgets/link_listener.dart rename to packages/espressocash_app/lib/features/outgoing_direct_payments/widgets/link_listener.dart index e912da253..38eebbabd 100644 --- a/packages/espressocash_app/lib/features/outgoing_direct_payments/src/widgets/link_listener.dart +++ b/packages/espressocash_app/lib/features/outgoing_direct_payments/widgets/link_listener.dart @@ -6,17 +6,17 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:solana/solana_pay.dart'; -import '../../../../config.dart'; -import '../../../../core/amount.dart'; -import '../../../../core/conversion_rates/amount_ext.dart'; -import '../../../../core/conversion_rates/bl/repository.dart'; -import '../../../../core/currency.dart'; -import '../../../../core/dynamic_links_notifier.dart'; -import '../../../../core/presentation/format_amount.dart'; -import '../../../../core/tokens/token.dart'; -import '../../../../l10n/device_locale.dart'; -import '../../../../routes.gr.dart'; -import '../../widgets/extensions.dart'; +import '../../../config.dart'; +import '../../../core/amount.dart'; +import '../../../core/currency.dart'; +import '../../../core/dynamic_links_notifier.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../core/tokens/token.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../routes.gr.dart'; +import '../../conversion_rates/data/repository.dart'; +import '../../conversion_rates/services/amount_ext.dart'; +import 'extensions.dart'; class ODPLinkListener extends StatefulWidget { const ODPLinkListener({super.key, required this.child}); diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/repository.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/data/repository.dart similarity index 96% rename from packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/repository.dart rename to packages/espressocash_app/lib/features/outgoing_split_key_payments/data/repository.dart index c5e63bf0e..3a1fa7e80 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/repository.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/data/repository.dart @@ -8,15 +8,15 @@ import 'package:sentry_flutter/sentry_flutter.dart'; import 'package:solana/base58.dart'; import 'package:solana/encoder.dart'; -import '../../../../core/amount.dart'; -import '../../../../core/api_version.dart'; -import '../../../../core/currency.dart'; -import '../../../../core/escrow_private_key.dart'; -import '../../../../core/tokens/token_list.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../../../data/db/db.dart'; -import '../../../../data/db/mixins.dart'; -import '../../models/outgoing_split_key_payment.dart'; +import '../../../core/amount.dart'; +import '../../../core/api_version.dart'; +import '../../../core/currency.dart'; +import '../../../core/escrow_private_key.dart'; +import '../../../core/tokens/token_list.dart'; +import '../../../data/db/db.dart'; +import '../../../data/db/mixins.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../models/outgoing_split_key_payment.dart'; @injectable class OSKPRepository { diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/db.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/db.dart deleted file mode 100644 index 5de2dac27..000000000 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/db.dart +++ /dev/null @@ -1,2 +0,0 @@ -export 'src/bl/repository.dart' - show OSKPRowExt, OSKPRows, OSKPStatusDto, OskpApiVersionDto; diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/models/outgoing_split_key_payment.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/models/outgoing_split_key_payment.dart index fae519daf..0872d8526 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/models/outgoing_split_key_payment.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/models/outgoing_split_key_payment.dart @@ -4,7 +4,7 @@ import 'package:solana/encoder.dart'; import '../../../core/amount.dart'; import '../../../core/api_version.dart'; import '../../../core/escrow_private_key.dart'; -import '../../../core/transactions/tx_sender.dart'; +import '../../transactions/models/tx_sender.dart'; part 'outgoing_split_key_payment.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/module.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/module.dart index 1440a47b7..90d575dc6 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/module.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/module.dart @@ -2,17 +2,17 @@ import 'package:flutter/material.dart'; import 'package:nested/nested.dart'; import 'package:provider/provider.dart'; -import '../../core/accounts/bl/account.dart'; -import '../../core/accounts/module.dart'; -import '../../core/balances/context_ext.dart'; import '../../di.dart'; -import 'src/bl/cancel_tx_created_watcher.dart'; -import 'src/bl/cancel_tx_sent_watcher.dart'; -import 'src/bl/repository.dart'; -import 'src/bl/tx_confirmed_watcher.dart'; -import 'src/bl/tx_created_watcher.dart'; -import 'src/bl/tx_ready_watcher.dart'; -import 'src/bl/tx_sent_watcher.dart'; +import '../accounts/models/account.dart'; +import '../accounts/module.dart'; +import '../balances/widgets/context_ext.dart'; +import 'data/repository.dart'; +import 'services/cancel_tx_created_watcher.dart'; +import 'services/cancel_tx_sent_watcher.dart'; +import 'services/tx_confirmed_watcher.dart'; +import 'services/tx_created_watcher.dart'; +import 'services/tx_ready_watcher.dart'; +import 'services/tx_sent_watcher.dart'; class OSKPModule extends SingleChildStatelessWidget { const OSKPModule({super.key, super.child}); diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/oskp_confirmation_screen.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/screens/oskp_confirmation_screen.dart similarity index 88% rename from packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/oskp_confirmation_screen.dart rename to packages/espressocash_app/lib/features/outgoing_split_key_payments/screens/oskp_confirmation_screen.dart index 3c8e89867..08db10a08 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/oskp_confirmation_screen.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/screens/oskp_confirmation_screen.dart @@ -2,20 +2,20 @@ import 'package:auto_route/auto_route.dart'; import 'package:dfunc/dfunc.dart'; import 'package:flutter/material.dart'; -import '../../../../core/amount.dart'; -import '../../../../core/conversion_rates/context_ext.dart'; -import '../../../../core/currency.dart'; -import '../../../../core/fee_label.dart'; -import '../../../../core/presentation/format_amount.dart'; -import '../../../../l10n/device_locale.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/app_bar.dart'; -import '../../../../ui/back_button.dart'; -import '../../../../ui/button.dart'; -import '../../../../ui/chip.dart'; -import '../../../../ui/content_padding.dart'; -import '../../../../ui/info_widget.dart'; -import '../../../../ui/theme.dart'; +import '../../../core/amount.dart'; +import '../../../core/currency.dart'; +import '../../../core/fee_label.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/app_bar.dart'; +import '../../../ui/back_button.dart'; +import '../../../ui/button.dart'; +import '../../../ui/chip.dart'; +import '../../../ui/content_padding.dart'; +import '../../../ui/info_widget.dart'; +import '../../../ui/theme.dart'; +import '../../conversion_rates/widgets/context_ext.dart'; @RoutePage() class OSKPConfirmationScreen extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/oskp_screen.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/screens/oskp_screen.dart similarity index 91% rename from packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/oskp_screen.dart rename to packages/espressocash_app/lib/features/outgoing_split_key_payments/screens/oskp_screen.dart index 643c6d9f3..0d0fa1530 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/oskp_screen.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/screens/oskp_screen.dart @@ -4,24 +4,24 @@ import 'package:auto_route/auto_route.dart'; import 'package:dfunc/dfunc.dart'; import 'package:flutter/material.dart'; -import '../../../../core/presentation/format_amount.dart'; -import '../../../../core/presentation/format_date.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../../../di.dart'; -import '../../../../l10n/device_locale.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../routes.gr.dart'; -import '../../../../ui/button.dart'; -import '../../../../ui/content_padding.dart'; -import '../../../../ui/dialogs.dart'; -import '../../../../ui/status_screen.dart'; -import '../../../../ui/status_widget.dart'; -import '../../../../ui/text_button.dart'; -import '../../../../ui/timeline.dart'; -import '../../../../ui/transfer_status/transfer_progress.dart'; -import '../../models/outgoing_split_key_payment.dart'; -import '../../widgets/extensions.dart'; -import '../bl/repository.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../core/presentation/format_date.dart'; +import '../../../di.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; +import '../../../routes.gr.dart'; +import '../../../ui/button.dart'; +import '../../../ui/content_padding.dart'; +import '../../../ui/dialogs.dart'; +import '../../../ui/status_screen.dart'; +import '../../../ui/status_widget.dart'; +import '../../../ui/text_button.dart'; +import '../../../ui/timeline.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../../transactions/widgets/transfer_progress.dart'; +import '../data/repository.dart'; +import '../models/outgoing_split_key_payment.dart'; +import '../widgets/extensions.dart'; @RoutePage() class OSKPScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/share_links_screen.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/screens/share_links_screen.dart similarity index 86% rename from packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/share_links_screen.dart rename to packages/espressocash_app/lib/features/outgoing_split_key_payments/screens/share_links_screen.dart index c7abc8032..149cbf246 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/share_links_screen.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/screens/share_links_screen.dart @@ -1,14 +1,14 @@ import 'package:auto_route/annotations.dart'; import 'package:flutter/material.dart'; -import '../../../../core/amount.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/app_bar.dart'; -import '../../../../ui/tab_bar.dart'; -import '../../../../ui/theme.dart'; -import '../../models/outgoing_split_key_payment.dart'; -import 'components/share_link.dart'; -import 'components/share_qr.dart'; +import '../../../core/amount.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/app_bar.dart'; +import '../../../ui/tab_bar.dart'; +import '../../../ui/theme.dart'; +import '../models/outgoing_split_key_payment.dart'; +import '../widgets/share_link.dart'; +import '../widgets/share_qr.dart'; @RoutePage() class ShareLinksScreen extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/cancel_tx_created_watcher.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/cancel_tx_created_watcher.dart similarity index 88% rename from packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/cancel_tx_created_watcher.dart rename to packages/espressocash_app/lib/features/outgoing_split_key_payments/services/cancel_tx_created_watcher.dart index 0c31f1c2a..295649592 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/cancel_tx_created_watcher.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/cancel_tx_created_watcher.dart @@ -3,11 +3,12 @@ import 'dart:async'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; -import '../../../../core/cancelable_job.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../models/outgoing_split_key_payment.dart'; +import '../../../core/cancelable_job.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../../transactions/services/tx_sender.dart'; +import '../data/repository.dart'; +import '../models/outgoing_split_key_payment.dart'; import 'payment_watcher.dart'; -import 'repository.dart'; /// Watches for [OSKPStatus.cancelTxCreated] payments and sends the tx. /// diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/cancel_tx_sent_watcher.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/cancel_tx_sent_watcher.dart similarity index 89% rename from packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/cancel_tx_sent_watcher.dart rename to packages/espressocash_app/lib/features/outgoing_split_key_payments/services/cancel_tx_sent_watcher.dart index a1f9a5300..915019861 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/cancel_tx_sent_watcher.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/cancel_tx_sent_watcher.dart @@ -3,11 +3,11 @@ import 'dart:async'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; -import '../../../../core/cancelable_job.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../models/outgoing_split_key_payment.dart'; +import '../../../core/cancelable_job.dart'; +import '../../transactions/services/tx_sender.dart'; +import '../data/repository.dart'; +import '../models/outgoing_split_key_payment.dart'; import 'payment_watcher.dart'; -import 'repository.dart'; /// Watches for [OSKPStatus.cancelTxSent] payments and waits for the tx to be /// confirmed. diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/oskp_service.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/oskp_service.dart similarity index 92% rename from packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/oskp_service.dart rename to packages/espressocash_app/lib/features/outgoing_split_key_payments/services/oskp_service.dart index 84d5ee0d7..b2c920a28 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/oskp_service.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/oskp_service.dart @@ -5,15 +5,15 @@ import 'package:solana/encoder.dart'; import 'package:solana/solana.dart'; import 'package:uuid/uuid.dart'; -import '../../../../config.dart'; -import '../../../../core/accounts/bl/ec_wallet.dart'; -import '../../../../core/amount.dart'; -import '../../../../core/api_version.dart'; -import '../../../../core/escrow_private_key.dart'; -import '../../../../core/transactions/resign_tx.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../models/outgoing_split_key_payment.dart'; -import 'repository.dart'; +import '../../../config.dart'; +import '../../../core/amount.dart'; +import '../../../core/api_version.dart'; +import '../../../core/escrow_private_key.dart'; +import '../../accounts/models/ec_wallet.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../../transactions/services/resign_tx.dart'; +import '../data/repository.dart'; +import '../models/outgoing_split_key_payment.dart'; @injectable class OSKPService { diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/payment_watcher.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/payment_watcher.dart similarity index 93% rename from packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/payment_watcher.dart rename to packages/espressocash_app/lib/features/outgoing_split_key_payments/services/payment_watcher.dart index b2861a3db..2c70fa946 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/payment_watcher.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/payment_watcher.dart @@ -5,9 +5,9 @@ import 'package:dfunc/dfunc.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:flutter/foundation.dart'; -import '../../../../core/cancelable_job.dart'; -import '../../models/outgoing_split_key_payment.dart'; -import 'repository.dart'; +import '../../../core/cancelable_job.dart'; +import '../data/repository.dart'; +import '../models/outgoing_split_key_payment.dart'; abstract class PaymentWatcher { PaymentWatcher(this._repository); diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/tx_confirmed_watcher.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/tx_confirmed_watcher.dart similarity index 90% rename from packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/tx_confirmed_watcher.dart rename to packages/espressocash_app/lib/features/outgoing_split_key_payments/services/tx_confirmed_watcher.dart index f23803b9d..5f1c066b7 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/tx_confirmed_watcher.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/tx_confirmed_watcher.dart @@ -4,13 +4,13 @@ import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; import 'package:solana/base58.dart'; -import '../../../../core/amount.dart'; -import '../../../../core/cancelable_job.dart'; -import '../../../../core/link_shortener.dart'; -import '../../../../core/split_key_payments.dart'; -import '../../models/outgoing_split_key_payment.dart'; +import '../../../core/amount.dart'; +import '../../../core/cancelable_job.dart'; +import '../../../core/link_shortener.dart'; +import '../../../core/split_key_payments.dart'; +import '../data/repository.dart'; +import '../models/outgoing_split_key_payment.dart'; import 'payment_watcher.dart'; -import 'repository.dart'; /// Watches for [OSKPStatus.txConfirmed] payments and generates the links. @injectable diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/tx_created_watcher.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/tx_created_watcher.dart similarity index 87% rename from packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/tx_created_watcher.dart rename to packages/espressocash_app/lib/features/outgoing_split_key_payments/services/tx_created_watcher.dart index 8506bf466..459fdd028 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/tx_created_watcher.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/tx_created_watcher.dart @@ -3,11 +3,12 @@ import 'dart:async'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; -import '../../../../core/cancelable_job.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../models/outgoing_split_key_payment.dart'; +import '../../../core/cancelable_job.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../../transactions/services/tx_sender.dart'; +import '../data/repository.dart'; +import '../models/outgoing_split_key_payment.dart'; import 'payment_watcher.dart'; -import 'repository.dart'; /// Watches for [OSKPStatus.txCreated] payments and and sends the tx. /// diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/tx_ready_watcher.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/tx_ready_watcher.dart similarity index 95% rename from packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/tx_ready_watcher.dart rename to packages/espressocash_app/lib/features/outgoing_split_key_payments/services/tx_ready_watcher.dart index cdfcbaaf5..ec05df284 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/tx_ready_watcher.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/tx_ready_watcher.dart @@ -8,10 +8,10 @@ import 'package:rxdart/rxdart.dart'; import 'package:solana/dto.dart'; import 'package:solana/solana.dart'; -import '../../../../core/api_version.dart'; -import '../../../../core/transactions/tx_destinations.dart'; -import '../../models/outgoing_split_key_payment.dart'; -import 'repository.dart'; +import '../../../core/api_version.dart'; +import '../../transactions/services/tx_destinations.dart'; +import '../data/repository.dart'; +import '../models/outgoing_split_key_payment.dart'; @injectable class TxReadyWatcher { diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/tx_sent_watcher.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/tx_sent_watcher.dart similarity index 89% rename from packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/tx_sent_watcher.dart rename to packages/espressocash_app/lib/features/outgoing_split_key_payments/services/tx_sent_watcher.dart index 253b6064a..97b7f80b3 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/bl/tx_sent_watcher.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/services/tx_sent_watcher.dart @@ -4,11 +4,11 @@ import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; -import '../../../../core/cancelable_job.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../models/outgoing_split_key_payment.dart'; +import '../../../core/cancelable_job.dart'; +import '../../transactions/services/tx_sender.dart'; +import '../data/repository.dart'; +import '../models/outgoing_split_key_payment.dart'; import 'payment_watcher.dart'; -import 'repository.dart'; /// Watches for [OSKPStatus.txSent] payments and waits for the tx to be /// confirmed. diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/widgets/extensions.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/widgets/extensions.dart index 3685e276d..01eea15d8 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/widgets/extensions.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/widgets/extensions.dart @@ -4,13 +4,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:provider/provider.dart'; -import '../../../core/accounts/bl/account.dart'; import '../../../core/amount.dart'; import '../../../core/analytics/analytics_manager.dart'; import '../../../di.dart'; import '../../../ui/loader.dart'; +import '../../accounts/models/account.dart'; import '../models/outgoing_split_key_payment.dart'; -import '../src/bl/oskp_service.dart'; +import '../services/oskp_service.dart'; extension BuildContextExt on BuildContext { Future createOSKP({required CryptoAmount amount}) async => diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/components/share_link.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/widgets/share_link.dart similarity index 86% rename from packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/components/share_link.dart rename to packages/espressocash_app/lib/features/outgoing_split_key_payments/widgets/share_link.dart index 6e59ea1d2..0ebb4da2a 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/components/share_link.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/widgets/share_link.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; import 'package:share/share.dart'; -import '../../../../../core/amount.dart'; -import '../../../../../core/presentation/format_amount.dart'; -import '../../../../../core/presentation/utils.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../ui/button.dart'; -import '../../../../../ui/colors.dart'; -import '../../../../../ui/share_message/share_message_bubble.dart'; -import '../../../../../ui/share_message/share_message_header.dart'; -import '../../../models/outgoing_split_key_payment.dart'; +import '../../../core/amount.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../core/presentation/utils.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/button.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/share_message/share_message_bubble.dart'; +import '../../../ui/share_message/share_message_header.dart'; +import '../models/outgoing_split_key_payment.dart'; class ShareLinks extends StatelessWidget { const ShareLinks({ diff --git a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/components/share_qr.dart b/packages/espressocash_app/lib/features/outgoing_split_key_payments/widgets/share_qr.dart similarity index 93% rename from packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/components/share_qr.dart rename to packages/espressocash_app/lib/features/outgoing_split_key_payments/widgets/share_qr.dart index a09430368..5c93ba6b5 100644 --- a/packages/espressocash_app/lib/features/outgoing_split_key_payments/src/widgets/components/share_qr.dart +++ b/packages/espressocash_app/lib/features/outgoing_split_key_payments/widgets/share_qr.dart @@ -1,13 +1,13 @@ import 'package:barcode_widget/barcode_widget.dart'; import 'package:flutter/material.dart'; -import '../../../../../core/amount.dart'; -import '../../../../../core/presentation/format_amount.dart'; -import '../../../../../gen/assets.gen.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../ui/colors.dart'; -import '../../../../../ui/content_padding.dart'; -import '../../../../../ui/rounded_rectangle.dart'; +import '../../../core/amount.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../gen/assets.gen.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/content_padding.dart'; +import '../../../ui/rounded_rectangle.dart'; class ShareQr extends StatelessWidget { const ShareQr({ diff --git a/packages/espressocash_app/lib/features/payment_request/src/bl/repository.dart b/packages/espressocash_app/lib/features/payment_request/data/repository.dart similarity index 96% rename from packages/espressocash_app/lib/features/payment_request/src/bl/repository.dart rename to packages/espressocash_app/lib/features/payment_request/data/repository.dart index 04880a6cf..845875695 100644 --- a/packages/espressocash_app/lib/features/payment_request/src/bl/repository.dart +++ b/packages/espressocash_app/lib/features/payment_request/data/repository.dart @@ -6,9 +6,9 @@ import 'package:injectable/injectable.dart'; import 'package:solana/solana.dart'; import 'package:solana/solana_pay.dart'; -import '../../../../data/db/db.dart'; -import '../../../../data/db/mixins.dart'; -import '../../models/payment_request.dart'; +import '../../../data/db/db.dart'; +import '../../../data/db/mixins.dart'; +import '../models/payment_request.dart'; @injectable class PaymentRequestRepository { diff --git a/packages/espressocash_app/lib/features/payment_request/watch_payment_request.dart b/packages/espressocash_app/lib/features/payment_request/data/watch_payment_request.dart similarity index 53% rename from packages/espressocash_app/lib/features/payment_request/watch_payment_request.dart rename to packages/espressocash_app/lib/features/payment_request/data/watch_payment_request.dart index 2ac3ff496..470c10015 100644 --- a/packages/espressocash_app/lib/features/payment_request/watch_payment_request.dart +++ b/packages/espressocash_app/lib/features/payment_request/data/watch_payment_request.dart @@ -1,6 +1,6 @@ -import '../../di.dart'; -import 'models/payment_request.dart'; -import 'src/bl/repository.dart'; +import '../../../di.dart'; +import '../models/payment_request.dart'; +import 'repository.dart'; Stream watchPaymentRequest(String id) => sl().watchById(id); diff --git a/packages/espressocash_app/lib/features/payment_request/db.dart b/packages/espressocash_app/lib/features/payment_request/db.dart deleted file mode 100644 index 382e27af9..000000000 --- a/packages/espressocash_app/lib/features/payment_request/db.dart +++ /dev/null @@ -1 +0,0 @@ -export 'src/bl/repository.dart' show PaymentRequestRows, PaymentRequestStateDto; diff --git a/packages/espressocash_app/lib/features/payment_request/module.dart b/packages/espressocash_app/lib/features/payment_request/module.dart index cf8bee777..c4d5c02d8 100644 --- a/packages/espressocash_app/lib/features/payment_request/module.dart +++ b/packages/espressocash_app/lib/features/payment_request/module.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:nested/nested.dart'; -import '../../core/accounts/module.dart'; import '../../di.dart'; -import 'src/bl/repository.dart'; +import '../accounts/module.dart'; +import 'data/repository.dart'; class PaymentRequestModule extends SingleChildStatelessWidget { const PaymentRequestModule({super.key, super.child}); diff --git a/packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/flow.dart b/packages/espressocash_app/lib/features/payment_request/screens/link_details_flow_screen.dart similarity index 84% rename from packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/flow.dart rename to packages/espressocash_app/lib/features/payment_request/screens/link_details_flow_screen.dart index 04566899a..46ad65cdd 100644 --- a/packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/flow.dart +++ b/packages/espressocash_app/lib/features/payment_request/screens/link_details_flow_screen.dart @@ -3,19 +3,19 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:provider/provider.dart'; -import '../../../../../core/balances/context_ext.dart'; -import '../../../../../di.dart'; -import '../../../../../gen/assets.gen.dart'; -import '../../../../../l10n/device_locale.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../ui/app_bar.dart'; -import '../../../../../ui/back_button.dart'; -import '../../../../../ui/theme.dart'; -import '../../../formatted_amount.dart'; -import '../../../models/payment_request.dart'; -import '../../bl/payment_request_verifier/bloc.dart'; -import '../../bl/repository.dart'; -import 'tx_result_screen.dart'; +import '../../../di.dart'; +import '../../../gen/assets.gen.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/app_bar.dart'; +import '../../../ui/back_button.dart'; +import '../../../ui/theme.dart'; +import '../../balances/widgets/context_ext.dart'; +import '../data/repository.dart'; +import '../models/payment_request.dart'; +import '../services/payment_request_verifier_bloc.dart'; +import '../widgets/formatted_amount.dart'; +import '../widgets/tx_result_screen.dart'; @RoutePage() class LinkDetailsFlowScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/payment_request/src/widgets/link_request/flow.dart b/packages/espressocash_app/lib/features/payment_request/screens/link_request_flow_screen.dart similarity index 86% rename from packages/espressocash_app/lib/features/payment_request/src/widgets/link_request/flow.dart rename to packages/espressocash_app/lib/features/payment_request/screens/link_request_flow_screen.dart index 14d28f1ec..ff7d7cc01 100644 --- a/packages/espressocash_app/lib/features/payment_request/src/widgets/link_request/flow.dart +++ b/packages/espressocash_app/lib/features/payment_request/screens/link_request_flow_screen.dart @@ -4,17 +4,17 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:provider/provider.dart'; -import '../../../../../core/accounts/bl/account.dart'; -import '../../../../../core/amount.dart'; -import '../../../../../core/conversion_rates/bl/repository.dart'; -import '../../../../../core/user_preferences.dart'; -import '../../../../../di.dart'; -import '../../../../../routes.gr.dart'; -import '../../../../../ui/dialogs.dart'; -import '../../../../../ui/loader.dart'; -import '../../bl/create_payment_request/bloc.dart'; -import '../../bl/repository.dart'; -import 'request_note_screen.dart'; +import '../../../core/amount.dart'; +import '../../../core/user_preferences.dart'; +import '../../../di.dart'; +import '../../../routes.gr.dart'; +import '../../../ui/dialogs.dart'; +import '../../../ui/loader.dart'; +import '../../accounts/models/account.dart'; +import '../../conversion_rates/data/repository.dart'; +import '../data/repository.dart'; +import '../services/create_payment_request_bloc.dart'; +import '../widgets/request_note_screen.dart'; @RoutePage() class LinkRequestFlowScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/share_request.dart b/packages/espressocash_app/lib/features/payment_request/screens/share_payment_request_screen.dart similarity index 82% rename from packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/share_request.dart rename to packages/espressocash_app/lib/features/payment_request/screens/share_payment_request_screen.dart index a79abaa24..968c8939b 100644 --- a/packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/share_request.dart +++ b/packages/espressocash_app/lib/features/payment_request/screens/share_payment_request_screen.dart @@ -2,18 +2,18 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../../../../../di.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../ui/app_bar.dart'; -import '../../../../../ui/back_button.dart'; -import '../../../../../ui/dialogs.dart'; -import '../../../../../ui/tab_bar.dart'; -import '../../../../../ui/text_button.dart'; -import '../../../../../ui/theme.dart'; -import '../../../models/payment_request.dart'; -import '../../bl/repository.dart'; -import 'components/share_link.dart'; -import 'components/share_qr_code.dart'; +import '../../../di.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/app_bar.dart'; +import '../../../ui/back_button.dart'; +import '../../../ui/dialogs.dart'; +import '../../../ui/tab_bar.dart'; +import '../../../ui/text_button.dart'; +import '../../../ui/theme.dart'; +import '../data/repository.dart'; +import '../models/payment_request.dart'; +import '../widgets/share_link.dart'; +import '../widgets/share_qr_code.dart'; @RoutePage() class SharePaymentRequestScreen extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/payment_request/src/bl/create_payment_request/bloc.dart b/packages/espressocash_app/lib/features/payment_request/services/create_payment_request_bloc.dart similarity index 73% rename from packages/espressocash_app/lib/features/payment_request/src/bl/create_payment_request/bloc.dart rename to packages/espressocash_app/lib/features/payment_request/services/create_payment_request_bloc.dart index 0d679a317..259639801 100644 --- a/packages/espressocash_app/lib/features/payment_request/src/bl/create_payment_request/bloc.dart +++ b/packages/espressocash_app/lib/features/payment_request/services/create_payment_request_bloc.dart @@ -5,18 +5,49 @@ import 'package:solana/solana.dart'; import 'package:solana/solana_pay.dart'; import 'package:uuid/uuid.dart'; -import '../../../../../core/amount.dart'; -import '../../../../../core/conversion_rates/amount_ext.dart'; -import '../../../../../core/conversion_rates/bl/repository.dart'; -import '../../../../../core/currency.dart'; -import '../../../../../core/flow.dart'; -import '../../../../../core/tokens/token.dart'; -import '../../../models/payment_request.dart'; -import '../repository.dart'; - -part 'bloc.freezed.dart'; -part 'event.dart'; -part 'state.dart'; +import '../../../core/amount.dart'; +import '../../../core/currency.dart'; +import '../../../core/flow.dart'; +import '../../../core/tokens/token.dart'; +import '../../conversion_rates/data/repository.dart'; +import '../../conversion_rates/services/amount_ext.dart'; +import '../data/repository.dart'; +import '../models/payment_request.dart'; + +part 'create_payment_request_bloc.freezed.dart'; + +@freezed +class CreatePaymentRequestEvent with _$CreatePaymentRequestEvent { + const factory CreatePaymentRequestEvent.labelUpdated(String value) = + LabelUpdated; + + const factory CreatePaymentRequestEvent.tokenAmountUpdated( + Decimal amount, + ) = TokenAmountUpdated; + + const factory CreatePaymentRequestEvent.fiatAmountUpdated( + Decimal amount, + ) = FiatAmountUpdated; + + const factory CreatePaymentRequestEvent.submitted({ + required Ed25519HDPublicKey recipient, + }) = Submitted; +} + +@freezed +class CreatePaymentRequestState with _$CreatePaymentRequestState { + const factory CreatePaymentRequestState({ + @Default('') String label, + required CryptoAmount tokenAmount, + required FiatAmount fiatAmount, + @Default(Flow.initial()) + Flow flow, + }) = _CreatePaymentRequestState; + + const CreatePaymentRequestState._(); + + Token get token => tokenAmount.cryptoCurrency.token; +} typedef _Event = CreatePaymentRequestEvent; typedef _State = CreatePaymentRequestState; diff --git a/packages/espressocash_app/lib/features/payment_request/src/bl/payment_request_verifier/bloc.dart b/packages/espressocash_app/lib/features/payment_request/services/payment_request_verifier_bloc.dart similarity index 81% rename from packages/espressocash_app/lib/features/payment_request/src/bl/payment_request_verifier/bloc.dart rename to packages/espressocash_app/lib/features/payment_request/services/payment_request_verifier_bloc.dart index a5131890d..772872217 100644 --- a/packages/espressocash_app/lib/features/payment_request/src/bl/payment_request_verifier/bloc.dart +++ b/packages/espressocash_app/lib/features/payment_request/services/payment_request_verifier_bloc.dart @@ -11,12 +11,34 @@ import 'package:rxdart/rxdart.dart'; import 'package:solana/solana.dart'; import 'package:solana/solana_pay.dart'; -import '../../../models/payment_request.dart'; -import '../repository.dart'; +import '../data/repository.dart'; +import '../models/payment_request.dart'; -part 'bloc.freezed.dart'; -part 'event.dart'; -part 'state.dart'; +part 'payment_request_verifier_bloc.freezed.dart'; + +@freezed +class PaymentRequestVerifierEvent with _$PaymentRequestVerifierEvent { + const factory PaymentRequestVerifierEvent.waitingFailed(Exception e) = + WaitingFailed; + + const factory PaymentRequestVerifierEvent.txAdded(TransactionId id) = TxAdded; + + const factory PaymentRequestVerifierEvent.verificationFailed( + Exception error, { + required TransactionId transactionId, + }) = VerificationFailed; + + const factory PaymentRequestVerifierEvent.suceeded() = Succeeded; +} + +@freezed +class PaymentRequestVerifierState with _$PaymentRequestVerifierState { + const factory PaymentRequestVerifierState.waiting() = Waiting; + const factory PaymentRequestVerifierState.retrying() = Retrying; + const factory PaymentRequestVerifierState.verifying() = Verifying; + const factory PaymentRequestVerifierState.success() = Success; + const factory PaymentRequestVerifierState.failure() = Failure; +} typedef _Event = PaymentRequestVerifierEvent; typedef _State = PaymentRequestVerifierState; diff --git a/packages/espressocash_app/lib/features/payment_request/src/bl/create_payment_request/event.dart b/packages/espressocash_app/lib/features/payment_request/src/bl/create_payment_request/event.dart deleted file mode 100644 index 7d9b1bf3d..000000000 --- a/packages/espressocash_app/lib/features/payment_request/src/bl/create_payment_request/event.dart +++ /dev/null @@ -1,19 +0,0 @@ -part of 'bloc.dart'; - -@freezed -class CreatePaymentRequestEvent with _$CreatePaymentRequestEvent { - const factory CreatePaymentRequestEvent.labelUpdated(String value) = - LabelUpdated; - - const factory CreatePaymentRequestEvent.tokenAmountUpdated( - Decimal amount, - ) = TokenAmountUpdated; - - const factory CreatePaymentRequestEvent.fiatAmountUpdated( - Decimal amount, - ) = FiatAmountUpdated; - - const factory CreatePaymentRequestEvent.submitted({ - required Ed25519HDPublicKey recipient, - }) = Submitted; -} diff --git a/packages/espressocash_app/lib/features/payment_request/src/bl/create_payment_request/state.dart b/packages/espressocash_app/lib/features/payment_request/src/bl/create_payment_request/state.dart deleted file mode 100644 index bbf648a54..000000000 --- a/packages/espressocash_app/lib/features/payment_request/src/bl/create_payment_request/state.dart +++ /dev/null @@ -1,16 +0,0 @@ -part of 'bloc.dart'; - -@freezed -class CreatePaymentRequestState with _$CreatePaymentRequestState { - const factory CreatePaymentRequestState({ - @Default('') String label, - required CryptoAmount tokenAmount, - required FiatAmount fiatAmount, - @Default(Flow.initial()) - Flow flow, - }) = _CreatePaymentRequestState; - - const CreatePaymentRequestState._(); - - Token get token => tokenAmount.cryptoCurrency.token; -} diff --git a/packages/espressocash_app/lib/features/payment_request/src/bl/payment_request_verifier/event.dart b/packages/espressocash_app/lib/features/payment_request/src/bl/payment_request_verifier/event.dart deleted file mode 100644 index 046dcb73a..000000000 --- a/packages/espressocash_app/lib/features/payment_request/src/bl/payment_request_verifier/event.dart +++ /dev/null @@ -1,16 +0,0 @@ -part of 'bloc.dart'; - -@freezed -class PaymentRequestVerifierEvent with _$PaymentRequestVerifierEvent { - const factory PaymentRequestVerifierEvent.waitingFailed(Exception e) = - WaitingFailed; - - const factory PaymentRequestVerifierEvent.txAdded(TransactionId id) = TxAdded; - - const factory PaymentRequestVerifierEvent.verificationFailed( - Exception error, { - required TransactionId transactionId, - }) = VerificationFailed; - - const factory PaymentRequestVerifierEvent.suceeded() = Succeeded; -} diff --git a/packages/espressocash_app/lib/features/payment_request/src/bl/payment_request_verifier/state.dart b/packages/espressocash_app/lib/features/payment_request/src/bl/payment_request_verifier/state.dart deleted file mode 100644 index 4be1d40c0..000000000 --- a/packages/espressocash_app/lib/features/payment_request/src/bl/payment_request_verifier/state.dart +++ /dev/null @@ -1,10 +0,0 @@ -part of 'bloc.dart'; - -@freezed -class PaymentRequestVerifierState with _$PaymentRequestVerifierState { - const factory PaymentRequestVerifierState.waiting() = Waiting; - const factory PaymentRequestVerifierState.retrying() = Retrying; - const factory PaymentRequestVerifierState.verifying() = Verifying; - const factory PaymentRequestVerifierState.success() = Success; - const factory PaymentRequestVerifierState.failure() = Failure; -} diff --git a/packages/espressocash_app/lib/features/payment_request/formatted_amount.dart b/packages/espressocash_app/lib/features/payment_request/widgets/formatted_amount.dart similarity index 59% rename from packages/espressocash_app/lib/features/payment_request/formatted_amount.dart rename to packages/espressocash_app/lib/features/payment_request/widgets/formatted_amount.dart index d659db2ca..9dfabca2f 100644 --- a/packages/espressocash_app/lib/features/payment_request/formatted_amount.dart +++ b/packages/espressocash_app/lib/features/payment_request/widgets/formatted_amount.dart @@ -1,8 +1,8 @@ import 'package:flutter/widgets.dart'; -import '../../core/presentation/format_amount.dart'; -import '../../core/tokens/token_list.dart'; -import 'models/payment_request.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../core/tokens/token_list.dart'; +import '../models/payment_request.dart'; extension PaymentRequestFormatAmountExt on PaymentRequest { String formattedAmount(Locale locale) => diff --git a/packages/espressocash_app/lib/features/payment_request/widgets/payment_request_verifier.dart b/packages/espressocash_app/lib/features/payment_request/widgets/payment_request_verifier.dart index a50038bb3..154ec76af 100644 --- a/packages/espressocash_app/lib/features/payment_request/widgets/payment_request_verifier.dart +++ b/packages/espressocash_app/lib/features/payment_request/widgets/payment_request_verifier.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../../core/balances/context_ext.dart'; import '../../../di.dart'; +import '../../balances/widgets/context_ext.dart'; import '../models/payment_request.dart'; -import '../src/bl/payment_request_verifier/bloc.dart'; +import '../services/payment_request_verifier_bloc.dart'; class PaymentRequestVerifier extends StatelessWidget { const PaymentRequestVerifier({ diff --git a/packages/espressocash_app/lib/features/payment_request/src/widgets/link_request/request_note_screen.dart b/packages/espressocash_app/lib/features/payment_request/widgets/request_note_screen.dart similarity index 85% rename from packages/espressocash_app/lib/features/payment_request/src/widgets/link_request/request_note_screen.dart rename to packages/espressocash_app/lib/features/payment_request/widgets/request_note_screen.dart index 220362001..f5a10d8fd 100644 --- a/packages/espressocash_app/lib/features/payment_request/src/widgets/link_request/request_note_screen.dart +++ b/packages/espressocash_app/lib/features/payment_request/widgets/request_note_screen.dart @@ -3,17 +3,17 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../../../../../core/amount.dart'; -import '../../../../../core/presentation/format_amount.dart'; -import '../../../../../l10n/device_locale.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../ui/app_bar.dart'; -import '../../../../../ui/back_button.dart'; -import '../../../../../ui/bordered_row.dart'; -import '../../../../../ui/bottom_button.dart'; -import '../../../../../ui/colors.dart'; -import '../../../../../ui/content_padding.dart'; -import '../../../../../ui/theme.dart'; +import '../../../core/amount.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/app_bar.dart'; +import '../../../ui/back_button.dart'; +import '../../../ui/bordered_row.dart'; +import '../../../ui/bottom_button.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/content_padding.dart'; +import '../../../ui/theme.dart'; abstract class NoteSetter { const NoteSetter(); diff --git a/packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/components/share_link.dart b/packages/espressocash_app/lib/features/payment_request/widgets/share_link.dart similarity index 83% rename from packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/components/share_link.dart rename to packages/espressocash_app/lib/features/payment_request/widgets/share_link.dart index 0bacea825..a94ce5332 100644 --- a/packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/components/share_link.dart +++ b/packages/espressocash_app/lib/features/payment_request/widgets/share_link.dart @@ -1,16 +1,16 @@ import 'package:flutter/material.dart'; import 'package:share/share.dart'; -import '../../../../../../core/presentation/format_amount.dart'; -import '../../../../../../core/presentation/utils.dart'; -import '../../../../../../core/tokens/token_list.dart'; -import '../../../../../../di.dart'; -import '../../../../../../l10n/l10n.dart'; -import '../../../../../../ui/button.dart'; -import '../../../../../../ui/colors.dart'; -import '../../../../../../ui/share_message/share_message_bubble.dart'; -import '../../../../../../ui/share_message/share_message_header.dart'; -import '../../../../models/payment_request.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../core/presentation/utils.dart'; +import '../../../core/tokens/token_list.dart'; +import '../../../di.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/button.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/share_message/share_message_bubble.dart'; +import '../../../ui/share_message/share_message_header.dart'; +import '../models/payment_request.dart'; class ShareLink extends StatelessWidget { const ShareLink({ diff --git a/packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/components/share_qr_code.dart b/packages/espressocash_app/lib/features/payment_request/widgets/share_qr_code.dart similarity index 89% rename from packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/components/share_qr_code.dart rename to packages/espressocash_app/lib/features/payment_request/widgets/share_qr_code.dart index e0e057fab..2dac3679e 100644 --- a/packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/components/share_qr_code.dart +++ b/packages/espressocash_app/lib/features/payment_request/widgets/share_qr_code.dart @@ -1,12 +1,12 @@ import 'package:barcode_widget/barcode_widget.dart'; import 'package:flutter/material.dart'; -import '../../../../../../core/presentation/format_amount.dart'; -import '../../../../../../core/tokens/token_list.dart'; -import '../../../../../../di.dart'; -import '../../../../../../l10n/l10n.dart'; -import '../../../../../../ui/rounded_rectangle.dart'; -import '../../../../models/payment_request.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../core/tokens/token_list.dart'; +import '../../../di.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/rounded_rectangle.dart'; +import '../models/payment_request.dart'; class ShareQrCode extends StatelessWidget { const ShareQrCode({ diff --git a/packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/tx_result_screen.dart b/packages/espressocash_app/lib/features/payment_request/widgets/tx_result_screen.dart similarity index 84% rename from packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/tx_result_screen.dart rename to packages/espressocash_app/lib/features/payment_request/widgets/tx_result_screen.dart index d188c34a0..07df1a88c 100644 --- a/packages/espressocash_app/lib/features/payment_request/src/widgets/link_details/tx_result_screen.dart +++ b/packages/espressocash_app/lib/features/payment_request/widgets/tx_result_screen.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:solana/solana.dart'; -import '../../../../../core/presentation/utils.dart'; -import '../../../../../core/transactions/create_transaction_link.dart'; -import '../../../../../gen/assets.gen.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../ui/app_bar.dart'; -import '../../../../../ui/colors.dart'; -import '../../../../../ui/content_padding.dart'; -import '../../../../../ui/theme.dart'; +import '../../../core/presentation/utils.dart'; +import '../../../gen/assets.gen.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/app_bar.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/content_padding.dart'; +import '../../../ui/theme.dart'; +import '../../transactions/services/create_transaction_link.dart'; class TxResultScreen extends StatefulWidget { const TxResultScreen({ diff --git a/packages/espressocash_app/lib/features/popular_tokens/src/data/coingecko_client.dart b/packages/espressocash_app/lib/features/popular_tokens/data/coingecko_client.dart similarity index 95% rename from packages/espressocash_app/lib/features/popular_tokens/src/data/coingecko_client.dart rename to packages/espressocash_app/lib/features/popular_tokens/data/coingecko_client.dart index 57eb150f4..d0f96dd4c 100644 --- a/packages/espressocash_app/lib/features/popular_tokens/src/data/coingecko_client.dart +++ b/packages/espressocash_app/lib/features/popular_tokens/data/coingecko_client.dart @@ -5,8 +5,8 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; import 'package:retrofit/retrofit.dart'; -import '../../../../core/tokens/token.dart'; -import '../../../../core/tokens/token_list.dart'; +import '../../../core/tokens/token.dart'; +import '../../../core/tokens/token_list.dart'; part 'coingecko_client.freezed.dart'; part 'coingecko_client.g.dart'; diff --git a/packages/espressocash_app/lib/features/popular_tokens/src/data/popular_token_cache.dart b/packages/espressocash_app/lib/features/popular_tokens/data/popular_token_cache.dart similarity index 93% rename from packages/espressocash_app/lib/features/popular_tokens/src/data/popular_token_cache.dart rename to packages/espressocash_app/lib/features/popular_tokens/data/popular_token_cache.dart index 28c109b28..92eccdf99 100644 --- a/packages/espressocash_app/lib/features/popular_tokens/src/data/popular_token_cache.dart +++ b/packages/espressocash_app/lib/features/popular_tokens/data/popular_token_cache.dart @@ -2,9 +2,9 @@ import 'package:drift/drift.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; -import '../../../../core/tokens/token.dart'; -import '../../../../core/tokens/token_list.dart'; -import '../../../../data/db/db.dart'; +import '../../../core/tokens/token.dart'; +import '../../../core/tokens/token_list.dart'; +import '../../../data/db/db.dart'; @injectable class PopularTokenCache { diff --git a/packages/espressocash_app/lib/features/popular_tokens/src/bl/repository.dart b/packages/espressocash_app/lib/features/popular_tokens/data/repository.dart similarity index 92% rename from packages/espressocash_app/lib/features/popular_tokens/src/bl/repository.dart rename to packages/espressocash_app/lib/features/popular_tokens/data/repository.dart index c749ea21d..0bb40174c 100644 --- a/packages/espressocash_app/lib/features/popular_tokens/src/bl/repository.dart +++ b/packages/espressocash_app/lib/features/popular_tokens/data/repository.dart @@ -3,10 +3,10 @@ import 'package:dfunc/dfunc.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; -import '../../../../core/tokens/token.dart'; -import '../../../../core/tokens/token_list.dart'; -import '../data/coingecko_client.dart'; -import '../data/popular_token_cache.dart'; +import '../../../core/tokens/token.dart'; +import '../../../core/tokens/token_list.dart'; +import 'coingecko_client.dart'; +import 'popular_token_cache.dart'; @injectable class PopularTokenRepository { diff --git a/packages/espressocash_app/lib/features/popular_tokens/db.dart b/packages/espressocash_app/lib/features/popular_tokens/db.dart deleted file mode 100644 index dfc4c8fe7..000000000 --- a/packages/espressocash_app/lib/features/popular_tokens/db.dart +++ /dev/null @@ -1 +0,0 @@ -export 'src/data/popular_token_cache.dart' show PopularTokenRows; diff --git a/packages/espressocash_app/lib/features/popular_tokens/module.dart b/packages/espressocash_app/lib/features/popular_tokens/module.dart index c977070ca..987aa1f6a 100644 --- a/packages/espressocash_app/lib/features/popular_tokens/module.dart +++ b/packages/espressocash_app/lib/features/popular_tokens/module.dart @@ -3,11 +3,11 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:nested/nested.dart'; import 'package:provider/provider.dart'; -import '../../core/accounts/module.dart'; import '../../core/user_preferences.dart'; import '../../di.dart'; -import 'src/bl/bloc.dart'; -import 'src/bl/repository.dart'; +import '../accounts/module.dart'; +import 'data/repository.dart'; +import 'services/bloc.dart'; class PopularTokensModule extends SingleChildStatelessWidget { const PopularTokensModule({super.key, super.child}); diff --git a/packages/espressocash_app/lib/features/popular_tokens/src/bl/bloc.dart b/packages/espressocash_app/lib/features/popular_tokens/services/bloc.dart similarity index 94% rename from packages/espressocash_app/lib/features/popular_tokens/src/bl/bloc.dart rename to packages/espressocash_app/lib/features/popular_tokens/services/bloc.dart index 5ce9a4a94..d176198cb 100644 --- a/packages/espressocash_app/lib/features/popular_tokens/src/bl/bloc.dart +++ b/packages/espressocash_app/lib/features/popular_tokens/services/bloc.dart @@ -5,10 +5,10 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; -import '../../../../core/currency.dart'; -import '../../../../core/processing_state.dart'; -import '../../../../core/tokens/token.dart'; -import 'repository.dart'; +import '../../../core/currency.dart'; +import '../../../core/processing_state.dart'; +import '../../../core/tokens/token.dart'; +import '../data/repository.dart'; part 'bloc.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/popular_tokens/widgets/extensions.dart b/packages/espressocash_app/lib/features/popular_tokens/widgets/extensions.dart index f7e62282c..d14e02ee1 100644 --- a/packages/espressocash_app/lib/features/popular_tokens/widgets/extensions.dart +++ b/packages/espressocash_app/lib/features/popular_tokens/widgets/extensions.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../src/bl/bloc.dart'; +import '../services/bloc.dart'; extension BuildContextExt on BuildContext { Future refreshPopularTokens() => read().refresh(); diff --git a/packages/espressocash_app/lib/features/popular_tokens/widgets/popular_token_list.dart b/packages/espressocash_app/lib/features/popular_tokens/widgets/popular_token_list.dart index cb66764b6..0d1197758 100644 --- a/packages/espressocash_app/lib/features/popular_tokens/widgets/popular_token_list.dart +++ b/packages/espressocash_app/lib/features/popular_tokens/widgets/popular_token_list.dart @@ -13,7 +13,7 @@ import '../../../../../../ui/colors.dart'; import '../../../../../../ui/token_icon.dart'; import '../../../l10n/l10n.dart'; import '../../../ui/loader.dart'; -import '../src/bl/bloc.dart'; +import '../services/bloc.dart'; class PopularTokenList extends StatelessWidget { const PopularTokenList({super.key}); diff --git a/packages/espressocash_app/lib/app/screens/authenticated/profile/edit_profile_screen.dart b/packages/espressocash_app/lib/features/profile/screens/edit_profile_screen.dart similarity index 87% rename from packages/espressocash_app/lib/app/screens/authenticated/profile/edit_profile_screen.dart rename to packages/espressocash_app/lib/features/profile/screens/edit_profile_screen.dart index d71279dab..5300f203c 100644 --- a/packages/espressocash_app/lib/app/screens/authenticated/profile/edit_profile_screen.dart +++ b/packages/espressocash_app/lib/features/profile/screens/edit_profile_screen.dart @@ -4,15 +4,15 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../../../core/accounts/bl/accounts_bloc.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/app_bar.dart'; -import '../../../../ui/back_button.dart'; -import '../../../../ui/loader.dart'; -import '../../../../ui/onboarding_screen.dart'; -import '../../../../ui/profile_image_picker/pick_profile_picture.dart'; -import '../../../../ui/text_field.dart'; -import '../../../../ui/theme.dart'; +import '../../../../../l10n/l10n.dart'; +import '../../../../../ui/app_bar.dart'; +import '../../../../../ui/back_button.dart'; +import '../../../../../ui/loader.dart'; +import '../../../../../ui/onboarding_screen.dart'; +import '../../../../../ui/profile_image_picker/pick_profile_picture.dart'; +import '../../../../../ui/text_field.dart'; +import '../../../../../ui/theme.dart'; +import '../../accounts/services/accounts_bloc.dart'; @RoutePage() class EditProfileScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/app/screens/authenticated/profile/help_screen.dart b/packages/espressocash_app/lib/features/profile/screens/help_screen.dart similarity index 83% rename from packages/espressocash_app/lib/app/screens/authenticated/profile/help_screen.dart rename to packages/espressocash_app/lib/features/profile/screens/help_screen.dart index 314aaf18a..337400436 100644 --- a/packages/espressocash_app/lib/app/screens/authenticated/profile/help_screen.dart +++ b/packages/espressocash_app/lib/features/profile/screens/help_screen.dart @@ -2,11 +2,11 @@ import 'package:auto_route/annotations.dart'; import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; -import '../../../../config.dart'; -import '../../../../core/presentation/utils.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/app_bar.dart'; -import 'components/profile_button.dart'; +import '../../../../../config.dart'; +import '../../../../../core/presentation/utils.dart'; +import '../../../../../l10n/l10n.dart'; +import '../../../../../ui/app_bar.dart'; +import '../widgets/profile_button.dart'; @RoutePage() class HelpScreen extends StatelessWidget { diff --git a/packages/espressocash_app/lib/app/screens/authenticated/profile/profile_screen.dart b/packages/espressocash_app/lib/features/profile/screens/profile_screen.dart similarity index 91% rename from packages/espressocash_app/lib/app/screens/authenticated/profile/profile_screen.dart rename to packages/espressocash_app/lib/features/profile/screens/profile_screen.dart index 74c12af7e..46d6bc79b 100644 --- a/packages/espressocash_app/lib/app/screens/authenticated/profile/profile_screen.dart +++ b/packages/espressocash_app/lib/features/profile/screens/profile_screen.dart @@ -9,15 +9,15 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:provider/provider.dart'; import 'package:solana/solana.dart'; -import '../../../../core/accounts/bl/account.dart'; -import '../../../../core/presentation/utils.dart'; -import '../../../../features/qr_scanner/models/qr_address_data.dart'; -import '../../../../gen/assets.gen.dart'; -import '../../../../ui/icon_button.dart'; -import '../../../../ui/user_avatar.dart'; -import 'components/learning_section.dart'; -import 'components/profile_section.dart'; -import 'components/security_section.dart'; +import '../../../../../core/presentation/utils.dart'; +import '../../../../../features/qr_scanner/models/qr_address_data.dart'; +import '../../../../../gen/assets.gen.dart'; +import '../../../../../ui/icon_button.dart'; +import '../../../../../ui/user_avatar.dart'; +import '../../accounts/models/account.dart'; +import '../widgets/learning_section.dart'; +import '../widgets/profile_section.dart'; +import '../widgets/security_section.dart'; @RoutePage() class ProfileScreen extends StatelessWidget { diff --git a/packages/espressocash_app/lib/app/screens/authenticated/profile/components/danger_section.dart b/packages/espressocash_app/lib/features/profile/widgets/danger_section.dart similarity index 100% rename from packages/espressocash_app/lib/app/screens/authenticated/profile/components/danger_section.dart rename to packages/espressocash_app/lib/features/profile/widgets/danger_section.dart diff --git a/packages/espressocash_app/lib/app/screens/authenticated/profile/components/edit_profile_section.dart b/packages/espressocash_app/lib/features/profile/widgets/edit_profile_section.dart similarity index 100% rename from packages/espressocash_app/lib/app/screens/authenticated/profile/components/edit_profile_section.dart rename to packages/espressocash_app/lib/features/profile/widgets/edit_profile_section.dart diff --git a/packages/espressocash_app/lib/app/screens/authenticated/profile/components/learning_section.dart b/packages/espressocash_app/lib/features/profile/widgets/learning_section.dart similarity index 100% rename from packages/espressocash_app/lib/app/screens/authenticated/profile/components/learning_section.dart rename to packages/espressocash_app/lib/features/profile/widgets/learning_section.dart diff --git a/packages/espressocash_app/lib/app/screens/authenticated/profile/components/menu_button.dart b/packages/espressocash_app/lib/features/profile/widgets/menu_button.dart similarity index 100% rename from packages/espressocash_app/lib/app/screens/authenticated/profile/components/menu_button.dart rename to packages/espressocash_app/lib/features/profile/widgets/menu_button.dart diff --git a/packages/espressocash_app/lib/app/screens/authenticated/profile/components/profile_button.dart b/packages/espressocash_app/lib/features/profile/widgets/profile_button.dart similarity index 100% rename from packages/espressocash_app/lib/app/screens/authenticated/profile/components/profile_button.dart rename to packages/espressocash_app/lib/features/profile/widgets/profile_button.dart diff --git a/packages/espressocash_app/lib/app/screens/authenticated/profile/components/profile_section.dart b/packages/espressocash_app/lib/features/profile/widgets/profile_section.dart similarity index 97% rename from packages/espressocash_app/lib/app/screens/authenticated/profile/components/profile_section.dart rename to packages/espressocash_app/lib/features/profile/widgets/profile_section.dart index b19c0d08b..93483c40d 100644 --- a/packages/espressocash_app/lib/app/screens/authenticated/profile/components/profile_section.dart +++ b/packages/espressocash_app/lib/features/profile/widgets/profile_section.dart @@ -6,7 +6,6 @@ import 'package:package_info_plus/package_info_plus.dart'; import 'package:provider/provider.dart'; import '../../../../../config.dart'; -import '../../../../../core/accounts/bl/accounts_bloc.dart'; import '../../../../../core/presentation/utils.dart'; import '../../../../../features/investments/widgets/investments_zero_balance_switch.dart'; import '../../../../../gen/assets.gen.dart'; @@ -14,6 +13,7 @@ import '../../../../../l10n/l10n.dart'; import '../../../../../routes.gr.dart'; import '../../../../../ui/colors.dart'; import '../../../../../ui/dialogs.dart'; +import '../../accounts/services/accounts_bloc.dart'; import 'profile_button.dart'; part 'danger_section.dart'; diff --git a/packages/espressocash_app/lib/app/screens/authenticated/profile/components/security_section.dart b/packages/espressocash_app/lib/features/profile/widgets/security_section.dart similarity index 92% rename from packages/espressocash_app/lib/app/screens/authenticated/profile/components/security_section.dart rename to packages/espressocash_app/lib/features/profile/widgets/security_section.dart index dadbc3ef6..7e2dbcb63 100644 --- a/packages/espressocash_app/lib/app/screens/authenticated/profile/components/security_section.dart +++ b/packages/espressocash_app/lib/features/profile/widgets/security_section.dart @@ -2,12 +2,12 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../../../../../core/accounts/bl/accounts_bloc.dart'; -import '../../../../../core/accounts/bl/ec_wallet.dart'; import '../../../../../features/app_lock/widgets/app_lock_menu_item.dart'; import '../../../../../features/legal/flow.dart'; import '../../../../../l10n/l10n.dart'; import '../../../../../routes.gr.dart'; +import '../../accounts/models/ec_wallet.dart'; +import '../../accounts/services/accounts_bloc.dart'; import 'profile_button.dart'; import 'profile_section.dart'; diff --git a/packages/espressocash_app/lib/app/screens/authenticated/profile/components/share_section.dart b/packages/espressocash_app/lib/features/profile/widgets/share_section.dart similarity index 100% rename from packages/espressocash_app/lib/app/screens/authenticated/profile/components/share_section.dart rename to packages/espressocash_app/lib/features/profile/widgets/share_section.dart diff --git a/packages/espressocash_app/lib/app/screens/authenticated/profile/components/version_section.dart b/packages/espressocash_app/lib/features/profile/widgets/version_section.dart similarity index 100% rename from packages/espressocash_app/lib/app/screens/authenticated/profile/components/version_section.dart rename to packages/espressocash_app/lib/features/profile/widgets/version_section.dart diff --git a/packages/espressocash_app/lib/features/qr_scanner/src/widgets/qr_scanner_screen.dart b/packages/espressocash_app/lib/features/qr_scanner/screens/qr_scanner_screen.dart similarity index 93% rename from packages/espressocash_app/lib/features/qr_scanner/src/widgets/qr_scanner_screen.dart rename to packages/espressocash_app/lib/features/qr_scanner/screens/qr_scanner_screen.dart index 65d19cf25..d2f56e005 100644 --- a/packages/espressocash_app/lib/features/qr_scanner/src/widgets/qr_scanner_screen.dart +++ b/packages/espressocash_app/lib/features/qr_scanner/screens/qr_scanner_screen.dart @@ -6,16 +6,16 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:mobile_scanner/mobile_scanner.dart'; -import '../../../../di.dart'; -import '../../../../gen/assets.gen.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/button.dart'; -import '../../../../ui/dialogs.dart'; -import '../../../../ui/theme.dart'; -import '../../models/qr_scanner_request.dart'; -import '../bl/qr_scanner_bloc.dart'; -import 'components/input_address_bottom_sheet.dart'; -import 'components/qr_scanner_background.dart'; +import '../../../di.dart'; +import '../../../gen/assets.gen.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/button.dart'; +import '../../../ui/dialogs.dart'; +import '../../../ui/theme.dart'; +import '../models/qr_scanner_request.dart'; +import '../services/qr_scanner_bloc.dart'; +import '../widgets/input_address_bottom_sheet.dart'; +import '../widgets/qr_scanner_background.dart'; @RoutePage() class QrScannerScreen extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/qr_scanner/src/bl/qr_scanner_bloc.dart b/packages/espressocash_app/lib/features/qr_scanner/services/qr_scanner_bloc.dart similarity index 96% rename from packages/espressocash_app/lib/features/qr_scanner/src/bl/qr_scanner_bloc.dart rename to packages/espressocash_app/lib/features/qr_scanner/services/qr_scanner_bloc.dart index 84d494c24..3e00c5b76 100644 --- a/packages/espressocash_app/lib/features/qr_scanner/src/bl/qr_scanner_bloc.dart +++ b/packages/espressocash_app/lib/features/qr_scanner/services/qr_scanner_bloc.dart @@ -5,7 +5,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; -import '../../models/qr_scanner_request.dart'; +import '../models/qr_scanner_request.dart'; part 'qr_scanner_bloc.freezed.dart'; part 'qr_scanner_event.dart'; diff --git a/packages/espressocash_app/lib/features/qr_scanner/src/bl/qr_scanner_event.dart b/packages/espressocash_app/lib/features/qr_scanner/services/qr_scanner_event.dart similarity index 100% rename from packages/espressocash_app/lib/features/qr_scanner/src/bl/qr_scanner_event.dart rename to packages/espressocash_app/lib/features/qr_scanner/services/qr_scanner_event.dart diff --git a/packages/espressocash_app/lib/features/qr_scanner/src/bl/qr_scanner_state.dart b/packages/espressocash_app/lib/features/qr_scanner/services/qr_scanner_state.dart similarity index 100% rename from packages/espressocash_app/lib/features/qr_scanner/src/bl/qr_scanner_state.dart rename to packages/espressocash_app/lib/features/qr_scanner/services/qr_scanner_state.dart diff --git a/packages/espressocash_app/lib/features/qr_scanner/widgets/build_context_ext.dart b/packages/espressocash_app/lib/features/qr_scanner/widgets/build_context_ext.dart index c38ce1760..c493db60e 100644 --- a/packages/espressocash_app/lib/features/qr_scanner/widgets/build_context_ext.dart +++ b/packages/espressocash_app/lib/features/qr_scanner/widgets/build_context_ext.dart @@ -6,8 +6,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import '../../../core/amount.dart'; -import '../../../core/conversion_rates/amount_ext.dart'; -import '../../../core/conversion_rates/bl/repository.dart'; import '../../../core/currency.dart'; import '../../../core/presentation/format_amount.dart'; import '../../../core/tokens/token_list.dart'; @@ -15,7 +13,9 @@ import '../../../core/wallet.dart'; import '../../../di.dart'; import '../../../l10n/device_locale.dart'; import '../../../routes.gr.dart'; -import '../../incoming_split_key_payments/extensions.dart'; +import '../../conversion_rates/data/repository.dart'; +import '../../conversion_rates/services/amount_ext.dart'; +import '../../incoming_split_key_payments/widgets/extensions.dart'; import '../../outgoing_direct_payments/widgets/extensions.dart'; import '../../payment_request/models/payment_request.dart'; import '../models/qr_scanner_request.dart'; diff --git a/packages/espressocash_app/lib/features/qr_scanner/src/widgets/components/input_address_bottom_sheet.dart b/packages/espressocash_app/lib/features/qr_scanner/widgets/input_address_bottom_sheet.dart similarity index 95% rename from packages/espressocash_app/lib/features/qr_scanner/src/widgets/components/input_address_bottom_sheet.dart rename to packages/espressocash_app/lib/features/qr_scanner/widgets/input_address_bottom_sheet.dart index 825a7605c..aa58cd748 100644 --- a/packages/espressocash_app/lib/features/qr_scanner/src/widgets/components/input_address_bottom_sheet.dart +++ b/packages/espressocash_app/lib/features/qr_scanner/widgets/input_address_bottom_sheet.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../ui/button.dart'; -import '../../../../../ui/text_field.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/button.dart'; +import '../../../ui/text_field.dart'; class InputAddressBottomSheet extends StatefulWidget { const InputAddressBottomSheet({super.key}); diff --git a/packages/espressocash_app/lib/features/qr_scanner/src/widgets/components/qr_scanner_background.dart b/packages/espressocash_app/lib/features/qr_scanner/widgets/qr_scanner_background.dart similarity index 97% rename from packages/espressocash_app/lib/features/qr_scanner/src/widgets/components/qr_scanner_background.dart rename to packages/espressocash_app/lib/features/qr_scanner/widgets/qr_scanner_background.dart index 06ce7a254..0d6d22ea6 100644 --- a/packages/espressocash_app/lib/features/qr_scanner/src/widgets/components/qr_scanner_background.dart +++ b/packages/espressocash_app/lib/features/qr_scanner/widgets/qr_scanner_background.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import '../../../../../gen/assets.gen.dart'; +import '../../../gen/assets.gen.dart'; class QrScannerBackground extends StatelessWidget { const QrScannerBackground({ diff --git a/packages/espressocash_app/lib/features/ramp/src/widgets/off_ramp_bottom_sheet.dart b/packages/espressocash_app/lib/features/ramp/widgets/off_ramp_bottom_sheet.dart similarity index 93% rename from packages/espressocash_app/lib/features/ramp/src/widgets/off_ramp_bottom_sheet.dart rename to packages/espressocash_app/lib/features/ramp/widgets/off_ramp_bottom_sheet.dart index d3d7f3d05..f6c546dd6 100644 --- a/packages/espressocash_app/lib/features/ramp/src/widgets/off_ramp_bottom_sheet.dart +++ b/packages/espressocash_app/lib/features/ramp/widgets/off_ramp_bottom_sheet.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/button.dart'; -import '../../../../ui/colors.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/button.dart'; +import '../../../ui/colors.dart'; class OffRampBottomSheet extends StatelessWidget { const OffRampBottomSheet({super.key}); diff --git a/packages/espressocash_app/lib/features/ramp/widgets/ramp_buttons.dart b/packages/espressocash_app/lib/features/ramp/widgets/ramp_buttons.dart index 8a0bf60f4..2d80609ab 100644 --- a/packages/espressocash_app/lib/features/ramp/widgets/ramp_buttons.dart +++ b/packages/espressocash_app/lib/features/ramp/widgets/ramp_buttons.dart @@ -5,10 +5,10 @@ import 'package:ramp_flutter/ramp_flutter.dart'; import '../../../../../l10n/l10n.dart'; import '../../../config.dart'; -import '../../../core/accounts/bl/account.dart'; -import '../../../core/balances/context_ext.dart'; import '../../../ui/button.dart'; -import '../src/widgets/off_ramp_bottom_sheet.dart'; +import '../../accounts/models/account.dart'; +import '../../balances/widgets/context_ext.dart'; +import 'off_ramp_bottom_sheet.dart'; class AddCashButton extends StatelessWidget { const AddCashButton({ diff --git a/packages/espressocash_app/lib/features/sign_in/src/widgets/create_wallet_screen.dart b/packages/espressocash_app/lib/features/sign_in/screens/create_wallet_screen.dart similarity index 88% rename from packages/espressocash_app/lib/features/sign_in/src/widgets/create_wallet_screen.dart rename to packages/espressocash_app/lib/features/sign_in/screens/create_wallet_screen.dart index 5864414e5..e823b5b67 100644 --- a/packages/espressocash_app/lib/features/sign_in/src/widgets/create_wallet_screen.dart +++ b/packages/espressocash_app/lib/features/sign_in/screens/create_wallet_screen.dart @@ -3,10 +3,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:solana_seed_vault/solana_seed_vault.dart'; -import '../../../../di.dart'; -import '../../../../saga.dart'; -import '../../../../ui/splash_screen.dart'; -import '../bl/sign_in_bloc.dart'; +import '../../../di.dart'; +import '../../../saga.dart'; +import '../../../ui/splash_screen.dart'; +import '../services/sign_in_bloc.dart'; @RoutePage() class CreateWalletLoadingScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/sign_in/src/widgets/get_started_screen.dart b/packages/espressocash_app/lib/features/sign_in/screens/get_started_screen.dart similarity index 94% rename from packages/espressocash_app/lib/features/sign_in/src/widgets/get_started_screen.dart rename to packages/espressocash_app/lib/features/sign_in/screens/get_started_screen.dart index ac95ed1b4..2c77e0409 100644 --- a/packages/espressocash_app/lib/features/sign_in/src/widgets/get_started_screen.dart +++ b/packages/espressocash_app/lib/features/sign_in/screens/get_started_screen.dart @@ -5,15 +5,15 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:solana_seed_vault/solana_seed_vault.dart'; -import '../../../../di.dart'; -import '../../../../gen/assets.gen.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/bullet_item.dart'; -import '../../../../ui/button.dart'; -import '../../../../ui/colors.dart'; -import '../../../../ui/theme.dart'; -import '../bl/sign_in_bloc.dart'; -import 'components/terms_disclaimer.dart'; +import '../../../di.dart'; +import '../../../gen/assets.gen.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/bullet_item.dart'; +import '../../../ui/button.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/theme.dart'; +import '../services/sign_in_bloc.dart'; +import '../widgets/terms_disclaimer.dart'; import 'sign_in_flow_screen.dart'; @RoutePage() diff --git a/packages/espressocash_app/lib/features/sign_in/src/widgets/restore_account_screen.dart b/packages/espressocash_app/lib/features/sign_in/screens/restore_account_screen.dart similarity index 91% rename from packages/espressocash_app/lib/features/sign_in/src/widgets/restore_account_screen.dart rename to packages/espressocash_app/lib/features/sign_in/screens/restore_account_screen.dart index d1fed86e5..bda8b767c 100644 --- a/packages/espressocash_app/lib/features/sign_in/src/widgets/restore_account_screen.dart +++ b/packages/espressocash_app/lib/features/sign_in/screens/restore_account_screen.dart @@ -2,13 +2,13 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/app_bar.dart'; -import '../../../../ui/colors.dart'; -import '../../../../ui/onboarding_screen.dart'; -import '../../../../ui/theme.dart'; -import '../bl/sign_in_bloc.dart'; -import 'components/mnemonic_input_formatter.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/app_bar.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/onboarding_screen.dart'; +import '../../../ui/theme.dart'; +import '../services/sign_in_bloc.dart'; +import '../widgets/mnemonic_input_formatter.dart'; import 'sign_in_flow_screen.dart'; @RoutePage() diff --git a/packages/espressocash_app/lib/features/sign_in/src/widgets/sign_in_flow_screen.dart b/packages/espressocash_app/lib/features/sign_in/screens/sign_in_flow_screen.dart similarity index 85% rename from packages/espressocash_app/lib/features/sign_in/src/widgets/sign_in_flow_screen.dart rename to packages/espressocash_app/lib/features/sign_in/screens/sign_in_flow_screen.dart index 052eb2749..9849f55f5 100644 --- a/packages/espressocash_app/lib/features/sign_in/src/widgets/sign_in_flow_screen.dart +++ b/packages/espressocash_app/lib/features/sign_in/screens/sign_in_flow_screen.dart @@ -5,16 +5,16 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:provider/provider.dart'; -import '../../../../core/accounts/bl/accounts_bloc.dart'; -import '../../../../core/dynamic_links_notifier.dart'; -import '../../../../core/router_wrapper.dart'; -import '../../../../core/split_key_payments.dart'; -import '../../../../di.dart'; -import '../../../../routes.gr.dart'; -import '../../../../saga.dart'; -import '../../../../ui/dialogs.dart'; -import '../../../../ui/loader.dart'; -import '../bl/sign_in_bloc.dart'; +import '../../../core/dynamic_links_notifier.dart'; +import '../../../core/router_wrapper.dart'; +import '../../../core/split_key_payments.dart'; +import '../../../di.dart'; +import '../../../routes.gr.dart'; +import '../../../saga.dart'; +import '../../../ui/dialogs.dart'; +import '../../../ui/loader.dart'; +import '../../accounts/services/accounts_bloc.dart'; +import '../services/sign_in_bloc.dart'; @RoutePage() class SignInFlowScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/sign_in/src/widgets/sign_in_profile_screen.dart b/packages/espressocash_app/lib/features/sign_in/screens/sign_in_profile_screen.dart similarity index 85% rename from packages/espressocash_app/lib/features/sign_in/src/widgets/sign_in_profile_screen.dart rename to packages/espressocash_app/lib/features/sign_in/screens/sign_in_profile_screen.dart index e1e7e49d7..365ad32e1 100644 --- a/packages/espressocash_app/lib/features/sign_in/src/widgets/sign_in_profile_screen.dart +++ b/packages/espressocash_app/lib/features/sign_in/screens/sign_in_profile_screen.dart @@ -2,8 +2,8 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../../onboarding/widgets/create_profile.dart'; -import '../bl/sign_in_bloc.dart'; +import '../../onboarding/widgets/create_profile.dart'; +import '../services/sign_in_bloc.dart'; @RoutePage() class SignInProfileScreen extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/sign_in/src/bl/sign_in_bloc.dart b/packages/espressocash_app/lib/features/sign_in/services/sign_in_bloc.dart similarity index 96% rename from packages/espressocash_app/lib/features/sign_in/src/bl/sign_in_bloc.dart rename to packages/espressocash_app/lib/features/sign_in/services/sign_in_bloc.dart index 3c705f79f..7069d2a1e 100644 --- a/packages/espressocash_app/lib/features/sign_in/src/bl/sign_in_bloc.dart +++ b/packages/espressocash_app/lib/features/sign_in/services/sign_in_bloc.dart @@ -9,11 +9,11 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; import 'package:solana_seed_vault/solana_seed_vault.dart'; -import '../../../../core/accounts/bl/account.dart'; -import '../../../../core/accounts/bl/mnemonic.dart'; -import '../../../../core/file_manager.dart'; -import '../../../../core/flow.dart'; -import '../../../../core/wallet.dart'; +import '../../../core/file_manager.dart'; +import '../../../core/flow.dart'; +import '../../../core/wallet.dart'; +import '../../accounts/models/account.dart'; +import '../../accounts/models/mnemonic.dart'; part 'sign_in_bloc.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/sign_in/src/widgets/components/mnemonic_input_formatter.dart b/packages/espressocash_app/lib/features/sign_in/widgets/mnemonic_input_formatter.dart similarity index 100% rename from packages/espressocash_app/lib/features/sign_in/src/widgets/components/mnemonic_input_formatter.dart rename to packages/espressocash_app/lib/features/sign_in/widgets/mnemonic_input_formatter.dart diff --git a/packages/espressocash_app/lib/features/sign_in/src/widgets/components/terms_disclaimer.dart b/packages/espressocash_app/lib/features/sign_in/widgets/terms_disclaimer.dart similarity index 91% rename from packages/espressocash_app/lib/features/sign_in/src/widgets/components/terms_disclaimer.dart rename to packages/espressocash_app/lib/features/sign_in/widgets/terms_disclaimer.dart index 663b04916..68f5f6c2e 100644 --- a/packages/espressocash_app/lib/features/sign_in/src/widgets/components/terms_disclaimer.dart +++ b/packages/espressocash_app/lib/features/sign_in/widgets/terms_disclaimer.dart @@ -2,9 +2,9 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../ui/colors.dart'; -import '../../../../legal/flow.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/colors.dart'; +import '../../legal/flow.dart'; class TermsDisclaimer extends StatelessWidget { const TermsDisclaimer({super.key}); diff --git a/packages/espressocash_app/lib/features/swap/src/route_repository.dart b/packages/espressocash_app/lib/features/swap/data/route_repository.dart similarity index 97% rename from packages/espressocash_app/lib/features/swap/src/route_repository.dart rename to packages/espressocash_app/lib/features/swap/data/route_repository.dart index 3d64d25cb..ea9b0cf26 100644 --- a/packages/espressocash_app/lib/features/swap/src/route_repository.dart +++ b/packages/espressocash_app/lib/features/swap/data/route_repository.dart @@ -4,8 +4,8 @@ import 'package:injectable/injectable.dart'; import '../../../../core/amount.dart'; import '../../../../core/currency.dart'; import '../../../../core/tokens/token.dart'; +import '../models/swap_route.dart'; import '../models/swap_seed.dart'; -import 'swap_route.dart'; @injectable class RouteRepository { diff --git a/packages/espressocash_app/lib/features/swap/src/swap/swap_repository.dart b/packages/espressocash_app/lib/features/swap/data/swap_repository.dart similarity index 94% rename from packages/espressocash_app/lib/features/swap/src/swap/swap_repository.dart rename to packages/espressocash_app/lib/features/swap/data/swap_repository.dart index 55998a616..c32c8a364 100644 --- a/packages/espressocash_app/lib/features/swap/src/swap/swap_repository.dart +++ b/packages/espressocash_app/lib/features/swap/data/swap_repository.dart @@ -6,14 +6,14 @@ import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; import 'package:solana/encoder.dart'; -import '../../../../core/amount.dart'; -import '../../../../core/currency.dart'; -import '../../../../core/tokens/token_list.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../../../data/db/db.dart'; -import '../../../../data/db/mixins.dart'; -import '../../models/swap.dart'; -import '../../models/swap_seed.dart'; +import '../../../core/amount.dart'; +import '../../../core/currency.dart'; +import '../../../core/tokens/token_list.dart'; +import '../../../data/db/db.dart'; +import '../../../data/db/mixins.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../models/swap.dart'; +import '../models/swap_seed.dart'; @injectable class SwapRepository { diff --git a/packages/espressocash_app/lib/features/swap/db.dart b/packages/espressocash_app/lib/features/swap/db.dart deleted file mode 100644 index 8a684cb10..000000000 --- a/packages/espressocash_app/lib/features/swap/db.dart +++ /dev/null @@ -1,2 +0,0 @@ -export 'src/swap/swap_repository.dart' - show SlippageDto, SwapRowExt, SwapRows, SwapStatusDto; diff --git a/packages/espressocash_app/lib/features/swap/models/swap.dart b/packages/espressocash_app/lib/features/swap/models/swap.dart index 74f8c6324..0efdc8596 100644 --- a/packages/espressocash_app/lib/features/swap/models/swap.dart +++ b/packages/espressocash_app/lib/features/swap/models/swap.dart @@ -1,7 +1,7 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:solana/encoder.dart'; -import '../../../core/transactions/tx_sender.dart'; +import '../../transactions/models/tx_sender.dart'; import 'swap_seed.dart'; part 'swap.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/swap/src/swap_operation.dart b/packages/espressocash_app/lib/features/swap/models/swap_operation.dart similarity index 100% rename from packages/espressocash_app/lib/features/swap/src/swap_operation.dart rename to packages/espressocash_app/lib/features/swap/models/swap_operation.dart diff --git a/packages/espressocash_app/lib/features/swap/src/swap_route.dart b/packages/espressocash_app/lib/features/swap/models/swap_route.dart similarity index 91% rename from packages/espressocash_app/lib/features/swap/src/swap_route.dart rename to packages/espressocash_app/lib/features/swap/models/swap_route.dart index b7360c3ec..75361471b 100644 --- a/packages/espressocash_app/lib/features/swap/src/swap_route.dart +++ b/packages/espressocash_app/lib/features/swap/models/swap_route.dart @@ -1,7 +1,7 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import '../../../../core/amount.dart'; -import '../models/swap_seed.dart'; +import 'swap_seed.dart'; part 'swap_route.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/swap/module.dart b/packages/espressocash_app/lib/features/swap/module.dart index 3f62509ea..cfa4f7356 100644 --- a/packages/espressocash_app/lib/features/swap/module.dart +++ b/packages/espressocash_app/lib/features/swap/module.dart @@ -2,12 +2,12 @@ import 'package:flutter/material.dart'; import 'package:nested/nested.dart'; import 'package:provider/provider.dart'; -import '../../core/accounts/module.dart'; -import '../../core/balances/context_ext.dart'; import '../../di.dart'; -import 'src/swap/swap_repository.dart'; -import 'src/swap/tx_created_watcher.dart'; -import 'src/swap/tx_sent_watcher.dart'; +import '../accounts/module.dart'; +import '../balances/widgets/context_ext.dart'; +import 'data/swap_repository.dart'; +import 'services/tx_created_watcher.dart'; +import 'services/tx_sent_watcher.dart'; class SwapModule extends SingleChildStatelessWidget { const SwapModule({super.key, super.child}); diff --git a/packages/espressocash_app/lib/features/swap/src/create_swap/create_swap_screen.dart b/packages/espressocash_app/lib/features/swap/screens/create_swap_screen.dart similarity index 87% rename from packages/espressocash_app/lib/features/swap/src/create_swap/create_swap_screen.dart rename to packages/espressocash_app/lib/features/swap/screens/create_swap_screen.dart index b6b923810..efaabcabf 100644 --- a/packages/espressocash_app/lib/features/swap/src/create_swap/create_swap_screen.dart +++ b/packages/espressocash_app/lib/features/swap/screens/create_swap_screen.dart @@ -5,29 +5,29 @@ import 'package:dfunc/dfunc.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../../../core/accounts/bl/account.dart'; -import '../../../../core/amount.dart'; -import '../../../../core/balances/bl/balances_bloc.dart'; -import '../../../../core/callback.dart'; -import '../../../../core/presentation/format_amount.dart'; -import '../../../../core/tokens/token.dart'; -import '../../../../di.dart'; -import '../../../../l10n/device_locale.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/amount_keypad/amount_keypad.dart'; -import '../../../../ui/content_padding.dart'; -import '../../../../ui/dialogs.dart'; -import '../../../../ui/number_formatter.dart'; -import '../../../../ui/slider.dart'; -import '../../models/swap_seed.dart'; -import '../swap_operation.dart'; -import '../swap_route.dart'; -import 'available_balance.dart'; -import 'components/display_header.dart'; -import 'components/equivalent_header.dart'; -import 'components/slippage_info.dart'; -import 'components/token_dropdown.dart'; -import 'create_swap_bloc.dart'; +import '../../../core/amount.dart'; +import '../../../core/callback.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../core/tokens/token.dart'; +import '../../../di.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/amount_keypad/amount_keypad.dart'; +import '../../../ui/content_padding.dart'; +import '../../../ui/dialogs.dart'; +import '../../../ui/number_formatter.dart'; +import '../../../ui/slider.dart'; +import '../../accounts/models/account.dart'; +import '../../balances/services/balances_bloc.dart'; +import '../models/swap_operation.dart'; +import '../models/swap_route.dart'; +import '../models/swap_seed.dart'; +import '../services/create_swap_bloc.dart'; +import '../widgets/available_balance.dart'; +import '../widgets/display_header.dart'; +import '../widgets/equivalent_header.dart'; +import '../widgets/slippage_info.dart'; +import '../widgets/token_dropdown.dart'; class CreateSwapScreen extends StatefulWidget { const CreateSwapScreen({ diff --git a/packages/espressocash_app/lib/features/swap/src/swap/process_swap_screen.dart b/packages/espressocash_app/lib/features/swap/screens/process_swap_screen.dart similarity index 80% rename from packages/espressocash_app/lib/features/swap/src/swap/process_swap_screen.dart rename to packages/espressocash_app/lib/features/swap/screens/process_swap_screen.dart index e93525075..1b4d112bd 100644 --- a/packages/espressocash_app/lib/features/swap/src/swap/process_swap_screen.dart +++ b/packages/espressocash_app/lib/features/swap/screens/process_swap_screen.dart @@ -2,17 +2,17 @@ import 'package:auto_route/auto_route.dart'; import 'package:dfunc/dfunc.dart'; import 'package:flutter/material.dart'; -import '../../../../core/presentation/utils.dart'; -import '../../../../core/tokens/token.dart'; -import '../../../../core/transactions/create_transaction_link.dart'; -import '../../../../di.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/transfer_status/transfer_error.dart'; -import '../../../../ui/transfer_status/transfer_progress.dart'; -import '../../../../ui/transfer_status/transfer_success.dart'; -import '../../models/swap.dart'; -import 'extensions.dart'; -import 'swap_repository.dart'; +import '../../../core/presentation/utils.dart'; +import '../../../core/tokens/token.dart'; +import '../../../di.dart'; +import '../../../l10n/l10n.dart'; +import '../../transactions/services/create_transaction_link.dart'; +import '../../transactions/widgets/transfer_error.dart'; +import '../../transactions/widgets/transfer_progress.dart'; +import '../../transactions/widgets/transfer_success.dart'; +import '../data/swap_repository.dart'; +import '../models/swap.dart'; +import '../widgets/extensions.dart'; @RoutePage() class ProcessSwapScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/swap/src/flow.dart b/packages/espressocash_app/lib/features/swap/screens/swap_flow_screen.dart similarity index 90% rename from packages/espressocash_app/lib/features/swap/src/flow.dart rename to packages/espressocash_app/lib/features/swap/screens/swap_flow_screen.dart index 355a76377..f931b82c3 100644 --- a/packages/espressocash_app/lib/features/swap/src/flow.dart +++ b/packages/espressocash_app/lib/features/swap/screens/swap_flow_screen.dart @@ -6,10 +6,10 @@ import '../../../../routes.gr.dart'; import '../../../../ui/app_bar.dart'; import '../../../../ui/colors.dart'; import '../../../../ui/theme.dart'; -import 'create_swap/create_swap_screen.dart'; -import 'swap/extensions.dart'; -import 'swap_operation.dart'; -import 'swap_route.dart'; +import '../models/swap_operation.dart'; +import '../models/swap_route.dart'; +import '../widgets/extensions.dart'; +import 'create_swap_screen.dart'; @RoutePage() class SwapFlowScreen extends StatefulWidget { diff --git a/packages/espressocash_app/lib/features/swap/src/create_swap/create_swap_bloc.dart b/packages/espressocash_app/lib/features/swap/services/create_swap_bloc.dart similarity index 95% rename from packages/espressocash_app/lib/features/swap/src/create_swap/create_swap_bloc.dart rename to packages/espressocash_app/lib/features/swap/services/create_swap_bloc.dart index acfc0036b..1154d907f 100644 --- a/packages/espressocash_app/lib/features/swap/src/create_swap/create_swap_bloc.dart +++ b/packages/espressocash_app/lib/features/swap/services/create_swap_bloc.dart @@ -9,14 +9,14 @@ import 'package:injectable/injectable.dart'; import 'package:rxdart/rxdart.dart'; import 'package:solana/solana.dart'; -import '../../../../../core/amount.dart'; -import '../../../../../core/analytics/analytics_manager.dart'; -import '../../../../../core/currency.dart'; -import '../../../../../core/flow.dart'; -import '../../../../../core/tokens/token.dart'; -import '../../models/swap_seed.dart'; -import '../route_repository.dart'; -import '../swap_route.dart'; +import '../../../../core/amount.dart'; +import '../../../../core/analytics/analytics_manager.dart'; +import '../../../../core/currency.dart'; +import '../../../../core/flow.dart'; +import '../../../../core/tokens/token.dart'; +import '../data/route_repository.dart'; +import '../models/swap_route.dart'; +import '../models/swap_seed.dart'; part 'create_swap_bloc.freezed.dart'; part 'create_swap_event.dart'; diff --git a/packages/espressocash_app/lib/features/swap/src/create_swap/create_swap_event.dart b/packages/espressocash_app/lib/features/swap/services/create_swap_event.dart similarity index 100% rename from packages/espressocash_app/lib/features/swap/src/create_swap/create_swap_event.dart rename to packages/espressocash_app/lib/features/swap/services/create_swap_event.dart diff --git a/packages/espressocash_app/lib/features/swap/src/create_swap/create_swap_state.dart b/packages/espressocash_app/lib/features/swap/services/create_swap_state.dart similarity index 100% rename from packages/espressocash_app/lib/features/swap/src/create_swap/create_swap_state.dart rename to packages/espressocash_app/lib/features/swap/services/create_swap_state.dart diff --git a/packages/espressocash_app/lib/features/swap/src/swap/swap_service.dart b/packages/espressocash_app/lib/features/swap/services/swap_service.dart similarity index 84% rename from packages/espressocash_app/lib/features/swap/src/swap/swap_service.dart rename to packages/espressocash_app/lib/features/swap/services/swap_service.dart index 4cd75611f..04961a548 100644 --- a/packages/espressocash_app/lib/features/swap/src/swap/swap_service.dart +++ b/packages/espressocash_app/lib/features/swap/services/swap_service.dart @@ -2,14 +2,14 @@ import 'package:injectable/injectable.dart'; import 'package:solana/encoder.dart'; import 'package:uuid/uuid.dart'; -import '../../../../core/accounts/bl/ec_wallet.dart'; -import '../../../../core/transactions/resign_tx.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../models/swap.dart'; -import '../../models/swap_seed.dart'; -import '../route_repository.dart'; -import '../swap_route.dart'; -import 'swap_repository.dart'; +import '../../accounts/models/ec_wallet.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../../transactions/services/resign_tx.dart'; +import '../data/route_repository.dart'; +import '../data/swap_repository.dart'; +import '../models/swap.dart'; +import '../models/swap_route.dart'; +import '../models/swap_seed.dart'; @injectable class SwapService { diff --git a/packages/espressocash_app/lib/features/swap/src/swap/swap_watcher.dart b/packages/espressocash_app/lib/features/swap/services/swap_watcher.dart similarity index 93% rename from packages/espressocash_app/lib/features/swap/src/swap/swap_watcher.dart rename to packages/espressocash_app/lib/features/swap/services/swap_watcher.dart index 49b3bf1ac..badc215c8 100644 --- a/packages/espressocash_app/lib/features/swap/src/swap/swap_watcher.dart +++ b/packages/espressocash_app/lib/features/swap/services/swap_watcher.dart @@ -5,9 +5,9 @@ import 'package:dfunc/dfunc.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:flutter/foundation.dart'; -import '../../../../core/cancelable_job.dart'; -import '../../models/swap.dart'; -import 'swap_repository.dart'; +import '../../../core/cancelable_job.dart'; +import '../data/swap_repository.dart'; +import '../models/swap.dart'; abstract class SwapWatcher { SwapWatcher(this._repository); diff --git a/packages/espressocash_app/lib/features/swap/token_ext.dart b/packages/espressocash_app/lib/features/swap/services/token_ext.dart similarity index 66% rename from packages/espressocash_app/lib/features/swap/token_ext.dart rename to packages/espressocash_app/lib/features/swap/services/token_ext.dart index 5d296898b..ece0a5c05 100644 --- a/packages/espressocash_app/lib/features/swap/token_ext.dart +++ b/packages/espressocash_app/lib/features/swap/services/token_ext.dart @@ -1,4 +1,4 @@ -import '../../core/tokens/token.dart'; +import '../../../core/tokens/token.dart'; extension TokenExt on Token { bool get canBeSwapped => address != coingeckoId; diff --git a/packages/espressocash_app/lib/features/swap/src/swap/tx_created_watcher.dart b/packages/espressocash_app/lib/features/swap/services/tx_created_watcher.dart similarity index 87% rename from packages/espressocash_app/lib/features/swap/src/swap/tx_created_watcher.dart rename to packages/espressocash_app/lib/features/swap/services/tx_created_watcher.dart index c11269752..c186889f0 100644 --- a/packages/espressocash_app/lib/features/swap/src/swap/tx_created_watcher.dart +++ b/packages/espressocash_app/lib/features/swap/services/tx_created_watcher.dart @@ -3,10 +3,11 @@ import 'dart:async'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; -import '../../../../core/cancelable_job.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../models/swap.dart'; -import 'swap_repository.dart'; +import '../../../core/cancelable_job.dart'; +import '../../transactions/models/tx_sender.dart'; +import '../../transactions/services/tx_sender.dart'; +import '../data/swap_repository.dart'; +import '../models/swap.dart'; import 'swap_watcher.dart'; /// Watches for [SwapStatus.txCreated] swaps and and sends the tx. diff --git a/packages/espressocash_app/lib/features/swap/src/swap/tx_sent_watcher.dart b/packages/espressocash_app/lib/features/swap/services/tx_sent_watcher.dart similarity index 88% rename from packages/espressocash_app/lib/features/swap/src/swap/tx_sent_watcher.dart rename to packages/espressocash_app/lib/features/swap/services/tx_sent_watcher.dart index c6bdf4443..10af76d06 100644 --- a/packages/espressocash_app/lib/features/swap/src/swap/tx_sent_watcher.dart +++ b/packages/espressocash_app/lib/features/swap/services/tx_sent_watcher.dart @@ -3,10 +3,10 @@ import 'dart:async'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; -import '../../../../core/cancelable_job.dart'; -import '../../../../core/transactions/tx_sender.dart'; -import '../../models/swap.dart'; -import 'swap_repository.dart'; +import '../../../core/cancelable_job.dart'; +import '../../transactions/services/tx_sender.dart'; +import '../data/swap_repository.dart'; +import '../models/swap.dart'; import 'swap_watcher.dart'; /// Watches for [SwapStatus.txSent] swaps and waits for the tx to be diff --git a/packages/espressocash_app/lib/features/swap/src/swap/extensions.dart b/packages/espressocash_app/lib/features/swap/src/swap/extensions.dart deleted file mode 100644 index d7a8fcc05..000000000 --- a/packages/espressocash_app/lib/features/swap/src/swap/extensions.dart +++ /dev/null @@ -1,29 +0,0 @@ -import 'package:flutter/widgets.dart'; -import 'package:provider/provider.dart'; - -import '../../../../core/accounts/bl/account.dart'; -import '../../../../di.dart'; -import '../../../../ui/loader.dart'; -import '../../models/swap.dart'; -import '../swap_route.dart'; -import 'swap_service.dart'; - -extension SwapExt on BuildContext { - Future createSwap(SwapRoute route) async => - runWithLoader(this, () async { - final swap = await sl().create( - route: route, - account: read().wallet, - ); - - return swap.id; - }); - - Future retrySwap(Swap swap) async => runWithLoader( - this, - () => sl().retry( - swap, - account: read().wallet, - ), - ); -} diff --git a/packages/espressocash_app/lib/features/swap/src/create_swap/available_balance.dart b/packages/espressocash_app/lib/features/swap/widgets/available_balance.dart similarity index 80% rename from packages/espressocash_app/lib/features/swap/src/create_swap/available_balance.dart rename to packages/espressocash_app/lib/features/swap/widgets/available_balance.dart index beda18426..c98fba603 100644 --- a/packages/espressocash_app/lib/features/swap/src/create_swap/available_balance.dart +++ b/packages/espressocash_app/lib/features/swap/widgets/available_balance.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import '../../../../core/amount.dart'; -import '../../../../core/presentation/format_amount.dart'; -import '../../../../l10n/device_locale.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/colors.dart'; +import '../../../core/amount.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/colors.dart'; class AvailableBalance extends StatelessWidget { const AvailableBalance({ diff --git a/packages/espressocash_app/lib/features/swap/src/create_swap/components/display_header.dart b/packages/espressocash_app/lib/features/swap/widgets/display_header.dart similarity index 88% rename from packages/espressocash_app/lib/features/swap/src/create_swap/components/display_header.dart rename to packages/espressocash_app/lib/features/swap/widgets/display_header.dart index c2642f503..b73fba1c3 100644 --- a/packages/espressocash_app/lib/features/swap/src/create_swap/components/display_header.dart +++ b/packages/espressocash_app/lib/features/swap/widgets/display_header.dart @@ -1,10 +1,10 @@ import 'package:decimal/decimal.dart'; import 'package:flutter/material.dart'; -import '../../../../../l10n/decimal_separator.dart'; -import '../../../../../l10n/device_locale.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../ui/number_formatter.dart'; +import '../../../l10n/decimal_separator.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/number_formatter.dart'; class DisplayHeader extends StatelessWidget { const DisplayHeader({ diff --git a/packages/espressocash_app/lib/features/swap/src/create_swap/components/equivalent_header.dart b/packages/espressocash_app/lib/features/swap/widgets/equivalent_header.dart similarity index 89% rename from packages/espressocash_app/lib/features/swap/src/create_swap/components/equivalent_header.dart rename to packages/espressocash_app/lib/features/swap/widgets/equivalent_header.dart index beb1053fb..e7e85d448 100644 --- a/packages/espressocash_app/lib/features/swap/src/create_swap/components/equivalent_header.dart +++ b/packages/espressocash_app/lib/features/swap/widgets/equivalent_header.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import '../../../../../core/amount.dart'; -import '../../../../../core/presentation/format_amount.dart'; -import '../../../../../l10n/device_locale.dart'; -import '../../../../../l10n/l10n.dart'; +import '../../../core/amount.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; import 'swap_fee.dart'; class EquivalentHeader extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/swap/widgets/extensions.dart b/packages/espressocash_app/lib/features/swap/widgets/extensions.dart index 4ff9586fe..5941035a7 100644 --- a/packages/espressocash_app/lib/features/swap/widgets/extensions.dart +++ b/packages/espressocash_app/lib/features/swap/widgets/extensions.dart @@ -1,8 +1,15 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; import '../../../core/tokens/token.dart'; +import '../../../di.dart'; import '../../../routes.gr.dart'; +import '../../../ui/loader.dart'; +import '../../accounts/models/account.dart'; +import '../models/swap.dart'; +import '../models/swap_route.dart'; +import '../services/swap_service.dart'; extension BuildContextExt on BuildContext { void navigateToBuyToken(Token token) => navigateTo( @@ -19,3 +26,23 @@ extension BuildContextExt on BuildContext { ), ); } + +extension SwapExt on BuildContext { + Future createSwap(SwapRoute route) async => + runWithLoader(this, () async { + final swap = await sl().create( + route: route, + account: read().wallet, + ); + + return swap.id; + }); + + Future retrySwap(Swap swap) async => runWithLoader( + this, + () => sl().retry( + swap, + account: read().wallet, + ), + ); +} diff --git a/packages/espressocash_app/lib/features/swap/src/create_swap/components/slippage_info.dart b/packages/espressocash_app/lib/features/swap/widgets/slippage_info.dart similarity index 95% rename from packages/espressocash_app/lib/features/swap/src/create_swap/components/slippage_info.dart rename to packages/espressocash_app/lib/features/swap/widgets/slippage_info.dart index 95a7b6baf..7bddd757d 100644 --- a/packages/espressocash_app/lib/features/swap/src/create_swap/components/slippage_info.dart +++ b/packages/espressocash_app/lib/features/swap/widgets/slippage_info.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import '../../../../../l10n/l10n.dart'; -import '../../../../../ui/button.dart'; -import '../../../../../ui/colors.dart'; -import '../../../models/swap_seed.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/button.dart'; +import '../../../ui/colors.dart'; +import '../models/swap_seed.dart'; class SlippageInfo extends StatelessWidget { const SlippageInfo({ diff --git a/packages/espressocash_app/lib/features/swap/src/create_swap/components/swap_fee.dart b/packages/espressocash_app/lib/features/swap/widgets/swap_fee.dart similarity index 63% rename from packages/espressocash_app/lib/features/swap/src/create_swap/components/swap_fee.dart rename to packages/espressocash_app/lib/features/swap/widgets/swap_fee.dart index f18c1815c..9e47b1e33 100644 --- a/packages/espressocash_app/lib/features/swap/src/create_swap/components/swap_fee.dart +++ b/packages/espressocash_app/lib/features/swap/widgets/swap_fee.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../../../../../core/amount.dart'; -import '../../../../../core/conversion_rates/amount_ext.dart'; -import '../../../../../core/conversion_rates/bl/repository.dart'; -import '../../../../../core/currency.dart'; -import '../../../../../core/presentation/format_amount.dart'; -import '../../../../../l10n/device_locale.dart'; -import '../../../../../l10n/l10n.dart'; +import '../../../core/amount.dart'; +import '../../../core/currency.dart'; +import '../../../core/presentation/format_amount.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; +import '../../conversion_rates/data/repository.dart'; +import '../../conversion_rates/services/amount_ext.dart'; class SwapFee extends StatelessWidget { const SwapFee({ diff --git a/packages/espressocash_app/lib/features/swap/src/create_swap/components/token_dropdown.dart b/packages/espressocash_app/lib/features/swap/widgets/token_dropdown.dart similarity index 98% rename from packages/espressocash_app/lib/features/swap/src/create_swap/components/token_dropdown.dart rename to packages/espressocash_app/lib/features/swap/widgets/token_dropdown.dart index 373190415..0c48a4657 100644 --- a/packages/espressocash_app/lib/features/swap/src/create_swap/components/token_dropdown.dart +++ b/packages/espressocash_app/lib/features/swap/widgets/token_dropdown.dart @@ -1,8 +1,8 @@ import 'package:dfunc/dfunc.dart'; import 'package:flutter/material.dart'; -import '../../../../../core/tokens/token.dart'; -import '../../../../../ui/colors.dart'; +import '../../../core/tokens/token.dart'; +import '../../../ui/colors.dart'; class TokenDropDown extends StatelessWidget { const TokenDropDown({ diff --git a/packages/espressocash_app/lib/features/token_chart/src/data/coingecko_client.dart b/packages/espressocash_app/lib/features/token_chart/data/coingecko_client.dart similarity index 96% rename from packages/espressocash_app/lib/features/token_chart/src/data/coingecko_client.dart rename to packages/espressocash_app/lib/features/token_chart/data/coingecko_client.dart index 5d5dd1db8..a25bc5aa9 100644 --- a/packages/espressocash_app/lib/features/token_chart/src/data/coingecko_client.dart +++ b/packages/espressocash_app/lib/features/token_chart/data/coingecko_client.dart @@ -5,7 +5,7 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; import 'package:retrofit/retrofit.dart'; -import '../../../../core/coingecko_client.dart'; +import '../../../core/coingecko_client.dart'; part 'coingecko_client.freezed.dart'; part 'coingecko_client.g.dart'; diff --git a/packages/espressocash_app/lib/features/token_chart/src/repository.dart b/packages/espressocash_app/lib/features/token_chart/data/repository.dart similarity index 94% rename from packages/espressocash_app/lib/features/token_chart/src/repository.dart rename to packages/espressocash_app/lib/features/token_chart/data/repository.dart index f0ddd7a78..4d7d8cd83 100644 --- a/packages/espressocash_app/lib/features/token_chart/src/repository.dart +++ b/packages/espressocash_app/lib/features/token_chart/data/repository.dart @@ -3,9 +3,9 @@ import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; import '../../../core/tokens/token.dart'; -import 'chart_interval.dart'; -import 'data/coingecko_client.dart'; -import 'token_chart_item.dart'; +import '../models/chart_interval.dart'; +import '../models/token_chart_item.dart'; +import 'coingecko_client.dart'; @injectable class ChartRepository { diff --git a/packages/espressocash_app/lib/features/token_chart/src/chart_interval.dart b/packages/espressocash_app/lib/features/token_chart/models/chart_interval.dart similarity index 100% rename from packages/espressocash_app/lib/features/token_chart/src/chart_interval.dart rename to packages/espressocash_app/lib/features/token_chart/models/chart_interval.dart diff --git a/packages/espressocash_app/lib/features/token_chart/src/token_chart_item.dart b/packages/espressocash_app/lib/features/token_chart/models/token_chart_item.dart similarity index 100% rename from packages/espressocash_app/lib/features/token_chart/src/token_chart_item.dart rename to packages/espressocash_app/lib/features/token_chart/models/token_chart_item.dart diff --git a/packages/espressocash_app/lib/features/token_chart/module.dart b/packages/espressocash_app/lib/features/token_chart/module.dart index 24d73a501..2d21ed1d0 100644 --- a/packages/espressocash_app/lib/features/token_chart/module.dart +++ b/packages/espressocash_app/lib/features/token_chart/module.dart @@ -4,7 +4,7 @@ import 'package:nested/nested.dart'; import '../../core/tokens/token.dart'; import '../../di.dart'; -import 'src/bloc.dart'; +import 'services/bloc.dart'; class TokenChartModule extends SingleChildStatelessWidget { const TokenChartModule(this.token, {super.key, super.child}); diff --git a/packages/espressocash_app/lib/features/token_chart/src/bloc.dart b/packages/espressocash_app/lib/features/token_chart/services/bloc.dart similarity index 95% rename from packages/espressocash_app/lib/features/token_chart/src/bloc.dart rename to packages/espressocash_app/lib/features/token_chart/services/bloc.dart index 600cf0b6a..fdfd80ca4 100644 --- a/packages/espressocash_app/lib/features/token_chart/src/bloc.dart +++ b/packages/espressocash_app/lib/features/token_chart/services/bloc.dart @@ -7,9 +7,9 @@ import 'package:injectable/injectable.dart'; import '../../../core/processing_state.dart'; import '../../../core/tokens/token.dart'; -import 'chart_interval.dart'; -import 'repository.dart'; -import 'token_chart_item.dart'; +import '../data/repository.dart'; +import '../models/chart_interval.dart'; +import '../models/token_chart_item.dart'; part 'bloc.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/token_chart/src/date_format.dart b/packages/espressocash_app/lib/features/token_chart/widgets/date_format.dart similarity index 100% rename from packages/espressocash_app/lib/features/token_chart/src/date_format.dart rename to packages/espressocash_app/lib/features/token_chart/widgets/date_format.dart diff --git a/packages/espressocash_app/lib/features/token_chart/widgets/token_chart.dart b/packages/espressocash_app/lib/features/token_chart/widgets/token_chart.dart index 3fd8ab84f..23e773b49 100644 --- a/packages/espressocash_app/lib/features/token_chart/widgets/token_chart.dart +++ b/packages/espressocash_app/lib/features/token_chart/widgets/token_chart.dart @@ -11,12 +11,12 @@ import '../../../core/user_preferences.dart'; import '../../../l10n/device_locale.dart'; import '../../../l10n/l10n.dart'; import '../../../ui/loader.dart'; -import '../src/bloc.dart'; -import '../src/chart_interval.dart'; -import '../src/date_format.dart'; -import '../src/token_chart_item.dart'; +import '../models/chart_interval.dart'; +import '../models/token_chart_item.dart'; +import '../services/bloc.dart'; +import 'date_format.dart'; -export '../src/token_chart_item.dart'; +export '../models/token_chart_item.dart'; class TokenChart extends StatelessWidget { const TokenChart({ diff --git a/packages/espressocash_app/lib/features/token_chart/widgets/token_overview.dart b/packages/espressocash_app/lib/features/token_chart/widgets/token_overview.dart index 48eebc5cb..85257cfce 100644 --- a/packages/espressocash_app/lib/features/token_chart/widgets/token_overview.dart +++ b/packages/espressocash_app/lib/features/token_chart/widgets/token_overview.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import '../../../core/user_preferences.dart'; -import '../src/bloc.dart'; +import '../services/bloc.dart'; import 'token_chart.dart'; -export '../src/token_chart_item.dart'; +export '../models/token_chart_item.dart'; class ChartPriceOverview extends StatelessWidget { const ChartPriceOverview({super.key}); diff --git a/packages/espressocash_app/lib/features/token_details/src/data/coingecko_client.dart b/packages/espressocash_app/lib/features/token_details/data/coingecko_client.dart similarity index 97% rename from packages/espressocash_app/lib/features/token_details/src/data/coingecko_client.dart rename to packages/espressocash_app/lib/features/token_details/data/coingecko_client.dart index 03b883b1b..41cfb4b4c 100644 --- a/packages/espressocash_app/lib/features/token_details/src/data/coingecko_client.dart +++ b/packages/espressocash_app/lib/features/token_details/data/coingecko_client.dart @@ -6,7 +6,7 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; import 'package:retrofit/retrofit.dart'; -import '../../../../core/coingecko_client.dart'; +import '../../../core/coingecko_client.dart'; part 'coingecko_client.freezed.dart'; part 'coingecko_client.g.dart'; diff --git a/packages/espressocash_app/lib/features/token_details/src/repository.dart b/packages/espressocash_app/lib/features/token_details/data/repository.dart similarity index 94% rename from packages/espressocash_app/lib/features/token_details/src/repository.dart rename to packages/espressocash_app/lib/features/token_details/data/repository.dart index 6aef9a7a6..7fa59812c 100644 --- a/packages/espressocash_app/lib/features/token_details/src/repository.dart +++ b/packages/espressocash_app/lib/features/token_details/data/repository.dart @@ -2,8 +2,8 @@ import 'package:dfunc/dfunc.dart'; import 'package:injectable/injectable.dart'; import '../../../core/tokens/token.dart'; -import 'data/coingecko_client.dart'; -import 'token_details.dart'; +import '../models/token_details.dart'; +import 'coingecko_client.dart'; @injectable class TokenDetailsRepository { diff --git a/packages/espressocash_app/lib/features/token_details/src/token_details.dart b/packages/espressocash_app/lib/features/token_details/models/token_details.dart similarity index 100% rename from packages/espressocash_app/lib/features/token_details/src/token_details.dart rename to packages/espressocash_app/lib/features/token_details/models/token_details.dart diff --git a/packages/espressocash_app/lib/features/token_details/widgets/token_details_screen.dart b/packages/espressocash_app/lib/features/token_details/screens/token_details_screen.dart similarity index 95% rename from packages/espressocash_app/lib/features/token_details/widgets/token_details_screen.dart rename to packages/espressocash_app/lib/features/token_details/screens/token_details_screen.dart index 8eef02c64..599837bd9 100644 --- a/packages/espressocash_app/lib/features/token_details/widgets/token_details_screen.dart +++ b/packages/espressocash_app/lib/features/token_details/screens/token_details_screen.dart @@ -6,7 +6,6 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:provider/provider.dart'; import '../../../core/amount.dart'; -import '../../../core/balances/presentation/watch_balance.dart'; import '../../../core/presentation/extensions.dart'; import '../../../core/presentation/format_amount.dart'; import '../../../core/tokens/token.dart'; @@ -19,17 +18,18 @@ import '../../../ui/content_padding.dart'; import '../../../ui/loader.dart'; import '../../../ui/navigation_bar/navigation_bar.dart'; import '../../../ui/theme.dart'; +import '../../balances/widgets/watch_balance.dart'; import '../../ramp/widgets/ramp_buttons.dart'; -import '../../swap/token_ext.dart'; +import '../../swap/services/token_ext.dart'; import '../../token_chart/module.dart'; import '../../token_chart/widgets/token_chart.dart'; import '../../token_chart/widgets/token_overview.dart'; -import '../src/token_details.dart'; -import '../src/token_details_bloc.dart'; -import '../src/widgets/balance_widget.dart'; -import '../src/widgets/exchange_buttons.dart'; -import '../src/widgets/token_app_bar.dart'; -import '../src/widgets/token_details_widget.dart'; +import '../models/token_details.dart'; +import '../services/token_details_bloc.dart'; +import '../widgets/balance_widget.dart'; +import '../widgets/exchange_buttons.dart'; +import '../widgets/token_app_bar.dart'; +import '../widgets/token_details_widget.dart'; @RoutePage() class TokenDetailsScreen extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/token_details/src/token_details_bloc.dart b/packages/espressocash_app/lib/features/token_details/services/token_details_bloc.dart similarity index 95% rename from packages/espressocash_app/lib/features/token_details/src/token_details_bloc.dart rename to packages/espressocash_app/lib/features/token_details/services/token_details_bloc.dart index c18201f53..31a59c19b 100644 --- a/packages/espressocash_app/lib/features/token_details/src/token_details_bloc.dart +++ b/packages/espressocash_app/lib/features/token_details/services/token_details_bloc.dart @@ -7,8 +7,8 @@ import 'package:injectable/injectable.dart'; import '../../../core/currency.dart'; import '../../../core/flow.dart'; import '../../../core/tokens/token.dart'; -import '../src/repository.dart'; -import 'token_details.dart'; +import '../data/repository.dart'; +import '../models/token_details.dart'; part 'token_details_bloc.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/token_details/src/widgets/balance_widget.dart b/packages/espressocash_app/lib/features/token_details/widgets/balance_widget.dart similarity index 100% rename from packages/espressocash_app/lib/features/token_details/src/widgets/balance_widget.dart rename to packages/espressocash_app/lib/features/token_details/widgets/balance_widget.dart diff --git a/packages/espressocash_app/lib/features/token_details/src/widgets/exchange_buttons.dart b/packages/espressocash_app/lib/features/token_details/widgets/exchange_buttons.dart similarity index 85% rename from packages/espressocash_app/lib/features/token_details/src/widgets/exchange_buttons.dart rename to packages/espressocash_app/lib/features/token_details/widgets/exchange_buttons.dart index 999523b34..5f372e0b3 100644 --- a/packages/espressocash_app/lib/features/token_details/src/widgets/exchange_buttons.dart +++ b/packages/espressocash_app/lib/features/token_details/widgets/exchange_buttons.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import '../../../../core/tokens/token.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/button.dart'; -import '../../../swap/widgets/extensions.dart'; +import '../../../core/tokens/token.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/button.dart'; +import '../../swap/widgets/extensions.dart'; class ExchangeButtons extends StatelessWidget { const ExchangeButtons({ diff --git a/packages/espressocash_app/lib/features/token_details/src/widgets/expandable_text.dart b/packages/espressocash_app/lib/features/token_details/widgets/expandable_text.dart similarity index 99% rename from packages/espressocash_app/lib/features/token_details/src/widgets/expandable_text.dart rename to packages/espressocash_app/lib/features/token_details/widgets/expandable_text.dart index 47db589ae..c605ef6b2 100644 --- a/packages/espressocash_app/lib/features/token_details/src/widgets/expandable_text.dart +++ b/packages/espressocash_app/lib/features/token_details/widgets/expandable_text.dart @@ -2,7 +2,7 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import '../../../../l10n/l10n.dart'; +import '../../../l10n/l10n.dart'; class ExpandableText extends StatefulWidget { const ExpandableText({ diff --git a/packages/espressocash_app/lib/features/token_details/src/widgets/token_app_bar.dart b/packages/espressocash_app/lib/features/token_details/widgets/token_app_bar.dart similarity index 94% rename from packages/espressocash_app/lib/features/token_details/src/widgets/token_app_bar.dart rename to packages/espressocash_app/lib/features/token_details/widgets/token_app_bar.dart index 7879297a8..83f502cf6 100644 --- a/packages/espressocash_app/lib/features/token_details/src/widgets/token_app_bar.dart +++ b/packages/espressocash_app/lib/features/token_details/widgets/token_app_bar.dart @@ -5,12 +5,12 @@ import 'package:dfunc/dfunc.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import '../../../../core/tokens/token.dart'; -import '../../../../ui/back_button.dart'; -import '../../../../ui/colors.dart'; -import '../../../../ui/token_icon.dart'; -import '../../../favorite_tokens/widgets/favorite_button.dart'; -import '../../../swap/token_ext.dart'; +import '../../../core/tokens/token.dart'; +import '../../../ui/back_button.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/token_icon.dart'; +import '../../favorite_tokens/widgets/favorite_button.dart'; +import '../../swap/services/token_ext.dart'; import 'unavailable_token.dart'; class TokenAppBar extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/token_details/src/widgets/token_details_widget.dart b/packages/espressocash_app/lib/features/token_details/widgets/token_details_widget.dart similarity index 95% rename from packages/espressocash_app/lib/features/token_details/src/widgets/token_details_widget.dart rename to packages/espressocash_app/lib/features/token_details/widgets/token_details_widget.dart index 382098dda..ab3d11551 100644 --- a/packages/espressocash_app/lib/features/token_details/src/widgets/token_details_widget.dart +++ b/packages/espressocash_app/lib/features/token_details/widgets/token_details_widget.dart @@ -1,9 +1,9 @@ import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; -import '../../../../l10n/device_locale.dart'; -import '../../../../l10n/l10n.dart'; -import '../token_details.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; +import '../models/token_details.dart'; import 'expandable_text.dart'; class TokenDetailsWidget extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/token_details/src/widgets/unavailable_token.dart b/packages/espressocash_app/lib/features/token_details/widgets/unavailable_token.dart similarity index 93% rename from packages/espressocash_app/lib/features/token_details/src/widgets/unavailable_token.dart rename to packages/espressocash_app/lib/features/token_details/widgets/unavailable_token.dart index 8a91cc9de..a19fc2a6e 100644 --- a/packages/espressocash_app/lib/features/token_details/src/widgets/unavailable_token.dart +++ b/packages/espressocash_app/lib/features/token_details/widgets/unavailable_token.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/info_icon.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/info_icon.dart'; class UnavailableTokenNotice extends StatelessWidget { const UnavailableTokenNotice({super.key, required this.tokenName}); diff --git a/packages/espressocash_app/lib/features/token_search/src/data/coingecko_client.dart b/packages/espressocash_app/lib/features/token_search/data/coingecko_client.dart similarity index 95% rename from packages/espressocash_app/lib/features/token_search/src/data/coingecko_client.dart rename to packages/espressocash_app/lib/features/token_search/data/coingecko_client.dart index 8b390d0bf..c43180375 100644 --- a/packages/espressocash_app/lib/features/token_search/src/data/coingecko_client.dart +++ b/packages/espressocash_app/lib/features/token_search/data/coingecko_client.dart @@ -5,9 +5,9 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; import 'package:retrofit/retrofit.dart'; -import '../../../../core/coingecko_client.dart'; -import '../../../../core/tokens/token.dart'; -import '../../../../core/tokens/token_list.dart'; +import '../../../core/coingecko_client.dart'; +import '../../../core/tokens/token.dart'; +import '../../../core/tokens/token_list.dart'; part 'coingecko_client.freezed.dart'; part 'coingecko_client.g.dart'; diff --git a/packages/espressocash_app/lib/features/token_search/src/bl/repository.dart b/packages/espressocash_app/lib/features/token_search/data/repository.dart similarity index 89% rename from packages/espressocash_app/lib/features/token_search/src/bl/repository.dart rename to packages/espressocash_app/lib/features/token_search/data/repository.dart index 35005855f..fbc2fecda 100644 --- a/packages/espressocash_app/lib/features/token_search/src/bl/repository.dart +++ b/packages/espressocash_app/lib/features/token_search/data/repository.dart @@ -2,10 +2,10 @@ import 'package:dfunc/dfunc.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:injectable/injectable.dart'; -import '../../../../core/tokens/token.dart'; -import '../../../../core/tokens/token_list.dart'; -import '../../models/crypto_categories.dart'; -import '../data/coingecko_client.dart'; +import '../../../core/tokens/token.dart'; +import '../../../core/tokens/token_list.dart'; +import '../models/crypto_categories.dart'; +import 'coingecko_client.dart'; @injectable class SearchRepository { diff --git a/packages/espressocash_app/lib/features/token_search/src/widgets/token_search_screen.dart b/packages/espressocash_app/lib/features/token_search/screens/token_search_screen.dart similarity index 91% rename from packages/espressocash_app/lib/features/token_search/src/widgets/token_search_screen.dart rename to packages/espressocash_app/lib/features/token_search/screens/token_search_screen.dart index fd3b78896..04a016cbb 100644 --- a/packages/espressocash_app/lib/features/token_search/src/widgets/token_search_screen.dart +++ b/packages/espressocash_app/lib/features/token_search/screens/token_search_screen.dart @@ -4,20 +4,20 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:provider/provider.dart'; -import '../../../../core/tokens/token.dart'; -import '../../../../di.dart'; -import '../../../../gen/assets.gen.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../routes.gr.dart'; -import '../../../../ui/app_bar.dart'; -import '../../../../ui/colors.dart'; -import '../../../../ui/icon_button.dart'; -import '../../../../ui/loader.dart'; -import '../../../../ui/text_field.dart'; -import '../../../favorite_tokens/widgets/favorite_button.dart'; -import '../../models/crypto_categories.dart'; -import '../../widgets/discover_header.dart'; -import '../bl/bloc.dart'; +import '../../../core/tokens/token.dart'; +import '../../../di.dart'; +import '../../../gen/assets.gen.dart'; +import '../../../l10n/l10n.dart'; +import '../../../routes.gr.dart'; +import '../../../ui/app_bar.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/icon_button.dart'; +import '../../../ui/loader.dart'; +import '../../../ui/text_field.dart'; +import '../../favorite_tokens/widgets/favorite_button.dart'; +import '../models/crypto_categories.dart'; +import '../services/bloc.dart'; +import '../widgets/discover_header.dart'; @RoutePage() class TokenSearchScreen extends StatelessWidget { diff --git a/packages/espressocash_app/lib/features/token_search/src/bl/bloc.dart b/packages/espressocash_app/lib/features/token_search/services/bloc.dart similarity index 93% rename from packages/espressocash_app/lib/features/token_search/src/bl/bloc.dart rename to packages/espressocash_app/lib/features/token_search/services/bloc.dart index 42cf6988b..1eed75449 100644 --- a/packages/espressocash_app/lib/features/token_search/src/bl/bloc.dart +++ b/packages/espressocash_app/lib/features/token_search/services/bloc.dart @@ -5,10 +5,10 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; import 'package:rxdart/rxdart.dart'; -import '../../../../core/flow.dart'; -import '../../../../core/tokens/token.dart'; -import '../../models/crypto_categories.dart'; -import 'repository.dart'; +import '../../../core/flow.dart'; +import '../../../core/tokens/token.dart'; +import '../data/repository.dart'; +import '../models/crypto_categories.dart'; part 'bloc.freezed.dart'; diff --git a/packages/espressocash_app/lib/features/transactions/models/tx_sender.dart b/packages/espressocash_app/lib/features/transactions/models/tx_sender.dart new file mode 100644 index 000000000..28ef78869 --- /dev/null +++ b/packages/espressocash_app/lib/features/transactions/models/tx_sender.dart @@ -0,0 +1,71 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; +import 'package:solana/base58.dart'; +import 'package:solana/encoder.dart'; + +part 'tx_sender.freezed.dart'; + +// TODO(KB): should be removed after full migration to waiting status with +// SignedTx +class StubSignedTx implements SignedTx { + const StubSignedTx(this.id); + + @override + String get blockhash => base58encode(List.filled(32, 0)); + + @override + String encode() => throw UnimplementedError(); + + @override + final String id; + + @override + ByteArray toByteArray() => throw UnimplementedError(); + + @override + TransactionVersion get version => throw UnimplementedError(); + + @override + $SignedTxCopyWith get copyWith => throw UnimplementedError(); + + @override + Message decompileMessage({ + List addressLookupTableAccounts = const [], + }) { + throw UnimplementedError(); + } + + @override + CompiledMessage get compiledMessage => throw UnimplementedError(); + + @override + List get signatures => throw UnimplementedError(); +} + +@freezed +class TxSendResult with _$TxSendResult { + const factory TxSendResult.sent() = TxSendSent; + const factory TxSendResult.invalidBlockhash() = TxSendInvalidBlockhash; + const factory TxSendResult.failure({ + required TxFailureReason reason, + }) = TxSendFailure; + const factory TxSendResult.networkError() = TxSendNetworkError; +} + +@freezed +class TxWaitResult with _$TxWaitResult { + const factory TxWaitResult.success() = TxWaitSuccess; + const factory TxWaitResult.failure({ + required TxFailureReason reason, + }) = TxWaitFailure; + const factory TxWaitResult.networkError() = TxWaitNetworkError; +} + +enum TxFailureReason { + insufficientFunds, + invalidBlockhashSending, + invalidBlockhashWaiting, + creatingFailure, + txError, + unknown, + escrowFailure, +} diff --git a/packages/espressocash_app/lib/core/transactions/create_transaction_link.dart b/packages/espressocash_app/lib/features/transactions/services/create_transaction_link.dart similarity index 87% rename from packages/espressocash_app/lib/core/transactions/create_transaction_link.dart rename to packages/espressocash_app/lib/features/transactions/services/create_transaction_link.dart index ce49de4b4..46825ba66 100644 --- a/packages/espressocash_app/lib/core/transactions/create_transaction_link.dart +++ b/packages/espressocash_app/lib/features/transactions/services/create_transaction_link.dart @@ -1,4 +1,4 @@ -import '../../config.dart'; +import '../../../config.dart'; String createTransactionLink(String signature) { final sb = StringBuffer() diff --git a/packages/espressocash_app/lib/core/transactions/resign_tx.dart b/packages/espressocash_app/lib/features/transactions/services/resign_tx.dart similarity index 95% rename from packages/espressocash_app/lib/core/transactions/resign_tx.dart rename to packages/espressocash_app/lib/features/transactions/services/resign_tx.dart index ae25ec9d1..4a9eacc9b 100644 --- a/packages/espressocash_app/lib/core/transactions/resign_tx.dart +++ b/packages/espressocash_app/lib/features/transactions/services/resign_tx.dart @@ -3,7 +3,7 @@ import 'dart:typed_data'; import 'package:dfunc/dfunc.dart'; import 'package:solana/encoder.dart'; -import '../accounts/bl/ec_wallet.dart'; +import '../../accounts/models/ec_wallet.dart'; extension ResignTx on SignedTx { Future resign(ECWallet wallet) async => diff --git a/packages/espressocash_app/lib/core/transactions/tx_destinations.dart b/packages/espressocash_app/lib/features/transactions/services/tx_destinations.dart similarity index 100% rename from packages/espressocash_app/lib/core/transactions/tx_destinations.dart rename to packages/espressocash_app/lib/features/transactions/services/tx_destinations.dart diff --git a/packages/espressocash_app/lib/core/transactions/tx_sender.dart b/packages/espressocash_app/lib/features/transactions/services/tx_sender.dart similarity index 73% rename from packages/espressocash_app/lib/core/transactions/tx_sender.dart rename to packages/espressocash_app/lib/features/transactions/services/tx_sender.dart index d7a5476ec..a499a76d9 100644 --- a/packages/espressocash_app/lib/core/transactions/tx_sender.dart +++ b/packages/espressocash_app/lib/features/transactions/services/tx_sender.dart @@ -1,14 +1,11 @@ -import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; import 'package:rxdart/rxdart.dart'; -import 'package:solana/base58.dart'; import 'package:solana/dto.dart'; import 'package:solana/encoder.dart'; import 'package:solana/solana.dart'; -import '../../config.dart'; - -part 'tx_sender.freezed.dart'; +import '../../../config.dart'; +import '../models/tx_sender.dart'; @injectable class TxSender { @@ -129,72 +126,6 @@ class TxSender { } } -// TODO(KB): should be removed after full migration to waiting status with -// SignedTx -class StubSignedTx implements SignedTx { - const StubSignedTx(this.id); - - @override - String get blockhash => base58encode(List.filled(32, 0)); - - @override - String encode() => throw UnimplementedError(); - - @override - final String id; - - @override - ByteArray toByteArray() => throw UnimplementedError(); - - @override - TransactionVersion get version => throw UnimplementedError(); - - @override - $SignedTxCopyWith get copyWith => throw UnimplementedError(); - - @override - Message decompileMessage({ - List addressLookupTableAccounts = const [], - }) { - throw UnimplementedError(); - } - - @override - CompiledMessage get compiledMessage => throw UnimplementedError(); - - @override - List get signatures => throw UnimplementedError(); -} - -@freezed -class TxSendResult with _$TxSendResult { - const factory TxSendResult.sent() = TxSendSent; - const factory TxSendResult.invalidBlockhash() = TxSendInvalidBlockhash; - const factory TxSendResult.failure({ - required TxFailureReason reason, - }) = TxSendFailure; - const factory TxSendResult.networkError() = TxSendNetworkError; -} - -@freezed -class TxWaitResult with _$TxWaitResult { - const factory TxWaitResult.success() = TxWaitSuccess; - const factory TxWaitResult.failure({ - required TxFailureReason reason, - }) = TxWaitFailure; - const factory TxWaitResult.networkError() = TxWaitNetworkError; -} - -enum TxFailureReason { - insufficientFunds, - invalidBlockhashSending, - invalidBlockhashWaiting, - creatingFailure, - txError, - unknown, - escrowFailure, -} - extension on JsonRpcException { // TODO(KB): Think about some better error handling bool get isInsufficientFunds { diff --git a/packages/espressocash_app/lib/ui/transfer_status/transfer_error.dart b/packages/espressocash_app/lib/features/transactions/widgets/transfer_error.dart similarity index 87% rename from packages/espressocash_app/lib/ui/transfer_status/transfer_error.dart rename to packages/espressocash_app/lib/features/transactions/widgets/transfer_error.dart index 7d230e8e6..091503224 100644 --- a/packages/espressocash_app/lib/ui/transfer_status/transfer_error.dart +++ b/packages/espressocash_app/lib/features/transactions/widgets/transfer_error.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import '../../core/transactions/tx_sender.dart'; -import '../../l10n/l10n.dart'; -import '../button.dart'; -import '../status_screen.dart'; -import '../status_widget.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/button.dart'; +import '../../../ui/status_screen.dart'; +import '../../../ui/status_widget.dart'; +import '../models/tx_sender.dart'; class TransferError extends StatelessWidget { const TransferError({ diff --git a/packages/espressocash_app/lib/ui/transfer_status/transfer_progress.dart b/packages/espressocash_app/lib/features/transactions/widgets/transfer_progress.dart similarity index 85% rename from packages/espressocash_app/lib/ui/transfer_status/transfer_progress.dart rename to packages/espressocash_app/lib/features/transactions/widgets/transfer_progress.dart index 53bf03c0f..37f7150c0 100644 --- a/packages/espressocash_app/lib/ui/transfer_status/transfer_progress.dart +++ b/packages/espressocash_app/lib/features/transactions/widgets/transfer_progress.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import '../../l10n/l10n.dart'; -import '../colors.dart'; -import '../status_screen.dart'; -import '../status_widget.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/colors.dart'; +import '../../../ui/status_screen.dart'; +import '../../../ui/status_widget.dart'; class TransferProgress extends StatelessWidget { const TransferProgress({ diff --git a/packages/espressocash_app/lib/ui/transfer_status/transfer_success.dart b/packages/espressocash_app/lib/features/transactions/widgets/transfer_success.dart similarity index 89% rename from packages/espressocash_app/lib/ui/transfer_status/transfer_success.dart rename to packages/espressocash_app/lib/features/transactions/widgets/transfer_success.dart index f53fae334..42a84789b 100644 --- a/packages/espressocash_app/lib/ui/transfer_status/transfer_success.dart +++ b/packages/espressocash_app/lib/features/transactions/widgets/transfer_success.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import '../../l10n/l10n.dart'; -import '../button.dart'; -import '../status_screen.dart'; -import '../status_widget.dart'; -import '../text_button.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/button.dart'; +import '../../../ui/status_screen.dart'; +import '../../../ui/status_widget.dart'; +import '../../../ui/text_button.dart'; class TransferSuccess extends StatelessWidget { const TransferSuccess({ diff --git a/packages/espressocash_app/lib/app/screens/authenticated/wallet_flow/wallet_flow_screen.dart b/packages/espressocash_app/lib/features/wallet_flow/screens/wallet_flow_screen.dart similarity index 87% rename from packages/espressocash_app/lib/app/screens/authenticated/wallet_flow/wallet_flow_screen.dart rename to packages/espressocash_app/lib/features/wallet_flow/screens/wallet_flow_screen.dart index 140b96ced..ba4024673 100644 --- a/packages/espressocash_app/lib/app/screens/authenticated/wallet_flow/wallet_flow_screen.dart +++ b/packages/espressocash_app/lib/features/wallet_flow/screens/wallet_flow_screen.dart @@ -3,16 +3,16 @@ import 'package:decimal/decimal.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../../../../core/amount.dart'; -import '../../../../core/conversion_rates/amount_ext.dart'; -import '../../../../core/conversion_rates/bl/repository.dart'; -import '../../../../core/currency.dart'; -import '../../../../features/outgoing_split_key_payments/widgets/extensions.dart'; -import '../../../../features/qr_scanner/widgets/build_context_ext.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../routes.gr.dart'; -import '../../../../ui/shake.dart'; -import '../../../../ui/theme.dart'; +import '../../../core/amount.dart'; +import '../../../core/currency.dart'; +import '../../../l10n/l10n.dart'; +import '../../../routes.gr.dart'; +import '../../../ui/shake.dart'; +import '../../../ui/theme.dart'; +import '../../conversion_rates/data/repository.dart'; +import '../../conversion_rates/services/amount_ext.dart'; +import '../../outgoing_split_key_payments/widgets/extensions.dart'; +import '../../qr_scanner/widgets/build_context_ext.dart'; import 'wallet_main_screen.dart'; const _cryptoCurrency = Currency.usdc; diff --git a/packages/espressocash_app/lib/app/screens/authenticated/wallet_flow/wallet_main_screen.dart b/packages/espressocash_app/lib/features/wallet_flow/screens/wallet_main_screen.dart similarity index 91% rename from packages/espressocash_app/lib/app/screens/authenticated/wallet_flow/wallet_main_screen.dart rename to packages/espressocash_app/lib/features/wallet_flow/screens/wallet_main_screen.dart index 6a42e817d..2601fade7 100644 --- a/packages/espressocash_app/lib/app/screens/authenticated/wallet_flow/wallet_main_screen.dart +++ b/packages/espressocash_app/lib/features/wallet_flow/screens/wallet_main_screen.dart @@ -1,18 +1,18 @@ import 'package:decimal/decimal.dart'; import 'package:flutter/material.dart'; -import '../../../../core/amount.dart'; -import '../../../../core/tokens/token.dart'; -import '../../../../gen/assets.gen.dart'; -import '../../../../l10n/device_locale.dart'; -import '../../../../l10n/l10n.dart'; -import '../../../../ui/amount_keypad/amount_keypad.dart'; -import '../../../../ui/amount_with_equivalent.dart'; -import '../../../../ui/button.dart'; -import '../../../../ui/icon_button.dart'; -import '../../../../ui/number_formatter.dart'; -import '../../../../ui/tab_bar.dart'; -import '../../../../ui/usdc_info.dart'; +import '../../../core/amount.dart'; +import '../../../core/tokens/token.dart'; +import '../../../gen/assets.gen.dart'; +import '../../../l10n/device_locale.dart'; +import '../../../l10n/l10n.dart'; +import '../../../ui/amount_keypad/amount_keypad.dart'; +import '../../../ui/button.dart'; +import '../../../ui/icon_button.dart'; +import '../../../ui/number_formatter.dart'; +import '../../../ui/tab_bar.dart'; +import '../../../ui/usdc_info.dart'; +import '../../conversion_rates/widgets/amount_with_equivalent.dart'; class WalletMainScreen extends StatefulWidget { const WalletMainScreen({ diff --git a/packages/espressocash_app/lib/main.dart b/packages/espressocash_app/lib/main.dart index ebbfd487a..ce09dd31e 100644 --- a/packages/espressocash_app/lib/main.dart +++ b/packages/espressocash_app/lib/main.dart @@ -11,12 +11,12 @@ import 'package:provider/provider.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'app/app.dart'; +import 'app.dart'; import 'config.dart'; -import 'core/accounts/module.dart'; -import 'core/balances/module.dart'; import 'core/dynamic_links_notifier.dart'; import 'di.dart'; +import 'features/accounts/module.dart'; +import 'features/balances/module.dart'; import 'logging.dart'; import 'ui/splash_screen.dart'; diff --git a/packages/espressocash_app/lib/storybook/stories/app/investments/portfolio_widget.dart b/packages/espressocash_app/lib/storybook/stories/app/investments/portfolio_widget.dart index f43b5412e..412b18444 100644 --- a/packages/espressocash_app/lib/storybook/stories/app/investments/portfolio_widget.dart +++ b/packages/espressocash_app/lib/storybook/stories/app/investments/portfolio_widget.dart @@ -3,10 +3,10 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:storybook_flutter/storybook_flutter.dart'; -import '../../../../core/conversion_rates/bl/repository.dart'; import '../../../../core/tokens/token_list.dart'; import '../../../../core/user_preferences.dart'; import '../../../../di.dart'; +import '../../../../features/conversion_rates/data/repository.dart'; import '../../../../features/investments/widgets/portfolio_widget.dart'; import '../app_wrapper.dart'; diff --git a/packages/espressocash_app/lib/storybook/stories/app/wallet_main_screen.dart b/packages/espressocash_app/lib/storybook/stories/app/wallet_main_screen.dart index e76107f34..b263b543a 100644 --- a/packages/espressocash_app/lib/storybook/stories/app/wallet_main_screen.dart +++ b/packages/espressocash_app/lib/storybook/stories/app/wallet_main_screen.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:storybook_flutter/storybook_flutter.dart'; -import '../../../app/screens/authenticated/wallet_flow/wallet_main_screen.dart'; import '../../../core/amount.dart'; import '../../../core/currency.dart'; +import '../../../features/wallet_flow/screens/wallet_main_screen.dart'; import '../../../ui/theme.dart'; import 'app_wrapper.dart'; diff --git a/packages/espressocash_app/test/core/balances/accounts/accounts_bloc_test.dart b/packages/espressocash_app/test/core/balances/accounts/accounts_bloc_test.dart index 98221983b..cd8f73f20 100644 --- a/packages/espressocash_app/test/core/balances/accounts/accounts_bloc_test.dart +++ b/packages/espressocash_app/test/core/balances/accounts/accounts_bloc_test.dart @@ -1,10 +1,10 @@ import 'package:bip39/bip39.dart' as bip39; import 'package:bloc_test/bloc_test.dart'; -import 'package:espressocash_app/core/accounts/bl/account.dart'; -import 'package:espressocash_app/core/accounts/bl/accounts_bloc.dart'; -import 'package:espressocash_app/core/accounts/bl/mnemonic.dart'; import 'package:espressocash_app/core/file_manager.dart'; import 'package:espressocash_app/core/wallet.dart'; +import 'package:espressocash_app/features/accounts/models/account.dart'; +import 'package:espressocash_app/features/accounts/models/mnemonic.dart'; +import 'package:espressocash_app/features/accounts/services/accounts_bloc.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/packages/espressocash_app/test/core/balances/balances_bloc_test.dart b/packages/espressocash_app/test/core/balances/balances_bloc_test.dart index df6db09af..ff1afa5dd 100644 --- a/packages/espressocash_app/test/core/balances/balances_bloc_test.dart +++ b/packages/espressocash_app/test/core/balances/balances_bloc_test.dart @@ -1,12 +1,12 @@ import 'package:bloc_test/bloc_test.dart'; import 'package:espressocash_app/config.dart'; -import 'package:espressocash_app/core/accounts/bl/account.dart'; -import 'package:espressocash_app/core/accounts/bl/ec_wallet.dart'; import 'package:espressocash_app/core/amount.dart'; -import 'package:espressocash_app/core/balances/bl/balances_bloc.dart'; import 'package:espressocash_app/core/processing_state.dart'; import 'package:espressocash_app/core/tokens/token.dart'; import 'package:espressocash_app/core/tokens/token_list.dart'; +import 'package:espressocash_app/features/accounts/models/account.dart'; +import 'package:espressocash_app/features/accounts/models/ec_wallet.dart'; +import 'package:espressocash_app/features/balances/services/balances_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:solana/solana.dart'; diff --git a/packages/espressocash_app/test/core/balances/sorted_balance_test.dart b/packages/espressocash_app/test/core/balances/sorted_balance_test.dart index d06df721d..e9448267b 100644 --- a/packages/espressocash_app/test/core/balances/sorted_balance_test.dart +++ b/packages/espressocash_app/test/core/balances/sorted_balance_test.dart @@ -1,8 +1,8 @@ import 'dart:math'; import 'package:espressocash_app/core/amount.dart'; -import 'package:espressocash_app/core/balances/bl/balances_bloc.dart'; import 'package:espressocash_app/core/tokens/token.dart'; +import 'package:espressocash_app/features/balances/services/balances_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/packages/espressocash_app/test/core/conversion_rates/conversion_rates_provider_test.dart b/packages/espressocash_app/test/core/conversion_rates/conversion_rates_provider_test.dart index 05c38ee56..c49d54fd1 100644 --- a/packages/espressocash_app/test/core/conversion_rates/conversion_rates_provider_test.dart +++ b/packages/espressocash_app/test/core/conversion_rates/conversion_rates_provider_test.dart @@ -1,8 +1,8 @@ import 'package:decimal/decimal.dart'; -import 'package:espressocash_app/core/conversion_rates/bl/conversion_rates_client.dart'; -import 'package:espressocash_app/core/conversion_rates/bl/repository.dart'; import 'package:espressocash_app/core/currency.dart'; import 'package:espressocash_app/core/tokens/token.dart'; +import 'package:espressocash_app/features/conversion_rates/data/conversion_rates_client.dart'; +import 'package:espressocash_app/features/conversion_rates/data/repository.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/packages/espressocash_app/test/core/transactions/tx_sender_test.dart b/packages/espressocash_app/test/core/transactions/tx_sender_test.dart index fe672c85c..14e62473c 100644 --- a/packages/espressocash_app/test/core/transactions/tx_sender_test.dart +++ b/packages/espressocash_app/test/core/transactions/tx_sender_test.dart @@ -1,4 +1,5 @@ -import 'package:espressocash_app/core/transactions/tx_sender.dart'; +import 'package:espressocash_app/features/transactions/models/tx_sender.dart'; +import 'package:espressocash_app/features/transactions/services/tx_sender.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:solana/dto.dart'; import 'package:solana/encoder.dart'; diff --git a/packages/espressocash_app/test/features/backup_phrase/puzzle_reminder_bloc_test.dart b/packages/espressocash_app/test/features/backup_phrase/puzzle_reminder_bloc_test.dart index 8b4410196..4d0d6b6cf 100644 --- a/packages/espressocash_app/test/features/backup_phrase/puzzle_reminder_bloc_test.dart +++ b/packages/espressocash_app/test/features/backup_phrase/puzzle_reminder_bloc_test.dart @@ -1,4 +1,4 @@ -import 'package:espressocash_app/features/backup_phrase/src/bl/puzzle_reminder_bloc.dart'; +import 'package:espressocash_app/features/backup_phrase/services/puzzle_reminder_bloc.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/packages/espressocash_app/test/features/outgoing_direct_payments/service_test.dart b/packages/espressocash_app/test/features/outgoing_direct_payments/service_test.dart index 91383d459..641913cc1 100644 --- a/packages/espressocash_app/test/features/outgoing_direct_payments/service_test.dart +++ b/packages/espressocash_app/test/features/outgoing_direct_payments/service_test.dart @@ -3,16 +3,17 @@ import 'dart:typed_data'; import 'package:dfunc/dfunc.dart'; import 'package:espressocash_api/espressocash_api.dart'; -import 'package:espressocash_app/core/accounts/bl/ec_wallet.dart'; import 'package:espressocash_app/core/amount.dart'; import 'package:espressocash_app/core/currency.dart'; import 'package:espressocash_app/core/tokens/token.dart'; -import 'package:espressocash_app/core/transactions/tx_sender.dart'; +import 'package:espressocash_app/features/accounts/models/ec_wallet.dart'; +import 'package:espressocash_app/features/outgoing_direct_payments/data/repository.dart'; import 'package:espressocash_app/features/outgoing_direct_payments/models/outgoing_direct_payment.dart'; -import 'package:espressocash_app/features/outgoing_direct_payments/src/bl/odp_service.dart'; -import 'package:espressocash_app/features/outgoing_direct_payments/src/bl/repository.dart'; -import 'package:espressocash_app/features/outgoing_direct_payments/src/bl/tx_created_watcher.dart'; -import 'package:espressocash_app/features/outgoing_direct_payments/src/bl/tx_sent_watcher.dart'; +import 'package:espressocash_app/features/outgoing_direct_payments/services/odp_service.dart'; +import 'package:espressocash_app/features/outgoing_direct_payments/services/tx_created_watcher.dart'; +import 'package:espressocash_app/features/outgoing_direct_payments/services/tx_sent_watcher.dart'; +import 'package:espressocash_app/features/transactions/models/tx_sender.dart'; +import 'package:espressocash_app/features/transactions/services/tx_sender.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/packages/espressocash_app/test/features/qr_scanner/qr_scanner_bloc_test.dart b/packages/espressocash_app/test/features/qr_scanner/qr_scanner_bloc_test.dart index 8ce1ca0e5..193371507 100644 --- a/packages/espressocash_app/test/features/qr_scanner/qr_scanner_bloc_test.dart +++ b/packages/espressocash_app/test/features/qr_scanner/qr_scanner_bloc_test.dart @@ -1,7 +1,7 @@ import 'package:bloc_test/bloc_test.dart'; import 'package:espressocash_app/features/qr_scanner/models/qr_address_data.dart'; import 'package:espressocash_app/features/qr_scanner/models/qr_scanner_request.dart'; -import 'package:espressocash_app/features/qr_scanner/src/bl/qr_scanner_bloc.dart'; +import 'package:espressocash_app/features/qr_scanner/services/qr_scanner_bloc.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:solana/solana.dart'; diff --git a/packages/espressocash_app/test/golden/golden_test.dart b/packages/espressocash_app/test/golden/golden_test.dart index 0e02f9791..03f02f6fc 100644 --- a/packages/espressocash_app/test/golden/golden_test.dart +++ b/packages/espressocash_app/test/golden/golden_test.dart @@ -1,17 +1,17 @@ import 'package:decimal/decimal.dart'; -import 'package:espressocash_app/app/screens/authenticated/wallet_flow/wallet_flow_screen.dart'; -import 'package:espressocash_app/core/accounts/bl/account.dart'; -import 'package:espressocash_app/core/accounts/bl/ec_wallet.dart'; import 'package:espressocash_app/core/amount.dart'; -import 'package:espressocash_app/core/balances/bl/balances_bloc.dart'; -import 'package:espressocash_app/core/conversion_rates/bl/conversion_rates_bloc.dart'; -import 'package:espressocash_app/core/conversion_rates/bl/repository.dart'; import 'package:espressocash_app/core/currency.dart'; import 'package:espressocash_app/core/tokens/token.dart'; import 'package:espressocash_app/core/user_preferences.dart'; -import 'package:espressocash_app/features/app_lock/src/bl/app_lock_bloc.dart'; -import 'package:espressocash_app/features/onboarding/src/widgets/no_email_and_password_screen.dart'; -import 'package:espressocash_app/features/sign_in/src/widgets/get_started_screen.dart'; +import 'package:espressocash_app/features/accounts/models/account.dart'; +import 'package:espressocash_app/features/accounts/models/ec_wallet.dart'; +import 'package:espressocash_app/features/app_lock/services/app_lock_bloc.dart'; +import 'package:espressocash_app/features/balances/services/balances_bloc.dart'; +import 'package:espressocash_app/features/conversion_rates/data/repository.dart'; +import 'package:espressocash_app/features/conversion_rates/services/conversion_rates_bloc.dart'; +import 'package:espressocash_app/features/onboarding/screens/no_email_and_password_screen.dart'; +import 'package:espressocash_app/features/sign_in/screens/get_started_screen.dart'; +import 'package:espressocash_app/features/wallet_flow/screens/wallet_flow_screen.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart';