From 28658521240bcef909570070b18019bbb6568d29 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Wed, 1 Oct 2025 23:59:19 +0300 Subject: [PATCH] fix: refactor --- lib/core/app_config.dart | 53 +++++ lib/core/app_initializer.dart | 68 ++++++ lib/core/di/cubit_registrations.dart | 162 +++++++++++++ lib/core/di/external_registrations.dart | 33 +++ lib/core/di/repository_registrations.dart | 88 +++++++ lib/core/di/service_registrations.dart | 88 +++++++ lib/core/locator_service.dart | 276 ++-------------------- lib/main.dart | 68 +----- 8 files changed, 520 insertions(+), 316 deletions(-) create mode 100644 lib/core/app_config.dart create mode 100644 lib/core/app_initializer.dart create mode 100644 lib/core/di/cubit_registrations.dart create mode 100644 lib/core/di/external_registrations.dart create mode 100644 lib/core/di/repository_registrations.dart create mode 100644 lib/core/di/service_registrations.dart diff --git a/lib/core/app_config.dart b/lib/core/app_config.dart new file mode 100644 index 00000000..554a326f --- /dev/null +++ b/lib/core/app_config.dart @@ -0,0 +1,53 @@ +import 'package:eatvio_app/core/locator_service.dart'; +import 'package:eatvio_app/core/views/cubit/views_cubit.dart'; +import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart'; +import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart'; +import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart'; +import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart'; +import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart'; +import 'package:eatvio_app/features/internet_connection_checker/internet_connection_checker_screen.dart'; +import 'package:eatvio_app/generated/l10n.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; + +/// Конфигурация приложения +class AppConfig { + /// Список глобальных BlocProvider'ов + static List get globalBlocProviders => [ + BlocProvider(create: (context) => sl()), + BlocProvider( + create: (context) => sl()..getNotifications(), + ), + BlocProvider( + create: (context) => sl()..loadFeedBlogPostList(), + ), + BlocProvider( + create: (context) => sl()..getMyProfile(), + ), + BlocProvider( + create: (context) => sl()..getChatRoomsWithLoading(), + ), + ]; + + /// Делегаты локализации + static const List localizationDelegates = [ + S.delegate, + GlobalMaterialLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + ]; + + /// Поддерживаемые локали + static const List supportedLocales = [ + Locale.fromSubtags(languageCode: 'ru'), + ]; + + /// Создание обертки для проверки интернет-соединения + static Widget createInternetConnectionWrapper(Widget child) { + return BlocProvider( + create: (context) => sl(), + child: InternetConnectionCheckerScreen(child: child), + ); + } +} diff --git a/lib/core/app_initializer.dart b/lib/core/app_initializer.dart new file mode 100644 index 00000000..a3798a34 --- /dev/null +++ b/lib/core/app_initializer.dart @@ -0,0 +1,68 @@ +import 'dart:io' as io; +import 'package:eatvio_app/core/env_config.dart'; +import 'package:eatvio_app/core/locator_service.dart' as di; +import 'package:eatvio_app/firebase_options.dart'; +import 'package:firebase_core/firebase_core.dart'; +import 'package:firebase_messaging/firebase_messaging.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter_native_splash/flutter_native_splash.dart'; +import 'package:flutter_dotenv/flutter_dotenv.dart'; +import 'package:appmetrica_plugin/appmetrica_plugin.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + +/// Класс для инициализации приложения +class AppInitializer { + /// Инициализация всех сервисов приложения + static Future initialize() async { + await _initializeSentry(); + await _initializeEnvironment(); + await _initializeFirebase(); + await _initializeDependencyInjection(); + await _initializeDebugMode(); + await _initializeAnalytics(); + } + + /// Инициализация Sentry + static Future _initializeSentry() async { + final widgetsBinding = SentryWidgetsFlutterBinding.ensureInitialized(); + FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding); + } + + /// Загрузка переменных окружения + static Future _initializeEnvironment() async { + await dotenv.load(fileName: ".env"); + } + + /// Инициализация Firebase + static Future _initializeFirebase() async { + await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform); + await FirebaseMessaging.instance.requestPermission(); + } + + /// Инициализация системы внедрения зависимостей + static Future _initializeDependencyInjection() async { + await di.init(); + } + + /// Настройка режима отладки + static Future _initializeDebugMode() async { + if (kDebugMode) { + io.HttpClient.enableTimelineLogging = true; + } + } + + /// Инициализация аналитики + static Future _initializeAnalytics() async { + AppMetrica.activate(AppMetricaConfig(EnvConfig.appMetricaApiKey)); + AppMetrica.reportEvent('Application started'); + } + + /// Запуск приложения с Sentry + static Future runAppWithSentry(VoidCallback appRunner) async { + await SentryFlutter.init((options) { + options.dsn = EnvConfig.sentryDsn; + options.tracesSampleRate = 1.0; + options.debug = false; + }, appRunner: appRunner); + } +} diff --git a/lib/core/di/cubit_registrations.dart b/lib/core/di/cubit_registrations.dart new file mode 100644 index 00000000..efd0dbd2 --- /dev/null +++ b/lib/core/di/cubit_registrations.dart @@ -0,0 +1,162 @@ +import 'package:eatvio_app/core/views/cubit/views_cubit.dart'; +import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart'; +import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart'; +import 'package:eatvio_app/features/blog_post/presentation/cubit/blog_post_cubit.dart'; +import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart'; +import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart'; +import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart'; +import 'package:eatvio_app/features/calendar/presentation/bloc/calendar_cubit.dart'; +import 'package:eatvio_app/features/cancel_plan_bottom_sheet/cubit/cancel_plan_cubit.dart'; +import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart'; +import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart'; +import 'package:eatvio_app/features/complaining/presentation/cubit/complaining_cubit.dart'; +import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart'; +import 'package:eatvio_app/features/consultant_rating/presentation/cubit/consultant_rating_cubit.dart'; +import 'package:eatvio_app/features/consultations/presentation/cubit/consultations_cubit.dart'; +import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_cubit.dart'; +import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_cubit.dart'; +import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart'; +import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_cubit/consultant_comments_cubit.dart'; +import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart'; +import 'package:eatvio_app/features/diets/presentation/cubit/about_diet_cubit.dart'; +import 'package:eatvio_app/features/feed/presentation/bloc/consultants_cubit/consultants_cubit.dart'; +import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart'; +import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart'; +import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_cubit.dart'; +import 'package:eatvio_app/features/feed/presentation/bloc/profile_cubit/profile_cubit.dart'; +import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart'; +import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/archive/consultations_archive_cubit.dart'; +import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/consultant_finances/consultant_finances_cubit.dart'; +import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/user_purchases/user_purchases_cubit.dart'; +import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart'; +import 'package:eatvio_app/features/menu/presentation/bloc/notification_settings_cubit/notification_settings_cubit.dart'; +import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_cubit.dart'; +import 'package:eatvio_app/features/my_finance/presentation/cubit/user_cards_cubit/user_cards_cubit.dart'; +import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.dart'; +import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart'; +import 'package:eatvio_app/features/order_info/cubit/order_info_cubit.dart'; +import 'package:eatvio_app/features/plans/presentation/cubit/about_plan_cubit.dart'; +import 'package:eatvio_app/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart' as profile_plans; +import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart'; +import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart'; +import 'package:eatvio_app/features/recipe/presentation/cubit/about_recipe_cubit.dart'; +import 'package:eatvio_app/features/recipe/presentation/cubit/my_recipes_cubit/my_recieps_cubit.dart'; +import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart'; +import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart'; +import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart'; +import 'package:eatvio_app/features/user_details/presentation/cubit/user_details_cubit.dart'; +import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart'; +import 'package:get_it/get_it.dart'; + +/// Регистрация всех Cubit'ов в системе внедрения зависимостей +class CubitRegistrations { + static final sl = GetIt.instance; + + /// Регистрация всех Cubit'ов + static void registerAll() { + _registerSingletonCubits(); + _registerFactoryCubits(); + } + + /// Регистрация Cubit'ов как синглтонов + static void _registerSingletonCubits() { + sl.registerLazySingleton(() => NewMessagesCubit()); + sl.registerLazySingleton( + () => NotificationsCubit(wsManager: sl(), notificationsRepository: sl()), + ); + sl.registerLazySingleton( + () => ProfileAvatarCubit(profileRepository: sl()), + ); + sl.registerLazySingleton( + () => ChatsCubit(chatRepository: sl(), wsManager: sl(), profileRepository: sl()), + ); + } + + /// Регистрация Cubit'ов как фабрик + static void _registerFactoryCubits() { + // Auth related cubits + sl.registerFactory(() => AuthCubit(authRepository: sl())); + sl.registerFactory(() => RegistrationCubit(registrationRepository: sl())); + sl.registerFactory(() => ResetPasswordCubit(resetPasswordRepository: sl())); + sl.registerFactory(() => VerifyEmailCubit(profileRepository: sl())); + + // Feed related cubits + sl.registerFactory(() => FeedCubit(feedRepository: sl())); + sl.registerFactory( + () => RecipesCubit(feedRepository: sl(), recipeRepository: sl(), aboutRecipeRepository: sl()), + ); + sl.registerFactory(() => DietsCubit(feedRepository: sl(), dietsRepository: sl())); + sl.registerFactory(() => PlansCubit(feedRepository: sl(), planRepository: sl())); + sl.registerFactory(() => ConsultantsCubit(feedRepository: sl())); + sl.registerFactory(() => CommentsCubit(feedRepository: sl(), commentsRepository: sl())); + + // Chat related cubits + sl.registerFactory( + () => ChatRoomCubit(cardsRepository: sl(), chatRepository: sl(), wsManager: sl()), + ); + + // Profile related cubits + sl.registerFactory( + () => ProfileCubit(profileRepository: sl(), chatRepository: sl(), consultantRepository: sl()), + ); + sl.registerFactory(() => profile_plans.PlansCubit(plansRepository: sl())); + sl.registerFactory(() => SubCubit(profileRepository: sl())); + + // Content creation cubits + sl.registerFactory( + () => CreateDietCubit(profileRepository: sl(), createDietRepository: sl(), glossaryRepository: sl()), + ); + sl.registerFactory(() => CreatePlanCubit(createPlanRepository: sl())); + sl.registerFactory( + () => CreateRecipeCubit(recipeRepository: sl(), glossaryRepository: sl()), + ); + sl.registerFactory(() => BlogPostCreateCubit(blogPostRepository: sl())); + + // Content viewing cubits + sl.registerFactory(() => AboutDietCubit(dietsRepository: sl(), profileRepository: sl())); + sl.registerFactory(() => AboutPlanCubit(planRepository: sl())); + sl.registerFactory(() => AboutRecipeCubit(recipeRepository: sl(), profileRepository: sl())); + sl.registerFactory(() => BlogPostCubit(sl())); + + // User content cubits + sl.registerFactory(() => MyDietsCubit(myDietsRepository: sl(), createDietRepository: sl())); + sl.registerFactory(() => MyPlansCubit(myPlansRepository: sl())); + sl.registerFactory(() => MyRecipesCubit(myRecipesRepository: sl(), aboutRecipeRepository: sl())); + + // Other feature cubits + sl.registerFactory(() => CalendarCubit(calendarRepository: sl())); + sl.registerFactory( + () => DiaryCubit( + chatRepository: sl(), + diaryRepository: sl(), + glossaryRepository: sl(), + profileRepository: sl(), + dietRepository: sl(), + settingsRepository: sl(), + ), + ); + sl.registerFactory( + () => SettingsCubit( + profileRepository: sl(), + settingsRepository: sl(), + consultantRepository: sl(), + consultationsRepository: sl(), + ), + ); + sl.registerFactory(() => RegisterConsultantCubit(consultantRepository: sl())); + sl.registerFactory(() => ComplainingCubit(repository: sl())); + sl.registerFactory(() => UserCardsCubit(cardsRepository: sl())); + sl.registerFactory(() => OrderInfoCubit(chatRepository: sl())); + sl.registerFactory(() => ConsultationsCubit(consultationsRepository: sl())); + sl.registerFactory(() => ConsultantCommentsCubit(diaryRepository: sl())); + sl.registerFactory(() => CancelPlanCubit(cancelPlanRepository: sl())); + sl.registerFactory(() => ConsultationsArchiveCubit(consultationsRepository: sl())); + sl.registerFactory(() => ConsultantFinancesCubit(consultationsRepository: sl())); + sl.registerFactory(() => UserPurchasesCubit(consultationsRepository: sl())); + sl.registerFactory(() => BlockedUsersCubit(blockedUsersRepository: sl())); + sl.registerFactory(() => NotificationSettingsCubit(notificationSettingsRepository: sl())); + sl.registerFactory(() => ConsultantRatingCubit(sl())); + sl.registerFactory(() => ViewsCubit(viewsRepository: sl())); + sl.registerFactory(() => UserDetailsCubit(profileRepository: sl())); + } +} diff --git a/lib/core/di/external_registrations.dart b/lib/core/di/external_registrations.dart new file mode 100644 index 00000000..38b3caa0 --- /dev/null +++ b/lib/core/di/external_registrations.dart @@ -0,0 +1,33 @@ +import 'package:dio/dio.dart'; +import 'package:eatvio_app/core/const.dart'; +import 'package:eatvio_app/core/dio/phone_verify_error_interceptor.dart'; +import 'package:eatvio_app/core/interceptors/token_interceptor.dart'; +import 'package:get_it/get_it.dart'; + +/// Регистрация внешних зависимостей в системе внедрения зависимостей +class ExternalRegistrations { + static final sl = GetIt.instance; + + /// Регистрация всех внешних зависимостей + static void registerAll() { + _registerDio(); + } + + /// Регистрация Dio HTTP клиента + static void _registerDio() { + sl.registerLazySingleton( + () => Dio( + BaseOptions( + baseUrl: baseUrl, + headers: { + 'accept': 'application/json', + 'content-type': 'application/json', + }, + ), + )..interceptors.addAll([ + TokenInterceptor(), + PhoneVerifyErrorInterceptor(), + ]), + ); + } +} diff --git a/lib/core/di/repository_registrations.dart b/lib/core/di/repository_registrations.dart new file mode 100644 index 00000000..6ce258aa --- /dev/null +++ b/lib/core/di/repository_registrations.dart @@ -0,0 +1,88 @@ +import 'package:eatvio_app/core/comments/repositories/comments_repository.dart'; +import 'package:eatvio_app/core/views/repository/views_repository.dart'; +import 'package:eatvio_app/features/auth/repositories/auth_repository.dart'; +import 'package:eatvio_app/features/auth/repositories/reset_password_repository.dart'; +import 'package:eatvio_app/features/blog_post_create/repositories/blog_post_repository.dart'; +import 'package:eatvio_app/features/calendar/repositories/calendar_repository.dart'; +import 'package:eatvio_app/features/cancel_plan_bottom_sheet/repository/cancel_plan_repository.dart'; +import 'package:eatvio_app/features/chat/repositories/chat_repository.dart'; +import 'package:eatvio_app/features/complaining/repositories/complaining_repository.dart'; +import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart'; +import 'package:eatvio_app/features/consultant_rating/repositories/consultant_rating_repository.dart'; +import 'package:eatvio_app/features/consultations/repositories/consultations_repository.dart'; +import 'package:eatvio_app/features/create_diet/repositories/create_diet_repository.dart'; +import 'package:eatvio_app/features/create_plan/repositories/create_plan_repository.dart'; +import 'package:eatvio_app/features/create_recipe/reporitories/recipe_repository.dart'; +import 'package:eatvio_app/features/diary/repositories/diary_repository.dart'; +import 'package:eatvio_app/features/diets/repositories/diet_repository.dart'; +import 'package:eatvio_app/features/feed/repositories/feed_repository.dart'; +import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart'; +import 'package:eatvio_app/features/menu/presentation/repositories/blocked_users_repository.dart'; +import 'package:eatvio_app/features/menu/repositories/notification_settings_repository.dart'; +import 'package:eatvio_app/features/my_diets/repositories/my_diets_repository.dart'; +import 'package:eatvio_app/features/my_finance/repositories/cards_repository.dart'; +import 'package:eatvio_app/features/my_plans/repositories/my_diets_repository.dart'; +import 'package:eatvio_app/features/notifications/repository/notifications_repository.dart'; +import 'package:eatvio_app/features/plans/repositories/plan_repository.dart'; +import 'package:eatvio_app/features/plans/repositories/plans_repository.dart'; +import 'package:eatvio_app/features/profile/repositories/profile_repository.dart'; +import 'package:eatvio_app/features/recipe/repositories/about_recipe_repository.dart'; +import 'package:eatvio_app/features/recipe/repositories/my_recipes_repository.dart'; +import 'package:eatvio_app/features/registration/repositories/registration_repository.dart'; +import 'package:eatvio_app/features/settings/repositories/service_repository.dart'; +import 'package:get_it/get_it.dart'; + +/// Регистрация всех Repository в системе внедрения зависимостей +class RepositoryRegistrations { + static final sl = GetIt.instance; + + /// Регистрация всех Repository + static void registerAll() { + _registerSingletonRepositories(); + _registerFactoryRepositories(); + } + + /// Регистрация Repository как синглтонов + static void _registerSingletonRepositories() { + // Core repositories + sl.registerLazySingleton(() => ChatRepository(chatService: sl())); + sl.registerLazySingleton(() => FeedRepository(feedService: sl())); + sl.registerLazySingleton(() => ProfileRepository(profileService: sl())); + sl.registerLazySingleton(() => CalendarRepository(calendarService: sl())); + sl.registerLazySingleton(() => SettingsRepository(settingsService: sl())); + sl.registerLazySingleton(() => ConsultantRepository(consultantService: sl())); + sl.registerLazySingleton(() => DiaryRepository(diaryService: sl())); + sl.registerLazySingleton(() => GlossaryRepository(glossaryService: sl())); + sl.registerLazySingleton(() => DietRepository(dietsService: sl())); + sl.registerLazySingleton(() => PlansRepository(plansService: sl())); + sl.registerLazySingleton(() => PlanRepository(planService: sl())); + sl.registerLazySingleton(() => AboutRecipeRepository(recipeService: sl())); + sl.registerLazySingleton(() => ComplainingRepository(service: sl())); + sl.registerLazySingleton(() => AuthRepository(authService: sl())); + sl.registerLazySingleton(() => CardsRepository(cardsService: sl())); + sl.registerLazySingleton(() => ConsultationsRepository(consultationService: sl())); + sl.registerLazySingleton(() => CancelPlanRepository(cancelService: sl())); + sl.registerLazySingleton(() => CreatePlanRepository(createPlanService: sl())); + sl.registerLazySingleton(() => NotificationsRepository(notificationsService: sl())); + sl.registerLazySingleton(() => BlockedUsersRepository(blockedUserService: sl())); + sl.registerLazySingleton(() => CommentsRepository(service: sl())); + sl.registerLazySingleton(() => NotificationSettingsRepository(sl())); + + // Content repositories + sl.registerLazySingleton(() => BlogPostRepository(blogPostService: sl())); + sl.registerLazySingleton(() => CreateDietRepository(createDietService: sl())); + sl.registerLazySingleton(() => MyDietsRepository(myDietsService: sl())); + sl.registerLazySingleton(() => MyPlansRepository(myPlansService: sl())); + + // Auth repositories + sl.registerLazySingleton(() => RegistrationRepository(registrationService: sl())); + } + + /// Регистрация Repository как фабрик + static void _registerFactoryRepositories() { + sl.registerFactory(() => MyRecipesRepository(myRecipesService: sl())); + sl.registerFactory(() => ResetPasswordRepository(resetPasswordService: sl())); + sl.registerFactory(() => ConsultantRatingRepository(sl())); + sl.registerFactory(() => ViewsRepository(viewsService: sl())); + } +} diff --git a/lib/core/di/service_registrations.dart b/lib/core/di/service_registrations.dart new file mode 100644 index 00000000..454d9064 --- /dev/null +++ b/lib/core/di/service_registrations.dart @@ -0,0 +1,88 @@ +import 'package:eatvio_app/core/comments/services/comments_service.dart'; +import 'package:eatvio_app/core/firebase_api.dart'; +import 'package:eatvio_app/core/views/service/views_service.dart'; +import 'package:eatvio_app/core/websockets/ws_service.dart'; +import 'package:eatvio_app/features/auth/services/auth_service.dart'; +import 'package:eatvio_app/features/auth/services/reset_password_service.dart'; +import 'package:eatvio_app/features/blog_post_create/services/blog_post_service.dart'; +import 'package:eatvio_app/features/calendar/services/calendar_service.dart'; +import 'package:eatvio_app/features/cancel_plan_bottom_sheet/service/cancel_plan_service.dart'; +import 'package:eatvio_app/features/chat/services/chat_service.dart'; +import 'package:eatvio_app/features/complaining/services/complaining_service.dart'; +import 'package:eatvio_app/features/consultant/become_consultant/services/consultant_service.dart'; +import 'package:eatvio_app/features/consultant_rating/services/consultant_rating_service.dart'; +import 'package:eatvio_app/features/consultations/services/consultation_service.dart'; +import 'package:eatvio_app/features/create_diet/services/create_diet_service.dart'; +import 'package:eatvio_app/features/create_plan/services/create_plan_service.dart'; +import 'package:eatvio_app/features/create_recipe/services/recipe_service.dart'; +import 'package:eatvio_app/features/diary/services/diary_service.dart'; +import 'package:eatvio_app/features/diets/services/diet_service.dart'; +import 'package:eatvio_app/features/feed/services/feed_service.dart'; +import 'package:eatvio_app/features/glossary/services/glossary_service.dart'; +import 'package:eatvio_app/features/menu/services/blocked_users_service.dart'; +import 'package:eatvio_app/features/menu/services/notification_settings_service.dart'; +import 'package:eatvio_app/features/my_diets/services/my_diets_service.dart'; +import 'package:eatvio_app/features/my_finance/services/cards_service.dart'; +import 'package:eatvio_app/features/my_plans/services/my_plans_service.dart'; +import 'package:eatvio_app/features/notifications/service/notifications_service.dart'; +import 'package:eatvio_app/features/plans/services/plan_service.dart'; +import 'package:eatvio_app/features/plans/services/plans_service.dart'; +import 'package:eatvio_app/features/profile/services/profile_service.dart'; +import 'package:eatvio_app/features/recipe/services/about_recipe_service.dart'; +import 'package:eatvio_app/features/recipe/services/my_recipes_service.dart'; +import 'package:eatvio_app/features/registration/services/registration_service.dart'; +import 'package:eatvio_app/features/settings/services/settings_service.dart'; +import 'package:get_it/get_it.dart'; + +/// Регистрация всех Service в системе внедрения зависимостей +class ServiceRegistrations { + static final sl = GetIt.instance; + + /// Регистрация всех Service + static void registerAll() { + _registerSingletonServices(); + } + + /// Регистрация Service как синглтонов + static void _registerSingletonServices() { + // Core services + sl.registerLazySingleton(() => ChatService(sl())); + sl.registerLazySingleton(() => FeedService(sl())); + sl.registerLazySingleton(() => ProfileService(sl())); + sl.registerLazySingleton(() => CalendarService(sl())); + sl.registerLazySingleton(() => SettingsService(sl())); + sl.registerLazySingleton(() => ConsultantService(sl())); + sl.registerLazySingleton(() => DiaryService(sl())); + sl.registerLazySingleton(() => GlossaryService(sl())); + sl.registerLazySingleton(() => DietService(sl())); + sl.registerLazySingleton(() => PlansService(sl())); + sl.registerLazySingleton(() => PlanService(sl())); + sl.registerLazySingleton(() => MyDietsService(sl())); + sl.registerLazySingleton(() => MyPlansService(sl())); + sl.registerLazySingleton(() => WsService(sl())); + sl.registerLazySingleton(() => AboutRecipeService(sl())); + sl.registerLazySingleton(() => ComplainingService(sl())); + sl.registerLazySingleton(() => AuthService(sl())); + sl.registerLazySingleton(() => CardsService(sl())); + sl.registerLazySingleton(() => ConsultationService(sl())); + sl.registerLazySingleton(() => CancelPlanService(sl())); + sl.registerLazySingleton(() => CreatePlanService(sl())); + sl.registerLazySingleton(() => NotificationsService(sl())); + sl.registerLazySingleton(() => FirebaseApi()); + sl.registerLazySingleton(() => ResetPasswordService(sl())); + sl.registerLazySingleton(() => BlockedUserService(sl())); + sl.registerLazySingleton(() => CommentsService(sl())); + sl.registerLazySingleton(() => MyRecipesService(sl())); + sl.registerLazySingleton(() => ConsultantRatingService(sl())); + sl.registerLazySingleton(() => NotificationSettingsService(sl())); + sl.registerLazySingleton(() => ViewsService(sl())); + + // Content services + sl.registerLazySingleton(() => CreateRecipeService(sl())); + sl.registerLazySingleton(() => BlogPostService(sl())); + sl.registerLazySingleton(() => CreateDietService(sl())); + + // Auth services + sl.registerLazySingleton(() => RegistrationService(sl())); + } +} diff --git a/lib/core/locator_service.dart b/lib/core/locator_service.dart index 37713f29..8299fea2 100644 --- a/lib/core/locator_service.dart +++ b/lib/core/locator_service.dart @@ -1,263 +1,27 @@ -import 'package:dio/dio.dart'; -import 'package:eatvio_app/core/comments/repositories/comments_repository.dart'; -import 'package:eatvio_app/core/comments/services/comments_service.dart'; -import 'package:eatvio_app/core/const.dart'; -import 'package:eatvio_app/core/dio/phone_verify_error_interceptor.dart'; -import 'package:eatvio_app/core/firebase_api.dart'; -import 'package:eatvio_app/core/interceptors/token_interceptor.dart'; -import 'package:eatvio_app/core/views/cubit/views_cubit.dart'; -import 'package:eatvio_app/core/views/repository/views_repository.dart'; -import 'package:eatvio_app/core/views/service/views_service.dart'; +import 'package:eatvio_app/core/di/cubit_registrations.dart'; +import 'package:eatvio_app/core/di/external_registrations.dart'; +import 'package:eatvio_app/core/di/repository_registrations.dart'; +import 'package:eatvio_app/core/di/service_registrations.dart'; import 'package:eatvio_app/core/websockets/ws_manager.dart'; -import 'package:eatvio_app/core/websockets/ws_service.dart'; -import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart'; -import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart'; -import 'package:eatvio_app/features/auth/repositories/auth_repository.dart'; -import 'package:eatvio_app/features/auth/repositories/reset_password_repository.dart'; -import 'package:eatvio_app/features/auth/services/auth_service.dart'; -import 'package:eatvio_app/features/auth/services/reset_password_service.dart'; -import 'package:eatvio_app/features/blog_post/presentation/cubit/blog_post_cubit.dart'; -import 'package:eatvio_app/features/cancel_plan_bottom_sheet/cubit/cancel_plan_cubit.dart'; -import 'package:eatvio_app/features/cancel_plan_bottom_sheet/repository/cancel_plan_repository.dart'; -import 'package:eatvio_app/features/cancel_plan_bottom_sheet/service/cancel_plan_service.dart'; -import 'package:eatvio_app/features/complaining/presentation/cubit/complaining_cubit.dart'; -import 'package:eatvio_app/features/complaining/repositories/complaining_repository.dart'; -import 'package:eatvio_app/features/complaining/services/complaining_service.dart'; -import 'package:eatvio_app/features/consultant_rating/presentation/cubit/consultant_rating_cubit.dart'; -import 'package:eatvio_app/features/consultant_rating/repositories/consultant_rating_repository.dart'; -import 'package:eatvio_app/features/consultant_rating/services/consultant_rating_service.dart'; -import 'package:eatvio_app/features/consultations/presentation/cubit/consultations_cubit.dart'; -import 'package:eatvio_app/features/consultations/repositories/consultations_repository.dart'; -import 'package:eatvio_app/features/consultations/services/consultation_service.dart'; -import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/archive/consultations_archive_cubit.dart'; -import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_cubit.dart'; -import 'package:eatvio_app/features/create_diet/repositories/create_diet_repository.dart'; -import 'package:eatvio_app/features/create_diet/services/create_diet_service.dart'; -import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_cubit.dart'; -import 'package:eatvio_app/features/create_plan/repositories/create_plan_repository.dart'; -import 'package:eatvio_app/features/create_plan/services/create_plan_service.dart'; -import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_cubit/consultant_comments_cubit.dart'; -import 'package:eatvio_app/features/diets/repositories/diet_repository.dart'; -import 'package:eatvio_app/features/diets/services/diet_service.dart'; -import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart'; -import 'package:eatvio_app/features/blog_post_create/repositories/blog_post_repository.dart'; -import 'package:eatvio_app/features/blog_post_create/services/blog_post_service.dart'; -import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart'; -import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/consultant_finances/consultant_finances_cubit.dart'; -import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/user_purchases/user_purchases_cubit.dart'; -import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart'; -import 'package:eatvio_app/features/menu/presentation/bloc/notification_settings_cubit/notification_settings_cubit.dart'; -import 'package:eatvio_app/features/menu/presentation/repositories/blocked_users_repository.dart'; -import 'package:eatvio_app/features/menu/repositories/notification_settings_repository.dart'; -import 'package:eatvio_app/features/menu/services/blocked_users_service.dart'; -import 'package:eatvio_app/features/menu/services/notification_settings_service.dart'; -import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart'; -import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart'; -import 'package:eatvio_app/features/calendar/presentation/bloc/calendar_cubit.dart'; -import 'package:eatvio_app/features/calendar/repositories/calendar_repository.dart'; -import 'package:eatvio_app/features/calendar/services/calendar_service.dart'; -import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart'; -import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart'; -import 'package:eatvio_app/features/chat/repositories/chat_repository.dart'; -import 'package:eatvio_app/features/chat/services/chat_service.dart'; -import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart'; -import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart'; -import 'package:eatvio_app/features/consultant/become_consultant/services/consultant_service.dart'; -import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart'; -import 'package:eatvio_app/features/diary/repositories/diary_repository.dart'; -import 'package:eatvio_app/features/diary/services/diary_service.dart'; -import 'package:eatvio_app/features/diets/presentation/cubit/about_diet_cubit.dart'; -import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart'; -import 'package:eatvio_app/features/feed/presentation/bloc/consultants_cubit/consultants_cubit.dart'; -import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart'; -import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart'; -import 'package:eatvio_app/features/feed/presentation/bloc/profile_cubit/profile_cubit.dart'; -import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart'; -import 'package:eatvio_app/features/feed/repositories/feed_repository.dart'; -import 'package:eatvio_app/features/feed/services/feed_service.dart'; -import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart'; -import 'package:eatvio_app/features/glossary/services/glossary_service.dart'; -import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_cubit.dart'; -import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_cubit.dart'; -import 'package:eatvio_app/features/my_diets/repositories/my_diets_repository.dart'; -import 'package:eatvio_app/features/my_diets/services/my_diets_service.dart'; -import 'package:eatvio_app/features/my_finance/presentation/cubit/user_cards_cubit/user_cards_cubit.dart'; -import 'package:eatvio_app/features/my_finance/repositories/cards_repository.dart'; -import 'package:eatvio_app/features/my_finance/services/cards_service.dart'; -import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.dart'; -import 'package:eatvio_app/features/my_plans/repositories/my_diets_repository.dart'; -import 'package:eatvio_app/features/my_plans/services/my_plans_service.dart'; -import 'package:eatvio_app/features/notifications/repository/notifications_repository.dart'; -import 'package:eatvio_app/features/notifications/service/notifications_service.dart'; -import 'package:eatvio_app/features/order_info/cubit/order_info_cubit.dart'; -import 'package:eatvio_app/features/plans/repositories/plans_repository.dart'; -import 'package:eatvio_app/features/plans/services/plans_service.dart'; -import 'package:eatvio_app/features/plans/presentation/cubit/about_plan_cubit.dart'; -import 'package:eatvio_app/features/plans/repositories/plan_repository.dart'; -import 'package:eatvio_app/features/plans/services/plan_service.dart'; -import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart'; -import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart'; -import 'package:eatvio_app/features/profile/repositories/profile_repository.dart'; -import 'package:eatvio_app/features/profile/services/profile_service.dart'; -import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart'; -import 'package:eatvio_app/features/create_recipe/reporitories/recipe_repository.dart'; -import 'package:eatvio_app/features/create_recipe/services/recipe_service.dart'; -import 'package:eatvio_app/features/recipe/presentation/cubit/about_recipe_cubit.dart'; -import 'package:eatvio_app/features/recipe/presentation/cubit/my_recipes_cubit/my_recieps_cubit.dart'; -import 'package:eatvio_app/features/recipe/repositories/about_recipe_repository.dart'; -import 'package:eatvio_app/features/recipe/repositories/my_recipes_repository.dart'; -import 'package:eatvio_app/features/recipe/services/about_recipe_service.dart'; -import 'package:eatvio_app/features/recipe/services/my_recipes_service.dart'; -import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart'; -import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart'; -import 'package:eatvio_app/features/registration/repositories/registration_repository.dart'; -import 'package:eatvio_app/features/registration/services/registration_service.dart'; -import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart'; -import 'package:eatvio_app/features/settings/repositories/service_repository.dart'; -import 'package:eatvio_app/features/settings/services/settings_service.dart'; -import 'package:eatvio_app/features/user_details/presentation/cubit/user_details_cubit.dart'; import 'package:get_it/get_it.dart'; -import 'package:eatvio_app/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart' as profile_plans; +/// Глобальный экземпляр GetIt для внедрения зависимостей final sl = GetIt.instance; +/// Инициализация системы внедрения зависимостей Future init() async { - // Cubit singletons + // Регистрация внешних зависимостей (Dio, etc.) + ExternalRegistrations.registerAll(); + + // Регистрация сервисов + ServiceRegistrations.registerAll(); + + // Регистрация репозиториев + RepositoryRegistrations.registerAll(); + + // Регистрация Cubit'ов + CubitRegistrations.registerAll(); + + // Регистрация WebSocket менеджера sl.registerLazySingleton(() => WsManager(wsService: sl())); - sl.registerLazySingleton(() => NewMessagesCubit()); - sl.registerLazySingleton(() => NotificationsCubit(wsManager: sl(), notificationsRepository: sl())); - sl.registerLazySingleton(() => ProfileAvatarCubit(profileRepository: sl())); - sl.registerLazySingleton(() => ChatsCubit(chatRepository: sl(), wsManager: sl(), profileRepository: sl())); - - // Cubit factories - sl.registerFactory(() => FeedCubit(feedRepository: sl())); - sl.registerFactory(() => RegistrationCubit(registrationRepository: sl())); - sl.registerFactory(() => ChatRoomCubit(cardsRepository: sl(), chatRepository: sl(), wsManager: sl())); - sl.registerFactory(() => RecipesCubit(feedRepository: sl(), recipeRepository: sl(), aboutRecipeRepository: sl())); - sl.registerFactory(() => CalendarCubit(calendarRepository: sl())); - sl.registerFactory(() => ProfileCubit(profileRepository: sl(), chatRepository: sl(), consultantRepository: sl())); - sl.registerFactory(() => profile_plans.PlansCubit(plansRepository: sl())); - sl.registerFactory(() => DietsCubit(feedRepository: sl(), dietsRepository: sl())); - sl.registerFactory(() => CommentsCubit(feedRepository: sl(), commentsRepository: sl())); - sl.registerFactory(() => PlansCubit(feedRepository: sl(), planRepository: sl())); - sl.registerFactory(() => SettingsCubit(profileRepository: sl(), settingsRepository: sl(), consultantRepository: sl(), consultationsRepository: sl())); - sl.registerFactory(() => RegisterConsultantCubit(consultantRepository: sl())); - sl.registerFactory( - () => DiaryCubit( - chatRepository: sl(), - diaryRepository: sl(), - glossaryRepository: sl(), - profileRepository: sl(), - dietRepository: sl(), - settingsRepository: sl(), - ), - ); - sl.registerFactory(() => AboutDietCubit(dietsRepository: sl(), profileRepository: sl())); - sl.registerFactory(() => BlogPostCreateCubit(blogPostRepository: sl())); - sl.registerFactory(() => SubCubit(profileRepository: sl())); - sl.registerFactory(() => CreateDietCubit(profileRepository: sl(), createDietRepository: sl(), glossaryRepository: sl())); - sl.registerFactory(() => CreatePlanCubit(createPlanRepository: sl())); - sl.registerFactory(() => FeedProfileCubit(profileRepository: sl())); - sl.registerFactory(() => AboutPlanCubit(planRepository: sl())); - sl.registerFactory(() => CreateRecipeCubit(recipeRepository: sl(), glossaryRepository: sl())); - sl.registerFactory(() => MyDietsCubit(myDietsRepository: sl(), createDietRepository: sl())); - sl.registerFactory(() => MyPlansCubit(myPlansRepository: sl())); - sl.registerFactory(() => UserDetailsCubit(profileRepository: sl())); - sl.registerFactory(() => ConsultantsCubit(feedRepository: sl())); - sl.registerFactory(() => AboutRecipeCubit(recipeRepository: sl(), profileRepository: sl())); - sl.registerFactory(() => AuthCubit(authRepository: sl())); - sl.registerFactory(() => ComplainingCubit(repository: sl())); - sl.registerFactory(() => UserCardsCubit(cardsRepository: sl())); - sl.registerFactory(() => OrderInfoCubit(chatRepository: sl())); - sl.registerFactory(() => ConsultationsCubit(consultationsRepository: sl())); - sl.registerFactory(() => ConsultantCommentsCubit(diaryRepository: sl())); - sl.registerFactory(() => CancelPlanCubit(cancelPlanRepository: sl())); - sl.registerFactory(() => VerifyEmailCubit(profileRepository: sl())); - sl.registerFactory(() => MyRecipesCubit(myRecipesRepository: sl(), aboutRecipeRepository: sl())); - sl.registerFactory(() => ConsultationsArchiveCubit(consultationsRepository: sl())); - sl.registerFactory(() => ConsultantFinancesCubit(consultationsRepository: sl())); - sl.registerFactory(() => UserPurchasesCubit(consultationsRepository: sl())); - sl.registerFactory(() => ResetPasswordCubit(resetPasswordRepository: sl())); - sl.registerFactory(() => BlogPostCubit(sl())); - sl.registerFactory(() => BlockedUsersCubit(blockedUsersRepository: sl())); - sl.registerFactory(() => NotificationSettingsCubit(notificationSettingsRepository: sl())); - sl.registerFactory(() => ConsultantRatingCubit(sl())); - sl.registerFactory(() => ViewsCubit(viewsRepository: sl())); - - // Repository - sl.registerLazySingleton(() => ChatRepository(chatService: sl())); - sl.registerLazySingleton(() => FeedRepository(feedService: sl())); - sl.registerLazySingleton(() => RegistrationRepository(registrationService: sl())); - sl.registerLazySingleton(() => CalendarRepository(calendarService: sl())); - sl.registerLazySingleton(() => ProfileRepository(profileService: sl())); - sl.registerLazySingleton(() => RecipeRepository(recipeService: sl())); - sl.registerLazySingleton(() => SettingsRepository(settingsService: sl())); - sl.registerLazySingleton(() => ConsultantRepository(consultantService: sl())); - sl.registerLazySingleton(() => DiaryRepository(diaryService: sl())); - sl.registerLazySingleton(() => GlossaryRepository(glossaryService: sl())); - sl.registerLazySingleton(() => DietRepository(dietsService: sl())); - sl.registerLazySingleton(() => BlogPostRepository(blogPostService: sl())); - sl.registerLazySingleton(() => CreateDietRepository(createDietService: sl())); - sl.registerLazySingleton(() => PlansRepository(plansService: sl())); - sl.registerLazySingleton(() => PlanRepository(planService: sl())); - sl.registerLazySingleton(() => MyDietsRepository(myDietsService: sl())); - sl.registerLazySingleton(() => MyPlansRepository(myPlansService: sl())); - sl.registerLazySingleton(() => AboutRecipeRepository(recipeService: sl())); - sl.registerLazySingleton(() => ComplainingRepository(service: sl())); - sl.registerLazySingleton(() => AuthRepository(authService: sl())); - sl.registerLazySingleton(() => CardsRepository(cardsService: sl())); - sl.registerLazySingleton(() => ConsultationsRepository(consultationService: sl())); - sl.registerLazySingleton(() => CancelPlanRepository(cancelService: sl())); - sl.registerLazySingleton(() => CreatePlanRepository(createPlanService: sl())); - sl.registerLazySingleton(() => NotificationsRepository(notificationsService: sl())); - sl.registerFactory(() => MyRecipesRepository(myRecipesService: sl())); - sl.registerFactory(() => ResetPasswordRepository(resetPasswordService: sl())); - sl.registerLazySingleton(() => BlockedUsersRepository(blockedUserService: sl())); - sl.registerLazySingleton(() => CommentsRepository(service: sl())); - sl.registerLazySingleton(() => NotificationSettingsRepository(sl())); - sl.registerFactory(() => ConsultantRatingRepository(sl())); - sl.registerFactory(() => ViewsRepository(viewsService: sl())); - - // Services - sl.registerLazySingleton(() => ChatService(sl())); - sl.registerLazySingleton(() => FeedService(sl())); - sl.registerLazySingleton(() => RegistrationService(sl())); - sl.registerLazySingleton(() => CalendarService(sl())); - sl.registerLazySingleton(() => ProfileService(sl())); - sl.registerLazySingleton(() => CreateRecipeService(sl())); - sl.registerLazySingleton(() => SettingsService(sl())); - sl.registerLazySingleton(() => ConsultantService(sl())); - sl.registerLazySingleton(() => DiaryService(sl())); - sl.registerLazySingleton(() => GlossaryService(sl())); - sl.registerLazySingleton(() => DietService(sl())); - sl.registerLazySingleton(() => BlogPostService(sl())); - sl.registerLazySingleton(() => CreateDietService(sl())); - sl.registerLazySingleton(() => PlansService(sl())); - sl.registerLazySingleton(() => PlanService(sl())); - sl.registerLazySingleton(() => MyDietsService(sl())); - sl.registerLazySingleton(() => MyPlansService(sl())); - sl.registerLazySingleton(() => WsService(sl())); - sl.registerLazySingleton(() => AboutRecipeService(sl())); - sl.registerLazySingleton(() => ComplainingService(sl())); - sl.registerLazySingleton(() => AuthService(sl())); - sl.registerLazySingleton(() => CardsService(sl())); - sl.registerLazySingleton(() => ConsultationService(sl())); - sl.registerLazySingleton(() => CancelPlanService(sl())); - sl.registerLazySingleton(() => CreatePlanService(sl())); - sl.registerLazySingleton(() => NotificationsService(sl())); - sl.registerLazySingleton(() => FirebaseApi()); - sl.registerLazySingleton(() => ResetPasswordService(sl())); - sl.registerLazySingleton(() => BlockedUserService(sl())); - sl.registerLazySingleton(() => CommentsService(sl())); - sl.registerLazySingleton(() => MyRecipesService(sl())); - sl.registerLazySingleton(() => ConsultantRatingService(sl())); - sl.registerLazySingleton(() => NotificationSettingsService(sl())); - sl.registerLazySingleton(() => ViewsService(sl())); - - // External - sl.registerLazySingleton( - () => - Dio(BaseOptions(baseUrl: baseUrl, headers: {'accept': 'application/json', 'content-type': 'application/json'})) - ..interceptors.addAll([TokenInterceptor(), PhoneVerifyErrorInterceptor()]), - ); -} +} \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index d716f3fa..c6501d49 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,53 +1,15 @@ -import 'dart:io' as io; +import 'package:eatvio_app/core/app_config.dart'; +import 'package:eatvio_app/core/app_initializer.dart'; import 'package:eatvio_app/core/app_router.dart'; -import 'package:eatvio_app/core/locator_service.dart' as di; -import 'package:eatvio_app/core/locator_service.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; -import 'package:eatvio_app/core/views/cubit/views_cubit.dart'; -import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart'; -import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart'; -import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart'; -import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart'; -import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart'; -import 'package:eatvio_app/features/internet_connection_checker/internet_connection_checker_screen.dart'; -import 'package:eatvio_app/firebase_options.dart'; -import 'package:eatvio_app/generated/l10n.dart'; -import 'package:firebase_core/firebase_core.dart'; -import 'package:firebase_messaging/firebase_messaging.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; -import 'package:flutter_native_splash/flutter_native_splash.dart'; import 'package:flutter_portal/flutter_portal.dart'; import 'package:keyboard_dismisser/keyboard_dismisser.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; -import 'package:eatvio_app/core/env_config.dart'; -import 'package:appmetrica_plugin/appmetrica_plugin.dart'; Future main() async { - WidgetsBinding widgetsBinding = SentryWidgetsFlutterBinding.ensureInitialized(); - FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding); - - await dotenv.load(fileName: ".env"); - - await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform); - await FirebaseMessaging.instance.requestPermission(); - await di.init(); - - if (kDebugMode) { - io.HttpClient.enableTimelineLogging = true; - } - - AppMetrica.activate(AppMetricaConfig(EnvConfig.appMetricaApiKey)); - AppMetrica.reportEvent('Application started'); - - await SentryFlutter.init((options) { - options.dsn = EnvConfig.sentryDsn; - options.tracesSampleRate = 1.0; - options.debug = false; - }, appRunner: () => runApp(const MyApp())); + await AppInitializer.initialize(); + await AppInitializer.runAppWithSentry(() => runApp(const MyApp())); } class MyApp extends StatelessWidget { @@ -56,30 +18,16 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { return MultiBlocProvider( - providers: [ - BlocProvider(create: (context) => sl()), - BlocProvider(create: (context) => sl()..getNotifications()), - BlocProvider(create: (context) => sl()..loadFeedBlogPostList()), - BlocProvider(create: (context) => sl()..getMyProfile()), - BlocProvider(create: (context) => sl()..getChatRoomsWithLoading()), - ], + providers: AppConfig.globalBlocProviders, child: Portal( child: KeyboardDismisser( child: MaterialApp.router( theme: ThemeHelper().themeData(), routerConfig: AppRouter.appRouter, - builder: (context, child) => BlocProvider( - create: (context) => sl(), - child: InternetConnectionCheckerScreen(child: child!), - ), + builder: (context, child) => AppConfig.createInternetConnectionWrapper(child!), debugShowCheckedModeBanner: false, - localizationsDelegates: const [ - S.delegate, - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, - ], - supportedLocales: const [Locale.fromSubtags(languageCode: 'ru')], + localizationsDelegates: AppConfig.localizationDelegates, + supportedLocales: AppConfig.supportedLocales, ), ), ),