merge upstream

lib/core/app_router.dart

@@ -20,6 +20,8 @@ import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.da
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart';
 import 'package:eatvio_app/features/consultations/presentation/pages/consultations_screen.dart';
+import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart';
+import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/user_purchases_screen.dart';
 import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
 import 'package:eatvio_app/features/create_diet/presentation/create_diet_screen.dart';
 import 'package:eatvio_app/features/create_diet/presentation/diet_preview_screen.dart';
@@ -210,10 +212,20 @@ class AppRouter {
         },
       ),
       GoRoute(
-        path: '/consultant-finance-screen',
-        name: 'consultantFinanceScreen',
+        path: ConsultationsArchiveScreen.path,
+        name: ConsultationsArchiveScreen.name,
         builder: (context, state) => const ConsultationsArchiveScreen(),
       ),
+      GoRoute(
+        path: ConsultantFinancesScreen.path,
+        name: ConsultantFinancesScreen.name,
+        builder: (context, state) => const ConsultantFinancesScreen(),
+      ),
+      GoRoute(
+        path: UserPurchasesScreen.path,
+        name: UserPurchasesScreen.name,
+        builder: (context, state) => const UserPurchasesScreen(),
+      ),
       GoRoute(
         path: '/user-finance-screen',
         name: 'userFinanceScreen',

lib/core/locator_service.dart

@@ -31,6 +31,8 @@ import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit
 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/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';
@@ -123,8 +125,14 @@ Future<void> init() async {
   sl.registerFactory<PlansCubit>(() => PlansCubit(feedRepository: sl(), planRepository: sl()));
   sl.registerFactory<SettingsCubit>(() => SettingsCubit(profileRepository: sl(), settingsRepository: sl(), consultantRepository: sl()));
   sl.registerFactory<RegisterConsultantCubit>(() => RegisterConsultantCubit(consultantRepository: sl()));
-  sl.registerFactory<DiaryCubit>(
-      () => DiaryCubit(chatRepository: sl(), diaryRepository: sl(), glossaryRepository: sl(), profileRepository: sl(), dietRepository: sl()));
+  sl.registerFactory<DiaryCubit>(() => DiaryCubit(
+        chatRepository: sl(),
+        diaryRepository: sl(),
+        glossaryRepository: sl(),
+        profileRepository: sl(),
+        dietRepository: sl(),
+        settingsRepository: sl(),
+      ));
   sl.registerFactory<AboutDietCubit>(() => AboutDietCubit(dietsRepository: sl(), profileRepository: sl()));
   sl.registerFactory<BlogPostCreateCubit>(() => BlogPostCreateCubit(blogPostRepository: sl()));
   sl.registerFactory<SubCubit>(() => SubCubit(profileRepository: sl()));
@@ -148,6 +156,8 @@ Future<void> init() async {
   sl.registerFactory<VerifyEmailCubit>(() => VerifyEmailCubit(profileRepository: sl()));
   sl.registerFactory<MyRecipesCubit>(() => MyRecipesCubit(myRecipesRepository: sl(), aboutRecipeRepository: sl()));
   sl.registerFactory<ConsultationsArchiveCubit>(() => ConsultationsArchiveCubit(consultationsRepository: sl()));
+  sl.registerFactory<ConsultantFinancesCubit>(() => ConsultantFinancesCubit(consultationsRepository: sl()));
+  sl.registerFactory<UserPurchasesCubit>(() => UserPurchasesCubit(consultationsRepository: sl()));
 
   // Repository
   sl.registerLazySingleton<ChatRepository>(() => ChatRepository(chatService: sl()));

lib/core/permission_handler/permission_handler.dart

@@ -0,0 +1,23 @@
+import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+class PermissionHandler {
+  static Future<void> checkPermission({
+    required Permission permission,
+    required String title,
+    required String description,
+    required Future<void> Function() onGranted,
+    required BuildContext context,
+  }) async {
+    final permissionState = await permission.request();
+    if (permissionState.isGranted) {
+      await onGranted();
+      return;
+    }
+    if (context.mounted) {
+      showErrorDialog(context, title: title, description: description, buttonTitle: S.of(context).allowAccess, needToOpenSettings: true);
+    }
+  }
+}

lib/core/widgets/show_error_dialog.dart

@@ -4,8 +4,9 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
+import 'package:permission_handler/permission_handler.dart';
 
-Future<void> showErrorDialog(BuildContext context, {String? title, String? description}) async {
+Future<void> showErrorDialog(BuildContext context, {String? title, String? description, String? buttonTitle, bool? needToOpenSettings}) async {
   return await showDialog<void>(
     context: context,
     barrierColor: Colors.transparent,
@@ -43,8 +44,13 @@ Future<void> showErrorDialog(BuildContext context, {String? title, String? descr
                   Align(
                     alignment: Alignment.centerRight,
                     child: TextButton(
-                      onPressed: () => AppRouter.navigatorKey.currentContext?.pop(),
-                      child: Text(s.ok, style: TextStyles.textLSemibold.copyWith(color: appTheme.blueA400)),
+                      onPressed: () {
+                        AppRouter.navigatorKey.currentContext?.pop();
+                        if (needToOpenSettings ?? false) {
+                          openAppSettings();
+                        }
+                      },
+                      child: Text(buttonTitle ?? s.ok, style: TextStyles.textLSemibold.copyWith(color: appTheme.blueA400)),
                     ),
                   ),
                   const SizedBox(height: 12),