fix bug in loading screen (chat)

nbtpj · Jun 10, 2022 · ea594e0 · ea594e0
1 parent dda0eba
commit ea594e0
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 36 deletions.
diff --git a/lib/ui/screens/chat/screen/chat_screens.dart b/lib/ui/screens/chat/screen/chat_screens.dart
@@ -1,5 +1,6 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:flutter/material.dart';
+import 'package:foodnet_01/ui/components/loading_view.dart';
 import 'package:foodnet_01/ui/screens/chat/utils.dart';
 import 'package:foodnet_01/util/constants/colors.dart';
 import 'package:foodnet_01/util/constants/strings.dart';
@@ -315,7 +316,7 @@ class _ChatScreensState extends State<ChatScreens> {
               ),
             );
           } else {
-            return const Center();
+            return loading;
           }
         });
   }

diff --git a/lib/ui/screens/chat/widgets/favourite_contact.dart b/lib/ui/screens/chat/widgets/favourite_contact.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:foodnet_01/ui/components/loading_view.dart';
 import 'package:foodnet_01/ui/screens/chat/screen/chat_screens.dart';
 import 'package:foodnet_01/util/data.dart';
 import 'package:foodnet_01/util/entities.dart';
@@ -50,42 +51,46 @@ class _FavoriteContactsState extends State<FavoriteContacts> {
               child: FutureBuilder<List<FriendData>>(
                 future: fetchRootFriend(),
                 builder: (context, snapshot) {
-                  var favourites = snapshot.data ?? [];
-
-                  return ListView.builder(
-                      padding: const EdgeInsets.only(left: 10.0),
-                      scrollDirection: Axis.horizontal,
-                      itemCount: favourites.length,
-                      itemBuilder: (BuildContext context, int index) {
-                        return GestureDetector(
-                          onTap: () {
-                            seenChat(getMyProfileId(), favourites[index].id);
-                            Navigator.of(context).push(MaterialPageRoute(
-                                builder: (context) => ChatScreens(
-                                      userId: favourites[index].id,
-                                    )));
-                          },
-                          child: Padding(
-                            padding: const EdgeInsets.all(10.0),
-                            child: Column(
-                              children: <Widget>[
-                                CircleAvatar(
-                                  radius: 35.0,
-                                  backgroundImage:
-                                      NetworkImage(favourites[index].userAsset),
-                                ),
-                                Text(
-                                  favourites[index].name,
-                                  style: const TextStyle(
-                                      fontSize: 16.0,
-                                      fontWeight: FontWeight.w600,
-                                      color: Colors.black),
-                                ),
-                              ],
+                  if (snapshot.hasData){
+                    var favourites = snapshot.data ?? [];
+                    return ListView.builder(
+                        padding: const EdgeInsets.only(left: 10.0),
+                        scrollDirection: Axis.horizontal,
+                        itemCount: favourites.length,
+                        itemBuilder: (BuildContext context, int index) {
+                          return GestureDetector(
+                            onTap: () {
+                              seenChat(getMyProfileId(), favourites[index].id);
+                              Navigator.of(context).push(MaterialPageRoute(
+                                  builder: (context) => ChatScreens(
+                                    userId: favourites[index].id,
+                                  )));
+                            },
+                            child: Padding(
+                              padding: const EdgeInsets.all(10.0),
+                              child: Column(
+                                children: <Widget>[
+                                  CircleAvatar(
+                                    radius: 35.0,
+                                    backgroundImage:
+                                    NetworkImage(favourites[index].userAsset),
+                                  ),
+                                  Text(
+                                    favourites[index].name,
+                                    style: const TextStyle(
+                                        fontSize: 16.0,
+                                        fontWeight: FontWeight.w600,
+                                        color: Colors.black),
+                                  ),
+                                ],
+                              ),
                             ),
-                          ),
-                        );
-                      });
+                          );
+                        });
+                  } else {
+                    return loading;
+                  }
+
                 },
               )),
         ],