diff --git a/.env.template b/.env.template deleted file mode 100644 index b2af0ed5e..000000000 --- a/.env.template +++ /dev/null @@ -1,2 +0,0 @@ -MAPS_API_KEY=XXXXXXXXXXXXXXXXXXX -GH_API_TOKEN=XXXXXXXXXXXXXXXXXXX diff --git a/lib/core/constants/app_info.dart b/lib/constants/app_info.dart similarity index 100% rename from lib/core/constants/app_info.dart rename to lib/constants/app_info.dart diff --git a/lib/core/constants/markers.dart b/lib/constants/markers.dart similarity index 100% rename from lib/core/constants/markers.dart rename to lib/constants/markers.dart diff --git a/lib/core/constants/preferences_flags.dart b/lib/constants/preferences_flags.dart similarity index 100% rename from lib/core/constants/preferences_flags.dart rename to lib/constants/preferences_flags.dart diff --git a/lib/core/constants/update_code.dart b/lib/constants/update_code.dart similarity index 100% rename from lib/core/constants/update_code.dart rename to lib/constants/update_code.dart diff --git a/lib/core/constants/urls.dart b/lib/constants/urls.dart similarity index 100% rename from lib/core/constants/urls.dart rename to lib/constants/urls.dart diff --git a/lib/core/constants/widget_helper.dart b/lib/constants/widget_helper.dart similarity index 100% rename from lib/core/constants/widget_helper.dart rename to lib/constants/widget_helper.dart diff --git a/lib/core/services/analytics_service.dart b/lib/features/app/analytics/analytics_service.dart similarity index 100% rename from lib/core/services/analytics_service.dart rename to lib/features/app/analytics/analytics_service.dart diff --git a/lib/core/services/remote_config_service.dart b/lib/features/app/analytics/remote_config_service.dart similarity index 97% rename from lib/core/services/remote_config_service.dart rename to lib/features/app/analytics/remote_config_service.dart index 7e163ee0a..301a87935 100644 --- a/lib/core/services/remote_config_service.dart +++ b/lib/features/app/analytics/remote_config_service.dart @@ -4,8 +4,8 @@ import 'package:firebase_remote_config/firebase_remote_config.dart'; // Project imports: -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/utils/locator.dart'; //OTHERS diff --git a/lib/core/services/internal_info_service.dart b/lib/features/app/error/internal_info_service.dart similarity index 92% rename from lib/core/services/internal_info_service.dart rename to lib/features/app/error/internal_info_service.dart index d5ecbfe79..e870e564f 100644 --- a/lib/core/services/internal_info_service.dart +++ b/lib/features/app/error/internal_info_service.dart @@ -6,8 +6,8 @@ import 'package:device_info_plus/device_info_plus.dart'; import 'package:package_info_plus/package_info_plus.dart'; // Project imports: -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/utils/locator.dart'; // UTILS diff --git a/lib/ui/views/not_found_view.dart b/lib/features/app/error/not_found/not_found_view.dart similarity index 96% rename from lib/ui/views/not_found_view.dart rename to lib/features/app/error/not_found/not_found_view.dart index 6e2a6da09..a1af84d8a 100644 --- a/lib/ui/views/not_found_view.dart +++ b/lib/features/app/error/not_found/not_found_view.dart @@ -7,8 +7,8 @@ import 'package:rive/rive.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/viewmodels/not_found_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/features/app/error/not_found/not_found_viewmodel.dart'; +import 'package:notredame/utils/app_theme.dart'; class NotFoundView extends StatefulWidget { final String? pageName; diff --git a/lib/core/viewmodels/not_found_viewmodel.dart b/lib/features/app/error/not_found/not_found_viewmodel.dart similarity index 83% rename from lib/core/viewmodels/not_found_viewmodel.dart rename to lib/features/app/error/not_found/not_found_viewmodel.dart index 98dc1c958..31da02cef 100644 --- a/lib/core/viewmodels/not_found_viewmodel.dart +++ b/lib/features/app/error/not_found/not_found_viewmodel.dart @@ -3,11 +3,11 @@ import 'package:rive/rive.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/rive_animation_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/presentation/rive_animation_service.dart'; +import 'package:notredame/utils/locator.dart'; class NotFoundViewModel extends BaseViewModel { static const String tag = "NotFoundViewModel"; diff --git a/lib/ui/views/outage_view.dart b/lib/features/app/error/outage/outage_view.dart similarity index 96% rename from lib/ui/views/outage_view.dart rename to lib/features/app/error/outage/outage_view.dart index 6345b6e38..0f500e219 100644 --- a/lib/ui/views/outage_view.dart +++ b/lib/features/app/error/outage/outage_view.dart @@ -7,10 +7,10 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/urls.dart'; -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/outage_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/constants/urls.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/app/error/outage/outage_viewmodel.dart'; +import 'package:notredame/utils/app_theme.dart'; class OutageView extends StatelessWidget { @override diff --git a/lib/core/viewmodels/outage_viewmodel.dart b/lib/features/app/error/outage/outage_viewmodel.dart similarity index 81% rename from lib/core/viewmodels/outage_viewmodel.dart rename to lib/features/app/error/outage/outage_viewmodel.dart index aadd05e1d..27b42310d 100644 --- a/lib/core/viewmodels/outage_viewmodel.dart +++ b/lib/features/app/error/outage/outage_viewmodel.dart @@ -5,11 +5,11 @@ import 'package:flutter/material.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/views/startup_view.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/features/app/startup/startup_view.dart'; class OutageViewModel extends BaseViewModel { int _lastTap = DateTime.now().millisecondsSinceEpoch; diff --git a/lib/firebase_options.dart b/lib/features/app/integration/firebase_options.dart similarity index 100% rename from lib/firebase_options.dart rename to lib/features/app/integration/firebase_options.dart diff --git a/lib/core/services/github_api.dart b/lib/features/app/integration/github_api.dart similarity index 94% rename from lib/core/services/github_api.dart rename to lib/features/app/integration/github_api.dart index 2e5ebf4e0..5adf6817c 100644 --- a/lib/core/services/github_api.dart +++ b/lib/features/app/integration/github_api.dart @@ -14,10 +14,10 @@ import 'package:package_info_plus/package_info_plus.dart'; import 'package:path_provider/path_provider.dart'; // Project imports: -import 'package:notredame/core/models/feedback_issue.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/internal_info_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/more/feedback/models/feedback_issue.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/error/internal_info_service.dart'; +import 'package:notredame/utils/locator.dart'; class GithubApi { static const String tag = "GithubApi"; diff --git a/lib/core/services/launch_url_service.dart b/lib/features/app/integration/launch_url_service.dart similarity index 94% rename from lib/core/services/launch_url_service.dart rename to lib/features/app/integration/launch_url_service.dart index a7b7457b6..03dc55624 100644 --- a/lib/core/services/launch_url_service.dart +++ b/lib/features/app/integration/launch_url_service.dart @@ -6,9 +6,9 @@ import 'package:flutter_custom_tabs/flutter_custom_tabs.dart' as custom_tabs; import 'package:url_launcher/url_launcher.dart' as url_launch; // Project imports: -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; class LaunchUrlService { final SettingsManager settingsManager = locator(); diff --git a/lib/core/services/networking_service.dart b/lib/features/app/integration/networking_service.dart similarity index 100% rename from lib/core/services/networking_service.dart rename to lib/features/app/integration/networking_service.dart diff --git a/lib/ui/widgets/navigation_rail.dart b/lib/features/app/navigation/navigation_rail.dart similarity index 90% rename from lib/ui/widgets/navigation_rail.dart rename to lib/features/app/navigation/navigation_rail.dart index a4adf875b..cd4f47c14 100644 --- a/lib/ui/widgets/navigation_rail.dart +++ b/lib/features/app/navigation/navigation_rail.dart @@ -6,13 +6,13 @@ import 'package:feature_discovery/feature_discovery.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; // Project imports: -import 'package:notredame/core/constants/discovery_ids.dart'; -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/utils/discovery_components.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/welcome/discovery/discovery_components.dart'; /// Bottom navigation bar for the application. class NavRail extends StatefulWidget { diff --git a/lib/core/services/navigation_service.dart b/lib/features/app/navigation/navigation_service.dart similarity index 89% rename from lib/core/services/navigation_service.dart rename to lib/features/app/navigation/navigation_service.dart index 90954dbd5..7757080d6 100644 --- a/lib/core/services/navigation_service.dart +++ b/lib/features/app/navigation/navigation_service.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; +import 'package:notredame/utils/locator.dart'; //SERVICE diff --git a/lib/ui/router.dart b/lib/features/app/navigation/router.dart similarity index 74% rename from lib/ui/router.dart rename to lib/features/app/navigation/router.dart index a7ec2beb5..f3b77d52d 100644 --- a/lib/ui/router.dart +++ b/lib/features/app/navigation/router.dart @@ -5,32 +5,32 @@ import 'package:flutter/material.dart'; import 'package:ets_api_clients/models.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/constants/update_code.dart'; -import 'package:notredame/core/models/quick_link.dart'; -import 'package:notredame/ui/views/about_view.dart'; -import 'package:notredame/ui/views/author_view.dart'; -import 'package:notredame/ui/views/choose_language_view.dart'; -import 'package:notredame/ui/views/contributors_view.dart'; -import 'package:notredame/ui/views/dashboard_view.dart'; -import 'package:notredame/ui/views/ets_view.dart'; -import 'package:notredame/ui/views/faq_view.dart'; -import 'package:notredame/ui/views/feedback_view.dart'; -import 'package:notredame/ui/views/grade_details_view.dart'; -import 'package:notredame/ui/views/login_view.dart'; -import 'package:notredame/ui/views/more_view.dart'; -import 'package:notredame/ui/views/news_details_view.dart'; -import 'package:notredame/ui/views/news_view.dart'; -import 'package:notredame/ui/views/not_found_view.dart'; -import 'package:notredame/ui/views/outage_view.dart'; -import 'package:notredame/ui/views/quick_links_view.dart'; -import 'package:notredame/ui/views/schedule_default_view.dart'; -import 'package:notredame/ui/views/schedule_view.dart'; -import 'package:notredame/ui/views/security_view.dart'; -import 'package:notredame/ui/views/settings_view.dart'; -import 'package:notredame/ui/views/startup_view.dart'; -import 'package:notredame/ui/views/student_view.dart'; -import 'package:notredame/ui/widgets/link_web_view.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/constants/update_code.dart'; +import 'package:notredame/features/ets/events/author/author_view.dart'; +import 'package:notredame/features/ets/ets_view.dart'; +import 'package:notredame/features/ets/events/news/news-details/news_details_view.dart'; +import 'package:notredame/features/ets/events/news/news_view.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; +import 'package:notredame/features/more/about/about_view.dart'; +import 'package:notredame/features/more/settings/choose_language_view.dart'; +import 'package:notredame/features/more/contributors/contributors_view.dart'; +import 'package:notredame/features/dashboard/dashboard_view.dart'; +import 'package:notredame/features/more/faq/faq_view.dart'; +import 'package:notredame/features/more/feedback/feedback_view.dart'; +import 'package:notredame/features/student/grades/grade_details/grade_details_view.dart'; +import 'package:notredame/features/welcome/login/login_view.dart'; +import 'package:notredame/features/more/more_view.dart'; +import 'package:notredame/features/app/error/not_found/not_found_view.dart'; +import 'package:notredame/features/app/error/outage/outage_view.dart'; +import 'package:notredame/features/ets/quick-link/quick_links_view.dart'; +import 'package:notredame/features/schedule/schedule_default/schedule_default_view.dart'; +import 'package:notredame/features/schedule/schedule_view.dart'; +import 'package:notredame/features/ets/quick-link/widgets/security-info/security_view.dart'; +import 'package:notredame/features/more/settings/settings_view.dart'; +import 'package:notredame/features/app/startup/startup_view.dart'; +import 'package:notredame/features/student/student_view.dart'; +import 'package:notredame/features/app/widgets/link_web_view.dart'; Route generateRoute(RouteSettings routeSettings) { switch (routeSettings.name) { diff --git a/lib/core/constants/router_paths.dart b/lib/features/app/navigation/router_paths.dart similarity index 100% rename from lib/core/constants/router_paths.dart rename to lib/features/app/navigation/router_paths.dart diff --git a/lib/core/services/rive_animation_service.dart b/lib/features/app/presentation/rive_animation_service.dart similarity index 95% rename from lib/core/services/rive_animation_service.dart rename to lib/features/app/presentation/rive_animation_service.dart index 4a8079620..ff9df266b 100644 --- a/lib/core/services/rive_animation_service.dart +++ b/lib/features/app/presentation/rive_animation_service.dart @@ -5,7 +5,7 @@ import 'package:flutter/services.dart'; import 'package:rive/rive.dart'; // Project imports: -import 'package:notredame/core/utils/animation_exception.dart'; +import 'package:notredame/utils/animation_exception.dart'; /// Manage the rive animation for the application class RiveAnimationService { diff --git a/lib/core/extensions/webview_controller_extension.dart b/lib/features/app/presentation/webview_controller_extension.dart similarity index 100% rename from lib/core/extensions/webview_controller_extension.dart rename to lib/features/app/presentation/webview_controller_extension.dart diff --git a/lib/core/managers/author_repository.dart b/lib/features/app/repository/author_repository.dart similarity index 92% rename from lib/core/managers/author_repository.dart rename to lib/features/app/repository/author_repository.dart index 3ede3cdeb..4bb3ccc15 100644 --- a/lib/core/managers/author_repository.dart +++ b/lib/features/app/repository/author_repository.dart @@ -5,7 +5,7 @@ import 'package:ets_api_clients/clients.dart'; import 'package:ets_api_clients/models.dart'; // Project imports: -import 'package:notredame/locator.dart'; +import 'package:notredame/utils/locator.dart'; /// Repository to access authors class AuthorRepository { diff --git a/lib/core/managers/course_repository.dart b/lib/features/app/repository/course_repository.dart similarity index 97% rename from lib/core/managers/course_repository.dart rename to lib/features/app/repository/course_repository.dart index 0a12466ff..f944f6de4 100644 --- a/lib/core/managers/course_repository.dart +++ b/lib/features/app/repository/course_repository.dart @@ -11,13 +11,13 @@ import 'package:ets_api_clients/models.dart'; import 'package:logger/logger.dart'; // Project imports: -import 'package:notredame/core/constants/semester_codes.dart'; -import 'package:notredame/core/managers/cache_manager.dart'; -import 'package:notredame/core/managers/user_repository.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/core/utils/cache_exception.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/storage/cache_manager.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/student/semester_codes.dart'; +import 'package:notredame/utils/cache_exception.dart'; +import 'package:notredame/utils/locator.dart'; /// Repository to access all the data related to courses taken by the student class CourseRepository { diff --git a/lib/core/managers/news_repository.dart b/lib/features/app/repository/news_repository.dart similarity index 88% rename from lib/core/managers/news_repository.dart rename to lib/features/app/repository/news_repository.dart index 9b6e3e158..c965bcc96 100644 --- a/lib/core/managers/news_repository.dart +++ b/lib/features/app/repository/news_repository.dart @@ -5,8 +5,8 @@ import 'package:ets_api_clients/clients.dart'; import 'package:ets_api_clients/models.dart'; // Project imports: -import 'package:notredame/core/managers/cache_manager.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/storage/cache_manager.dart'; +import 'package:notredame/utils/locator.dart'; /// Repository to access all the news class NewsRepository { diff --git a/lib/core/managers/quick_link_repository.dart b/lib/features/app/repository/quick_link_repository.dart similarity index 75% rename from lib/core/managers/quick_link_repository.dart rename to lib/features/app/repository/quick_link_repository.dart index 3bc2392c5..ca6142571 100644 --- a/lib/core/managers/quick_link_repository.dart +++ b/lib/features/app/repository/quick_link_repository.dart @@ -5,11 +5,11 @@ import 'dart:convert'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; // Project imports: -import 'package:notredame/core/constants/quick_links.dart'; -import 'package:notredame/core/managers/cache_manager.dart'; -import 'package:notredame/core/models/quick_link.dart'; -import 'package:notredame/core/models/quick_link_data.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_links.dart'; +import 'package:notredame/features/app/storage/cache_manager.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link_data.dart'; +import 'package:notredame/utils/locator.dart'; class QuickLinkRepository { final CacheManager _cacheManager = locator(); diff --git a/lib/core/managers/user_repository.dart b/lib/features/app/repository/user_repository.dart similarity index 97% rename from lib/core/managers/user_repository.dart rename to lib/features/app/repository/user_repository.dart index 043313f1c..3e5506f3f 100644 --- a/lib/core/managers/user_repository.dart +++ b/lib/features/app/repository/user_repository.dart @@ -13,11 +13,11 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:logger/logger.dart'; // Project imports: -import 'package:notredame/core/managers/cache_manager.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/core/utils/cache_exception.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/storage/cache_manager.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/utils/cache_exception.dart'; +import 'package:notredame/utils/locator.dart'; class UserRepository { static const String tag = "UserRepository"; diff --git a/lib/ui/views/startup_view.dart b/lib/features/app/startup/startup_view.dart similarity index 92% rename from lib/ui/views/startup_view.dart rename to lib/features/app/startup/startup_view.dart index ec243d0e2..cddd2de22 100644 --- a/lib/ui/views/startup_view.dart +++ b/lib/features/app/startup/startup_view.dart @@ -6,9 +6,9 @@ import 'package:flutter_svg/flutter_svg.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/startup_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/app/startup/startup_viewmodel.dart'; +import 'package:notredame/utils/app_theme.dart'; class StartUpView extends StatelessWidget { @override diff --git a/lib/core/viewmodels/startup_viewmodel.dart b/lib/features/app/startup/startup_viewmodel.dart similarity index 86% rename from lib/core/viewmodels/startup_viewmodel.dart rename to lib/features/app/startup/startup_viewmodel.dart index 38497eca8..33d50bccc 100644 --- a/lib/core/viewmodels/startup_viewmodel.dart +++ b/lib/features/app/startup/startup_viewmodel.dart @@ -2,18 +2,18 @@ import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/constants/update_code.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/managers/user_repository.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/internal_info_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/core/services/preferences_service.dart'; -import 'package:notredame/core/services/siren_flutter_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/constants/update_code.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/error/internal_info_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/app/storage/preferences_service.dart'; +import 'package:notredame/features/app/storage/siren_flutter_service.dart'; +import 'package:notredame/utils/locator.dart'; class StartUpViewModel extends BaseViewModel { /// Manage the settings diff --git a/lib/core/managers/cache_manager.dart b/lib/features/app/storage/cache_manager.dart similarity index 92% rename from lib/core/managers/cache_manager.dart rename to lib/features/app/storage/cache_manager.dart index 438fd203c..0c533b316 100644 --- a/lib/core/managers/cache_manager.dart +++ b/lib/features/app/storage/cache_manager.dart @@ -5,9 +5,9 @@ import 'dart:convert'; import 'package:flutter_cache_manager/flutter_cache_manager.dart' as lib; // Project imports: -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/utils/cache_exception.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/utils/cache_exception.dart'; +import 'package:notredame/utils/locator.dart'; /// Abstraction of the cache management system. class CacheManager { diff --git a/lib/core/services/preferences_service.dart b/lib/features/app/storage/preferences_service.dart similarity index 98% rename from lib/core/services/preferences_service.dart rename to lib/features/app/storage/preferences_service.dart index a488b5eea..10f1c57f4 100644 --- a/lib/core/services/preferences_service.dart +++ b/lib/features/app/storage/preferences_service.dart @@ -4,7 +4,7 @@ import 'package:shared_preferences/shared_preferences.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; +import 'package:notredame/constants/preferences_flags.dart'; // CONSTANT diff --git a/lib/core/services/siren_flutter_service.dart b/lib/features/app/storage/siren_flutter_service.dart similarity index 100% rename from lib/core/services/siren_flutter_service.dart rename to lib/features/app/storage/siren_flutter_service.dart diff --git a/lib/core/services/app_widget_service.dart b/lib/features/app/widgets/app_widget_service.dart similarity index 91% rename from lib/core/services/app_widget_service.dart rename to lib/features/app/widgets/app_widget_service.dart index 9c5725f16..d5d586340 100644 --- a/lib/core/services/app_widget_service.dart +++ b/lib/features/app/widgets/app_widget_service.dart @@ -5,10 +5,10 @@ import 'package:flutter/services.dart'; import 'package:home_widget/home_widget.dart'; // Project imports: -import 'package:notredame/core/constants/widget_helper.dart'; -import 'package:notredame/core/models/widget_models.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/constants/widget_helper.dart'; +import 'package:notredame/features/student/grades/widget_models.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/utils/locator.dart'; // MODEL diff --git a/lib/ui/widgets/base_scaffold.dart b/lib/features/app/widgets/base_scaffold.dart similarity index 92% rename from lib/ui/widgets/base_scaffold.dart rename to lib/features/app/widgets/base_scaffold.dart index 38a43e813..43121295d 100644 --- a/lib/ui/widgets/base_scaffold.dart +++ b/lib/features/app/widgets/base_scaffold.dart @@ -9,13 +9,13 @@ import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; // Project imports: -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/widgets/bottom_bar.dart'; -import 'package:notredame/ui/widgets/navigation_rail.dart'; -import 'package:notredame/ui/utils/loading.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/app/navigation/navigation_rail.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/utils/loading.dart'; +import 'package:notredame/features/app/widgets/bottom_bar.dart'; /// Basic Scaffold to avoid boilerplate code in the application. /// Contains a loader controlled by [_isLoading] diff --git a/lib/ui/widgets/bottom_bar.dart b/lib/features/app/widgets/bottom_bar.dart similarity index 90% rename from lib/ui/widgets/bottom_bar.dart rename to lib/features/app/widgets/bottom_bar.dart index 866a0aa54..a61fd132a 100644 --- a/lib/ui/widgets/bottom_bar.dart +++ b/lib/features/app/widgets/bottom_bar.dart @@ -6,13 +6,13 @@ import 'package:feature_discovery/feature_discovery.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; // Project imports: -import 'package:notredame/core/constants/discovery_ids.dart'; -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/utils/discovery_components.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/welcome/discovery/discovery_components.dart'; /// Bottom navigation bar for the application. class BottomBar extends StatefulWidget { diff --git a/lib/ui/widgets/dismissible_card.dart b/lib/features/app/widgets/dismissible_card.dart similarity index 100% rename from lib/ui/widgets/dismissible_card.dart rename to lib/features/app/widgets/dismissible_card.dart diff --git a/lib/ui/widgets/link_web_view.dart b/lib/features/app/widgets/link_web_view.dart similarity index 88% rename from lib/ui/widgets/link_web_view.dart rename to lib/features/app/widgets/link_web_view.dart index 5f40d0fb8..12d9c6668 100644 --- a/lib/ui/widgets/link_web_view.dart +++ b/lib/features/app/widgets/link_web_view.dart @@ -5,8 +5,8 @@ import 'package:flutter/material.dart'; import 'package:webview_flutter/webview_flutter.dart'; // Project imports: -import 'package:notredame/core/models/quick_link.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; class LinkWebView extends StatefulWidget { final QuickLink _links; diff --git a/lib/ui/widgets/scaffold_safe_area.dart b/lib/features/app/widgets/scaffold_safe_area.dart similarity index 96% rename from lib/ui/widgets/scaffold_safe_area.dart rename to lib/features/app/widgets/scaffold_safe_area.dart index 963c639c6..a7283b2b5 100644 --- a/lib/ui/widgets/scaffold_safe_area.dart +++ b/lib/features/app/widgets/scaffold_safe_area.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; // Project imports: -import 'package:notredame/ui/utils/loading.dart'; +import 'package:notredame/utils/loading.dart'; /// ScaffoldSafeArea to avoid boilerplate code in the application. /// Contains a loader controlled by [_isLoading] diff --git a/lib/ui/views/dashboard_view.dart b/lib/features/dashboard/dashboard_view.dart similarity index 93% rename from lib/ui/views/dashboard_view.dart rename to lib/features/dashboard/dashboard_view.dart index c3e1829a1..f74c15104 100644 --- a/lib/ui/views/dashboard_view.dart +++ b/lib/features/dashboard/dashboard_view.dart @@ -11,25 +11,25 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/discovery_ids.dart'; -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/constants/progress_bar_text_options.dart'; -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/constants/update_code.dart'; -import 'package:notredame/core/constants/urls.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/dashboard_viewmodel.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/utils/discovery_components.dart'; -import 'package:notredame/ui/utils/loading.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; -import 'package:notredame/ui/widgets/course_activity_tile.dart'; -import 'package:notredame/ui/widgets/dismissible_card.dart'; -import 'package:notredame/ui/widgets/grade_button.dart'; -import 'package:notredame/ui/widgets/haptics_container.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/dashboard/progress_bar_text_options.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/constants/update_code.dart'; +import 'package:notredame/constants/urls.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/dashboard/dashboard_viewmodel.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/welcome/discovery/discovery_components.dart'; +import 'package:notredame/utils/loading.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; +import 'package:notredame/features/dashboard/widgets/course_activity_tile.dart'; +import 'package:notredame/features/app/widgets/dismissible_card.dart'; +import 'package:notredame/features/student/grades/widgets/grade_button.dart'; +import 'package:notredame/features/dashboard/widgets/haptics_container.dart'; class DashboardView extends StatefulWidget { final UpdateCode updateCode; diff --git a/lib/core/viewmodels/dashboard_viewmodel.dart b/lib/features/dashboard/dashboard_viewmodel.dart similarity index 93% rename from lib/core/viewmodels/dashboard_viewmodel.dart rename to lib/features/dashboard/dashboard_viewmodel.dart index 269138530..97ed31441 100644 --- a/lib/core/viewmodels/dashboard_viewmodel.dart +++ b/lib/features/dashboard/dashboard_viewmodel.dart @@ -12,25 +12,25 @@ import 'package:fluttertoast/fluttertoast.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/discovery_ids.dart'; -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/constants/progress_bar_text_options.dart'; -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/constants/update_code.dart'; -import 'package:notredame/core/constants/widget_helper.dart'; -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/models/widget_models.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/app_widget_service.dart'; -import 'package:notredame/core/services/in_app_review_service.dart'; -import 'package:notredame/core/services/launch_url_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/preferences_service.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; -import 'package:notredame/core/services/siren_flutter_service.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/discovery_components.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/dashboard/progress_bar_text_options.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/constants/update_code.dart'; +import 'package:notredame/constants/widget_helper.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/student/grades/widget_models.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/widgets/app_widget_service.dart'; +import 'package:notredame/features/more/feedback/in_app_review_service.dart'; +import 'package:notredame/features/app/integration/launch_url_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/storage/preferences_service.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; +import 'package:notredame/features/app/storage/siren_flutter_service.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/features/welcome/discovery/discovery_components.dart'; class DashboardViewModel extends FutureViewModel> { static const String tag = "DashboardViewModel"; diff --git a/lib/core/constants/progress_bar_text_options.dart b/lib/features/dashboard/progress_bar_text_options.dart similarity index 100% rename from lib/core/constants/progress_bar_text_options.dart rename to lib/features/dashboard/progress_bar_text_options.dart diff --git a/lib/ui/widgets/course_activity_tile.dart b/lib/features/dashboard/widgets/course_activity_tile.dart similarity index 100% rename from lib/ui/widgets/course_activity_tile.dart rename to lib/features/dashboard/widgets/course_activity_tile.dart diff --git a/lib/ui/widgets/haptics_container.dart b/lib/features/dashboard/widgets/haptics_container.dart similarity index 100% rename from lib/ui/widgets/haptics_container.dart rename to lib/features/dashboard/widgets/haptics_container.dart diff --git a/lib/ui/views/ets_view.dart b/lib/features/ets/ets_view.dart similarity index 87% rename from lib/ui/views/ets_view.dart rename to lib/features/ets/ets_view.dart index 2c528a142..88cc8e888 100644 --- a/lib/ui/views/ets_view.dart +++ b/lib/features/ets/ets_view.dart @@ -3,13 +3,13 @@ import 'package:flutter/material.dart'; // Package imports: import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; +import 'package:notredame/utils/locator.dart'; // Project imports: -import 'package:notredame/ui/views/news_view.dart'; -import 'package:notredame/ui/views/quick_links_view.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; +import 'package:notredame/features/ets/events/news/news_view.dart'; +import 'package:notredame/features/ets/quick-link//quick_links_view.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; class ETSView extends StatefulWidget { @override diff --git a/lib/ui/widgets/author_info_skeleton.dart b/lib/features/ets/events/author/author_info_skeleton.dart similarity index 97% rename from lib/ui/widgets/author_info_skeleton.dart rename to lib/features/ets/events/author/author_info_skeleton.dart index 7167da370..be94b03d0 100644 --- a/lib/ui/widgets/author_info_skeleton.dart +++ b/lib/features/ets/events/author/author_info_skeleton.dart @@ -5,8 +5,8 @@ import 'package:flutter/material.dart'; import 'package:shimmer/shimmer.dart'; // Project imports: -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/utils/app_theme.dart'; class AuthorInfoSkeleton extends StatelessWidget { @override diff --git a/lib/ui/views/author_view.dart b/lib/features/ets/events/author/author_view.dart similarity index 96% rename from lib/ui/views/author_view.dart rename to lib/features/ets/events/author/author_view.dart index 29e7c1b8c..465f2c2fd 100644 --- a/lib/ui/views/author_view.dart +++ b/lib/features/ets/events/author/author_view.dart @@ -6,18 +6,18 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart'; -import 'package:notredame/core/models/social_link.dart'; +import 'package:notredame/features/ets/events/social/models/social_link.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/author_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/widgets/author_info_skeleton.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; -import 'package:notredame/ui/widgets/news_card.dart'; -import 'package:notredame/ui/widgets/news_card_skeleton.dart'; -import 'package:notredame/ui/widgets/social_links_card.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/ets/events/author/author_viewmodel.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/ets/events/author/author_info_skeleton.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; +import 'package:notredame/features/ets/events/news/widgets/news_card.dart'; +import 'package:notredame/features/ets/events/news/widgets/news_card_skeleton.dart'; +import 'package:notredame/features/ets/events/social/social_links_card.dart'; class AuthorView extends StatefulWidget { final String authorId; diff --git a/lib/core/viewmodels/author_viewmodel.dart b/lib/features/ets/events/author/author_viewmodel.dart similarity index 92% rename from lib/core/viewmodels/author_viewmodel.dart rename to lib/features/ets/events/author/author_viewmodel.dart index efb96570e..2ce4fae6c 100644 --- a/lib/core/viewmodels/author_viewmodel.dart +++ b/lib/features/ets/events/author/author_viewmodel.dart @@ -6,9 +6,9 @@ import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/managers/author_repository.dart'; -import 'package:notredame/core/managers/news_repository.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/repository/author_repository.dart'; +import 'package:notredame/features/app/repository/news_repository.dart'; +import 'package:notredame/utils/locator.dart'; class AuthorViewModel extends BaseViewModel implements Initialisable { final AuthorRepository _authorRepository = locator(); diff --git a/lib/ui/views/news_details_view.dart b/lib/features/ets/events/news/news-details/news_details_view.dart similarity index 95% rename from lib/ui/views/news_details_view.dart rename to lib/features/ets/events/news/news-details/news_details_view.dart index 6d2bddac8..2d6931f7e 100644 --- a/lib/ui/views/news_details_view.dart +++ b/lib/features/ets/events/news/news-details/news_details_view.dart @@ -7,22 +7,22 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:flutter_svg/svg.dart'; import 'package:intl/intl.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/calendar_selection_viewmodel.dart'; -import 'package:notredame/ui/widgets/calendar_selector.dart'; -import 'package:notredame/ui/widgets/report_news.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; +import 'package:notredame/features/ets/events/report-news/report_news_widget.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/schedule/calendar_selection_viewmodel.dart'; +import 'package:notredame/features/schedule/widgets/calendar_selector.dart'; import 'package:shimmer/shimmer.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/viewmodels/news_details_viewmodel.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/ets/events/news/news-details/news_details_viewmodel.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; import 'package:share_plus/share_plus.dart'; class NewsDetailsView extends StatefulWidget { diff --git a/lib/core/viewmodels/news_details_viewmodel.dart b/lib/features/ets/events/news/news-details/news_details_viewmodel.dart similarity index 92% rename from lib/core/viewmodels/news_details_viewmodel.dart rename to lib/features/ets/events/news/news-details/news_details_viewmodel.dart index 5acfc1394..2769b6e53 100644 --- a/lib/core/viewmodels/news_details_viewmodel.dart +++ b/lib/features/ets/events/news/news-details/news_details_viewmodel.dart @@ -6,7 +6,7 @@ import 'package:ets_api_clients/models.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/utils/app_theme.dart'; class NewsDetailsViewModel extends FutureViewModel { News news; diff --git a/lib/ui/views/news_view.dart b/lib/features/ets/events/news/news_view.dart similarity index 96% rename from lib/ui/views/news_view.dart rename to lib/features/ets/events/news/news_view.dart index e0dd49f37..b88c7ed18 100644 --- a/lib/ui/views/news_view.dart +++ b/lib/features/ets/events/news/news_view.dart @@ -4,15 +4,15 @@ import 'package:flutter/material.dart'; // Package imports: import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/utils/app_theme.dart'; import 'package:stacked/stacked.dart'; import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart'; // Project imports: -import 'package:notredame/core/viewmodels/news_viewmodel.dart'; -import 'package:notredame/ui/widgets/news_card.dart'; -import 'package:notredame/ui/widgets/news_card_skeleton.dart'; +import 'package:notredame/features/ets/events/news/news_viewmodel.dart'; +import 'package:notredame/features/ets/events/news/widgets/news_card.dart'; +import 'package:notredame/features/ets/events/news/widgets/news_card_skeleton.dart'; class NewsView extends StatefulWidget { @override diff --git a/lib/core/viewmodels/news_viewmodel.dart b/lib/features/ets/events/news/news_viewmodel.dart similarity index 91% rename from lib/core/viewmodels/news_viewmodel.dart rename to lib/features/ets/events/news/news_viewmodel.dart index 2e8414383..86a43c3a1 100644 --- a/lib/core/viewmodels/news_viewmodel.dart +++ b/lib/features/ets/events/news/news_viewmodel.dart @@ -4,8 +4,8 @@ import 'package:stacked/stacked.dart'; import 'package:ets_api_clients/models.dart'; // Project imports: -import 'package:notredame/core/managers/news_repository.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/repository/news_repository.dart'; +import 'package:notredame/utils/locator.dart'; class NewsViewModel extends BaseViewModel implements Initialisable { /// Load the events diff --git a/lib/ui/widgets/news_card.dart b/lib/features/ets/events/news/widgets/news_card.dart similarity index 93% rename from lib/ui/widgets/news_card.dart rename to lib/features/ets/events/news/widgets/news_card.dart index 3139dad18..a39bd0b6d 100644 --- a/lib/ui/widgets/news_card.dart +++ b/lib/features/ets/events/news/widgets/news_card.dart @@ -8,10 +8,10 @@ import 'package:timeago/timeago.dart' as timeago; import 'package:ets_api_clients/models.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; class NewsCard extends StatefulWidget { final News news; diff --git a/lib/ui/widgets/news_card_skeleton.dart b/lib/features/ets/events/news/widgets/news_card_skeleton.dart similarity index 98% rename from lib/ui/widgets/news_card_skeleton.dart rename to lib/features/ets/events/news/widgets/news_card_skeleton.dart index 151d85168..ce3146e10 100644 --- a/lib/ui/widgets/news_card_skeleton.dart +++ b/lib/features/ets/events/news/widgets/news_card_skeleton.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:shimmer/shimmer.dart'; // Project imports: -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/utils/app_theme.dart'; class NewsCardSkeleton extends StatelessWidget { @override diff --git a/lib/core/models/report_news.dart b/lib/features/ets/events/report-news/models/report_news.dart similarity index 100% rename from lib/core/models/report_news.dart rename to lib/features/ets/events/report-news/models/report_news.dart diff --git a/lib/core/constants/report_news.dart b/lib/features/ets/events/report-news/report_news.dart similarity index 92% rename from lib/core/constants/report_news.dart rename to lib/features/ets/events/report-news/report_news.dart index 668f204a8..bffb91273 100644 --- a/lib/core/constants/report_news.dart +++ b/lib/features/ets/events/report-news/report_news.dart @@ -1,6 +1,6 @@ // Project imports: import 'package:flutter/material.dart'; -import 'package:notredame/core/models/report_news.dart'; +import 'package:notredame/features/ets/events/report-news/models/report_news.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; List getLocalizedReportNewsItems(BuildContext context) { diff --git a/lib/core/viewmodels/report_news_viewmodel.dart b/lib/features/ets/events/report-news/report_news_viewmodel.dart similarity index 90% rename from lib/core/viewmodels/report_news_viewmodel.dart rename to lib/features/ets/events/report-news/report_news_viewmodel.dart index cf83f7bb2..bd1026134 100644 --- a/lib/core/viewmodels/report_news_viewmodel.dart +++ b/lib/features/ets/events/report-news/report_news_viewmodel.dart @@ -1,7 +1,7 @@ // Package imports: import 'package:ets_api_clients/clients.dart'; import 'package:ets_api_clients/models.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/utils/locator.dart'; import 'package:stacked/stacked.dart'; class ReportNewsViewModel extends BaseViewModel { diff --git a/lib/ui/widgets/report_news.dart b/lib/features/ets/events/report-news/report_news_widget.dart similarity index 96% rename from lib/ui/widgets/report_news.dart rename to lib/features/ets/events/report-news/report_news_widget.dart index 8e323a42c..9a63c7f02 100644 --- a/lib/ui/widgets/report_news.dart +++ b/lib/features/ets/events/report-news/report_news_widget.dart @@ -4,13 +4,13 @@ import 'package:flutter/material.dart'; // Package imports: import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:fluttertoast/fluttertoast.dart'; +import 'package:notredame/utils/app_theme.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/report_news.dart'; -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/report_news_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/features/ets/events/report-news/report_news.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/ets/events/report-news/report_news_viewmodel.dart'; class ReportNews extends StatefulWidget { final bool showHandle; diff --git a/lib/core/models/social_link.dart b/lib/features/ets/events/social/models/social_link.dart similarity index 83% rename from lib/core/models/social_link.dart rename to lib/features/ets/events/social/models/social_link.dart index 56e2853d1..b30539195 100644 --- a/lib/core/models/social_link.dart +++ b/lib/features/ets/events/social/models/social_link.dart @@ -2,7 +2,7 @@ import 'package:flutter_svg/flutter_svg.dart'; // Project imports: -import 'package:notredame/core/models/quick_link.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; class SocialLink extends QuickLink { SocialLink({ diff --git a/lib/ui/widgets/social_links_card.dart b/lib/features/ets/events/social/social_links_card.dart similarity index 94% rename from lib/ui/widgets/social_links_card.dart rename to lib/features/ets/events/social/social_links_card.dart index 8360d8b28..becefd4b9 100644 --- a/lib/ui/widgets/social_links_card.dart +++ b/lib/features/ets/events/social/social_links_card.dart @@ -6,10 +6,10 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/models/social_link.dart'; -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/web_link_card_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/features/ets/events/social/models/social_link.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/ets/quick-link/widgets/web_link_card_viewmodel.dart'; +import 'package:notredame/utils/app_theme.dart'; class SocialLinks extends StatefulWidget { final bool showHandle; diff --git a/lib/core/models/quick_link.dart b/lib/features/ets/quick-link/models/quick_link.dart similarity index 100% rename from lib/core/models/quick_link.dart rename to lib/features/ets/quick-link/models/quick_link.dart diff --git a/lib/core/models/quick_link_data.dart b/lib/features/ets/quick-link/models/quick_link_data.dart similarity index 100% rename from lib/core/models/quick_link_data.dart rename to lib/features/ets/quick-link/models/quick_link_data.dart diff --git a/lib/core/constants/quick_links.dart b/lib/features/ets/quick-link/models/quick_links.dart similarity index 95% rename from lib/core/constants/quick_links.dart rename to lib/features/ets/quick-link/models/quick_links.dart index b14e4e108..25baa8a40 100644 --- a/lib/core/constants/quick_links.dart +++ b/lib/features/ets/quick-link/models/quick_links.dart @@ -8,8 +8,8 @@ import 'package:flutter_svg/flutter_svg.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; // Project imports: -import 'package:notredame/core/models/quick_link.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; +import 'package:notredame/utils/app_theme.dart'; List quickLinks(AppIntl intl) => [ QuickLink( diff --git a/lib/ui/views/quick_links_view.dart b/lib/features/ets/quick-link/quick_links_view.dart similarity index 95% rename from lib/ui/views/quick_links_view.dart rename to lib/features/ets/quick-link/quick_links_view.dart index 98c916b8b..0400af219 100644 --- a/lib/ui/views/quick_links_view.dart +++ b/lib/features/ets/quick-link/quick_links_view.dart @@ -3,14 +3,14 @@ import 'package:flutter/material.dart'; // Package imports: import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:notredame/features/ets/quick-link/widgets/web_link_card.dart'; import 'package:reorderable_grid_view/reorderable_grid_view.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/models/quick_link.dart'; -import 'package:notredame/core/viewmodels/quick_links_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/widgets/web_link_card.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; +import 'package:notredame/features/ets/quick-link/quick_links_viewmodel.dart'; +import 'package:notredame/utils/app_theme.dart'; class QuickLinksView extends StatefulWidget { @override diff --git a/lib/core/viewmodels/quick_links_viewmodel.dart b/lib/features/ets/quick-link/quick_links_viewmodel.dart similarity index 90% rename from lib/core/viewmodels/quick_links_viewmodel.dart rename to lib/features/ets/quick-link/quick_links_viewmodel.dart index dfb2f6524..607177c27 100644 --- a/lib/core/viewmodels/quick_links_viewmodel.dart +++ b/lib/features/ets/quick-link/quick_links_viewmodel.dart @@ -3,10 +3,10 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/managers/quick_link_repository.dart'; -import 'package:notredame/core/models/quick_link.dart'; -import 'package:notredame/core/models/quick_link_data.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/repository/quick_link_repository.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link_data.dart'; +import 'package:notredame/utils/locator.dart'; class QuickLinksViewModel extends FutureViewModel> { /// Localization class of the application. diff --git a/lib/ui/views/emergency_view.dart b/lib/features/ets/quick-link/widgets/security-info/emergency_view.dart similarity index 89% rename from lib/ui/views/emergency_view.dart rename to lib/features/ets/quick-link/widgets/security-info/emergency_view.dart index 13207b914..eb4143221 100644 --- a/lib/ui/views/emergency_view.dart +++ b/lib/features/ets/quick-link/widgets/security-info/emergency_view.dart @@ -6,9 +6,9 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:webview_flutter/webview_flutter.dart'; // Project imports: -import 'package:notredame/core/extensions/webview_controller_extension.dart'; -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/features/app/presentation/webview_controller_extension.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/utils/app_theme.dart'; class EmergencyView extends StatefulWidget { final String title; diff --git a/lib/core/models/emergency_procedure.dart b/lib/features/ets/quick-link/widgets/security-info/models/emergency_procedure.dart similarity index 100% rename from lib/core/models/emergency_procedure.dart rename to lib/features/ets/quick-link/widgets/security-info/models/emergency_procedure.dart diff --git a/lib/core/constants/emergency_procedures.dart b/lib/features/ets/quick-link/widgets/security-info/models/emergency_procedures.dart similarity index 94% rename from lib/core/constants/emergency_procedures.dart rename to lib/features/ets/quick-link/widgets/security-info/models/emergency_procedures.dart index 3508f29d9..e9169c84e 100644 --- a/lib/core/constants/emergency_procedures.dart +++ b/lib/features/ets/quick-link/widgets/security-info/models/emergency_procedures.dart @@ -2,7 +2,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; // Project imports: -import 'package:notredame/core/models/emergency_procedure.dart'; +import 'package:notredame/features/ets/quick-link/widgets/security-info/models/emergency_procedure.dart'; List emergencyProcedures(AppIntl intl) => [ EmergencyProcedure( diff --git a/lib/ui/views/security_view.dart b/lib/features/ets/quick-link/widgets/security-info/security_view.dart similarity index 95% rename from lib/ui/views/security_view.dart rename to lib/features/ets/quick-link/widgets/security-info/security_view.dart index 8f4f4d4a5..466f050a5 100644 --- a/lib/ui/views/security_view.dart +++ b/lib/features/ets/quick-link/widgets/security-info/security_view.dart @@ -9,10 +9,10 @@ import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/security_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/views/emergency_view.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/ets/quick-link/widgets/security-info/security_viewmodel.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/ets/quick-link/widgets/security-info/emergency_view.dart'; class SecurityView extends StatefulWidget { @override diff --git a/lib/core/viewmodels/security_viewmodel.dart b/lib/features/ets/quick-link/widgets/security-info/security_viewmodel.dart similarity index 85% rename from lib/core/viewmodels/security_viewmodel.dart rename to lib/features/ets/quick-link/widgets/security-info/security_viewmodel.dart index dcc01a45f..346fe0a75 100644 --- a/lib/core/viewmodels/security_viewmodel.dart +++ b/lib/features/ets/quick-link/widgets/security-info/security_viewmodel.dart @@ -8,9 +8,9 @@ import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/emergency_procedures.dart'; -import 'package:notredame/core/constants/markers.dart'; -import 'package:notredame/core/models/emergency_procedure.dart'; +import 'package:notredame/features/ets/quick-link/widgets/security-info/models/emergency_procedures.dart'; +import 'package:notredame/constants/markers.dart'; +import 'package:notredame/features/ets/quick-link/widgets/security-info/models/emergency_procedure.dart'; class SecurityViewModel extends BaseViewModel { GoogleMapController? controller; diff --git a/lib/ui/widgets/web_link_card.dart b/lib/features/ets/quick-link/widgets/web_link_card.dart similarity index 88% rename from lib/ui/widgets/web_link_card.dart rename to lib/features/ets/quick-link/widgets/web_link_card.dart index 0ff4bdabb..c10554164 100644 --- a/lib/ui/widgets/web_link_card.dart +++ b/lib/features/ets/quick-link/widgets/web_link_card.dart @@ -5,9 +5,9 @@ import 'package:flutter/material.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/models/quick_link.dart'; -import 'package:notredame/core/viewmodels/web_link_card_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; +import 'package:notredame/features/ets/quick-link/widgets/web_link_card_viewmodel.dart'; +import 'package:notredame/utils/app_theme.dart'; class WebLinkCard extends StatelessWidget { final QuickLink _links; diff --git a/lib/core/viewmodels/web_link_card_viewmodel.dart b/lib/features/ets/quick-link/widgets/web_link_card_viewmodel.dart similarity index 74% rename from lib/core/viewmodels/web_link_card_viewmodel.dart rename to lib/features/ets/quick-link/widgets/web_link_card_viewmodel.dart index b61cef761..1b8bff47b 100644 --- a/lib/core/viewmodels/web_link_card_viewmodel.dart +++ b/lib/features/ets/quick-link/widgets/web_link_card_viewmodel.dart @@ -6,12 +6,12 @@ import 'package:flutter/material.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/models/quick_link.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/launch_url_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/integration/launch_url_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/utils/locator.dart'; class WebLinkCardViewModel extends BaseViewModel { /// used to redirect on the security. diff --git a/lib/ui/views/about_view.dart b/lib/features/more/about/about_view.dart similarity index 98% rename from lib/ui/views/about_view.dart rename to lib/features/more/about/about_view.dart index 1699400a6..54183a454 100644 --- a/lib/ui/views/about_view.dart +++ b/lib/features/more/about/about_view.dart @@ -7,8 +7,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; // Project imports: -import 'package:notredame/core/constants/urls.dart'; -import 'package:notredame/core/utils/utils.dart'; +import 'package:notredame/constants/urls.dart'; +import 'package:notredame/utils/utils.dart'; class AboutView extends StatefulWidget { @override diff --git a/lib/ui/views/contributors_view.dart b/lib/features/more/contributors/contributors_view.dart similarity index 86% rename from lib/ui/views/contributors_view.dart rename to lib/features/more/contributors/contributors_view.dart index df8de14ed..efecdf1ee 100644 --- a/lib/ui/views/contributors_view.dart +++ b/lib/features/more/contributors/contributors_view.dart @@ -7,10 +7,10 @@ import 'package:github/github.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/contributors_viewmodel.dart'; -import 'package:notredame/ui/utils/loading.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/more/contributors/contributors_viewmodel.dart'; +import 'package:notredame/utils/loading.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; class ContributorsView extends StatelessWidget { @override diff --git a/lib/core/viewmodels/contributors_viewmodel.dart b/lib/features/more/contributors/contributors_viewmodel.dart similarity index 100% rename from lib/core/viewmodels/contributors_viewmodel.dart rename to lib/features/more/contributors/contributors_viewmodel.dart diff --git a/lib/ui/views/faq_view.dart b/lib/features/more/faq/faq_view.dart similarity index 97% rename from lib/ui/views/faq_view.dart rename to lib/features/more/faq/faq_view.dart index 8c6e3f6ba..cdbd740da 100644 --- a/lib/ui/views/faq_view.dart +++ b/lib/features/more/faq/faq_view.dart @@ -7,9 +7,9 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/faq.dart'; -import 'package:notredame/core/models/faq_actions.dart'; -import 'package:notredame/core/viewmodels/faq_viewmodel.dart'; +import 'package:notredame/features/more/faq/models/faq.dart'; +import 'package:notredame/features/more/faq/models/faq_actions.dart'; +import 'package:notredame/features/more/faq/faq_viewmodel.dart'; class FaqView extends StatefulWidget { final Color? backgroundColor; diff --git a/lib/core/viewmodels/faq_viewmodel.dart b/lib/features/more/faq/faq_viewmodel.dart similarity index 78% rename from lib/core/viewmodels/faq_viewmodel.dart rename to lib/features/more/faq/faq_viewmodel.dart index e82e8275c..71e2f7821 100644 --- a/lib/core/viewmodels/faq_viewmodel.dart +++ b/lib/features/more/faq/faq_viewmodel.dart @@ -6,11 +6,11 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/app_info.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/launch_url_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/constants/app_info.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/integration/launch_url_service.dart'; +import 'package:notredame/utils/locator.dart'; class FaqViewModel extends BaseViewModel { final SettingsManager _settingsManager = locator(); diff --git a/lib/core/constants/faq.dart b/lib/features/more/faq/models/faq.dart similarity index 95% rename from lib/core/constants/faq.dart rename to lib/features/more/faq/models/faq.dart index 0b4272ead..5e98b3076 100644 --- a/lib/core/constants/faq.dart +++ b/lib/features/more/faq/models/faq.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; // Project imports: -import 'package:notredame/core/constants/app_info.dart'; -import 'package:notredame/core/models/faq_actions.dart'; -import 'package:notredame/core/models/faq_questions.dart'; +import 'package:notredame/constants/app_info.dart'; +import 'package:notredame/features/more/faq/models/faq_actions.dart'; +import 'package:notredame/features/more/faq/models/faq_questions.dart'; class Faq { List questions = [ diff --git a/lib/core/models/faq_actions.dart b/lib/features/more/faq/models/faq_actions.dart similarity index 100% rename from lib/core/models/faq_actions.dart rename to lib/features/more/faq/models/faq_actions.dart diff --git a/lib/core/models/faq_questions.dart b/lib/features/more/faq/models/faq_questions.dart similarity index 100% rename from lib/core/models/faq_questions.dart rename to lib/features/more/faq/models/faq_questions.dart diff --git a/lib/core/constants/feedback_type.dart b/lib/features/more/feedback/feedback_type.dart similarity index 100% rename from lib/core/constants/feedback_type.dart rename to lib/features/more/feedback/feedback_type.dart diff --git a/lib/ui/views/feedback_view.dart b/lib/features/more/feedback/feedback_view.dart similarity index 98% rename from lib/ui/views/feedback_view.dart rename to lib/features/more/feedback/feedback_view.dart index a65af5c16..f4298028f 100644 --- a/lib/ui/views/feedback_view.dart +++ b/lib/features/more/feedback/feedback_view.dart @@ -7,11 +7,11 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/feedback_type.dart'; -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/feedback_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/utils/loading.dart'; +import 'package:notredame/features/more/feedback/feedback_type.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/more/feedback/feedback_viewmodel.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/utils/loading.dart'; class FeedbackView extends StatefulWidget { @override diff --git a/lib/core/viewmodels/feedback_viewmodel.dart b/lib/features/more/feedback/feedback_viewmodel.dart similarity index 88% rename from lib/core/viewmodels/feedback_viewmodel.dart rename to lib/features/more/feedback/feedback_viewmodel.dart index 02f650041..2f57cf068 100644 --- a/lib/core/viewmodels/feedback_viewmodel.dart +++ b/lib/features/more/feedback/feedback_viewmodel.dart @@ -1,4 +1,5 @@ // Dart imports: +// Dart imports: import 'dart:io'; import 'dart:typed_data'; @@ -11,12 +12,12 @@ import 'package:image/image.dart' as image; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/feedback_type.dart'; -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/models/feedback_issue.dart'; -import 'package:notredame/core/services/github_api.dart'; -import 'package:notredame/core/services/preferences_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/more/feedback/feedback_type.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/more/feedback/models/feedback_issue.dart'; +import 'package:notredame/features/app/integration/github_api.dart'; +import 'package:notredame/features/app/storage/preferences_service.dart'; +import 'package:notredame/utils/locator.dart'; class FeedbackViewModel extends FutureViewModel { /// Used to access Github functionalities diff --git a/lib/core/services/in_app_review_service.dart b/lib/features/more/feedback/in_app_review_service.dart similarity index 94% rename from lib/core/services/in_app_review_service.dart rename to lib/features/more/feedback/in_app_review_service.dart index f3da402d3..cd97e2e4c 100644 --- a/lib/core/services/in_app_review_service.dart +++ b/lib/features/more/feedback/in_app_review_service.dart @@ -2,7 +2,7 @@ import 'package:in_app_review/in_app_review.dart'; // Project imports: -import 'package:notredame/core/constants/app_info.dart'; +import 'package:notredame/constants/app_info.dart'; // CONSTANTS diff --git a/lib/core/constants/custom_feedback_localization.dart b/lib/features/more/feedback/models/custom_feedback_localization.dart similarity index 100% rename from lib/core/constants/custom_feedback_localization.dart rename to lib/features/more/feedback/models/custom_feedback_localization.dart diff --git a/lib/core/models/feedback.dart b/lib/features/more/feedback/models/feedback.dart similarity index 100% rename from lib/core/models/feedback.dart rename to lib/features/more/feedback/models/feedback.dart diff --git a/lib/core/models/feedback_issue.dart b/lib/features/more/feedback/models/feedback_issue.dart similarity index 100% rename from lib/core/models/feedback_issue.dart rename to lib/features/more/feedback/models/feedback_issue.dart diff --git a/lib/ui/widgets/custom_feedback.dart b/lib/features/more/feedback/widgets/custom_feedback.dart similarity index 94% rename from lib/ui/widgets/custom_feedback.dart rename to lib/features/more/feedback/widgets/custom_feedback.dart index a75d57c5b..163f95555 100644 --- a/lib/ui/widgets/custom_feedback.dart +++ b/lib/features/more/feedback/widgets/custom_feedback.dart @@ -5,8 +5,8 @@ import 'package:flutter/material.dart'; import 'package:feedback/feedback.dart'; // Project imports: -import 'package:notredame/core/constants/custom_feedback_localization.dart'; -import 'package:notredame/core/models/feedback.dart'; +import 'package:notredame/features/more/feedback/models/custom_feedback_localization.dart'; +import 'package:notredame/features/more/feedback/models/feedback.dart'; /// A form that prompts the user for the type of feedback they want to give and a /// free form text feedback. diff --git a/lib/ui/views/more_view.dart b/lib/features/more/more_view.dart similarity index 94% rename from lib/ui/views/more_view.dart rename to lib/features/more/more_view.dart index 5ce9954ef..bb5711d5c 100644 --- a/lib/ui/views/more_view.dart +++ b/lib/features/more/more_view.dart @@ -9,15 +9,15 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/discovery_ids.dart'; -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/more_viewmodel.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/utils/discovery_components.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/more/more_viewmodel.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/welcome/discovery/discovery_components.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; class MoreView extends StatefulWidget { @override diff --git a/lib/core/viewmodels/more_viewmodel.dart b/lib/features/more/more_viewmodel.dart similarity index 82% rename from lib/core/viewmodels/more_viewmodel.dart rename to lib/features/more/more_viewmodel.dart index 6c595dc50..f78f4d5ee 100644 --- a/lib/core/viewmodels/more_viewmodel.dart +++ b/lib/features/more/more_viewmodel.dart @@ -9,20 +9,20 @@ import 'package:package_info_plus/package_info_plus.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/discovery_ids.dart'; -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/managers/cache_manager.dart'; -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/managers/user_repository.dart'; -import 'package:notredame/core/services/in_app_review_service.dart'; -import 'package:notredame/core/services/launch_url_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/preferences_service.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/discovery_components.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/storage/cache_manager.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; +import 'package:notredame/features/more/feedback/in_app_review_service.dart'; +import 'package:notredame/features/app/integration/launch_url_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/storage/preferences_service.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/features/welcome/discovery/discovery_components.dart'; class MoreViewModel extends FutureViewModel { /// Cache manager diff --git a/lib/ui/views/choose_language_view.dart b/lib/features/more/settings/choose_language_view.dart similarity index 95% rename from lib/ui/views/choose_language_view.dart rename to lib/features/more/settings/choose_language_view.dart index 40aa840fc..61c640c20 100644 --- a/lib/ui/views/choose_language_view.dart +++ b/lib/features/more/settings/choose_language_view.dart @@ -6,9 +6,9 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/choose_language_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/more/settings/choose_language_viewmodel.dart'; +import 'package:notredame/utils/app_theme.dart'; class ChooseLanguageView extends StatefulWidget { @override diff --git a/lib/core/viewmodels/choose_language_viewmodel.dart b/lib/features/more/settings/choose_language_viewmodel.dart similarity index 82% rename from lib/core/viewmodels/choose_language_viewmodel.dart rename to lib/features/more/settings/choose_language_viewmodel.dart index aac3f0bc7..c0ed74e97 100644 --- a/lib/core/viewmodels/choose_language_viewmodel.dart +++ b/lib/features/more/settings/choose_language_viewmodel.dart @@ -3,10 +3,10 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/utils/locator.dart'; class ChooseLanguageViewModel extends BaseViewModel { static const int english = 0; diff --git a/lib/core/managers/settings_manager.dart b/lib/features/more/settings/settings_manager.dart similarity index 96% rename from lib/core/managers/settings_manager.dart rename to lib/features/more/settings/settings_manager.dart index ca51f1e1c..e8dc53f60 100644 --- a/lib/core/managers/settings_manager.dart +++ b/lib/features/more/settings/settings_manager.dart @@ -10,11 +10,11 @@ import 'package:logger/logger.dart'; import 'package:table_calendar/table_calendar.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/preferences_service.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/storage/preferences_service.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; +import 'package:notredame/utils/locator.dart'; class SettingsManager with ChangeNotifier { static const String tag = "SettingsManager"; diff --git a/lib/ui/views/settings_view.dart b/lib/features/more/settings/settings_view.dart similarity index 96% rename from lib/ui/views/settings_view.dart rename to lib/features/more/settings/settings_view.dart index ae332a49e..bef0ef57c 100644 --- a/lib/ui/views/settings_view.dart +++ b/lib/features/more/settings/settings_view.dart @@ -6,9 +6,9 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/viewmodels/settings_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; +import 'package:notredame/features/more/settings/settings_viewmodel.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; class SettingsView extends StatefulWidget { @override diff --git a/lib/core/viewmodels/settings_viewmodel.dart b/lib/features/more/settings/settings_viewmodel.dart similarity index 92% rename from lib/core/viewmodels/settings_viewmodel.dart rename to lib/features/more/settings/settings_viewmodel.dart index 6d01fbff1..2d11999e7 100644 --- a/lib/core/viewmodels/settings_viewmodel.dart +++ b/lib/features/more/settings/settings_viewmodel.dart @@ -6,8 +6,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/utils/locator.dart'; class SettingsViewModel extends FutureViewModel { /// Manage the settings diff --git a/lib/core/viewmodels/calendar_selection_viewmodel.dart b/lib/features/schedule/calendar_selection_viewmodel.dart similarity index 92% rename from lib/core/viewmodels/calendar_selection_viewmodel.dart rename to lib/features/schedule/calendar_selection_viewmodel.dart index ac777c60b..864d9f45e 100644 --- a/lib/core/viewmodels/calendar_selection_viewmodel.dart +++ b/lib/features/schedule/calendar_selection_viewmodel.dart @@ -6,9 +6,9 @@ import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/utils/calendar_utils.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/utils/calendar_utils.dart'; +import 'package:notredame/utils/locator.dart'; class CalendarSelectionViewModel { final AppIntl translations; diff --git a/lib/ui/widgets/schedule_default.dart b/lib/features/schedule/schedule_default/schedule_default.dart similarity index 96% rename from lib/ui/widgets/schedule_default.dart rename to lib/features/schedule/schedule_default/schedule_default.dart index 9bd6bf006..ef7243dae 100644 --- a/lib/ui/widgets/schedule_default.dart +++ b/lib/features/schedule/schedule_default/schedule_default.dart @@ -6,8 +6,8 @@ import 'package:calendar_view/calendar_view.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; // Project imports: -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/widgets/schedule_calendar_tile.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/schedule/widgets/schedule_calendar_tile.dart'; class ScheduleDefault extends StatefulWidget { final List> calendarEvents; diff --git a/lib/ui/views/schedule_default_view.dart b/lib/features/schedule/schedule_default/schedule_default_view.dart similarity index 88% rename from lib/ui/views/schedule_default_view.dart rename to lib/features/schedule/schedule_default/schedule_default_view.dart index f4b08cce8..99b03adfa 100644 --- a/lib/ui/views/schedule_default_view.dart +++ b/lib/features/schedule/schedule_default/schedule_default_view.dart @@ -6,9 +6,9 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/viewmodels/schedule_default_viewmodel.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; -import 'package:notredame/ui/widgets/schedule_default.dart'; +import 'package:notredame/features/schedule/schedule_default/schedule_default_viewmodel.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; +import 'package:notredame/features/schedule/schedule_default/schedule_default.dart'; class ScheduleDefaultView extends StatefulWidget { final String? sessionCode; diff --git a/lib/core/viewmodels/schedule_default_viewmodel.dart b/lib/features/schedule/schedule_default/schedule_default_viewmodel.dart similarity index 95% rename from lib/core/viewmodels/schedule_default_viewmodel.dart rename to lib/features/schedule/schedule_default/schedule_default_viewmodel.dart index 75a8da06e..294a9a83a 100644 --- a/lib/core/viewmodels/schedule_default_viewmodel.dart +++ b/lib/features/schedule/schedule_default/schedule_default_viewmodel.dart @@ -7,9 +7,9 @@ import 'package:ets_api_clients/models.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; class ScheduleDefaultViewModel extends FutureViewModel>> { diff --git a/lib/core/viewmodels/schedule_settings_viewmodel.dart b/lib/features/schedule/schedule_settings_viewmodel.dart similarity index 96% rename from lib/core/viewmodels/schedule_settings_viewmodel.dart rename to lib/features/schedule/schedule_settings_viewmodel.dart index 9f55ac077..74658d188 100644 --- a/lib/core/viewmodels/schedule_settings_viewmodel.dart +++ b/lib/features/schedule/schedule_settings_viewmodel.dart @@ -7,10 +7,10 @@ import 'package:stacked/stacked.dart'; import 'package:table_calendar/table_calendar.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/utils/locator.dart'; class ScheduleSettingsViewModel extends FutureViewModel> { diff --git a/lib/ui/views/schedule_view.dart b/lib/features/schedule/schedule_view.dart similarity index 96% rename from lib/ui/views/schedule_view.dart rename to lib/features/schedule/schedule_view.dart index a5642b5a7..a7eb7e74f 100644 --- a/lib/ui/views/schedule_view.dart +++ b/lib/features/schedule/schedule_view.dart @@ -9,22 +9,22 @@ import 'package:ets_api_clients/models.dart'; import 'package:feature_discovery/feature_discovery.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:intl/intl.dart'; -import 'package:notredame/ui/widgets/calendar_selector.dart'; +import 'package:notredame/features/schedule/widgets/calendar_selector.dart'; import 'package:stacked/stacked.dart'; import 'package:table_calendar/table_calendar.dart'; // Project imports: -import 'package:notredame/core/constants/discovery_ids.dart'; -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/viewmodels/schedule_viewmodel.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/utils/discovery_components.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; -import 'package:notredame/ui/widgets/course_activity_tile.dart'; -import 'package:notredame/ui/widgets/schedule_calendar_tile.dart'; -import 'package:notredame/ui/widgets/schedule_settings.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/schedule/schedule_viewmodel.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/welcome/discovery/discovery_components.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; +import 'package:notredame/features/dashboard/widgets/course_activity_tile.dart'; +import 'package:notredame/features/schedule/widgets/schedule_calendar_tile.dart'; +import 'package:notredame/features/schedule/widgets/schedule_settings.dart'; class ScheduleView extends StatefulWidget { @visibleForTesting diff --git a/lib/core/viewmodels/schedule_viewmodel.dart b/lib/features/schedule/schedule_viewmodel.dart similarity index 96% rename from lib/core/viewmodels/schedule_viewmodel.dart rename to lib/features/schedule/schedule_viewmodel.dart index 631d443e0..441931f81 100644 --- a/lib/core/viewmodels/schedule_viewmodel.dart +++ b/lib/features/schedule/schedule_viewmodel.dart @@ -13,14 +13,14 @@ import 'package:stacked/stacked.dart'; import 'package:table_calendar/table_calendar.dart'; // Project imports: -import 'package:notredame/core/constants/discovery_ids.dart'; -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/utils/discovery_components.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/welcome/discovery/discovery_components.dart'; class ScheduleViewModel extends FutureViewModel> { /// Load the events diff --git a/lib/ui/widgets/calendar_selector.dart b/lib/features/schedule/widgets/calendar_selector.dart similarity index 95% rename from lib/ui/widgets/calendar_selector.dart rename to lib/features/schedule/widgets/calendar_selector.dart index 0cd63bc58..96470af78 100644 --- a/lib/ui/widgets/calendar_selector.dart +++ b/lib/features/schedule/widgets/calendar_selector.dart @@ -5,10 +5,10 @@ import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/utils/calendar_utils.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/utils/calendar_utils.dart'; +import 'package:notredame/utils/locator.dart'; class CalendarSelectionWidget extends StatelessWidget { final AppIntl translations; diff --git a/lib/ui/widgets/schedule_calendar_tile.dart b/lib/features/schedule/widgets/schedule_calendar_tile.dart similarity index 100% rename from lib/ui/widgets/schedule_calendar_tile.dart rename to lib/features/schedule/widgets/schedule_calendar_tile.dart diff --git a/lib/ui/widgets/schedule_settings.dart b/lib/features/schedule/widgets/schedule_settings.dart similarity index 98% rename from lib/ui/widgets/schedule_settings.dart rename to lib/features/schedule/widgets/schedule_settings.dart index 5798ebfb0..9326518d1 100644 --- a/lib/ui/widgets/schedule_settings.dart +++ b/lib/features/schedule/widgets/schedule_settings.dart @@ -9,9 +9,9 @@ import 'package:stacked/stacked.dart'; import 'package:table_calendar/table_calendar.dart'; // Project imports: -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/schedule_settings_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/schedule/schedule_settings_viewmodel.dart'; +import 'package:notredame/utils/app_theme.dart'; class ScheduleSettings extends StatefulWidget { final bool showHandle; diff --git a/lib/ui/views/grade_details_view.dart b/lib/features/student/grades/grade_details/grade_details_view.dart similarity index 96% rename from lib/ui/views/grade_details_view.dart rename to lib/features/student/grades/grade_details/grade_details_view.dart index 172b91be6..226b9561c 100644 --- a/lib/ui/views/grade_details_view.dart +++ b/lib/features/student/grades/grade_details/grade_details_view.dart @@ -8,13 +8,13 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/grades_details_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; -import 'package:notredame/ui/widgets/grade_circular_progress.dart'; -import 'package:notredame/ui/widgets/grade_evaluation_tile.dart'; -import 'package:notredame/ui/widgets/grade_not_available.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/student/grades/grade_details/grades_details_viewmodel.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; +import 'package:notredame/features/student/grades/widgets/grade_circular_progress.dart'; +import 'package:notredame/features/student/grades/widgets/grade_evaluation_tile.dart'; +import 'package:notredame/features/student/grades/widgets/grade_not_available.dart'; class GradesDetailsView extends StatefulWidget { final Course course; diff --git a/lib/core/viewmodels/grades_details_viewmodel.dart b/lib/features/student/grades/grade_details/grades_details_viewmodel.dart similarity index 85% rename from lib/core/viewmodels/grades_details_viewmodel.dart rename to lib/features/student/grades/grade_details/grades_details_viewmodel.dart index bc3428971..c7d12ec08 100644 --- a/lib/core/viewmodels/grades_details_viewmodel.dart +++ b/lib/features/student/grades/grade_details/grades_details_viewmodel.dart @@ -10,12 +10,12 @@ import 'package:fluttertoast/fluttertoast.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/discovery_ids.dart'; -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/discovery_components.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/features/welcome/discovery/discovery_components.dart'; class GradesDetailsViewModel extends FutureViewModel { /// Used to get the courses of the student diff --git a/lib/ui/views/grades_view.dart b/lib/features/student/grades/grades_view.dart similarity index 90% rename from lib/ui/views/grades_view.dart rename to lib/features/student/grades/grades_view.dart index d6555bc41..7d30ba83d 100644 --- a/lib/ui/views/grades_view.dart +++ b/lib/features/student/grades/grades_view.dart @@ -9,14 +9,14 @@ import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/viewmodels/grades_viewmodel.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/utils/loading.dart'; -import 'package:notredame/ui/widgets/grade_button.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/student/grades/grades_viewmodel.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/utils/loading.dart'; +import 'package:notredame/features/student/grades/widgets/grade_button.dart'; class GradesView extends StatefulWidget { @override diff --git a/lib/core/viewmodels/grades_viewmodel.dart b/lib/features/student/grades/grades_viewmodel.dart similarity index 88% rename from lib/core/viewmodels/grades_viewmodel.dart rename to lib/features/student/grades/grades_viewmodel.dart index 5dbc8afc1..f1dee4420 100644 --- a/lib/core/viewmodels/grades_viewmodel.dart +++ b/lib/features/student/grades/grades_viewmodel.dart @@ -6,16 +6,16 @@ import 'package:ets_api_clients/models.dart'; import 'package:feature_discovery/feature_discovery.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:fluttertoast/fluttertoast.dart'; +import 'package:notredame/features/student/semester_codes.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/discovery_ids.dart'; -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/constants/semester_codes.dart'; -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/discovery_components.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/features/welcome/discovery/discovery_components.dart'; class GradesViewModel extends FutureViewModel>> { /// Used to get the courses of the student diff --git a/lib/core/models/widget_models.dart b/lib/features/student/grades/widget_models.dart similarity index 100% rename from lib/core/models/widget_models.dart rename to lib/features/student/grades/widget_models.dart diff --git a/lib/ui/widgets/grade_button.dart b/lib/features/student/grades/widgets/grade_button.dart similarity index 89% rename from lib/ui/widgets/grade_button.dart rename to lib/features/student/grades/widgets/grade_button.dart index f446e0818..c0cb8770e 100644 --- a/lib/ui/widgets/grade_button.dart +++ b/lib/features/student/grades/widgets/grade_button.dart @@ -7,14 +7,14 @@ import 'package:feature_discovery/feature_discovery.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; // Project imports: -import 'package:notredame/core/constants/discovery_ids.dart'; -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/utils/discovery_components.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/welcome/discovery/discovery_components.dart'; class GradeButton extends StatelessWidget { final Course course; diff --git a/lib/ui/widgets/grade_circular_progress.dart b/lib/features/student/grades/widgets/grade_circular_progress.dart similarity index 98% rename from lib/ui/widgets/grade_circular_progress.dart rename to lib/features/student/grades/widgets/grade_circular_progress.dart index 2dbae900b..9e635cc7c 100644 --- a/lib/ui/widgets/grade_circular_progress.dart +++ b/lib/features/student/grades/widgets/grade_circular_progress.dart @@ -6,7 +6,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:percent_indicator/percent_indicator.dart'; // Project imports: -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/utils/app_theme.dart'; class GradeCircularProgress extends StatefulWidget { final bool completed; diff --git a/lib/ui/widgets/grade_evaluation_tile.dart b/lib/features/student/grades/widgets/grade_evaluation_tile.dart similarity index 97% rename from lib/ui/widgets/grade_evaluation_tile.dart rename to lib/features/student/grades/widgets/grade_evaluation_tile.dart index b961d18ed..36912cef5 100644 --- a/lib/ui/widgets/grade_evaluation_tile.dart +++ b/lib/features/student/grades/widgets/grade_evaluation_tile.dart @@ -13,11 +13,11 @@ import 'package:intl/intl.dart'; import 'package:marquee/marquee.dart'; // Project imports: -import 'package:notredame/core/constants/discovery_ids.dart'; -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/utils/discovery_components.dart'; -import 'package:notredame/ui/widgets/grade_circular_progress.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/welcome/discovery/discovery_components.dart'; +import 'package:notredame/features/student/grades/widgets/grade_circular_progress.dart'; class GradeEvaluationTile extends StatefulWidget { final bool completed; diff --git a/lib/ui/widgets/grade_not_available.dart b/lib/features/student/grades/widgets/grade_not_available.dart similarity index 96% rename from lib/ui/widgets/grade_not_available.dart rename to lib/features/student/grades/widgets/grade_not_available.dart index 383e52d39..b3fd17d87 100644 --- a/lib/ui/widgets/grade_not_available.dart +++ b/lib/features/student/grades/widgets/grade_not_available.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; // Project imports: -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/utils/app_theme.dart'; class GradeNotAvailable extends StatelessWidget { final VoidCallback? onPressed; diff --git a/lib/ui/views/profile_view.dart b/lib/features/student/profile/profile_view.dart similarity index 96% rename from lib/ui/views/profile_view.dart rename to lib/features/student/profile/profile_view.dart index f7383bed2..bb3f96206 100644 --- a/lib/ui/views/profile_view.dart +++ b/lib/features/student/profile/profile_view.dart @@ -9,12 +9,12 @@ import 'package:percent_indicator/percent_indicator.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/viewmodels/profile_viewmodel.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/utils/loading.dart'; -import 'package:notredame/ui/widgets/student_program.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/student/profile/profile_viewmodel.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/utils/loading.dart'; +import 'package:notredame/features/student/widgets/student_program.dart'; class ProfileView extends StatefulWidget { @override diff --git a/lib/core/viewmodels/profile_viewmodel.dart b/lib/features/student/profile/profile_viewmodel.dart similarity index 93% rename from lib/core/viewmodels/profile_viewmodel.dart rename to lib/features/student/profile/profile_viewmodel.dart index ecb5cdaca..be5ded22b 100644 --- a/lib/core/viewmodels/profile_viewmodel.dart +++ b/lib/features/student/profile/profile_viewmodel.dart @@ -5,10 +5,10 @@ import 'package:fluttertoast/fluttertoast.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/programs_credits.dart'; -import 'package:notredame/core/managers/user_repository.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/student/profile/programs_credits.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/utils/locator.dart'; class ProfileViewModel extends FutureViewModel> { /// Load the user diff --git a/lib/core/constants/programs_credits.dart b/lib/features/student/profile/programs_credits.dart similarity index 100% rename from lib/core/constants/programs_credits.dart rename to lib/features/student/profile/programs_credits.dart diff --git a/lib/core/constants/semester_codes.dart b/lib/features/student/semester_codes.dart similarity index 100% rename from lib/core/constants/semester_codes.dart rename to lib/features/student/semester_codes.dart diff --git a/lib/ui/views/student_view.dart b/lib/features/student/student_view.dart similarity index 88% rename from lib/ui/views/student_view.dart rename to lib/features/student/student_view.dart index 87a7253c3..e9bc7c927 100644 --- a/lib/ui/views/student_view.dart +++ b/lib/features/student/student_view.dart @@ -6,12 +6,12 @@ import 'package:feature_discovery/feature_discovery.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; // Project imports: -import 'package:notredame/core/constants/discovery_ids.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/utils/discovery_components.dart'; -import 'package:notredame/ui/views/grades_view.dart'; -import 'package:notredame/ui/views/profile_view.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/welcome/discovery/discovery_components.dart'; +import 'package:notredame/features/student/grades/grades_view.dart'; +import 'package:notredame/features/student/profile/profile_view.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; class StudentView extends StatefulWidget { @override diff --git a/lib/ui/widgets/student_program.dart b/lib/features/student/widgets/student_program.dart similarity index 98% rename from lib/ui/widgets/student_program.dart rename to lib/features/student/widgets/student_program.dart index 3e701fd6a..f02d6a50e 100644 --- a/lib/ui/widgets/student_program.dart +++ b/lib/features/student/widgets/student_program.dart @@ -9,7 +9,7 @@ import 'package:ets_api_clients/models.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; // Project imports: -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/utils/app_theme.dart'; class StudentProgram extends StatefulWidget { final Program _program; diff --git a/lib/ui/utils/discovery_components.dart b/lib/features/welcome/discovery/discovery_components.dart similarity index 96% rename from lib/ui/utils/discovery_components.dart rename to lib/features/welcome/discovery/discovery_components.dart index 2bd0006dd..7d10a096d 100644 --- a/lib/ui/utils/discovery_components.dart +++ b/lib/features/welcome/discovery/discovery_components.dart @@ -6,14 +6,14 @@ import 'package:feature_discovery/feature_discovery.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; // Project imports: -import 'package:notredame/core/constants/discovery_ids.dart'; -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/models/discovery.dart'; -import 'package:notredame/core/models/group_discovery.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery.dart'; +import 'package:notredame/features/welcome/discovery/models/group_discovery.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; List discoveryComponents(BuildContext context) { return [ diff --git a/lib/core/models/discovery.dart b/lib/features/welcome/discovery/models/discovery.dart similarity index 100% rename from lib/core/models/discovery.dart rename to lib/features/welcome/discovery/models/discovery.dart diff --git a/lib/core/constants/discovery_ids.dart b/lib/features/welcome/discovery/models/discovery_ids.dart similarity index 100% rename from lib/core/constants/discovery_ids.dart rename to lib/features/welcome/discovery/models/discovery_ids.dart diff --git a/lib/core/models/group_discovery.dart b/lib/features/welcome/discovery/models/group_discovery.dart similarity index 70% rename from lib/core/models/group_discovery.dart rename to lib/features/welcome/discovery/models/group_discovery.dart index 8a09af894..ac4793746 100644 --- a/lib/core/models/group_discovery.dart +++ b/lib/features/welcome/discovery/models/group_discovery.dart @@ -1,5 +1,5 @@ // Project imports: -import 'package:notredame/core/models/discovery.dart'; +import 'package:notredame/features/welcome/discovery/models/discovery.dart'; class GroupDiscovery { final String name; diff --git a/lib/core/utils/login_mask.dart b/lib/features/welcome/login/login_mask.dart similarity index 100% rename from lib/core/utils/login_mask.dart rename to lib/features/welcome/login/login_mask.dart diff --git a/lib/ui/views/login_view.dart b/lib/features/welcome/login/login_view.dart similarity index 95% rename from lib/ui/views/login_view.dart rename to lib/features/welcome/login/login_view.dart index 0bb28e381..a71d7618b 100644 --- a/lib/ui/views/login_view.dart +++ b/lib/features/welcome/login/login_view.dart @@ -8,16 +8,16 @@ import 'package:fluttertoast/fluttertoast.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/services/launch_url_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; -import 'package:notredame/core/utils/login_mask.dart'; -import 'package:notredame/core/utils/utils.dart'; -import 'package:notredame/core/viewmodels/login_viewmodel.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/widgets/password_text_field.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/integration/launch_url_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; +import 'package:notredame/features/welcome/login/login_mask.dart'; +import 'package:notredame/utils/utils.dart'; +import 'package:notredame/features/welcome/login/login_viewmodel.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/welcome/widgets/password_text_field.dart'; class LoginView extends StatefulWidget { @override diff --git a/lib/core/viewmodels/login_viewmodel.dart b/lib/features/welcome/login/login_viewmodel.dart similarity index 87% rename from lib/core/viewmodels/login_viewmodel.dart rename to lib/features/welcome/login/login_viewmodel.dart index 12972eb08..8c798ee9f 100644 --- a/lib/core/viewmodels/login_viewmodel.dart +++ b/lib/features/welcome/login/login_viewmodel.dart @@ -4,12 +4,12 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:stacked/stacked.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/managers/user_repository.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/preferences_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/storage/preferences_service.dart'; +import 'package:notredame/utils/locator.dart'; class LoginViewModel extends BaseViewModel { /// Used to authenticate the user diff --git a/lib/ui/widgets/password_text_field.dart b/lib/features/welcome/widgets/password_text_field.dart similarity index 100% rename from lib/ui/widgets/password_text_field.dart rename to lib/features/welcome/widgets/password_text_field.dart diff --git a/lib/main.dart b/lib/main.dart index 7b47d4864..c40861a95 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -18,19 +18,19 @@ import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:provider/provider.dart'; // Project imports: -import 'package:notredame/core/constants/custom_feedback_localization.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/app_widget_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; -import 'package:notredame/firebase_options.dart'; -import 'package:notredame/locator.dart'; -import 'package:notredame/ui/router.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; -import 'package:notredame/ui/views/outage_view.dart'; -import 'package:notredame/ui/views/startup_view.dart'; -import 'package:notredame/ui/widgets/custom_feedback.dart'; +import 'package:notredame/features/more/feedback/models/custom_feedback_localization.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/widgets/app_widget_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; +import 'package:notredame/features/app/integration/firebase_options.dart'; +import 'package:notredame/utils/locator.dart'; +import 'package:notredame/features/app/navigation/router.dart'; +import 'package:notredame/utils/app_theme.dart'; +import 'package:notredame/features/app/error/outage/outage_view.dart'; +import 'package:notredame/features/app/startup/startup_view.dart'; +import 'package:notredame/features/more/feedback/widgets/custom_feedback.dart'; Future main() async { setupLocator(); diff --git a/lib/core/utils/animation_exception.dart b/lib/utils/animation_exception.dart similarity index 100% rename from lib/core/utils/animation_exception.dart rename to lib/utils/animation_exception.dart diff --git a/lib/ui/utils/app_theme.dart b/lib/utils/app_theme.dart similarity index 100% rename from lib/ui/utils/app_theme.dart rename to lib/utils/app_theme.dart diff --git a/lib/core/utils/cache_exception.dart b/lib/utils/cache_exception.dart similarity index 100% rename from lib/core/utils/cache_exception.dart rename to lib/utils/cache_exception.dart diff --git a/lib/core/utils/calendar_utils.dart b/lib/utils/calendar_utils.dart similarity index 100% rename from lib/core/utils/calendar_utils.dart rename to lib/utils/calendar_utils.dart diff --git a/lib/ui/utils/loading.dart b/lib/utils/loading.dart similarity index 100% rename from lib/ui/utils/loading.dart rename to lib/utils/loading.dart diff --git a/lib/locator.dart b/lib/utils/locator.dart similarity index 55% rename from lib/locator.dart rename to lib/utils/locator.dart index 3d40e534e..2281a5021 100644 --- a/lib/locator.dart +++ b/lib/utils/locator.dart @@ -3,27 +3,27 @@ import 'package:ets_api_clients/clients.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:get_it/get_it.dart'; import 'package:logger/logger.dart'; +import 'package:notredame/features/app/repository/author_repository.dart'; +import 'package:notredame/features/app/repository/news_repository.dart'; // Project imports: -import 'package:notredame/core/managers/author_repository.dart'; -import 'package:notredame/core/managers/cache_manager.dart'; -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/news_repository.dart'; -import 'package:notredame/core/managers/quick_link_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/managers/user_repository.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/app_widget_service.dart'; -import 'package:notredame/core/services/github_api.dart'; -import 'package:notredame/core/services/in_app_review_service.dart'; -import 'package:notredame/core/services/internal_info_service.dart'; -import 'package:notredame/core/services/launch_url_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/core/services/preferences_service.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; -import 'package:notredame/core/services/rive_animation_service.dart'; -import 'package:notredame/core/services/siren_flutter_service.dart'; +import 'package:notredame/features/app/storage/cache_manager.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/app/repository/quick_link_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/widgets/app_widget_service.dart'; +import 'package:notredame/features/app/integration/github_api.dart'; +import 'package:notredame/features/more/feedback/in_app_review_service.dart'; +import 'package:notredame/features/app/error/internal_info_service.dart'; +import 'package:notredame/features/app/integration/launch_url_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/app/storage/preferences_service.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; +import 'package:notredame/features/app/presentation/rive_animation_service.dart'; +import 'package:notredame/features/app/storage/siren_flutter_service.dart'; GetIt locator = GetIt.instance; diff --git a/lib/core/utils/utils.dart b/lib/utils/utils.dart similarity index 100% rename from lib/core/utils/utils.dart rename to lib/utils/utils.dart diff --git a/pubspec.yaml b/pubspec.yaml index 3a223bb89..8f71a607b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,7 +8,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 4.43.0+1 environment: - sdk: ">=3.3.0 <4.0.0" + sdk: '>=3.3.0 <4.0.0' dependencies: flutter: @@ -93,11 +93,11 @@ dev_dependencies: import_sorter: ^4.6.0 flutter_icons: - android: "launcher_icon" - ios: "LaunchImage" - image_path: "assets/icons/launcher_icon.png" - adaptive_icon_background: "#EF3F45" - adaptive_icon_foreground: "assets/icons/ic_launcher_foreground.png" + android: 'launcher_icon' + ios: 'LaunchImage' + image_path: 'assets/icons/launcher_icon.png' + adaptive_icon_background: '#EF3F45' + adaptive_icon_foreground: 'assets/icons/ic_launcher_foreground.png' flutter: uses-material-design: true diff --git a/test/helpers.dart b/test/helpers.dart index 1476838f4..34f2181a6 100644 --- a/test/helpers.dart +++ b/test/helpers.dart @@ -10,28 +10,28 @@ import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:logger/logger.dart'; +import 'package:notredame/features/app/repository/author_repository.dart'; +import 'package:notredame/features/app/repository/news_repository.dart'; // Project imports: -import 'package:notredame/core/managers/author_repository.dart'; -import 'package:notredame/core/managers/cache_manager.dart'; -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/news_repository.dart'; -import 'package:notredame/core/managers/quick_link_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/managers/user_repository.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/app_widget_service.dart'; -import 'package:notredame/core/services/github_api.dart'; -import 'package:notredame/core/services/in_app_review_service.dart'; -import 'package:notredame/core/services/internal_info_service.dart'; -import 'package:notredame/core/services/launch_url_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/core/services/preferences_service.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; -import 'package:notredame/core/services/rive_animation_service.dart'; -import 'package:notredame/core/services/siren_flutter_service.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/storage/cache_manager.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/app/repository/quick_link_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/widgets/app_widget_service.dart'; +import 'package:notredame/features/app/integration/github_api.dart'; +import 'package:notredame/features/more/feedback/in_app_review_service.dart'; +import 'package:notredame/features/app/error/internal_info_service.dart'; +import 'package:notredame/features/app/integration/launch_url_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/app/storage/preferences_service.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; +import 'package:notredame/features/app/presentation/rive_animation_service.dart'; +import 'package:notredame/features/app/storage/siren_flutter_service.dart'; +import 'package:notredame/utils/locator.dart'; import 'mock/managers/author_repository_mock.dart'; import 'mock/managers/cache_manager_mock.dart'; import 'mock/managers/course_repository_mock.dart'; diff --git a/test/managers/course_repository_test.dart b/test/managers/course_repository_test.dart index 2fc80a932..581da2785 100644 --- a/test/managers/course_repository_test.dart +++ b/test/managers/course_repository_test.dart @@ -11,10 +11,10 @@ import 'package:intl/intl.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/cache_manager.dart'; -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/user_repository.dart'; -import 'package:notredame/core/services/analytics_service.dart'; +import 'package:notredame/features/app/storage/cache_manager.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; import '../helpers.dart'; import '../mock/managers/cache_manager_mock.dart'; import '../mock/managers/user_repository_mock.dart'; diff --git a/test/managers/quick_link_repository_test.dart b/test/managers/quick_link_repository_test.dart index b1bc3acdf..e9b9a5b26 100644 --- a/test/managers/quick_link_repository_test.dart +++ b/test/managers/quick_link_repository_test.dart @@ -9,10 +9,10 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/cache_manager.dart'; -import 'package:notredame/core/managers/quick_link_repository.dart'; -import 'package:notredame/core/models/quick_link.dart'; -import 'package:notredame/core/models/quick_link_data.dart'; +import 'package:notredame/features/app/storage/cache_manager.dart'; +import 'package:notredame/features/app/repository/quick_link_repository.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link_data.dart'; import '../helpers.dart'; import '../mock/managers/cache_manager_mock.dart'; diff --git a/test/managers/settings_manager_test.dart b/test/managers/settings_manager_test.dart index f0a806108..82a0d646e 100644 --- a/test/managers/settings_manager_test.dart +++ b/test/managers/settings_manager_test.dart @@ -10,9 +10,9 @@ import 'package:mockito/mockito.dart'; import 'package:table_calendar/table_calendar.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/preferences_service.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/storage/preferences_service.dart'; import '../helpers.dart'; import '../mock/services/analytics_service_mock.dart'; import '../mock/services/preferences_service_mock.dart'; diff --git a/test/managers/user_repository_test.dart b/test/managers/user_repository_test.dart index b38974299..fa3d074a6 100644 --- a/test/managers/user_repository_test.dart +++ b/test/managers/user_repository_test.dart @@ -14,10 +14,10 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/cache_manager.dart'; -import 'package:notredame/core/managers/user_repository.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; +import 'package:notredame/features/app/storage/cache_manager.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; import '../helpers.dart'; import '../mock/managers/cache_manager_mock.dart'; import '../mock/services/analytics_service_mock.dart'; diff --git a/test/mock/managers/author_repository_mock.dart b/test/mock/managers/author_repository_mock.dart index b23ce9255..a3f7c42a1 100644 --- a/test/mock/managers/author_repository_mock.dart +++ b/test/mock/managers/author_repository_mock.dart @@ -4,7 +4,7 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/author_repository.dart'; +import 'package:notredame/features/app/repository/author_repository.dart'; import 'author_repository_mock.mocks.dart'; // Project imports: diff --git a/test/mock/managers/cache_manager_mock.dart b/test/mock/managers/cache_manager_mock.dart index 9eb3a3840..611698eb7 100644 --- a/test/mock/managers/cache_manager_mock.dart +++ b/test/mock/managers/cache_manager_mock.dart @@ -3,8 +3,8 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/cache_manager.dart'; -import 'package:notredame/core/utils/cache_exception.dart'; +import 'package:notredame/features/app/storage/cache_manager.dart'; +import 'package:notredame/utils/cache_exception.dart'; import 'cache_manager_mock.mocks.dart'; /// Mock for the [CacheManager] diff --git a/test/mock/managers/course_repository_mock.dart b/test/mock/managers/course_repository_mock.dart index f9807ad80..cef12cc0e 100644 --- a/test/mock/managers/course_repository_mock.dart +++ b/test/mock/managers/course_repository_mock.dart @@ -5,7 +5,7 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/course_repository.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; import 'course_repository_mock.mocks.dart'; @GenerateNiceMocks([MockSpec()]) diff --git a/test/mock/managers/news_repository_mock.dart b/test/mock/managers/news_repository_mock.dart index 65640dd46..b5781dc22 100644 --- a/test/mock/managers/news_repository_mock.dart +++ b/test/mock/managers/news_repository_mock.dart @@ -5,7 +5,7 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/news_repository.dart'; +import 'package:notredame/features/app/repository/news_repository.dart'; import 'news_repository_mock.mocks.dart'; @GenerateNiceMocks([MockSpec()]) diff --git a/test/mock/managers/quick_links_repository_mock.dart b/test/mock/managers/quick_links_repository_mock.dart index 44affe215..ec459e8e4 100644 --- a/test/mock/managers/quick_links_repository_mock.dart +++ b/test/mock/managers/quick_links_repository_mock.dart @@ -4,9 +4,9 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/quick_link_repository.dart'; -import 'package:notredame/core/models/quick_link.dart'; -import 'package:notredame/core/models/quick_link_data.dart'; +import 'package:notredame/features/app/repository/quick_link_repository.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link_data.dart'; import 'quick_links_repository_mock.mocks.dart'; @GenerateNiceMocks([MockSpec()]) diff --git a/test/mock/managers/settings_manager_mock.dart b/test/mock/managers/settings_manager_mock.dart index d0b4aa490..9780b2191 100644 --- a/test/mock/managers/settings_manager_mock.dart +++ b/test/mock/managers/settings_manager_mock.dart @@ -6,8 +6,8 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; import 'settings_manager_mock.mocks.dart'; @GenerateNiceMocks([MockSpec()]) diff --git a/test/mock/managers/user_repository_mock.dart b/test/mock/managers/user_repository_mock.dart index 8ac31014c..5688a0469 100644 --- a/test/mock/managers/user_repository_mock.dart +++ b/test/mock/managers/user_repository_mock.dart @@ -5,7 +5,7 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/user_repository.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; import 'user_repository_mock.mocks.dart'; /// Mock for the [UserRepository] diff --git a/test/mock/services/analytics_service_mock.dart b/test/mock/services/analytics_service_mock.dart index 883c9f4a7..59e72add6 100644 --- a/test/mock/services/analytics_service_mock.dart +++ b/test/mock/services/analytics_service_mock.dart @@ -2,7 +2,7 @@ import 'package:mockito/annotations.dart'; // Project imports: -import 'package:notredame/core/services/analytics_service.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; import 'analytics_service_mock.mocks.dart'; /// Mock for the [AnalyticsService] diff --git a/test/mock/services/app_widget_service_mock.dart b/test/mock/services/app_widget_service_mock.dart index 3f7c461df..a0eee541b 100644 --- a/test/mock/services/app_widget_service_mock.dart +++ b/test/mock/services/app_widget_service_mock.dart @@ -2,7 +2,7 @@ import 'package:mockito/annotations.dart'; // Project imports: -import 'package:notredame/core/services/app_widget_service.dart'; +import 'package:notredame/features/app/widgets/app_widget_service.dart'; import 'app_widget_service_mock.mocks.dart'; /// Mock for the [AppWidgetService] diff --git a/test/mock/services/github_api_mock.dart b/test/mock/services/github_api_mock.dart index 0c2983309..7dcbda5b3 100644 --- a/test/mock/services/github_api_mock.dart +++ b/test/mock/services/github_api_mock.dart @@ -8,8 +8,8 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/models/feedback_issue.dart'; -import 'package:notredame/core/services/github_api.dart'; +import 'package:notredame/features/more/feedback/models/feedback_issue.dart'; +import 'package:notredame/features/app/integration/github_api.dart'; import 'github_api_mock.mocks.dart'; /// Mock for the [GithubApi] diff --git a/test/mock/services/home_widget_mock.dart b/test/mock/services/home_widget_mock.dart index 1538e36cb..98ec3e5be 100644 --- a/test/mock/services/home_widget_mock.dart +++ b/test/mock/services/home_widget_mock.dart @@ -7,7 +7,7 @@ import 'package:home_widget/home_widget.dart'; import 'package:mockito/annotations.dart'; // Project imports: -import 'package:notredame/core/services/app_widget_service.dart'; +import 'package:notredame/features/app/widgets/app_widget_service.dart'; import 'home_widget_mock.mocks.dart'; /// Pseudo-mock for the static [HomeWidget] class (mocks the channel instead) diff --git a/test/mock/services/in_app_review_service_mock.dart b/test/mock/services/in_app_review_service_mock.dart index 53db569e5..314962191 100644 --- a/test/mock/services/in_app_review_service_mock.dart +++ b/test/mock/services/in_app_review_service_mock.dart @@ -3,7 +3,7 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/services/in_app_review_service.dart'; +import 'package:notredame/features/more/feedback/in_app_review_service.dart'; import 'in_app_review_service_mock.mocks.dart'; /// Mock for the [AnalyticsService] diff --git a/test/mock/services/internal_info_service_mock.dart b/test/mock/services/internal_info_service_mock.dart index 9fa8da90b..8b46b63ba 100644 --- a/test/mock/services/internal_info_service_mock.dart +++ b/test/mock/services/internal_info_service_mock.dart @@ -4,7 +4,7 @@ import 'package:mockito/mockito.dart'; import 'package:package_info_plus/package_info_plus.dart'; // Project imports: -import 'package:notredame/core/services/internal_info_service.dart'; +import 'package:notredame/features/app/error/internal_info_service.dart'; import 'internal_info_service_mock.mocks.dart'; @GenerateNiceMocks([MockSpec()]) diff --git a/test/mock/services/launch_url_service_mock.dart b/test/mock/services/launch_url_service_mock.dart index 6a3f85168..f323a6d29 100644 --- a/test/mock/services/launch_url_service_mock.dart +++ b/test/mock/services/launch_url_service_mock.dart @@ -3,7 +3,7 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/services/launch_url_service.dart'; +import 'package:notredame/features/app/integration/launch_url_service.dart'; import 'launch_url_service_mock.mocks.dart'; /// Mock for the [LaunchUrlService] diff --git a/test/mock/services/navigation_service_mock.dart b/test/mock/services/navigation_service_mock.dart index 53f438d1d..fcd2095a5 100644 --- a/test/mock/services/navigation_service_mock.dart +++ b/test/mock/services/navigation_service_mock.dart @@ -2,7 +2,7 @@ import 'package:mockito/annotations.dart'; // Project imports: -import 'package:notredame/core/services/navigation_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; import 'navigation_service_mock.mocks.dart'; /// Mock for the [NavigationService] diff --git a/test/mock/services/networking_service_mock.dart b/test/mock/services/networking_service_mock.dart index 12388978a..e9183d272 100644 --- a/test/mock/services/networking_service_mock.dart +++ b/test/mock/services/networking_service_mock.dart @@ -4,7 +4,7 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/services/networking_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; import 'networking_service_mock.mocks.dart'; /// Mock for the [NetworkingService] diff --git a/test/mock/services/preferences_service_mock.dart b/test/mock/services/preferences_service_mock.dart index b94c950de..819f8c3c5 100644 --- a/test/mock/services/preferences_service_mock.dart +++ b/test/mock/services/preferences_service_mock.dart @@ -3,8 +3,8 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/services/preferences_service.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/storage/preferences_service.dart'; import 'preferences_service_mock.mocks.dart'; @GenerateNiceMocks([MockSpec()]) diff --git a/test/mock/services/remote_config_service_mock.dart b/test/mock/services/remote_config_service_mock.dart index c0852494d..b0cbcb7ef 100644 --- a/test/mock/services/remote_config_service_mock.dart +++ b/test/mock/services/remote_config_service_mock.dart @@ -3,7 +3,7 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/services/remote_config_service.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; import 'remote_config_service_mock.mocks.dart'; /// Mock for the [RemoteConfigService] diff --git a/test/mock/services/rive_animation_service_mock.dart b/test/mock/services/rive_animation_service_mock.dart index 2b5c10753..dfda99d5e 100644 --- a/test/mock/services/rive_animation_service_mock.dart +++ b/test/mock/services/rive_animation_service_mock.dart @@ -4,8 +4,8 @@ import 'package:mockito/mockito.dart'; import 'package:rive/rive.dart'; // Project imports: -import 'package:notredame/core/services/rive_animation_service.dart'; -import 'package:notredame/core/utils/animation_exception.dart'; +import 'package:notredame/features/app/presentation/rive_animation_service.dart'; +import 'package:notredame/utils/animation_exception.dart'; import 'rive_animation_service_mock.mocks.dart'; /// Mock for the [RiveAnimationService] diff --git a/test/mock/services/siren_flutter_service_mock.dart b/test/mock/services/siren_flutter_service_mock.dart index fd90b7df6..9d03be2f3 100644 --- a/test/mock/services/siren_flutter_service_mock.dart +++ b/test/mock/services/siren_flutter_service_mock.dart @@ -4,7 +4,7 @@ import 'package:mockito/mockito.dart'; import 'package:pub_semver/pub_semver.dart'; // Project imports: -import 'package:notredame/core/services/siren_flutter_service.dart'; +import 'package:notredame/features/app/storage/siren_flutter_service.dart'; import 'siren_flutter_service_mock.mocks.dart'; /// Mock for the [SirenFlutterService] diff --git a/test/models/feedback_issue_test.dart b/test/models/feedback_issue_test.dart index 2aa0a2afd..501be5c13 100644 --- a/test/models/feedback_issue_test.dart +++ b/test/models/feedback_issue_test.dart @@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:github/github.dart'; // Project imports: -import 'package:notredame/core/models/feedback_issue.dart'; +import 'package:notredame/features/more/feedback/models/feedback_issue.dart'; void main() { group('FeedBackIssue - ', () { diff --git a/test/models/report_news_test.dart b/test/models/report_news_test.dart index 6f262595f..d4e956d12 100644 --- a/test/models/report_news_test.dart +++ b/test/models/report_news_test.dart @@ -2,7 +2,7 @@ import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/core/models/report_news.dart'; +import 'package:notredame/features/ets/events/report-news/models/report_news.dart'; void main() { group('ReportNews class tests', () { diff --git a/test/services/app_widget_service_test.dart b/test/services/app_widget_service_test.dart index 049236d82..91d07d278 100644 --- a/test/services/app_widget_service_test.dart +++ b/test/services/app_widget_service_test.dart @@ -3,9 +3,9 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:home_widget/home_widget.dart'; // Project imports: -import 'package:notredame/core/constants/widget_helper.dart'; -import 'package:notredame/core/models/widget_models.dart'; -import 'package:notredame/core/services/app_widget_service.dart'; +import 'package:notredame/constants/widget_helper.dart'; +import 'package:notredame/features/student/grades/widget_models.dart'; +import 'package:notredame/features/app/widgets/app_widget_service.dart'; import '../helpers.dart'; import '../mock/services/home_widget_mock.dart'; diff --git a/test/services/preferences_service_test.dart b/test/services/preferences_service_test.dart index 547faeaba..3cc302b45 100644 --- a/test/services/preferences_service_test.dart +++ b/test/services/preferences_service_test.dart @@ -3,8 +3,8 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/services/preferences_service.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/storage/preferences_service.dart'; void main() { late SharedPreferences sharedPreferences; diff --git a/test/ui/views/about_view_test.dart b/test/ui/views/about_view_test.dart index 309ebfee3..418be4909 100644 --- a/test/ui/views/about_view_test.dart +++ b/test/ui/views/about_view_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/ui/views/about_view.dart'; +import 'package:notredame/features/more/about/about_view.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/views/author_view_test.dart b/test/ui/views/author_view_test.dart index 9ae60b4c3..17f79c486 100644 --- a/test/ui/views/author_view_test.dart +++ b/test/ui/views/author_view_test.dart @@ -10,16 +10,16 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; // Project imports: -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/news_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/launch_url_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/ui/views/author_view.dart'; -import 'package:notredame/ui/widgets/news_card.dart'; -import 'package:notredame/ui/widgets/social_links_card.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/app/repository/news_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/integration/launch_url_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/ets/events/author/author_view.dart'; +import 'package:notredame/features/ets/events/news/widgets/news_card.dart'; +import 'package:notredame/features/ets/events/social/social_links_card.dart'; import '../../helpers.dart'; import '../../mock/managers/author_repository_mock.dart'; import '../../mock/managers/news_repository_mock.dart'; diff --git a/test/ui/views/choose_language_view_test.dart b/test/ui/views/choose_language_view_test.dart index df01ebcb3..f20cbd9f9 100644 --- a/test/ui/views/choose_language_view_test.dart +++ b/test/ui/views/choose_language_view_test.dart @@ -9,9 +9,9 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/ui/views/choose_language_view.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/more/settings/choose_language_view.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/views/dashboard_view_test.dart b/test/ui/views/dashboard_view_test.dart index 4aad5ae4b..839e761c8 100644 --- a/test/ui/views/dashboard_view_test.dart +++ b/test/ui/views/dashboard_view_test.dart @@ -11,12 +11,12 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/constants/update_code.dart'; -import 'package:notredame/ui/views/dashboard_view.dart'; -import 'package:notredame/ui/widgets/course_activity_tile.dart'; -import 'package:notredame/ui/widgets/dismissible_card.dart'; -import 'package:notredame/ui/widgets/grade_button.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/constants/update_code.dart'; +import 'package:notredame/features/dashboard/dashboard_view.dart'; +import 'package:notredame/features/dashboard/widgets/course_activity_tile.dart'; +import 'package:notredame/features/app/widgets/dismissible_card.dart'; +import 'package:notredame/features/student/grades/widgets/grade_button.dart'; import '../../helpers.dart'; import '../../mock/managers/course_repository_mock.dart'; import '../../mock/managers/settings_manager_mock.dart'; diff --git a/test/ui/views/emergency_view_test.dart b/test/ui/views/emergency_view_test.dart index 550018c51..cff82deea 100644 --- a/test/ui/views/emergency_view_test.dart +++ b/test/ui/views/emergency_view_test.dart @@ -7,7 +7,7 @@ import 'package:webview_flutter/webview_flutter.dart'; import 'package:webview_flutter_android/webview_flutter_android.dart'; // Project imports: -import 'package:notredame/ui/views/emergency_view.dart'; +import 'package:notredame/features/ets/quick-link/widgets/security-info/emergency_view.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/views/ets_view_test.dart b/test/ui/views/ets_view_test.dart index 6d32eb787..508dc96be 100644 --- a/test/ui/views/ets_view_test.dart +++ b/test/ui/views/ets_view_test.dart @@ -9,15 +9,15 @@ import 'package:feature_discovery/feature_discovery.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/news_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; -import 'package:notredame/ui/views/ets_view.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/app/repository/news_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; +import 'package:notredame/features/ets/ets_view.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; import '../../helpers.dart'; import '../../mock/managers/news_repository_mock.dart'; import '../../mock/services/remote_config_service_mock.dart'; diff --git a/test/ui/views/faq_view_test.dart b/test/ui/views/faq_view_test.dart index 2a924cf01..7a6190daa 100644 --- a/test/ui/views/faq_view_test.dart +++ b/test/ui/views/faq_view_test.dart @@ -10,8 +10,8 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; // Project imports: -import 'package:notredame/core/constants/faq.dart'; -import 'package:notredame/ui/views/faq_view.dart'; +import 'package:notredame/features/more/faq/models/faq.dart'; +import 'package:notredame/features/more/faq/faq_view.dart'; import '../../helpers.dart'; import '../../mock/managers/settings_manager_mock.dart'; diff --git a/test/ui/views/feedback_view_test.dart b/test/ui/views/feedback_view_test.dart index 7243f760e..cc4911755 100644 --- a/test/ui/views/feedback_view_test.dart +++ b/test/ui/views/feedback_view_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/ui/views/feedback_view.dart'; +import 'package:notredame/features/more/feedback/feedback_view.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/views/grades_details_view_test.dart b/test/ui/views/grades_details_view_test.dart index 841eeb4e9..cdec0db00 100644 --- a/test/ui/views/grades_details_view_test.dart +++ b/test/ui/views/grades_details_view_test.dart @@ -11,10 +11,10 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; // Project imports: -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/ui/views/grade_details_view.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/student/grades/grade_details/grade_details_view.dart'; import '../../helpers.dart'; import '../../mock/managers/course_repository_mock.dart'; diff --git a/test/ui/views/grades_view_test.dart b/test/ui/views/grades_view_test.dart index f6b8d8e8b..970839250 100644 --- a/test/ui/views/grades_view_test.dart +++ b/test/ui/views/grades_view_test.dart @@ -12,12 +12,12 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; // Project imports: -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/ui/views/grades_view.dart'; -import 'package:notredame/ui/widgets/grade_button.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/student/grades/grades_view.dart'; +import 'package:notredame/features/student/grades/widgets/grade_button.dart'; import '../../helpers.dart'; import '../../mock/managers/course_repository_mock.dart'; diff --git a/test/ui/views/login_view_test.dart b/test/ui/views/login_view_test.dart index 9a01d1cb4..054303e20 100644 --- a/test/ui/views/login_view_test.dart +++ b/test/ui/views/login_view_test.dart @@ -6,15 +6,15 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/managers/user_repository.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/launch_url_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/preferences_service.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; -import 'package:notredame/ui/views/login_view.dart'; -import 'package:notredame/ui/widgets/password_text_field.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/integration/launch_url_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/storage/preferences_service.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; +import 'package:notredame/features/welcome/login/login_view.dart'; +import 'package:notredame/features/welcome/widgets/password_text_field.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/views/more_view_test.dart b/test/ui/views/more_view_test.dart index 397d2b8dd..5c52621ce 100644 --- a/test/ui/views/more_view_test.dart +++ b/test/ui/views/more_view_test.dart @@ -12,9 +12,9 @@ import 'package:mockito/mockito.dart'; import 'package:shared_preferences/shared_preferences.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/ui/views/more_view.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/more/more_view.dart'; import '../../helpers.dart'; import '../../mock/managers/settings_manager_mock.dart'; import '../../mock/services/in_app_review_service_mock.dart'; diff --git a/test/ui/views/news_details_view_test.dart b/test/ui/views/news_details_view_test.dart index 20714a388..c4cd57f52 100644 --- a/test/ui/views/news_details_view_test.dart +++ b/test/ui/views/news_details_view_test.dart @@ -9,11 +9,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; -import 'package:notredame/ui/views/news_details_view.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; +import 'package:notredame/features/ets/events/news/news-details/news_details_view.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/views/news_view_test.dart b/test/ui/views/news_view_test.dart index c56e564a3..46e24eac5 100644 --- a/test/ui/views/news_view_test.dart +++ b/test/ui/views/news_view_test.dart @@ -8,13 +8,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/news_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/ui/views/news_view.dart'; -import 'package:notredame/ui/widgets/news_card.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/app/repository/news_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/ets/events/news/news_view.dart'; +import 'package:notredame/features/ets/events/news/widgets/news_card.dart'; import '../../helpers.dart'; import '../../mock/managers/news_repository_mock.dart'; diff --git a/test/ui/views/not_found_view_test.dart b/test/ui/views/not_found_view_test.dart index 7fe0bc0e0..c11713ebd 100644 --- a/test/ui/views/not_found_view_test.dart +++ b/test/ui/views/not_found_view_test.dart @@ -9,7 +9,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:rive/rive.dart'; // Project imports: -import 'package:notredame/ui/views/not_found_view.dart'; +import 'package:notredame/features/app/error/not_found/not_found_view.dart'; import '../../helpers.dart'; import '../../mock/services/rive_animation_service_mock.dart'; diff --git a/test/ui/views/profile_view_test.dart b/test/ui/views/profile_view_test.dart index ecc9ce31e..b19b82172 100644 --- a/test/ui/views/profile_view_test.dart +++ b/test/ui/views/profile_view_test.dart @@ -10,8 +10,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/ui/views/profile_view.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/student/profile/profile_view.dart'; import '../../helpers.dart'; import '../../mock/managers/user_repository_mock.dart'; import '../../mock/services/analytics_service_mock.dart'; diff --git a/test/ui/views/quick_links_view_test.dart b/test/ui/views/quick_links_view_test.dart index 111b1c68e..f7225c38b 100644 --- a/test/ui/views/quick_links_view_test.dart +++ b/test/ui/views/quick_links_view_test.dart @@ -10,12 +10,12 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/core/constants/quick_links.dart'; -import 'package:notredame/core/managers/quick_link_repository.dart'; -import 'package:notredame/core/services/launch_url_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/ui/views/quick_links_view.dart'; -import 'package:notredame/ui/widgets/web_link_card.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_links.dart'; +import 'package:notredame/features/app/repository/quick_link_repository.dart'; +import 'package:notredame/features/app/integration/launch_url_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/ets/quick-link/quick_links_view.dart'; +import 'package:notredame/features/ets/quick-link/widgets/web_link_card.dart'; import '../../helpers.dart'; import '../../mock/managers/quick_links_repository_mock.dart'; import '../../mock/services/analytics_service_mock.dart'; diff --git a/test/ui/views/schedule_default_view_test.dart b/test/ui/views/schedule_default_view_test.dart index fc6bfc0ca..87f8a02bd 100644 --- a/test/ui/views/schedule_default_view_test.dart +++ b/test/ui/views/schedule_default_view_test.dart @@ -10,11 +10,11 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/ui/views/schedule_default_view.dart'; -import 'package:notredame/ui/widgets/schedule_default.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/schedule/schedule_default/schedule_default_view.dart'; +import 'package:notredame/features/schedule/schedule_default/schedule_default.dart'; import '../../helpers.dart'; import '../../mock/managers/course_repository_mock.mocks.dart'; diff --git a/test/ui/views/schedule_view_test.dart b/test/ui/views/schedule_view_test.dart index 33baadac3..4d8274d40 100644 --- a/test/ui/views/schedule_view_test.dart +++ b/test/ui/views/schedule_view_test.dart @@ -8,19 +8,19 @@ import 'package:flutter/material.dart'; import 'package:ets_api_clients/models.dart'; import 'package:feature_discovery/feature_discovery.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/core/services/remote_config_service.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/app/analytics/remote_config_service.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:table_calendar/table_calendar.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/ui/views/schedule_view.dart'; -import 'package:notredame/ui/widgets/schedule_settings.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/schedule/schedule_view.dart'; +import 'package:notredame/features/schedule/widgets/schedule_settings.dart'; import '../../helpers.dart'; import '../../mock/managers/course_repository_mock.dart'; import '../../mock/managers/settings_manager_mock.dart'; diff --git a/test/ui/views/security_view_test.dart b/test/ui/views/security_view_test.dart index 4a19a130c..ada787023 100644 --- a/test/ui/views/security_view_test.dart +++ b/test/ui/views/security_view_test.dart @@ -7,8 +7,8 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; // Project imports: -import 'package:notredame/core/constants/emergency_procedures.dart'; -import 'package:notredame/ui/views/security_view.dart'; +import 'package:notredame/features/ets/quick-link/widgets/security-info/models/emergency_procedures.dart'; +import 'package:notredame/features/ets/quick-link/widgets/security-info/security_view.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/views/settings_view_test.dart b/test/ui/views/settings_view_test.dart index 78074b7da..b6ef8fdf9 100644 --- a/test/ui/views/settings_view_test.dart +++ b/test/ui/views/settings_view_test.dart @@ -10,8 +10,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/ui/views/settings_view.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/more/settings/settings_view.dart'; import '../../helpers.dart'; import '../../mock/services/analytics_service_mock.dart'; diff --git a/test/ui/views/student_view_test.dart b/test/ui/views/student_view_test.dart index 1e2923abc..63732fd32 100644 --- a/test/ui/views/student_view_test.dart +++ b/test/ui/views/student_view_test.dart @@ -9,11 +9,11 @@ import 'package:feature_discovery/feature_discovery.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/ui/views/student_view.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/student/student_view.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; import '../../helpers.dart'; import '../../mock/managers/course_repository_mock.dart'; import '../../mock/services/analytics_service_mock.dart'; diff --git a/test/ui/widgets/author_info_skeleton_test.dart b/test/ui/widgets/author_info_skeleton_test.dart index ae6a967d9..f60b1f116 100644 --- a/test/ui/widgets/author_info_skeleton_test.dart +++ b/test/ui/widgets/author_info_skeleton_test.dart @@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:shimmer/shimmer.dart'; // Project imports: -import 'package:notredame/ui/widgets/author_info_skeleton.dart'; +import 'package:notredame/features/ets/events/author/author_info_skeleton.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/widgets/base_scaffold_test.dart b/test/ui/widgets/base_scaffold_test.dart index 42145529d..c3a626db1 100644 --- a/test/ui/widgets/base_scaffold_test.dart +++ b/test/ui/widgets/base_scaffold_test.dart @@ -6,9 +6,9 @@ import 'package:feature_discovery/feature_discovery.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/ui/widgets/base_scaffold.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/app/widgets/base_scaffold.dart'; import '../../helpers.dart'; import '../../mock/services/analytics_service_mock.dart'; diff --git a/test/ui/widgets/bottom_bar_test.dart b/test/ui/widgets/bottom_bar_test.dart index dc069a22e..25c4d0967 100644 --- a/test/ui/widgets/bottom_bar_test.dart +++ b/test/ui/widgets/bottom_bar_test.dart @@ -7,10 +7,10 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/networking_service.dart'; -import 'package:notredame/ui/widgets/bottom_bar.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/integration/networking_service.dart'; +import 'package:notredame/features/app/widgets/bottom_bar.dart'; import '../../helpers.dart'; import '../../mock/services/analytics_service_mock.dart'; import '../../mock/services/navigation_service_mock.dart'; diff --git a/test/ui/widgets/course_activity_tile_test.dart b/test/ui/widgets/course_activity_tile_test.dart index 23deab4cb..c5e1b1418 100644 --- a/test/ui/widgets/course_activity_tile_test.dart +++ b/test/ui/widgets/course_activity_tile_test.dart @@ -6,7 +6,7 @@ import 'package:ets_api_clients/models.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/ui/widgets/course_activity_tile.dart'; +import 'package:notredame/features/dashboard/widgets/course_activity_tile.dart'; import '../../helpers.dart'; final CourseActivity course = CourseActivity( diff --git a/test/ui/widgets/dismissible_card_test.dart b/test/ui/widgets/dismissible_card_test.dart index a4a8100de..fe57d60a8 100644 --- a/test/ui/widgets/dismissible_card_test.dart +++ b/test/ui/widgets/dismissible_card_test.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/ui/widgets/dismissible_card.dart'; +import 'package:notredame/features/app/widgets/dismissible_card.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/widgets/grade_button_test.dart b/test/ui/widgets/grade_button_test.dart index e6e1f3deb..17433f043 100644 --- a/test/ui/widgets/grade_button_test.dart +++ b/test/ui/widgets/grade_button_test.dart @@ -5,11 +5,11 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/ui/widgets/grade_button.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/student/grades/widgets/grade_button.dart'; import '../../helpers.dart'; import '../../mock/managers/settings_manager_mock.dart'; import '../../mock/services/navigation_service_mock.dart'; diff --git a/test/ui/widgets/grade_circular_progress_test.dart b/test/ui/widgets/grade_circular_progress_test.dart index 94e3322bc..9768b63cc 100644 --- a/test/ui/widgets/grade_circular_progress_test.dart +++ b/test/ui/widgets/grade_circular_progress_test.dart @@ -4,7 +4,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:percent_indicator/percent_indicator.dart'; // Project imports: -import 'package:notredame/ui/widgets/grade_circular_progress.dart'; +import 'package:notredame/features/student/grades/widgets/grade_circular_progress.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/widgets/grade_evaluation_tile_test.dart b/test/ui/widgets/grade_evaluation_tile_test.dart index 97f86f274..abe129565 100644 --- a/test/ui/widgets/grade_evaluation_tile_test.dart +++ b/test/ui/widgets/grade_evaluation_tile_test.dart @@ -9,8 +9,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/ui/widgets/grade_circular_progress.dart'; -import 'package:notredame/ui/widgets/grade_evaluation_tile.dart'; +import 'package:notredame/features/student/grades/widgets/grade_circular_progress.dart'; +import 'package:notredame/features/student/grades/widgets/grade_evaluation_tile.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/widgets/grade_not_available_test.dart b/test/ui/widgets/grade_not_available_test.dart index 1abd31268..eba10fe6e 100644 --- a/test/ui/widgets/grade_not_available_test.dart +++ b/test/ui/widgets/grade_not_available_test.dart @@ -6,7 +6,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/ui/widgets/grade_not_available.dart'; +import 'package:notredame/features/student/grades/widgets/grade_not_available.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/widgets/link_web_view_test.dart b/test/ui/widgets/link_web_view_test.dart index 21eef2549..e1437781d 100644 --- a/test/ui/widgets/link_web_view_test.dart +++ b/test/ui/widgets/link_web_view_test.dart @@ -7,8 +7,8 @@ import 'package:webview_flutter/webview_flutter.dart'; import 'package:webview_flutter_android/webview_flutter_android.dart'; // Project imports: -import 'package:notredame/core/models/quick_link.dart'; -import 'package:notredame/ui/widgets/link_web_view.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; +import 'package:notredame/features/app/widgets/link_web_view.dart'; import '../../helpers.dart'; final _quickLink = QuickLink( diff --git a/test/ui/widgets/news_card_test.dart b/test/ui/widgets/news_card_test.dart index 9b4f1b085..d06907d1e 100644 --- a/test/ui/widgets/news_card_test.dart +++ b/test/ui/widgets/news_card_test.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/ui/widgets/news_card.dart'; +import 'package:notredame/features/ets/events/news/widgets/news_card.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/widgets/news_skeleton_test.dart b/test/ui/widgets/news_skeleton_test.dart index 27df32854..d574e3920 100644 --- a/test/ui/widgets/news_skeleton_test.dart +++ b/test/ui/widgets/news_skeleton_test.dart @@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:shimmer/shimmer.dart'; // Project imports: -import 'package:notredame/ui/widgets/news_card_skeleton.dart'; +import 'package:notredame/features/ets/events/news/widgets/news_card_skeleton.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/widgets/password_text_field_test.dart b/test/ui/widgets/password_text_field_test.dart index b6b937e8b..5c98478b2 100644 --- a/test/ui/widgets/password_text_field_test.dart +++ b/test/ui/widgets/password_text_field_test.dart @@ -6,7 +6,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/ui/widgets/password_text_field.dart'; +import 'package:notredame/features/welcome/widgets/password_text_field.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/widgets/schedule_default_test.dart b/test/ui/widgets/schedule_default_test.dart index f6d2aee38..eb41959b3 100644 --- a/test/ui/widgets/schedule_default_test.dart +++ b/test/ui/widgets/schedule_default_test.dart @@ -3,7 +3,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/ui/widgets/schedule_default.dart'; +import 'package:notredame/features/schedule/schedule_default/schedule_default.dart'; import '../../helpers.dart'; void main() { diff --git a/test/ui/widgets/schedule_settings_test.dart b/test/ui/widgets/schedule_settings_test.dart index 8409f8d16..8319b290e 100644 --- a/test/ui/widgets/schedule_settings_test.dart +++ b/test/ui/widgets/schedule_settings_test.dart @@ -13,8 +13,8 @@ import 'package:mockito/mockito.dart'; import 'package:table_calendar/table_calendar.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/ui/widgets/schedule_settings.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/schedule/widgets/schedule_settings.dart'; import '../../helpers.dart'; import '../../mock/managers/course_repository_mock.dart'; import '../../mock/managers/settings_manager_mock.dart'; diff --git a/test/ui/widgets/student_program_test.dart b/test/ui/widgets/student_program_test.dart index 9143a7f2d..a784e0952 100644 --- a/test/ui/widgets/student_program_test.dart +++ b/test/ui/widgets/student_program_test.dart @@ -7,7 +7,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/ui/widgets/student_program.dart'; +import 'package:notredame/features/student/widgets/student_program.dart'; import '../../helpers.dart'; final _program = Program( diff --git a/test/ui/widgets/web_link_card_test.dart b/test/ui/widgets/web_link_card_test.dart index a2db92117..02c2be5a8 100644 --- a/test/ui/widgets/web_link_card_test.dart +++ b/test/ui/widgets/web_link_card_test.dart @@ -6,11 +6,11 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/models/quick_link.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/internal_info_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/ui/widgets/web_link_card.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/error/internal_info_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/ets/quick-link/widgets/web_link_card.dart'; import '../../helpers.dart'; import '../../mock/services/analytics_service_mock.dart'; import '../../mock/services/launch_url_service_mock.dart'; diff --git a/test/viewmodels/author_viewmodel_test.dart b/test/viewmodels/author_viewmodel_test.dart index 449783594..70f977345 100644 --- a/test/viewmodels/author_viewmodel_test.dart +++ b/test/viewmodels/author_viewmodel_test.dart @@ -6,9 +6,9 @@ import 'package:logger/logger.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/author_repository.dart'; -import 'package:notredame/core/managers/news_repository.dart'; -import 'package:notredame/core/viewmodels/author_viewmodel.dart'; +import 'package:notredame/features/app/repository/author_repository.dart'; +import 'package:notredame/features/app/repository/news_repository.dart'; +import 'package:notredame/features/ets/events/author/author_viewmodel.dart'; import '../helpers.dart'; import '../mock/managers/author_repository_mock.dart'; import '../mock/managers/news_repository_mock.dart'; diff --git a/test/viewmodels/choose_language_viewmodel_test.dart b/test/viewmodels/choose_language_viewmodel_test.dart index 1e93a2e52..db84b90a7 100644 --- a/test/viewmodels/choose_language_viewmodel_test.dart +++ b/test/viewmodels/choose_language_viewmodel_test.dart @@ -4,11 +4,11 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/viewmodels/choose_language_viewmodel.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/more/settings/choose_language_viewmodel.dart'; import '../helpers.dart'; import '../mock/managers/settings_manager_mock.dart'; import '../mock/services/navigation_service_mock.dart'; diff --git a/test/viewmodels/dashboard_viewmodel_test.dart b/test/viewmodels/dashboard_viewmodel_test.dart index ee03a25c5..c2da7c7ee 100644 --- a/test/viewmodels/dashboard_viewmodel_test.dart +++ b/test/viewmodels/dashboard_viewmodel_test.dart @@ -4,10 +4,10 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/constants/progress_bar_text_options.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/viewmodels/dashboard_viewmodel.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/dashboard/progress_bar_text_options.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/dashboard/dashboard_viewmodel.dart'; import '../helpers.dart'; import '../mock/managers/course_repository_mock.dart'; import '../mock/managers/settings_manager_mock.dart'; diff --git a/test/viewmodels/faq_viewmodel_test.dart b/test/viewmodels/faq_viewmodel_test.dart index 7f39739dc..95c0575c9 100644 --- a/test/viewmodels/faq_viewmodel_test.dart +++ b/test/viewmodels/faq_viewmodel_test.dart @@ -6,9 +6,9 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/launch_url_service.dart'; -import 'package:notredame/core/viewmodels/faq_viewmodel.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/integration/launch_url_service.dart'; +import 'package:notredame/features/more/faq/faq_viewmodel.dart'; import '../helpers.dart'; import '../mock/services/launch_url_service_mock.dart'; diff --git a/test/viewmodels/feedback_viewmodel_test.dart b/test/viewmodels/feedback_viewmodel_test.dart index b685b2b9b..44d2d36b8 100644 --- a/test/viewmodels/feedback_viewmodel_test.dart +++ b/test/viewmodels/feedback_viewmodel_test.dart @@ -13,12 +13,12 @@ import 'package:image/image.dart' as image; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/constants/feedback_type.dart'; -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/models/feedback_issue.dart'; -import 'package:notredame/core/services/github_api.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/viewmodels/feedback_viewmodel.dart'; +import 'package:notredame/features/more/feedback/feedback_type.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/more/feedback/models/feedback_issue.dart'; +import 'package:notredame/features/app/integration/github_api.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/more/feedback/feedback_viewmodel.dart'; import '../helpers.dart'; import '../mock/services/github_api_mock.dart'; import '../mock/services/preferences_service_mock.dart'; diff --git a/test/viewmodels/grades_details_viewmodel_test.dart b/test/viewmodels/grades_details_viewmodel_test.dart index a099f4c79..2d1a13dde 100644 --- a/test/viewmodels/grades_details_viewmodel_test.dart +++ b/test/viewmodels/grades_details_viewmodel_test.dart @@ -5,9 +5,9 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/viewmodels/grades_details_viewmodel.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/student/grades/grade_details/grades_details_viewmodel.dart'; import '../helpers.dart'; import '../mock/managers/course_repository_mock.dart'; diff --git a/test/viewmodels/grades_viewmodel_test.dart b/test/viewmodels/grades_viewmodel_test.dart index b3be684fb..6f1a94040 100644 --- a/test/viewmodels/grades_viewmodel_test.dart +++ b/test/viewmodels/grades_viewmodel_test.dart @@ -5,10 +5,10 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/viewmodels/grades_viewmodel.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/student/grades/grades_viewmodel.dart'; import '../helpers.dart'; import '../mock/managers/course_repository_mock.dart'; diff --git a/test/viewmodels/login_viewmodel_test.dart b/test/viewmodels/login_viewmodel_test.dart index a96be3d0a..4e9f6ceee 100644 --- a/test/viewmodels/login_viewmodel_test.dart +++ b/test/viewmodels/login_viewmodel_test.dart @@ -4,10 +4,10 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/managers/user_repository.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/viewmodels/login_viewmodel.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/welcome/login/login_viewmodel.dart'; import '../helpers.dart'; import '../mock/managers/user_repository_mock.dart'; import '../mock/services/navigation_service_mock.dart'; diff --git a/test/viewmodels/more_viewmodel_test.dart b/test/viewmodels/more_viewmodel_test.dart index a6a78203a..37f35847b 100644 --- a/test/viewmodels/more_viewmodel_test.dart +++ b/test/viewmodels/more_viewmodel_test.dart @@ -5,14 +5,14 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/managers/cache_manager.dart'; -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/managers/user_repository.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/preferences_service.dart'; -import 'package:notredame/core/viewmodels/more_viewmodel.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/storage/cache_manager.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/storage/preferences_service.dart'; +import 'package:notredame/features/more/more_viewmodel.dart'; import '../helpers.dart'; import '../mock/managers/cache_manager_mock.dart'; import '../mock/managers/course_repository_mock.dart'; diff --git a/test/viewmodels/news_details_viewmodel_test.dart b/test/viewmodels/news_details_viewmodel_test.dart index 853b57d77..1f85084ed 100644 --- a/test/viewmodels/news_details_viewmodel_test.dart +++ b/test/viewmodels/news_details_viewmodel_test.dart @@ -3,8 +3,8 @@ import 'package:ets_api_clients/models.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/core/viewmodels/news_details_viewmodel.dart'; -import 'package:notredame/ui/utils/app_theme.dart'; +import 'package:notredame/features/ets/events/news/news-details/news_details_viewmodel.dart'; +import 'package:notredame/utils/app_theme.dart'; void main() { late NewsDetailsViewModel viewModel; diff --git a/test/viewmodels/news_viewmodel_test.dart b/test/viewmodels/news_viewmodel_test.dart index 058e36642..737b5554e 100644 --- a/test/viewmodels/news_viewmodel_test.dart +++ b/test/viewmodels/news_viewmodel_test.dart @@ -4,10 +4,10 @@ import 'package:logger/logger.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/news_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/viewmodels/news_viewmodel.dart'; -import 'package:notredame/locator.dart'; +import 'package:notredame/features/app/repository/news_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/ets/events/news/news_viewmodel.dart'; +import 'package:notredame/utils/locator.dart'; import '../helpers.dart'; import '../mock/managers/news_repository_mock.dart'; diff --git a/test/viewmodels/not_found_viewmodel_test.dart b/test/viewmodels/not_found_viewmodel_test.dart index 52e228fe7..e415ebc70 100644 --- a/test/viewmodels/not_found_viewmodel_test.dart +++ b/test/viewmodels/not_found_viewmodel_test.dart @@ -4,11 +4,11 @@ import 'package:mockito/mockito.dart'; import 'package:rive/rive.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/rive_animation_service.dart'; -import 'package:notredame/core/viewmodels/not_found_viewmodel.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/presentation/rive_animation_service.dart'; +import 'package:notredame/features/app/error/not_found/not_found_viewmodel.dart'; import '../helpers.dart'; import '../mock/services/analytics_service_mock.dart'; import '../mock/services/navigation_service_mock.dart'; diff --git a/test/viewmodels/profile_viewmodel_test.dart b/test/viewmodels/profile_viewmodel_test.dart index 023e6e3a7..904c1dec5 100644 --- a/test/viewmodels/profile_viewmodel_test.dart +++ b/test/viewmodels/profile_viewmodel_test.dart @@ -4,9 +4,9 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/constants/programs_credits.dart'; -import 'package:notredame/core/managers/user_repository.dart'; -import 'package:notredame/core/viewmodels/profile_viewmodel.dart'; +import 'package:notredame/features/student/profile/programs_credits.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; +import 'package:notredame/features/student/profile/profile_viewmodel.dart'; import '../helpers.dart'; import '../mock/managers/user_repository_mock.dart'; diff --git a/test/viewmodels/quick_links_viewmodel_test.dart b/test/viewmodels/quick_links_viewmodel_test.dart index 71abbb2b1..891952500 100644 --- a/test/viewmodels/quick_links_viewmodel_test.dart +++ b/test/viewmodels/quick_links_viewmodel_test.dart @@ -3,11 +3,11 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; // Project imports: -import 'package:notredame/core/constants/quick_links.dart'; -import 'package:notredame/core/managers/quick_link_repository.dart'; -import 'package:notredame/core/models/quick_link.dart'; -import 'package:notredame/core/models/quick_link_data.dart'; -import 'package:notredame/core/viewmodels/quick_links_viewmodel.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_links.dart'; +import 'package:notredame/features/app/repository/quick_link_repository.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link_data.dart'; +import 'package:notredame/features/ets/quick-link/quick_links_viewmodel.dart'; import '../helpers.dart'; import '../mock/managers/quick_links_repository_mock.dart'; diff --git a/test/viewmodels/schedule_default_viewmodel_test.dart b/test/viewmodels/schedule_default_viewmodel_test.dart index 134afbe28..71d422879 100644 --- a/test/viewmodels/schedule_default_viewmodel_test.dart +++ b/test/viewmodels/schedule_default_viewmodel_test.dart @@ -7,8 +7,8 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/viewmodels/schedule_default_viewmodel.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/schedule/schedule_default/schedule_default_viewmodel.dart'; import '../helpers.dart'; void main() { diff --git a/test/viewmodels/schedule_settings_viewmodel_test.dart b/test/viewmodels/schedule_settings_viewmodel_test.dart index 0d9b1f70b..15344538f 100644 --- a/test/viewmodels/schedule_settings_viewmodel_test.dart +++ b/test/viewmodels/schedule_settings_viewmodel_test.dart @@ -6,9 +6,9 @@ import 'package:mockito/mockito.dart'; import 'package:table_calendar/table_calendar.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/viewmodels/schedule_settings_viewmodel.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/schedule/schedule_settings_viewmodel.dart'; import '../helpers.dart'; import '../mock/managers/course_repository_mock.dart'; import '../mock/managers/settings_manager_mock.dart'; diff --git a/test/viewmodels/schedule_viewmodel_test.dart b/test/viewmodels/schedule_viewmodel_test.dart index 91f16e108..daf430640 100644 --- a/test/viewmodels/schedule_viewmodel_test.dart +++ b/test/viewmodels/schedule_viewmodel_test.dart @@ -6,10 +6,10 @@ import 'package:mockito/mockito.dart'; import 'package:table_calendar/table_calendar.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/managers/course_repository.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/viewmodels/schedule_viewmodel.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/repository/course_repository.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/schedule/schedule_viewmodel.dart'; import '../helpers.dart'; import '../mock/managers/course_repository_mock.dart'; import '../mock/managers/settings_manager_mock.dart'; diff --git a/test/viewmodels/settings_viewmodel_test.dart b/test/viewmodels/settings_viewmodel_test.dart index a3d01d24e..8d0138a25 100644 --- a/test/viewmodels/settings_viewmodel_test.dart +++ b/test/viewmodels/settings_viewmodel_test.dart @@ -7,9 +7,9 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/viewmodels/settings_viewmodel.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/more/settings/settings_viewmodel.dart'; import '../helpers.dart'; import '../mock/managers/settings_manager_mock.dart'; diff --git a/test/viewmodels/startup_viewmodel_test.dart b/test/viewmodels/startup_viewmodel_test.dart index 211173905..2beb4ec01 100644 --- a/test/viewmodels/startup_viewmodel_test.dart +++ b/test/viewmodels/startup_viewmodel_test.dart @@ -4,15 +4,15 @@ import 'package:mockito/mockito.dart'; import 'package:pub_semver/pub_semver.dart'; // Project imports: -import 'package:notredame/core/constants/preferences_flags.dart'; -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/constants/update_code.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/managers/user_repository.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/services/preferences_service.dart'; -import 'package:notredame/core/services/siren_flutter_service.dart'; -import 'package:notredame/core/viewmodels/startup_viewmodel.dart'; +import 'package:notredame/constants/preferences_flags.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/constants/update_code.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/app/repository/user_repository.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/app/storage/preferences_service.dart'; +import 'package:notredame/features/app/storage/siren_flutter_service.dart'; +import 'package:notredame/features/app/startup/startup_viewmodel.dart'; import '../helpers.dart'; import '../mock/managers/settings_manager_mock.dart'; import '../mock/managers/user_repository_mock.dart'; diff --git a/test/viewmodels/web_link_card_viewmodel_test.dart b/test/viewmodels/web_link_card_viewmodel_test.dart index 290c835dd..8a6f9420e 100644 --- a/test/viewmodels/web_link_card_viewmodel_test.dart +++ b/test/viewmodels/web_link_card_viewmodel_test.dart @@ -6,13 +6,13 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; // Project imports: -import 'package:notredame/core/constants/router_paths.dart'; -import 'package:notredame/core/managers/settings_manager.dart'; -import 'package:notredame/core/models/quick_link.dart'; -import 'package:notredame/core/services/analytics_service.dart'; -import 'package:notredame/core/services/internal_info_service.dart'; -import 'package:notredame/core/services/navigation_service.dart'; -import 'package:notredame/core/viewmodels/web_link_card_viewmodel.dart'; +import 'package:notredame/features/app/navigation/router_paths.dart'; +import 'package:notredame/features/more/settings/settings_manager.dart'; +import 'package:notredame/features/ets/quick-link/models/quick_link.dart'; +import 'package:notredame/features/app/analytics/analytics_service.dart'; +import 'package:notredame/features/app/error/internal_info_service.dart'; +import 'package:notredame/features/app/navigation/navigation_service.dart'; +import 'package:notredame/features/ets/quick-link/widgets/web_link_card_viewmodel.dart'; import '../helpers.dart'; import '../mock/services/analytics_service_mock.dart'; import '../mock/services/internal_info_service_mock.dart';