Merge branch 'main' into personalDiets

2025-07-16 17:04:21 +07:00
parent 19787f459e 74fa65a1ba
commit 996f2ecd70
33 changed files with 206 additions and 1494 deletions
--- a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart
+++ b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart
@@ -47,14 +47,14 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
    _timer?.cancel();
  }

-  Future<void> loadNextPage(String chatId) async {
+  Future<void> loadNextPage(String uuid) async {
    if (currentPage < lastPage && !isLoading) {
      isLoading = true;

      emit((state as ChatRoomStateLoaded).copyWith(isLoading: isLoading));

      try {
-        final chatMessages = await chatRepository.getChatMessages(chatId, currentPage + 1);
+        final chatMessages = await chatRepository.getChatMessages(uuid, currentPage + 1);

        isLoading = false;
        emit(
@@ -89,17 +89,19 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
    }
  }

-  Future<void> initChat(String chatId, {bool sendInitialMessage = false}) async {
+  Future<void> initChat(
+    String uuid, {
+    bool sendInitialMessage = false,
+  }) async {
    try {
-      final chatRoom = await chatRepository.getChatRoom(chatId);
+      final chatRoom = await chatRepository.getChatRoom(uuid);
      ChosenPlanModel? chosenPlan;
      if (chatRoom.chosenPlanId != null) {
        chosenPlan = await chatRepository.getChosenPlan(id: chatRoom.chosenPlanId!);
      }
-      final chatMessages = await chatRepository.getChatMessages(chatId, currentPage);
+      final chatMessages = await chatRepository.getChatMessages(uuid, currentPage);
      lastPage = chatMessages.meta.lastPage;
-
-      await _subscribeToChatChannel(chatId: chatId);
+      await _subscribeToChatChannel(uuid: uuid, chatId: chatRoom.id);
      emit(
        ChatRoomState.loaded(
          chatRoom: chatRoom.copyWith(chosenPlan: chosenPlan),
@@ -158,14 +160,14 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
    }
  }

-  Future<void> _subscribeToChatChannel({required String chatId}) async {
+  Future<void> _subscribeToChatChannel({required String uuid, required String chatId}) async {
    final client = wsManager.client;
    if (client == null) return;
    await wsManager.initPrivateDirectChatChannel(chatId);
    wsManager.subscribeDirectChatChannel();
    messagesSubscription = wsManager.directChatStream?.listen((event) {
      AudioPlayer().play((AssetSource('audio/recive_message.wav')));
-      final message = ChatMessageModel.fromJson(jsonDecode(event.data)['message']);
+      final message = ChatMessageModel.fromJson(jsonDecode(event.data));
      List<ChatMessageModel> messagesList = [message, ...(state as ChatRoomStateLoaded).chatMessages];
      chatRepository.emitNewMessageToChats(message);
      emit((state as ChatRoomStateLoaded).copyWith(chatMessages: messagesList, isLoading: isLoading));
@@ -179,7 +181,15 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
    typingSubscription = wsManager.clientTypingStream?.listen((event) {
      emit((state as ChatRoomStateLoaded).copyWith(isTyping: true, isLoading: isLoading));
      EasyDebounce.debounce(
-          'client-typing', const Duration(seconds: 3), () => emit((state as ChatRoomStateLoaded).copyWith(isTyping: false, isLoading: isLoading)));
+        'client-typing',
+        const Duration(seconds: 3),
+        () => emit(
+          (state as ChatRoomStateLoaded).copyWith(
+            isTyping: false,
+            isLoading: isLoading,
+          ),
+        ),
+      );
    });
  }

@@ -189,12 +199,30 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
    required String userSlug,
  }) async {
    try {
+      final compressedFiles = files != null ? await ImageCompressUtility.compressFilesList(List<File>.from(files)) : null;
+      AudioPlayer().play((AssetSource('audio/send_message.wav')));
+      emit(
+        (state as ChatRoomStateLoaded).copyWith(
+          chatMessages: [
+            ChatMessageModel(
+              id: 1,
+              data: data ?? '',
+              mediaData: compressedFiles,
+              authorId: 1,
+              updatedAt: DateTime.now(),
+              isRead: true,
+              isCurrentUserAuthor: true,
+              roomId: '',
+            ),
+            ...(state as ChatRoomStateLoaded).chatMessages,
+          ],
+        ),
+      );
      await chatRepository.sendMessage(
        data: data,
-        files: files != null ? await ImageCompressUtility.compressFilesList(List<File>.from(files)) : null,
+        files: compressedFiles,
        slug: userSlug,
      );
-      AudioPlayer().play((AssetSource('audio/send_message.wav')));
      return true;
    } catch (e, st) {
      log(e.toString(), stackTrace: st);
--- a/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart
+++ b/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart
@@ -21,7 +21,7 @@ class ChatsCubit extends Cubit<ChatsState> {
    required this.chatRepository,
    required this.wsManager,
    required this.profileRepository,
-  }) : super(ChatsState()) {    
+  }) : super(ChatsState()) {
    newLastMessageSubscription = chatRepository.newUserMessagesStream.listen((message) {
      _setNewLastMessage(message);
    });
@@ -29,6 +29,7 @@ class ChatsCubit extends Cubit<ChatsState> {
  String? _query;
  int page = 1;
  late int lastPage;
+
  Future<void> connectToWebSocket() async {
    await newIncomingMessagesSubscription?.cancel();
    newIncomingMessagesSubscription = wsManager.newMessagesStream?.listen((event) {
@@ -43,10 +44,10 @@ class ChatsCubit extends Cubit<ChatsState> {
    try {
      final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: query);
      final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
-      lastPage = chatRoomsPaginationModel.chatRooms.lastPage + 1;
+      lastPage = chatRoomsPaginationModel.meta.lastPage + 1;
      emit(
        state.copyWith(
-          chatRooms: chatRoomsPaginationModel.chatRooms.data,
+          chatRooms: chatRoomsPaginationModel.data,
          chatsWithUnreadMessagesCount: unreadChats,
          state: BaseState.success,
        ),
@@ -65,10 +66,10 @@ class ChatsCubit extends Cubit<ChatsState> {
    try {
      final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: query);
      final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
-      lastPage = chatRoomsPaginationModel.chatRooms.lastPage + 1;
+      lastPage = chatRoomsPaginationModel.meta.lastPage + 1;
      emit(
        state.copyWith(
-          chatRooms: chatRoomsPaginationModel.chatRooms.data,
+          chatRooms: chatRoomsPaginationModel.data,
          chatsWithUnreadMessagesCount: unreadChats,
          state: BaseState.success,
        ),
@@ -90,7 +91,7 @@ class ChatsCubit extends Cubit<ChatsState> {
      final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
      emit(
        state.copyWith(
-          chatRooms: [...state.chatRooms, ...chatRoomsPaginationModel.chatRooms.data],
+          chatRooms: [...state.chatRooms, ...chatRoomsPaginationModel.data],
          chatsWithUnreadMessagesCount: unreadChats,
          state: BaseState.success,
          isLoadingMoreChats: false,
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -32,10 +32,10 @@ import 'package:intl/intl.dart';
 import 'package:visibility_detector/visibility_detector.dart';

 class ChatScreen extends StatefulWidget {
-  final String chatId;
+  final String uuid;
  final bool? sendInitialMessage;

-  const ChatScreen({required this.chatId, super.key, required this.sendInitialMessage});
+  const ChatScreen({required this.uuid, super.key, required this.sendInitialMessage});

  @override
  State<ChatScreen> createState() => _ChatScreenState();
@@ -64,14 +64,14 @@ class _ChatScreenState extends State<ChatScreen> {
  void initState() {
    super.initState();
    scrollController.addListener(_onScroll);
-    chatRoomCubit.initChat(widget.chatId, sendInitialMessage: widget.sendInitialMessage ?? false);
+    chatRoomCubit.initChat(widget.uuid, sendInitialMessage: widget.sendInitialMessage ?? false);
    chatRoomCubit.setTimer();
    _listener = AppLifecycleListener(onHide: _onHide, onResume: _onResume);
  }

  void _onScroll() {
    if (scrollController.offset >= scrollController.position.maxScrollExtent && !scrollController.position.outOfRange) {
-      chatRoomCubit.loadNextPage(widget.chatId);
+      chatRoomCubit.loadNextPage(widget.uuid);
    }
  }

@@ -93,7 +93,7 @@ class _ChatScreenState extends State<ChatScreen> {
          if (state is ChatRoomStateLoaded) {
            return _buildChat(context, state);
          } else if (state is ChatRoomStateError) {
-            return Scaffold(appBar: AppBar(), body: DataErrorWidget(onReload: () => chatRoomCubit.initChat(widget.chatId)));
+            return Scaffold(appBar: AppBar(), body: DataErrorWidget(onReload: () => chatRoomCubit.initChat(widget.uuid)));
          } else {
            return const Scaffold(body: Loader());
          }
--- a/lib/features/chat/presentation/pages/empty_chat_screen.dart
+++ b/lib/features/chat/presentation/pages/empty_chat_screen.dart
@@ -145,7 +145,7 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                        AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
                          'chatScreen',
                          extra: {
-                            'chatId': chatIdOrError,
+                            'uuid': chatIdOrError,
                          },
                        );
                      }
@@ -186,7 +186,7 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
                  'chatScreen',
                  extra: {
-                    'chatId': chatIdOrError,
+                    'uuid': chatIdOrError,
                  },
                );
              }
@@ -214,7 +214,7 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
                  'chatScreen',
                  extra: {
-                    'chatId': chatIdOrError,
+                    'uuid': chatIdOrError,
                  },
                );
              }
@@ -264,7 +264,7 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
                  'chatScreen',
                  extra: {
-                    'chatId': chatIdOrError,
+                    'uuid': chatIdOrError,
                  },
                );
              }
--- a/lib/features/chat/presentation/widgets/chat_bubble_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_bubble_widget.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:dismissible_page/dismissible_page.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
@@ -59,8 +61,9 @@ class ChatBubbleWidget extends StatelessWidget {
                      ),
              ),
              child: Padding(
-                padding:
-                    mediaData.isNotEmpty ? const EdgeInsets.all(8) : EdgeInsets.only(top: 8, bottom: 8, left: isCurrentUser ? 16 : 8, right: isCurrentUser ? 8 : 16),
+                padding: mediaData.isNotEmpty
+                    ? const EdgeInsets.all(8)
+                    : EdgeInsets.only(top: 8, bottom: 8, left: isCurrentUser ? 16 : 8, right: isCurrentUser ? 8 : 16),
                child: Column(
                  crossAxisAlignment: isCurrentUser ? CrossAxisAlignment.end : CrossAxisAlignment.start,
                  children: [
@@ -86,17 +89,17 @@ class ChatBubbleWidget extends StatelessWidget {
                                    },
                                    leading: const Icon(
                                      Icons.file_copy_outlined,
-                                      color: Colors.white,
+                                      color: Colors.black,
                                    ),
                                    trailing: const Icon(
                                      Icons.download_outlined,
-                                      color: Colors.white,
+                                      color: Colors.black,
                                    ),
                                    title: Text(
                                      mediaData[index].toString().replaceAll('chat_files/', ''),
                                      maxLines: 2,
                                      style: const TextStyle(
-                                        color: Colors.white,
+                                        color: Colors.black,
                                        fontSize: 12,
                                        overflow: TextOverflow.ellipsis,
                                      ),
@@ -109,6 +112,7 @@ class ChatBubbleWidget extends StatelessWidget {
                                      PhotoViewScreen(
                                        imageUrls: mediaData.map((e) => '$e').toList(),
                                        index: index,
+                                        isLocal: mediaData[index] is File ? true : false,
                                      ),
                                    );
                                  },
@@ -117,9 +121,11 @@ class ChatBubbleWidget extends StatelessWidget {
                                    transitionOnUserGestures: true,
                                    child: ClipRRect(
                                      borderRadius: BorderRadius.circular(16),
-                                      child: CachedNetworkImage(
-                                        imageUrl: '${mediaData[index]}',
-                                      ),
+                                      child: mediaData[index] is File
+                                          ? Image.file(mediaData[index])
+                                          : CachedNetworkImage(
+                                              imageUrl: '${mediaData[index]}',
+                                            ),
                                    ),
                                  ),
                                );
--- a/lib/features/chat/presentation/widgets/chat_entry_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_entry_widget.dart
@@ -24,7 +24,7 @@ class _ChatEntryWidgetState extends State<ChatEntryWidget> {
      onTap: () => GoRouter.of(context).pushNamed(
        'chatScreen',
        extra: {
-          'chatId': widget.chatRoom.id.toString(),
+          'uuid': widget.chatRoom.id.toString(),
        },
      ),
      child: Container(