Chat Favorite Screen & Fixes

lib/generated/codegen_loader.g.dart

@@ -514,7 +514,9 @@ class CodegenLoader extends AssetLoader{
   "verification": "تَحَقّق",
   "resend": "إعادة إرسال",
   "codeExpire": "انتهت صلاحية رمز التحقق",
-  "typeheretoreply": "اكتب هنا للرد"
+  "typeheretoreply": "اكتب هنا للرد",
+  "favorite": "مفضل",
+  "searchfromchat": "البحث من الدردشة"
 };
 static const Map<String,dynamic> en_US = {
   "mohemm": "Mohemm",
@@ -1016,7 +1018,9 @@ static const Map<String,dynamic> en_US = {
   "resend": "Resend",
   "codeExpire": "The verification code has been expired",
   "allQuestionsCorrect": "You have answered all questions correct",
-  "typeheretoreply": "Type here to reply"
+  "typeheretoreply": "Type here to reply",
+  "favorite": "Favorite",
+  "searchfromchat": "Search from chat"
 };
 static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US};
 }

lib/ui/chat/chat_detailed_screen.dart

@@ -16,10 +16,12 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:swipe_to/swipe_to.dart';
 
 class ChatDetailScreen extends StatelessWidget {
-  ChatDetailScreen({Key? key}) : super(key: key);
   dynamic userDetails;
+
   late ChatProviderModel data;
+
   ScrollController scrollController = ScrollController();
+
   final RefreshController _refreshController = RefreshController(initialRefresh: false);
 
   void getMoreChat() async {

lib/ui/chat/chat_home_screen.dart

@@ -43,13 +43,14 @@ class _ChatHomeScreenState extends State<ChatHomeScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: MyColors.white,
-      body: Consumer<ChatProviderModel>(builder: (BuildContext context, ChatProviderModel m, Widget? child) {
+      body: Consumer<ChatProviderModel>(
+        builder: (BuildContext context, ChatProviderModel m, Widget? child) {
           return m.isLoading
               ? ChatHomeShimmer()
               : ListView(
                   shrinkWrap: true,
                   physics: const AlwaysScrollableScrollPhysics(),
-                children: [
+                  children: <Widget>[
                     Padding(
                       padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 20),
                       child: TextField(
@@ -183,7 +184,8 @@ class _ChatHomeScreenState extends State<ChatHomeScreen> {
                       ),
                   ],
                 );
-      }),
+        },
+      ),
       floatingActionButton: FloatingActionButton(
         child: Container(
           width: 60,

lib/ui/chat/favorite_users_screen.dart

@@ -12,25 +12,19 @@ import 'package:mohem_flutter_app/widgets/shimmer/dashboard_shimmer_widget.dart'
 import 'package:provider/provider.dart';
 
 class ChatFavoriteUsersScreen extends StatelessWidget {
-  const ChatFavoriteUsersScreen({Key? key}) : super(key: key);
-
   @override
   Widget build(BuildContext context) {
-    // TODO: implement build
     return Scaffold(
       backgroundColor: MyColors.white,
-      body: Consumer<ChatProviderModel>(builder: (BuildContext context, ChatProviderModel m, Widget? child) {
+      body: Consumer<ChatProviderModel>(
-        return m.isLoading
+        builder: (BuildContext context, ChatProviderModel m, Widget? child) {
-            ? ChatHomeShimmer()
+          if (m.isLoading) {
-            : ListView(
+            return ChatHomeShimmer();
-                shrinkWrap: true,
+          } else {
-                physics: const AlwaysScrollableScrollPhysics(),
+            return m.favUsersList != null && m.favUsersList.isNotEmpty
-                padding: const EdgeInsets.only(top: 20),
+                ? ListView.separated(
-                children: [
-                  if (m.favUsersList != null && m.favUsersList.isNotEmpty)
-                    ListView.separated(
                     itemCount: m.favUsersList!.length,
-                      padding: EdgeInsets.zero,
+                    padding: const EdgeInsets.only(top: 20),
                     shrinkWrap: true,
                     physics: const NeverScrollableScrollPhysics(),
                     itemBuilder: (BuildContext context, int index) {
@@ -61,7 +55,6 @@ class ChatFavoriteUsersScreen extends StatelessWidget {
                             ],
                           ),
                           title: (m.favUsersList![index].userName ?? "").toText14(color: MyColors.darkTextColor),
-                            // subtitle: (m.searchedChats![index].isTyping == true ? "Typing ..." : "").toText11(color: MyColors.normalTextColor),
                           trailing: IconButton(
                             alignment: Alignment.centerRight,
                             padding: EdgeInsets.zero,
@@ -77,26 +70,32 @@ class ChatFavoriteUsersScreen extends StatelessWidget {
                               context,
                               AppRoutes.chatDetailed,
                               arguments: {"targetUser": m.favUsersList![index]},
-                              ).then((value) {
+                            ).then(
+                              (Object? value) {
                                 m.clearSelections();
-                              });
                               },
-                            onLongPress: () {},
+                            );
+                          },
                         ),
                       );
                     },
                     separatorBuilder: (BuildContext context, int index) => const Padding(
                       padding: EdgeInsets.only(right: 10, left: 70),
                       child: Divider(
-                          color: Color(0xFFE5E5E5),
+                        color: Color(
+                          0xFFE5E5E5,
+                        ),
                       ),
                     ),
                   )
-                  else
+                : Column(
-                    Utils.getNoDataWidget(context).expanded
+                    children: [
+                      Utils.getNoDataWidget(context).expanded,
                     ],
                   );
-      }),
+          }
+        },
+      ),
     );
   }
 }