Merge pull request #58 from Iconica-Development/fix/fix-screen-routes

fix: add missing screen routes

packages/flutter_chat/lib/src/flutter_chat_userstory.dart

@@ -163,12 +163,13 @@ List<GoRoute> getChatStoryRoutes(
       GoRoute(
         path: ChatUserStoryRoutes.newGroupChatScreen,
         pageBuilder: (context, state) {
-          var newChatScreen = NewGroupChatScreen(
+          var newGroupChatScreen = NewGroupChatScreen(
             options: configuration.chatOptionsBuilder(context),
             translations: configuration.translations,
             service: configuration.chatService,
-            onPressGroupChatOverview: (user) async => context.push(
+            onPressGroupChatOverview: (users) async => context.push(
               ChatUserStoryRoutes.newGroupChatOverviewScreen,
+              extra: users,
             ),
           );
           return buildScreenWithoutTransition(
@@ -176,10 +177,51 @@ List<GoRoute> getChatStoryRoutes(
             state: state,
             child: configuration.chatPageBuilder?.call(
                   context,
-                  newChatScreen,
+                  newGroupChatScreen,
                 ) ??
                 Scaffold(
-                  body: newChatScreen,
+                  body: newGroupChatScreen,
+                ),
+          );
+        },
+      ),
+      GoRoute(
+        path: ChatUserStoryRoutes.newGroupChatOverviewScreen,
+        pageBuilder: (context, state) {
+          var users = state.extra! as List<ChatUserModel>;
+          var newGroupChatOverviewScreen = NewGroupChatOverviewScreen(
+            options: configuration.chatOptionsBuilder(context),
+            translations: configuration.translations,
+            service: configuration.chatService,
+            users: users,
+            onPressCompleteGroupChatCreation: (users, groupChatName) async {
+              configuration.onPressCompleteGroupChatCreation
+                  ?.call(users, groupChatName);
+              var chat = await configuration.chatService.chatOverviewService
+                  .storeChatIfNot(
+                GroupChatModel(
+                  canBeDeleted: true,
+                  title: groupChatName,
+                  imageUrl: 'https://picsum.photos/200/300',
+                  users: users,
+                ),
+              );
+              if (context.mounted) {
+                await context.push(
+                  ChatUserStoryRoutes.chatDetailViewPath(chat.id ?? ''),
+                );
+              }
+            },
+          );
+          return buildScreenWithoutTransition(
+            context: context,
+            state: state,
+            child: configuration.chatPageBuilder?.call(
+                  context,
+                  newGroupChatOverviewScreen,
+                ) ??
+                Scaffold(
+                  body: newGroupChatOverviewScreen,
                 ),
           );
         },

packages/flutter_chat_firebase/lib/service/firebase_chat_overview_service.dart

@@ -144,22 +144,25 @@ class FirebaseChatOverviewService implements ChatOverviewService {
                   imageUrl: chat.imageUrl ?? '',
                   unreadMessages: unread,
                   users: users,
-                  lastMessage: chat.lastMessage != null &&
+                  lastMessage: chat.lastMessage != null
-                          chat.lastMessage!.imageUrl == null
+                      ? chat.lastMessage!.imageUrl == null
                           ? ChatTextMessageModel(
                               sender: otherUser!,
                               text: chat.lastMessage!.text!,
                               timestamp: DateTime.fromMillisecondsSinceEpoch(
-                            chat.lastMessage!.timestamp.millisecondsSinceEpoch,
+                                chat.lastMessage!.timestamp
+                                    .millisecondsSinceEpoch,
                               ),
                             )
                           : ChatImageMessageModel(
                               sender: otherUser!,
                               imageUrl: chat.lastMessage!.imageUrl!,
                               timestamp: DateTime.fromMillisecondsSinceEpoch(
-                            chat.lastMessage!.timestamp.millisecondsSinceEpoch,
+                                chat.lastMessage!.timestamp
-                          ),
+                                    .millisecondsSinceEpoch,
                               ),
+                            )
+                      : null,
                   canBeDeleted: chat.canBeDeleted,
                   lastUsed: chat.lastUsed == null
                       ? null
@@ -381,7 +384,7 @@ class FirebaseChatOverviewService implements ChatOverviewService {
         ];
 
         var reference = await _db
-            .collection(_options.chatsCollectionName)
+            .collection(_options.chatsMetaDataCollectionName)
             .withConverter(
               fromFirestore: (snapshot, _) =>
                   FirebaseChatDocument.fromJson(snapshot.data()!, snapshot.id),
@@ -390,6 +393,8 @@ class FirebaseChatOverviewService implements ChatOverviewService {
             .add(
               FirebaseChatDocument(
                 personal: false,
+                title: chat.title,
+                imageUrl: chat.imageUrl,
                 canBeDeleted: chat.canBeDeleted,
                 users: userIds,
                 lastUsed: Timestamp.now(),
@@ -404,7 +409,6 @@ class FirebaseChatOverviewService implements ChatOverviewService {
               .doc(reference.id)
               .set({'users': userIds}, SetOptions(merge: true));
         }
-
         chat.id = reference.id;
       } else {
         throw Exception('Chat type not supported for firebase');

packages/flutter_chat_interface/lib/src/model/chat_user.dart

@@ -3,6 +3,8 @@
 //
 // SPDX-License-Identifier: BSD-3-Clause
 
+import 'package:flutter/material.dart';
+
 abstract class ChatUserModelInterface {
   String? get id;
   String? get firstName;
@@ -14,6 +16,7 @@ abstract class ChatUserModelInterface {
 
 /// A concrete implementation of [ChatUserModelInterface]
 /// representing a chat user.
+@immutable
 class ChatUserModel implements ChatUserModelInterface {
   /// Constructs a [ChatUserModel] instance.
   ///
@@ -24,7 +27,8 @@ class ChatUserModel implements ChatUserModelInterface {
   /// [lastName]: The last name of the user.
   ///
   /// [imageUrl]: The URL of the user's image.
-  ChatUserModel({
+  ///
+  const ChatUserModel({
     this.id,
     this.firstName,
     this.lastName,
@@ -57,4 +61,12 @@ class ChatUserModel implements ChatUserModelInterface {
 
     return fullName == '' ? null : fullName;
   }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) || other is ChatUserModel && id == other.id;
+
+  @override
+  int get hashCode =>
+      id.hashCode ^ firstName.hashCode ^ lastName.hashCode ^ imageUrl.hashCode;
 }

packages/flutter_chat_local/lib/service/local_chat_detail_service.dart

@@ -29,13 +29,13 @@ class LocalChatDetailService with ChangeNotifier implements ChatDetailService {
     int pageSize,
     String chatId,
   ) async {
-    await chatOverviewService.getChatById(chatId).then((value) {
+    var value = await chatOverviewService.getChatById(chatId);
     _cumulativeMessages.clear();
+    if (value.messages != null) {
       _cumulativeMessages.addAll(value.messages!);
+    }
     _controller.add(_cumulativeMessages);
-    });
     notifyListeners();
-    return Future.value();
   }
 
   @override
@@ -48,9 +48,11 @@ class LocalChatDetailService with ChangeNotifier implements ChatDetailService {
     _controller.onListen = () async {
       _subscription =
           chatOverviewService.getChatById(chatId).asStream().listen((event) {
+        if (event.messages != null) {
           _cumulativeMessages.clear();
           _cumulativeMessages.addAll(event.messages!);
           _controller.add(_cumulativeMessages);
+        }
       });
     };
 

packages/flutter_chat_view/lib/src/screens/new_group_chat_screen.dart

@@ -150,12 +150,13 @@ class _NewGroupChatScreenState extends State<NewGroupChatScreen> {
       itemCount: filteredUsers.length,
       itemBuilder: (context, index) {
         var user = filteredUsers[index];
-        var isSelected = selectedUserList.contains(user);
+        var isSelected =
+            selectedUserList.any((selectedUser) => selectedUser == user);
 
         return InkWell(
           onTap: () {
             setState(() {
-              if (isSelected) {
+              if (selectedUserList.contains(user)) {
                 selectedUserList.remove(user);
               } else {
                 selectedUserList.add(user);