From ec70627b57ba21dff9ba5f86b9adea2f1e186b99 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 2 Jul 2024 13:51:55 +0200 Subject: [PATCH] reorganize code around --- .../app/lib/{common => }/config/dependencies.dart | 6 +++--- .../business/model => data/models}/destination.dart | 0 .../destination}/destination_repository.dart | 4 ++-- .../destination}/destination_repository_local.dart | 6 +++--- compass_app/app/lib/data/services/placeholder | 0 compass_app/app/lib/main.dart | 4 ++-- compass_app/app/lib/routing/router.dart | 2 +- .../app/lib/{common => ui/core}/themes/colors.dart | 0 .../lib/{common => ui/core}/themes/text_styles.dart | 0 .../app/lib/{common => ui/core}/themes/theme.dart | 2 +- .../lib/{common/widgets => ui/core/ui}/tag_chip.dart | 4 ++-- .../results/business}/search_destination_usecase.dart | 6 +++--- .../results/presentation/result_card.dart | 6 +++--- .../results/presentation/results_screen.dart | 6 +++--- .../results/presentation/results_viewmodel.dart | 6 +++--- compass_app/app/lib/{common => }/utils/result.dart | 0 .../destination_repository_local_test.dart | 4 ++-- .../business}/search_destination_usecase_test.dart | 8 ++++---- .../results/presentation/results_screen_test.dart | 10 +++++----- .../results/presentation/results_viewmodel_test.dart | 8 ++++---- 20 files changed, 41 insertions(+), 41 deletions(-) rename compass_app/app/lib/{common => }/config/dependencies.dart (74%) rename compass_app/app/lib/{features/results/business/model => data/models}/destination.dart (100%) rename compass_app/app/lib/{features/results/data => data/repositories/destination}/destination_repository.dart (57%) rename compass_app/app/lib/{features/results/data => data/repositories/destination}/destination_repository_local.dart (80%) create mode 100644 compass_app/app/lib/data/services/placeholder rename compass_app/app/lib/{common => ui/core}/themes/colors.dart (100%) rename compass_app/app/lib/{common => ui/core}/themes/text_styles.dart (100%) rename compass_app/app/lib/{common => ui/core}/themes/theme.dart (89%) rename compass_app/app/lib/{common/widgets => ui/core/ui}/tag_chip.dart (95%) rename compass_app/app/lib/{features/results/business/usecases => ui/results/business}/search_destination_usecase.dart (76%) rename compass_app/app/lib/{features => ui}/results/presentation/result_card.dart (87%) rename compass_app/app/lib/{features => ui}/results/presentation/results_screen.dart (92%) rename compass_app/app/lib/{features => ui}/results/presentation/results_viewmodel.dart (87%) rename compass_app/app/lib/{common => }/utils/result.dart (100%) rename compass_app/app/test/{features/results/data => data/repositories/destination}/destination_repository_local_test.dart (82%) rename compass_app/app/test/{features/results/business/usecases => ui/results/business}/search_destination_usecase_test.dart (86%) rename compass_app/app/test/{features => ui}/results/presentation/results_screen_test.dart (83%) rename compass_app/app/test/{features => ui}/results/presentation/results_viewmodel_test.dart (74%) diff --git a/compass_app/app/lib/common/config/dependencies.dart b/compass_app/app/lib/config/dependencies.dart similarity index 74% rename from compass_app/app/lib/common/config/dependencies.dart rename to compass_app/app/lib/config/dependencies.dart index f4f5ad371..67a8ac3f8 100644 --- a/compass_app/app/lib/common/config/dependencies.dart +++ b/compass_app/app/lib/config/dependencies.dart @@ -1,6 +1,6 @@ -import 'package:compass_app/features/results/business/usecases/search_destination_usecase.dart'; -import 'package:compass_app/features/results/data/destination_repository_local.dart'; -import 'package:compass_app/features/results/presentation/results_viewmodel.dart'; +import 'package:compass_app/data/repositories/destination/destination_repository_local.dart'; +import 'package:compass_app/ui/results/business/search_destination_usecase.dart'; +import 'package:compass_app/ui/results/presentation/results_viewmodel.dart'; import 'package:provider/provider.dart'; import 'package:provider/single_child_widget.dart'; diff --git a/compass_app/app/lib/features/results/business/model/destination.dart b/compass_app/app/lib/data/models/destination.dart similarity index 100% rename from compass_app/app/lib/features/results/business/model/destination.dart rename to compass_app/app/lib/data/models/destination.dart diff --git a/compass_app/app/lib/features/results/data/destination_repository.dart b/compass_app/app/lib/data/repositories/destination/destination_repository.dart similarity index 57% rename from compass_app/app/lib/features/results/data/destination_repository.dart rename to compass_app/app/lib/data/repositories/destination/destination_repository.dart index 0603585b8..3a16d2d3c 100644 --- a/compass_app/app/lib/features/results/data/destination_repository.dart +++ b/compass_app/app/lib/data/repositories/destination/destination_repository.dart @@ -1,5 +1,5 @@ -import 'package:compass_app/common/utils/result.dart'; -import 'package:compass_app/features/results/business/model/destination.dart'; +import 'package:compass_app/utils/result.dart'; +import 'package:compass_app/data/models/destination.dart'; /// Data source with all possible destinations abstract class DestinationRepository { diff --git a/compass_app/app/lib/features/results/data/destination_repository_local.dart b/compass_app/app/lib/data/repositories/destination/destination_repository_local.dart similarity index 80% rename from compass_app/app/lib/features/results/data/destination_repository_local.dart rename to compass_app/app/lib/data/repositories/destination/destination_repository_local.dart index f36df28b8..fe5910409 100644 --- a/compass_app/app/lib/features/results/data/destination_repository_local.dart +++ b/compass_app/app/lib/data/repositories/destination/destination_repository_local.dart @@ -1,8 +1,8 @@ import 'dart:convert'; -import 'package:compass_app/common/utils/result.dart'; -import 'package:compass_app/features/results/business/model/destination.dart'; -import 'package:compass_app/features/results/data/destination_repository.dart'; +import 'package:compass_app/utils/result.dart'; +import 'package:compass_app/data/models/destination.dart'; +import 'package:compass_app/data/repositories/destination/destination_repository.dart'; import 'package:flutter/services.dart' show rootBundle; diff --git a/compass_app/app/lib/data/services/placeholder b/compass_app/app/lib/data/services/placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/compass_app/app/lib/main.dart b/compass_app/app/lib/main.dart index e3a39feaa..7fc4944da 100644 --- a/compass_app/app/lib/main.dart +++ b/compass_app/app/lib/main.dart @@ -1,5 +1,5 @@ -import 'package:compass_app/common/config/dependencies.dart'; -import 'package:compass_app/common/themes/theme.dart'; +import 'package:compass_app/config/dependencies.dart'; +import 'package:compass_app/ui/core/themes/theme.dart'; import 'package:compass_app/routing/router.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/compass_app/app/lib/routing/router.dart b/compass_app/app/lib/routing/router.dart index a1fef14ac..4dce35b7e 100644 --- a/compass_app/app/lib/routing/router.dart +++ b/compass_app/app/lib/routing/router.dart @@ -1,4 +1,4 @@ -import 'package:compass_app/features/results/presentation/results_screen.dart'; +import 'package:compass_app/ui/results/presentation/results_screen.dart'; import 'package:go_router/go_router.dart'; /// Top go_router entry point diff --git a/compass_app/app/lib/common/themes/colors.dart b/compass_app/app/lib/ui/core/themes/colors.dart similarity index 100% rename from compass_app/app/lib/common/themes/colors.dart rename to compass_app/app/lib/ui/core/themes/colors.dart diff --git a/compass_app/app/lib/common/themes/text_styles.dart b/compass_app/app/lib/ui/core/themes/text_styles.dart similarity index 100% rename from compass_app/app/lib/common/themes/text_styles.dart rename to compass_app/app/lib/ui/core/themes/text_styles.dart diff --git a/compass_app/app/lib/common/themes/theme.dart b/compass_app/app/lib/ui/core/themes/theme.dart similarity index 89% rename from compass_app/app/lib/common/themes/theme.dart rename to compass_app/app/lib/ui/core/themes/theme.dart index bbc19c2ff..d939b4076 100644 --- a/compass_app/app/lib/common/themes/theme.dart +++ b/compass_app/app/lib/ui/core/themes/theme.dart @@ -1,4 +1,4 @@ -import 'package:compass_app/common/themes/colors.dart'; +import 'package:compass_app/ui/core/themes/colors.dart'; import 'package:flutter/material.dart'; class AppTheme { diff --git a/compass_app/app/lib/common/widgets/tag_chip.dart b/compass_app/app/lib/ui/core/ui/tag_chip.dart similarity index 95% rename from compass_app/app/lib/common/widgets/tag_chip.dart rename to compass_app/app/lib/ui/core/ui/tag_chip.dart index 8a62210ce..74e0ae205 100644 --- a/compass_app/app/lib/common/widgets/tag_chip.dart +++ b/compass_app/app/lib/ui/core/ui/tag_chip.dart @@ -1,7 +1,7 @@ import 'dart:ui'; -import 'package:compass_app/common/themes/colors.dart'; -import 'package:compass_app/common/themes/text_styles.dart'; +import 'package:compass_app/ui/core/themes/colors.dart'; +import 'package:compass_app/ui/core/themes/text_styles.dart'; import 'package:flutter/material.dart'; class TagChip extends StatelessWidget { diff --git a/compass_app/app/lib/features/results/business/usecases/search_destination_usecase.dart b/compass_app/app/lib/ui/results/business/search_destination_usecase.dart similarity index 76% rename from compass_app/app/lib/features/results/business/usecases/search_destination_usecase.dart rename to compass_app/app/lib/ui/results/business/search_destination_usecase.dart index 4d19aa090..31a62b5ad 100644 --- a/compass_app/app/lib/features/results/business/usecases/search_destination_usecase.dart +++ b/compass_app/app/lib/ui/results/business/search_destination_usecase.dart @@ -1,6 +1,6 @@ -import 'package:compass_app/common/utils/result.dart'; -import 'package:compass_app/features/results/business/model/destination.dart'; -import 'package:compass_app/features/results/data/destination_repository.dart'; +import 'package:compass_app/utils/result.dart'; +import 'package:compass_app/data/models/destination.dart'; +import 'package:compass_app/data/repositories/destination/destination_repository.dart'; /// Search Destinations Usecase class SearchDestinationUsecase { diff --git a/compass_app/app/lib/features/results/presentation/result_card.dart b/compass_app/app/lib/ui/results/presentation/result_card.dart similarity index 87% rename from compass_app/app/lib/features/results/presentation/result_card.dart rename to compass_app/app/lib/ui/results/presentation/result_card.dart index da280b7a8..912c5d8e6 100644 --- a/compass_app/app/lib/features/results/presentation/result_card.dart +++ b/compass_app/app/lib/ui/results/presentation/result_card.dart @@ -1,6 +1,6 @@ -import 'package:compass_app/common/themes/text_styles.dart'; -import 'package:compass_app/common/widgets/tag_chip.dart'; -import 'package:compass_app/features/results/business/model/destination.dart'; +import 'package:compass_app/ui/core/themes/text_styles.dart'; +import 'package:compass_app/ui/core/ui/tag_chip.dart'; +import 'package:compass_app/data/models/destination.dart'; import 'package:flutter/material.dart'; class ResultCard extends StatelessWidget { diff --git a/compass_app/app/lib/features/results/presentation/results_screen.dart b/compass_app/app/lib/ui/results/presentation/results_screen.dart similarity index 92% rename from compass_app/app/lib/features/results/presentation/results_screen.dart rename to compass_app/app/lib/ui/results/presentation/results_screen.dart index 80ba5f9a5..501729500 100644 --- a/compass_app/app/lib/features/results/presentation/results_screen.dart +++ b/compass_app/app/lib/ui/results/presentation/results_screen.dart @@ -1,6 +1,6 @@ -import 'package:compass_app/common/themes/colors.dart'; -import 'package:compass_app/features/results/presentation/result_card.dart'; -import 'package:compass_app/features/results/presentation/results_viewmodel.dart'; +import 'package:compass_app/ui/core/themes/colors.dart'; +import 'package:compass_app/ui/results/presentation/result_card.dart'; +import 'package:compass_app/ui/results/presentation/results_viewmodel.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/compass_app/app/lib/features/results/presentation/results_viewmodel.dart b/compass_app/app/lib/ui/results/presentation/results_viewmodel.dart similarity index 87% rename from compass_app/app/lib/features/results/presentation/results_viewmodel.dart rename to compass_app/app/lib/ui/results/presentation/results_viewmodel.dart index 160004482..0f41a53b6 100644 --- a/compass_app/app/lib/features/results/presentation/results_viewmodel.dart +++ b/compass_app/app/lib/ui/results/presentation/results_viewmodel.dart @@ -1,6 +1,6 @@ -import 'package:compass_app/common/utils/result.dart'; -import 'package:compass_app/features/results/business/model/destination.dart'; -import 'package:compass_app/features/results/business/usecases/search_destination_usecase.dart'; +import 'package:compass_app/ui/results/business/search_destination_usecase.dart'; +import 'package:compass_app/utils/result.dart'; +import 'package:compass_app/data/models/destination.dart'; import 'package:flutter/cupertino.dart'; /// Results screen view model diff --git a/compass_app/app/lib/common/utils/result.dart b/compass_app/app/lib/utils/result.dart similarity index 100% rename from compass_app/app/lib/common/utils/result.dart rename to compass_app/app/lib/utils/result.dart diff --git a/compass_app/app/test/features/results/data/destination_repository_local_test.dart b/compass_app/app/test/data/repositories/destination/destination_repository_local_test.dart similarity index 82% rename from compass_app/app/test/features/results/data/destination_repository_local_test.dart rename to compass_app/app/test/data/repositories/destination/destination_repository_local_test.dart index e12c07d65..17141f794 100644 --- a/compass_app/app/test/features/results/data/destination_repository_local_test.dart +++ b/compass_app/app/test/data/repositories/destination/destination_repository_local_test.dart @@ -1,6 +1,6 @@ -import 'package:compass_app/common/utils/result.dart'; -import 'package:compass_app/features/results/data/destination_repository_local.dart'; +import 'package:compass_app/utils/result.dart'; +import 'package:compass_app/data/repositories/destination/destination_repository_local.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/compass_app/app/test/features/results/business/usecases/search_destination_usecase_test.dart b/compass_app/app/test/ui/results/business/search_destination_usecase_test.dart similarity index 86% rename from compass_app/app/test/features/results/business/usecases/search_destination_usecase_test.dart rename to compass_app/app/test/ui/results/business/search_destination_usecase_test.dart index 2ab0a0565..e6e46fe2f 100644 --- a/compass_app/app/test/features/results/business/usecases/search_destination_usecase_test.dart +++ b/compass_app/app/test/ui/results/business/search_destination_usecase_test.dart @@ -1,7 +1,7 @@ -import 'package:compass_app/common/utils/result.dart'; -import 'package:compass_app/features/results/business/model/destination.dart'; -import 'package:compass_app/features/results/business/usecases/search_destination_usecase.dart'; -import 'package:compass_app/features/results/data/destination_repository.dart'; +import 'package:compass_app/ui/results/business/search_destination_usecase.dart'; +import 'package:compass_app/utils/result.dart'; +import 'package:compass_app/data/models/destination.dart'; +import 'package:compass_app/data/repositories/destination/destination_repository.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/compass_app/app/test/features/results/presentation/results_screen_test.dart b/compass_app/app/test/ui/results/presentation/results_screen_test.dart similarity index 83% rename from compass_app/app/test/features/results/presentation/results_screen_test.dart rename to compass_app/app/test/ui/results/presentation/results_screen_test.dart index c1fa569c0..b7879b311 100644 --- a/compass_app/app/test/features/results/presentation/results_screen_test.dart +++ b/compass_app/app/test/ui/results/presentation/results_screen_test.dart @@ -1,10 +1,10 @@ -import 'package:compass_app/common/utils/result.dart'; -import 'package:compass_app/features/results/business/model/destination.dart'; -import 'package:compass_app/features/results/business/usecases/search_destination_usecase.dart'; -import 'package:compass_app/features/results/presentation/results_viewmodel.dart'; +import 'package:compass_app/ui/results/business/search_destination_usecase.dart'; +import 'package:compass_app/ui/results/presentation/results_screen.dart'; +import 'package:compass_app/ui/results/presentation/results_viewmodel.dart'; +import 'package:compass_app/utils/result.dart'; +import 'package:compass_app/data/models/destination.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:flutter/material.dart'; -import 'package:compass_app/features/results/presentation/results_screen.dart'; import 'package:mocktail_image_network/mocktail_image_network.dart'; import 'package:provider/provider.dart'; diff --git a/compass_app/app/test/features/results/presentation/results_viewmodel_test.dart b/compass_app/app/test/ui/results/presentation/results_viewmodel_test.dart similarity index 74% rename from compass_app/app/test/features/results/presentation/results_viewmodel_test.dart rename to compass_app/app/test/ui/results/presentation/results_viewmodel_test.dart index 92f0b62c1..bb6bb4fff 100644 --- a/compass_app/app/test/features/results/presentation/results_viewmodel_test.dart +++ b/compass_app/app/test/ui/results/presentation/results_viewmodel_test.dart @@ -1,7 +1,7 @@ -import 'package:compass_app/common/utils/result.dart'; -import 'package:compass_app/features/results/business/model/destination.dart'; -import 'package:compass_app/features/results/business/usecases/search_destination_usecase.dart'; -import 'package:compass_app/features/results/presentation/results_viewmodel.dart'; +import 'package:compass_app/ui/results/business/search_destination_usecase.dart'; +import 'package:compass_app/ui/results/presentation/results_viewmodel.dart'; +import 'package:compass_app/utils/result.dart'; +import 'package:compass_app/data/models/destination.dart'; import 'package:flutter_test/flutter_test.dart'; void main() {