Merge remote-tracking branch 'upstream/main' into personalDiets

2025-10-24 13:21:03 +03:00
parent 46841fb502 ce0099c385
commit 2e3172bc45
179 changed files with 42002 additions and 2610 deletions
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -18,7 +18,6 @@ import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/notification_banner.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
 import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
 import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
@@ -154,12 +153,7 @@ class _ChatScreenState extends State<ChatScreen> {
          onTap: () {
            GoRouter.of(context).pushNamed(
              'profileScreen',
-              extra: Author(
-                authorSlug: state.chatRoom.users.receiver.slug,
-                authorName: state.chatRoom.users.receiver.name,
-                authorProfileIcon: state.chatRoom.users.receiver.profilePhotoUrl ?? '',
-                authorIsMe: false,
-              ),
+              extra: state.chatRoom.users.receiver.slug,
            );
          },
          child: Row(
--- a/lib/features/chat/presentation/pages/empty_chat_screen.dart
+++ b/lib/features/chat/presentation/pages/empty_chat_screen.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
+import 'package:eatvio_app/features/profile/models/profile_model.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -16,12 +16,9 @@ import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked
 import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_state.dart';

 class EmptyChatScreen extends StatefulWidget {
-  final Author author;
+  final ProfileModel user;

-  const EmptyChatScreen({
-    super.key,
-    required this.author,
-  });
+  const EmptyChatScreen({super.key, required this.user});

  @override
  State<EmptyChatScreen> createState() => _EmptyChatScreenState();
@@ -40,34 +37,19 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
        centerTitle: false,
        title: GestureDetector(
          onTap: () {
-            GoRouter.of(context).pushNamed(
-              'profileScreen',
-              extra: Author(
-                authorSlug: widget.author.authorSlug,
-                authorName: widget.author.authorName,
-                authorProfileIcon: widget.author.authorProfileIcon,
-                authorIsMe: false,
-              ),
-            );
+            GoRouter.of(context).pushNamed('profileScreen', extra: widget.user.slug);
          },
          child: Row(
            children: [
              CircleAvatar(
                radius: 20,
-                foregroundImage: NetworkImage(widget.author.authorProfileIcon),
+                foregroundImage: NetworkImage(widget.user.profilePhotoUrl),
                backgroundImage: const AssetImage('assets/images/no_avatar.png'),
              ),
              const SizedBox(width: 16),
              Column(
                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    widget.author.authorName,
-                    style: CustomTextStyles.titleSmallBold.copyWith(
-                      color: PrimaryColors().black,
-                    ),
-                  ),
-                ],
+                children: [Text(widget.user.name, style: CustomTextStyles.titleSmallBold.copyWith(color: PrimaryColors().black))],
              ),
            ],
          ),
@@ -84,18 +66,14 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                children: [
                  const SizedBox(width: 8),
                  InkWell(
-                    onTap: () => showImagePicker(widget.author.authorSlug),
+                    onTap: () => showImagePicker(widget.user.slug),
                    customBorder: const CircleBorder(),
                    child: Ink(
                      height: 40,
                      width: 40,
                      child: Transform.rotate(
                        angle: pi / 4,
-                        child: const Icon(
-                          Icons.attach_file_rounded,
-                          size: 30,
-                          color: Color(0xFF858E99),
-                        ),
+                        child: const Icon(Icons.attach_file_rounded, size: 30, color: Color(0xFF858E99)),
                      ),
                    ),
                  ),
@@ -117,8 +95,10 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                          hintText: 'Сообщение',
                          hintStyle: const TextStyle(fontSize: 14, fontWeight: FontWeight.w400, height: 1, color: Color(0xFFAEAEB2)),
                          filled: true,
-                          border:
-                              OutlineInputBorder(borderRadius: BorderRadius.circular(100), borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1)),
+                          border: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(100),
+                            borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
+                          ),
                          enabledBorder: OutlineInputBorder(
                            borderRadius: BorderRadius.circular(100),
                            borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
@@ -139,40 +119,29 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                      final blockedUsersCubit = sl<BlockedUsersCubit>();
                      await blockedUsersCubit.getBlockedUsers();
                      final blockedState = blockedUsersCubit.state;
-                      
+
                      if (blockedState is BlockedUsersStateLoaded) {
-                        final isBlocked = blockedState.profilesList.any((profile) => profile.slug == widget.author.authorSlug);
+                        final isBlocked = blockedState.profilesList.any((profile) => profile.slug == widget.user.slug);
                        if (isBlocked) {
                          if (context.mounted) {
                            ScaffoldMessenger.of(context).showSnackBar(
-                              const SnackBar(
-                                content: Text('Вы не можете отправить сообщение заблокированному пользователю'),
-                                backgroundColor: Colors.red,
-                              ),
+                              const SnackBar(content: Text('Вы не можете отправить сообщение заблокированному пользователю'), backgroundColor: Colors.red),
                            );
                          }
                          return;
                        }
                      }
-                      
+
                      if (textEditingController.text.isNotEmpty) {
-                        await sl<ChatRepository>().sendMessage(
-                          data: textEditingController.text.trim(),
-                          slug: widget.author.authorSlug,
-                        );
+                        await sl<ChatRepository>().sendMessage(data: textEditingController.text.trim(), slug: widget.user.slug);
                        if (mounted) {
                          setState(() {
                            textEditingController.clear();
                          });
                        }
-                        final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
+                        final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
                        if (context.mounted) {
-                          AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                            'chatScreen',
-                            extra: {
-                              'uuid': chatIdOrError,
-                            },
-                          );
+                          AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatIdOrError});
                        }
                      }
                    },
@@ -201,53 +170,36 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
          CupertinoActionSheetAction(
            onPressed: () async {
              Navigator.of(context).pop();
-              
+
              // Проверяем, заблокирован ли пользователь
              final blockedUsersCubit = sl<BlockedUsersCubit>();
              await blockedUsersCubit.getBlockedUsers();
              final blockedState = blockedUsersCubit.state;
-              
+
              if (blockedState is BlockedUsersStateLoaded) {
-                final isBlocked = blockedState.profilesList.any((profile) => profile.slug == widget.author.authorSlug);
+                final isBlocked = blockedState.profilesList.any((profile) => profile.slug == widget.user.slug);
                if (isBlocked) {
                  if (context.mounted) {
                    ScaffoldMessenger.of(context).showSnackBar(
-                      const SnackBar(
-                        content: Text('Вы не можете отправить сообщение заблокированному пользователю'),
-                        backgroundColor: Colors.red,
-                      ),
+                      const SnackBar(content: Text('Вы не можете отправить сообщение заблокированному пользователю'), backgroundColor: Colors.red),
                    );
                  }
                  return;
                }
              }
-              
+
              final picker = ImagePicker();
              List<XFile>? images = await picker.pickMultiImage();
              if (images.isNotEmpty) {
                List<File> files = images.map((image) => File(image.path)).toList();
-                await sl<ChatRepository>().sendMessage(
-                  files: files,
-                  slug: widget.author.authorSlug,
-                );
-                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
+                await sl<ChatRepository>().sendMessage(files: files, slug: widget.user.slug);
+                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
                if (mounted) {
-                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                    'chatScreen',
-                    extra: {
-                      'uuid': chatIdOrError,
-                    },
-                  );
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatIdOrError});
                }
              }
            },
-            child: const Row(
-              children: [
-                Icon(Icons.photo_library_rounded),
-                SizedBox(width: 8),
-                Text('Галерея'),
-              ],
-            ),
+            child: const Row(children: [Icon(Icons.photo_library_rounded), SizedBox(width: 8), Text('Галерея')]),
          ),
          CupertinoActionSheetAction(
            onPressed: () async {
@@ -256,28 +208,14 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
              List<XFile>? images = await picker.pickMultiImage();
              if (images.isNotEmpty) {
                List<File> files = images.map((image) => File(image.path)).toList();
-                await sl<ChatRepository>().sendMessage(
-                  files: files,
-                  slug: widget.author.authorSlug,
-                );
-                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
+                await sl<ChatRepository>().sendMessage(files: files, slug: widget.user.slug);
+                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
                if (mounted) {
-                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                    'chatScreen',
-                    extra: {
-                      'uuid': chatIdOrError,
-                    },
-                  );
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatIdOrError});
                }
              }
            },
-            child: const Row(
-              children: [
-                Icon(Icons.photo_camera),
-                SizedBox(width: 8),
-                Text('Фото'),
-              ],
-            ),
+            child: const Row(children: [Icon(Icons.photo_camera), SizedBox(width: 8), Text('Фото')]),
          ),
          CupertinoActionSheetAction(
            onPressed: () async {
@@ -308,35 +246,17 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
              );
              if (result != null) {
                List<File> files = result.paths.map((path) => File(path!)).toList();
-                await sl<ChatRepository>().sendMessage(
-                  files: files,
-                  slug: widget.author.authorSlug,
-                );
-                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
+                await sl<ChatRepository>().sendMessage(files: files, slug: widget.user.slug);
+                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
                if (mounted) {
-                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                    'chatScreen',
-                    extra: {
-                      'uuid': chatIdOrError,
-                    },
-                  );
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatIdOrError});
                }
              }
            },
-            child: const Row(
-              children: [
-                Icon(Icons.file_present_rounded),
-                SizedBox(width: 8),
-                Text('Файлы'),
-              ],
-            ),
+            child: const Row(children: [Icon(Icons.file_present_rounded), SizedBox(width: 8), Text('Файлы')]),
          ),
        ],
-        cancelButton: CupertinoActionSheetAction(
-          onPressed: () => Navigator.of(context).pop(),
-          isDestructiveAction: true,
-          child: const Text('Отмена'),
-        ),
+        cancelButton: CupertinoActionSheetAction(onPressed: () => Navigator.of(context).pop(), isDestructiveAction: true, child: const Text('Отмена')),
      ),
    );
  }
--- a/lib/features/chat/presentation/pages/photo_view_screen.dart
+++ b/lib/features/chat/presentation/pages/photo_view_screen.dart
@@ -1,6 +1,7 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:dismissible_page/dismissible_page.dart';
-import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/app_decoration.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
@@ -88,7 +89,7 @@ class _PhotoViewScreenState extends State<PhotoViewScreen> {
                          color: Colors.white,
                        ),
                        title: Text(
-                          widget.imageUrls[index].replaceAll('$baseUrl/storage/chat_files/', ''),
+                          widget.imageUrls[index].replaceAll('${sl<AppConfig>().baseUrl}/storage/chat_files/', ''),
                          style: const TextStyle(
                            color: Colors.white,
                            fontSize: 12,
--- a/lib/features/chat/presentation/widgets/order_card.dart
+++ b/lib/features/chat/presentation/widgets/order_card.dart
@@ -1,4 +1,5 @@
-import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/core/utils/localization_utils.dart';
@@ -47,7 +48,7 @@ class _OrderCardState extends State<OrderCard> {
                ClipRRect(
                  borderRadius: BorderRadius.circular(12),
                  child: Image.network(
-                    '$baseUrl/storage/${widget.plan.image}',
+                    '${sl<AppConfig>().baseUrl}/storage/${widget.plan.image}',
                    width: double.infinity,
                    fit: BoxFit.cover,
                  ),