fix pr comment

les-crepes · Sep 5, 2022 · 63e85e7 · 63e85e7
1 parent 646f870
commit 63e85e7
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 39 deletions.
diff --git a/lib/router/chat_guard.dart b/lib/router/chat_guard.dart
@@ -15,13 +15,7 @@ class ChatGuard extends AutoRouteGuard {
     if (isAdmin) {
       resolver.next(true);
     } else {
-      router.push(ChatScreenRoute(
-        otherUser: router.navigatorKey.currentContext!
-            .read<ChatProvider>()
-            .messages
-            .keys
-            .first,
-      ));
+      router.push(ChatScreenRoute());
     }
   }
 }
diff --git a/lib/router/chat_router_page.dart b/lib/router/chat_router_page.dart
@@ -12,7 +12,20 @@ class ChatRouterPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return ChangeNotifierProvider(
       create: (context) => ChatProvider(GetIt.I.get<AuthProvider>()),
-      child: const AutoRouter(),
+      builder: (context, child) {
+        return FutureBuilder(
+          future: context.read<ChatProvider>().fetchAllMessages(),
+          builder: (context, snapshot) =>
+              snapshot.connectionState == ConnectionState.done
+                  ? const AutoRouter()
+                  : Center(
+                      child: Column(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          children: const [CircularProgressIndicator()]),
+                    ),
+        );
+      },
     );
   }
 }
diff --git a/lib/router/router.gr.dart b/lib/router/router.gr.dart
@@ -79,7 +79,8 @@ class AppRouter extends _i18.RootStackRouter {
           routeData: routeData, child: const _i6.ProfileScreen());
     },
     ChatScreenRoute.name: (routeData) {
-      final args = routeData.argsAs<ChatScreenRouteArgs>();
+      final args = routeData.argsAs<ChatScreenRouteArgs>(
+          orElse: () => const ChatScreenRouteArgs());
       return _i18.MaterialPageX<dynamic>(
           routeData: routeData,
           child: _i7.ChatScreen(key: args.key, otherUser: args.otherUser));
@@ -283,7 +284,7 @@ class ProfileScreenRoute extends _i18.PageRouteInfo<void> {
 /// generated route for
 /// [_i7.ChatScreen]
 class ChatScreenRoute extends _i18.PageRouteInfo<ChatScreenRouteArgs> {
-  ChatScreenRoute({_i19.Key? key, required _i25.User otherUser})
+  ChatScreenRoute({_i19.Key? key, _i25.User? otherUser})
       : super(ChatScreenRoute.name,
             path: 'onechat',
             args: ChatScreenRouteArgs(key: key, otherUser: otherUser));
@@ -292,11 +293,11 @@ class ChatScreenRoute extends _i18.PageRouteInfo<ChatScreenRouteArgs> {
 }
 
 class ChatScreenRouteArgs {
-  const ChatScreenRouteArgs({this.key, required this.otherUser});
+  const ChatScreenRouteArgs({this.key, this.otherUser});
 
   final _i19.Key? key;
 
-  final _i25.User otherUser;
+  final _i25.User? otherUser;
 
   @override
   String toString() {

diff --git a/lib/screens/chat.dart b/lib/screens/chat.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:developer';
 import 'dart:math' as math;
 
 import 'package:auto_route/auto_route.dart';
@@ -21,10 +22,10 @@ String randomString() {
 }
 
 class ChatScreen extends StatefulWidget {
-  final User _otherUser;
+  final User? _otherUser;
   const ChatScreen({
     Key? key,
-    required User otherUser,
+    User? otherUser,
   })  : _otherUser = otherUser,
         super(key: key);
 
@@ -34,6 +35,7 @@ class ChatScreen extends StatefulWidget {
 
 class _ChatScreenState extends State<ChatScreen> {
   final _mainUser = types.User(id: GetIt.I.get<AuthProvider>().userUid);
+  late User _otherUser;
 
   @override
   void initState() {
@@ -60,10 +62,12 @@ class _ChatScreenState extends State<ChatScreen> {
   @override
   Widget build(BuildContext context) {
     final ChatProvider chatProvider = context.watch<ChatProvider>();
+    _otherUser = widget._otherUser ?? chatProvider.messages.keys.first;
+    log(chatProvider.messages.toString());
     return ChatInterface(
-      name: '${widget._otherUser.firstName} ${widget._otherUser.lastName}',
+      name: '${_otherUser.firstName} ${_otherUser.lastName}',
       currentUser: _mainUser,
-      messages: chatProvider.messages[widget._otherUser]!
+      messages: chatProvider.messages[_otherUser]!
           .map((m) => types.TextMessage(
                 id: m.uid,
                 author: types.User(id: m.fromId),

diff --git a/lib/screens/discussion_list.dart b/lib/screens/discussion_list.dart
@@ -12,29 +12,21 @@ class DiscussionListScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return FutureBuilder(
-      future: context.read<ChatProvider>().fetchAllMessages(),
-      builder: (context, snapshot) =>
-          snapshot.connectionState == ConnectionState.done
-              ? CustomList(
-                  title: 'Discussions',
-                  conversationsTileData: context
-                      .watch<ChatProvider>()
-                      .getLastMessageOfEachUser()
-                      .map((e) => CustomListTileData(
-                            title: '${e.key.firstName} ${e.key.lastName}',
-                            subtitle: e.value.content,
-                            date: e.value.time,
-                            onTap: () {
-                              AutoRouter.of(context)
-                                  .push(ChatScreenRoute(otherUser: e.key));
-                            },
-                          ))
-                      .toList(),
-                )
-              : Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: const [CircularProgressIndicator()]),
+    return CustomList(
+      title: 'Discussions',
+      conversationsTileData: context
+          .watch<ChatProvider>()
+          .getLastMessageOfEachUser()
+          .map((e) => CustomListTileData(
+                title: '${e.key.firstName} ${e.key.lastName}',
+                subtitle: e.value.content,
+                date: e.value.time,
+                onTap: () {
+                  AutoRouter.of(context)
+                      .push(ChatScreenRoute(otherUser: e.key));
+                },
+              ))
+          .toList(),
     );
   }
 }