refactor: restructure code (#997)

espresso-cash · Jun 17, 2023 · 9a58f90 · 9a58f90
1 parent d03dbce
commit 9a58f90
Show file tree

Hide file tree

Showing 286 changed files with 1,221 additions and 1,232 deletions.
diff --git 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
@@ -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 → packages/espressocash_app/lib/app.dart b/packages/espressocash_app/lib/app/app.dart → 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
@@ -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
@@ -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<LocalWallet> 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
@@ -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
@@ -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
@@ -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/...ash_app/lib/core/accounts/bl/account.dart → ...lib/features/accounts/models/account.dart b/...ash_app/lib/core/accounts/bl/account.dart → ...lib/features/accounts/models/account.dart
diff --git a/...h_app/lib/core/accounts/bl/ec_wallet.dart → ...b/features/accounts/models/ec_wallet.dart b/...h_app/lib/core/accounts/bl/ec_wallet.dart → ...b/features/accounts/models/ec_wallet.dart
diff --git a/...sh_app/lib/core/accounts/bl/mnemonic.dart → ...ib/features/accounts/models/mnemonic.dart b/...sh_app/lib/core/accounts/bl/mnemonic.dart → ...ib/features/accounts/models/mnemonic.dart
diff --git a/...ssocash_app/lib/core/accounts/module.dart → ...ash_app/lib/features/accounts/module.dart b/...ssocash_app/lib/core/accounts/module.dart → ...ash_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/...p/lib/core/accounts/bl/accounts_bloc.dart → ...ures/accounts/services/accounts_bloc.dart b/...p/lib/core/accounts/bl/accounts_bloc.dart → ...ures/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/.../lib/core/accounts/bl/accounts_event.dart → ...res/accounts/services/accounts_event.dart b/.../lib/core/accounts/bl/accounts_event.dart → ...res/accounts/services/accounts_event.dart
diff --git a/.../lib/core/accounts/bl/accounts_state.dart → ...res/accounts/services/accounts_state.dart b/.../lib/core/accounts/bl/accounts_state.dart → ...res/accounts/services/accounts_state.dart
diff --git a/...ures/activities/src/activity_builder.dart → ...res/activities/data/activity_builder.dart b/...ures/activities/src/activity_builder.dart → ...res/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/...es/src/pending_activities_repository.dart → ...s/data/pending_activities_repository.dart b/...es/src/pending_activities_repository.dart → ...s/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/...ctivities/src/transaction_repository.dart → ...tivities/data/transaction_repository.dart b/...ctivities/src/transaction_repository.dart → ...tivities/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/...es/src/updater/tx_updater_repository.dart → ...ctivities/data/tx_updater_repository.dart b/...es/src/updater/tx_updater_repository.dart → ...ctivities/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
diff --git a/...lib/features/activities/src/activity.dart → .../features/activities/models/activity.dart b/...lib/features/activities/src/activity.dart → .../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
@@ -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
@@ -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/...ticated/activities/activities_screen.dart → ...activities/screens/activities_screen.dart b/...ticated/activities/activities_screen.dart → ...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/...features/activities/src/updater/bloc.dart → ...ib/features/activities/services/bloc.dart b/...features/activities/src/updater/bloc.dart → ...ib/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/...s/activities/src/widgets/common_tile.dart → ...tures/activities/widgets/common_tile.dart b/...s/activities/src/widgets/common_tile.dart → ...tures/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/...s/activities/src/widgets/no_activity.dart → ...tures/activities/widgets/no_activity.dart b/...s/activities/src/widgets/no_activity.dart → ...tures/activities/widgets/no_activity.dart
diff --git a/...ures/activities/src/widgets/odp_tile.dart → ...features/activities/widgets/odp_tile.dart b/...ures/activities/src/widgets/odp_tile.dart → ...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/...res/activities/src/widgets/oskp_tile.dart → ...eatures/activities/widgets/oskp_tile.dart b/...res/activities/src/widgets/oskp_tile.dart → ...eatures/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/...ies/src/widgets/payment_request_tile.dart → ...ivities/widgets/payment_request_tile.dart b/...ies/src/widgets/payment_request_tile.dart → ...ivities/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
@@ -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/...atures/activities/src/widgets/styles.dart → ...b/features/activities/widgets/styles.dart b/...atures/activities/src/widgets/styles.dart → ...b/features/activities/widgets/styles.dart
diff --git a/...res/activities/src/widgets/swap_tile.dart → ...eatures/activities/widgets/swap_tile.dart b/...res/activities/src/widgets/swap_tile.dart → ...eatures/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/...ivities/src/widgets/transaction_item.dart → .../activities/widgets/transaction_item.dart b/...ivities/src/widgets/transaction_item.dart → .../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
@@ -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({