Merge branch 'main' into personalDiets

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]}',
+                                            ),
                                     ),
                                   ),
                                 );

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(