Fixes

lib/api/chat/chat_api_client.dart

@@ -46,15 +46,15 @@ class ChatApiClient {
     return userLoginResponse;
   }
 
-  Future<List<ChatUser>?> getChatMemberFromSearch(String sName, int cUserId) async {
-    Response response = await ApiClient().getJsonForResponse(
-      "${ApiConsts.chatLoginTokenUrl}getUserWithStatusAndFavAsync/$sName/$cUserId",
-      token: AppState().chatDetails!.response!.token,
-    );
+  Future<ChatUserModel> getChatMemberFromSearch(String searchParam, int cUserId, int pageNo) async {
+    ChatUserModel chatUserModel;
+    Response response = await ApiClient().postJsonForResponse("${ApiConsts.chatLoginTokenUrl}getUserWithStatusAndFavAsync", {"employeeNumber": cUserId, "userName": searchParam, "pageNumber": pageNo},
+        token: AppState().chatDetails!.response!.token);
     if (!kReleaseMode) {
       logger.i("res: " + response.body);
     }
-    return List<ChatUser>.from(json.decode(response.body).map((x) => ChatUser.fromJson(x)));
+    chatUserModel = chatUserModelFromJson(response.body);
+    return chatUserModel;
   }
 
   //Get User Recent Chats

lib/classes/consts.dart

@@ -3,7 +3,7 @@ import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
 class ApiConsts {
   //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
   // static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server
-  //static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
+ // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
     static String baseUrl = "https://hmgwebservices.com"; // Live server
   static String baseUrlServices = baseUrl + "/Services/"; // server
   // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server

lib/models/chat/get_search_user_chat_model.dart

@@ -1,5 +1,11 @@
+
+import 'dart:convert';
 import 'dart:io';
 
+ChatUserModel chatUserModelFromJson(String str) => ChatUserModel.fromJson(json.decode(str));
+
+String chatUserModelToJson(ChatUserModel data) => json.encode(data.toJson());
+
 class ChatUserModel {
   ChatUserModel({
     this.response,
@@ -7,16 +13,40 @@ class ChatUserModel {
   });
 
   List<ChatUser>? response;
-  dynamic errorResponses;
+  List<ErrorResponse>? errorResponses;
 
   factory ChatUserModel.fromJson(Map<String, dynamic> json) => ChatUserModel(
         response: json["response"] == null ? null : List<ChatUser>.from(json["response"].map((x) => ChatUser.fromJson(x))),
-        errorResponses: json["errorResponses"],
+        errorResponses: json["errorResponses"] == null ? null : List<ErrorResponse>.from(json["errorResponses"].map((x) => ErrorResponse.fromJson(x))),
       );
 
   Map<String, dynamic> toJson() => {
         "response": response == null ? null : List<dynamic>.from(response!.map((x) => x.toJson())),
-        "errorResponses": errorResponses,
+        "errorResponses": errorResponses == null ? null : List<dynamic>.from(errorResponses!.map((x) => x.toJson())),
+      };
+}
+
+class ErrorResponse {
+  ErrorResponse({
+    this.fieldName,
+    this.message,
+  });
+
+  dynamic? fieldName;
+  String? message;
+
+  factory ErrorResponse.fromRawJson(String str) => ErrorResponse.fromJson(json.decode(str));
+
+  String toRawJson() => json.encode(toJson());
+
+  factory ErrorResponse.fromJson(Map<String, dynamic> json) => ErrorResponse(
+        fieldName: json["fieldName"],
+        message: json["message"] == null ? null : json["message"],
+      );
+
+  Map<String, dynamic> toJson() => {
+        "fieldName": fieldName,
+        "message": message == null ? null : message,
       };
 }
 
@@ -34,6 +64,8 @@ class ChatUser {
     this.isPin,
     this.isFav,
     this.isAdmin,
+    this.rKey,
+    this.totalCount,
     this.isTyping,
     this.isImageLoaded,
     this.isImageLoading,
@@ -44,7 +76,7 @@ class ChatUser {
   String? userName;
   String? email;
   dynamic? phone;
-  dynamic? title;
+  String? title;
   int? userStatus;
   dynamic? image;
   int? unreadMessageCount;
@@ -52,17 +84,23 @@ class ChatUser {
   bool? isPin;
   bool? isFav;
   bool? isAdmin;
+  dynamic? rKey;
+  int? totalCount;
   bool? isTyping;
   bool? isImageLoaded;
   bool? isImageLoading;
   File? userLocalDownlaodedImage;
 
+  factory ChatUser.fromRawJson(String str) => ChatUser.fromJson(json.decode(str));
+
+  String toRawJson() => json.encode(toJson());
+
   factory ChatUser.fromJson(Map<String, dynamic> json) => ChatUser(
       id: json["id"] == null ? null : json["id"],
       userName: json["userName"] == null ? null : json["userName"],
       email: json["email"] == null ? null : json["email"],
       phone: json["phone"],
-      title: json["title"],
+      title: json["title"] == null ? null : json["title"],
       userStatus: json["userStatus"] == null ? null : json["userStatus"],
       image: json["image"],
       unreadMessageCount: json["unreadMessageCount"] == null ? null : json["unreadMessageCount"],
@@ -70,6 +108,8 @@ class ChatUser {
       isPin: json["isPin"] == null ? null : json["isPin"],
       isFav: json["isFav"] == null ? null : json["isFav"],
       isAdmin: json["isAdmin"] == null ? null : json["isAdmin"],
+      rKey: json["rKey"],
+      totalCount: json["totalCount"] == null ? null : json["totalCount"],
       isTyping: false,
       isImageLoaded: false,
       isImageLoading: true,
@@ -80,7 +120,7 @@ class ChatUser {
         "userName": userName == null ? null : userName,
         "email": email == null ? null : email,
         "phone": phone,
-        "title": title,
+        "title": title == null ? null : title,
         "userStatus": userStatus == null ? null : userStatus,
         "image": image,
         "unreadMessageCount": unreadMessageCount == null ? null : unreadMessageCount,
@@ -88,5 +128,7 @@ class ChatUser {
         "isPin": isPin == null ? null : isPin,
         "isFav": isFav == null ? null : isFav,
         "isAdmin": isAdmin == null ? null : isAdmin,
+        "rKey": rKey,
+        "totalCount": totalCount == null ? null : totalCount,
       };
 }

lib/provider/chat_provider_model.dart

@@ -82,7 +82,6 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
   }
 
   Future<void> buildHubConnection() async {
-
     chatHubConnection = await getHubConnection();
     await chatHubConnection.start();
     if (kDebugMode) {
@@ -173,7 +172,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
       if (isNewChat) {
         userChatHistory = [];
       } else if (loadMore) {
-        Utils.showToast("No More Data To Load");
+
       }
     } else {
       if (loadMore) {
@@ -330,7 +329,15 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
         user.userStatus = items.first["userStatus"];
       }
     }
-
+    if (teamMembersList != null) {
+      if (teamMembersList.isNotEmpty) {
+        for (ChatUser user in teamMembersList!) {
+          if (user.id == items.first["id"]) {
+            user.userStatus = items.first["userStatus"];
+          }
+        }
+      }
+    }
 
     notifyListeners();
   }

lib/ui/chat/chat_home_screen.dart

@@ -238,6 +238,7 @@ class _ChatHomeScreenState extends State<ChatHomeScreen> {
           ),
         ),
         onPressed: () async {
+          print(AppState().chatDetails!.response!.token);
           showMyBottomSheet(
             context,
             callBackFunc: () {},

lib/widgets/bottom_sheets/search_employee_bottom_sheet.dart

@@ -24,6 +24,7 @@ import 'package:mohem_flutter_app/ui/chat/chat_detailed_screen.dart';
 import 'package:mohem_flutter_app/widgets/button/default_button.dart';
 import 'package:mohem_flutter_app/widgets/circular_avatar.dart';
 import 'package:mohem_flutter_app/widgets/dynamic_forms/dynamic_textfield_widget.dart';
+import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 class SearchEmployeeBottomSheet extends StatefulWidget {
   int? notificationID;
@@ -47,6 +48,8 @@ class SearchEmployeeBottomSheet extends StatefulWidget {
 
 class _SearchEmployeeBottomSheetState extends State<SearchEmployeeBottomSheet> {
   TextEditingController username = TextEditingController();
+  ScrollController sc = ScrollController();
+
   String searchText = "";
 
   List<String>? optionsList = [
@@ -62,6 +65,7 @@ class _SearchEmployeeBottomSheetState extends State<SearchEmployeeBottomSheet> {
 
   // Chat Items
   List<ChatUser>? chatUsersList = [];
+  int pageNo = 1;
 
   int _selectedSearchIndex = 0;
 
@@ -88,12 +92,16 @@ class _SearchEmployeeBottomSheetState extends State<SearchEmployeeBottomSheet> {
   }
 
   void fetchChatUser({bool isNeedLoading = true}) async {
+    if (pageNo == 1)
+      chatUsersList = [];
     try {
       Utils.showLoading(context);
-      chatUsersList = await ChatApiClient().getChatMemberFromSearch(
-        searchText,
-        int.parse(AppState().chatDetails!.response!.id.toString()),
-      );
+      await ChatApiClient().getChatMemberFromSearch(searchText, AppState().chatDetails!.response!.id!, pageNo).then((ChatUserModel value) {
+        print(value.response!.length);
+        if (value.response != null) {
+          chatUsersList = value.response;
+        }
+      });
       chatUsersList!.removeWhere((ChatUser element) => element.id == AppState().chatDetails!.response!.id);
       Utils.hideLoading(context);
       setState(() {});
@@ -107,232 +115,263 @@ class _SearchEmployeeBottomSheetState extends State<SearchEmployeeBottomSheet> {
     return null;
   }
 
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      width: double.infinity,
-      height: MediaQuery.of(context).size.height - 100,
-      child: Column(
-        children: [
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              widget.title.toText24(isBold: true),
-              21.height,
-              "Search".toText16(),
-              11.height,
-              Row(
-                children: [
-                  radioOption("Name", 0, _selectedSearchIndex),
-                  radioOption("User Name", 1, _selectedSearchIndex),
-                  radioOption("Email", 2, _selectedSearchIndex),
-                ],
-              ),
-              14.height,
-              Row(
-                children: [
-                  DynamicTextFieldWidget(
-                    "Search",
-                    "Search By Username",
-                    inputAction: TextInputAction.done,
-                    suffixIconData: Icons.search,
-                    onChange: (text) {
-                      searchText = text;
-                      setState(() {});
-                    },
-                  ).expanded,
-                  IconButton(
-                    constraints: const BoxConstraints(),
-                    onPressed: () async {
-                      await SystemChannels.textInput.invokeMethod('TextInput.hide');
-                      widget.fromChat ? fetchChatUser() : fetchUserByInput();
-                    },
-                    icon: const Icon(Icons.search),
-                  )
-                ],
-              ),
-              if (replacementList != null)
-                replacementList!.isEmpty
-                    ? Utils.getNoDataWidget(context).expanded
-                    : ListView(
-                        physics: const BouncingScrollPhysics(),
-                        padding: EdgeInsets.only(top: 21, bottom: 8),
-                        children: [
-                          if (favouriteUserList?.isNotEmpty ?? false) ...[
-                            "Favorites".toText16(),
-                            12.height,
-                            ListView.separated(
-                                physics: const NeverScrollableScrollPhysics(),
-                                shrinkWrap: true,
-                                itemBuilder: (cxt, index) => employeeItemView(favouriteUserList![index]),
-                                separatorBuilder: (cxt, index) => Container(
-                                      height: 1,
-                                      color: MyColors.borderE3Color,
-                                    ),
-                                itemCount: favouriteUserList?.length ?? 0),
-                            12.height,
-                          ],
-                          if (nonFavouriteUserList?.isNotEmpty ?? false) ...[
-                            "Related".toText16(),
-                            12.height,
-                            ListView.separated(
-                                physics: const NeverScrollableScrollPhysics(),
-                                shrinkWrap: true,
-                                itemBuilder: (cxt, index) => employeeItemView(nonFavouriteUserList![index]),
-                                separatorBuilder: (cxt, index) => Container(
-                                      height: 1,
-                                      color: MyColors.borderE3Color,
-                                    ),
-                                itemCount: nonFavouriteUserList?.length ?? 0),
-                          ]
-                        ],
-                      ).expanded,
-              if (widget.fromChat)
-                if (chatUsersList != null && widget.fromChat)
-                  chatUsersList!.isEmpty
-                      ? Column(
-                          children: [
-                            20.height,
-                            Utils.getNoDataWidget(context),
-                          ],
-                        )
+  void loadMoreChatUsers() async {
+    try {
+      await ChatApiClient().getChatMemberFromSearch(searchText, AppState().chatDetails!.response!.id!, pageNo).then((ChatUserModel value) {
+        if (value.response != null) {
+          chatUsersList!.addAll(value.response!);
+        }
+      });
+      chatUsersList!.removeWhere((ChatUser element) => element.id == AppState().chatDetails!.response!.id);
+    } catch (e) {
+      Utils.hideLoading(context);
+      Utils.handleException(e, context, null);
+    }
+  }
+
+  void scrollListener() async {
+    if (sc.position.pixels ==
+        sc.position.maxScrollExtent) {
+      pageNo++;
+      setState(() {});
+    }
+
+    @override
+    void initState() {
+      super.initState();
+      sc.addListener(scrollListener);
+    }
+
+    @override
+    Widget build(BuildContext context) {
+      return SizedBox(
+        width: double.infinity,
+        height: MediaQuery
+            .of(context)
+            .size
+            .height - 100,
+        child: Column(
+          children: [
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                widget.title.toText24(isBold: true),
+                21.height,
+                "Search".toText16(),
+                11.height,
+                Row(
+                  children: [
+                    radioOption("Name", 0, _selectedSearchIndex),
+                    radioOption("User Name", 1, _selectedSearchIndex),
+                    radioOption("Email", 2, _selectedSearchIndex),
+                  ],
+                ),
+                14.height,
+                Row(
+                  children: [
+                    DynamicTextFieldWidget(
+                      "Search",
+                      "Search By Username",
+                      inputAction: TextInputAction.done,
+                      suffixIconData: Icons.search,
+                      onChange: (text) {
+                        searchText = text;
+                        setState(() {});
+                      },
+                    ).expanded,
+                    IconButton(
+                      constraints: const BoxConstraints(),
+                      onPressed: () async {
+                        await SystemChannels.textInput.invokeMethod('TextInput.hide');
+                        widget.fromChat ? fetchChatUser() : fetchUserByInput();
+                      },
+                      icon: const Icon(Icons.search),
+                    )
+                  ],
+                ),
+                if (replacementList != null)
+                  replacementList!.isEmpty
+                      ? Utils
+                      .getNoDataWidget(context)
+                      .expanded
                       : ListView(
-                          physics: const BouncingScrollPhysics(),
-                          padding: const EdgeInsets.only(
-                            top: 15,
-                          ),
-                          children: <Widget>[
-                            ListView.separated(
-                              physics: const NeverScrollableScrollPhysics(),
-                              shrinkWrap: true,
-                              itemBuilder: (BuildContext cxt, int index) {
-                                return SizedBox(
-                                  height: 55,
-                                  child: ListTile(
-                                    leading: Stack(
-                                      children: [
-                                        SvgPicture.asset(
-                                          "assets/images/user.svg",
-                                          height: 48,
-                                          width: 48,
-                                        ),
-                                        Positioned(
-                                          right: 5,
-                                          bottom: 1,
-                                          child: Container(
-                                            width: 10,
-                                            height: 10,
-                                            decoration: BoxDecoration(
-                                              color: chatUsersList![index].userStatus == 1 ? MyColors.green2DColor : Colors.red,
-                                              borderRadius: const BorderRadius.all(
-                                                Radius.circular(10),
-                                              ),
-                                            ),
-                                          ),
-                                        )
-                                      ],
+                    physics: const BouncingScrollPhysics(),
+                    padding: EdgeInsets.only(top: 21, bottom: 8),
+                    children: [
+                      if (favouriteUserList?.isNotEmpty ?? false) ...[
+                        "Favorites".toText16(),
+                        12.height,
+                        ListView.separated(
+                            physics: const NeverScrollableScrollPhysics(),
+                            shrinkWrap: true,
+                            itemBuilder: (cxt, index) => employeeItemView(favouriteUserList![index]),
+                            separatorBuilder: (cxt, index) =>
+                                Container(
+                                  height: 1,
+                                  color: MyColors.borderE3Color,
+                                ),
+                            itemCount: favouriteUserList?.length ?? 0),
+                        12.height,
+                      ],
+                      if (nonFavouriteUserList?.isNotEmpty ?? false) ...[
+                        "Related".toText16(),
+                        12.height,
+                        ListView.separated(
+                            physics: const NeverScrollableScrollPhysics(),
+                            shrinkWrap: true,
+                            itemBuilder: (cxt, index) => employeeItemView(nonFavouriteUserList![index]),
+                            separatorBuilder: (cxt, index) =>
+                                Container(
+                                  height: 1,
+                                  color: MyColors.borderE3Color,
+                                ),
+                            itemCount: nonFavouriteUserList?.length ?? 0),
+                      ]
+                    ],
+                  ).expanded,
+                if (widget.fromChat)
+                  if (chatUsersList != null && widget.fromChat)
+                    chatUsersList!.isEmpty
+                        ? Column(
+                      children: [
+                        20.height,
+                        Utils.getNoDataWidget(context),
+                      ],
+                    )
+                        : ListView
+                        .separated(
+                      physics: const AlwaysScrollableScrollPhysics(),
+                      controller: sc,
+                      shrinkWrap: true,
+                      itemBuilder: (BuildContext cxt, int index) {
+                        return SizedBox(
+                          height: 55,
+                          child: ListTile(
+                            leading: Stack(
+                              children: [
+                                SvgPicture.asset(
+                                  "assets/images/user.svg",
+                                  height: 48,
+                                  width: 48,
+                                ),
+                                Positioned(
+                                  right: 5,
+                                  bottom: 1,
+                                  child: Container(
+                                    width: 10,
+                                    height: 10,
+                                    decoration: BoxDecoration(
+                                      color: chatUsersList![index].userStatus == 1 ? MyColors.green2DColor : Colors.red,
+                                      borderRadius: const BorderRadius.all(
+                                        Radius.circular(10),
+                                      ),
                                     ),
-                                    title: (chatUsersList![index].userName ?? "").toText14(color: MyColors.darkTextColor),
-                                    minVerticalPadding: 0,
-                                    onTap: () {
-                                      Navigator.pop(context);
-                                      Navigator.pushNamed(
-                                        context,
-                                        AppRoutes.chatDetailed,
-                                        arguments: ChatDetailedScreenParams(chatUsersList![index], true),
-                                      );
-                                    },
                                   ),
-                                );
-                              },
-                              separatorBuilder: (BuildContext context, int index) => const Padding(
-                                padding: EdgeInsets.only(right: 10, left: 70, bottom: 0, top: 0),
-                                child: Divider(
-                                  color: Color(0xFFE5E5E5),
-                                ),
-                              ),
-                              itemCount: chatUsersList?.length ?? 0,
+                                )
+                              ],
                             ),
-                            12.height,
-                          ],
-                        ).expanded,
-            ],
-          ).paddingOnly(left: 21, right: 21, bottom: 0, top: 21).expanded,
-          Container(width: double.infinity, height: 1, color: MyColors.lightGreyEFColor),
-          DefaultButton(
-            LocaleKeys.cancel.tr(),
-            () {
-              Navigator.pop(context);
-            },
-            textColor: MyColors.grey3AColor,
-            colors: const [
-              Color(0xffE6E6E6),
-              Color(0xffE6E6E6),
-            ],
-          ).insideContainer
-        ],
-      ),
-    );
-  }
-
-  Widget employeeItemView(ReplacementList replacement) {
-    return InkWell(
-      onTap: () {
-        Navigator.pop(context);
-        widget.onSelectEmployee(replacement);
-      },
-      child: SizedBox(
-        height: 50,
-        child: Row(
-          children: [
-            CircularAvatar(
-              url: replacement.employeeImage ?? "",
-              height: 30,
-              width: 30,
-              isImageBase64: true,
-            ),
-            16.width,
-            Expanded(
-              child: (replacement.employeeDisplayName ?? "").toText12(),
-            ),
-            Icon(Icons.star, size: 16, color: replacement.isFavorite! ? MyColors.yellowFavColor : MyColors.borderCEColor),
+                            title: (chatUsersList![index].userName ?? "").toText14(color: MyColors.darkTextColor),
+                            minVerticalPadding: 0,
+                            onTap: () {
+                              Navigator.pop(context);
+                              Navigator.pushNamed(
+                                context,
+                                AppRoutes.chatDetailed,
+                                arguments: ChatDetailedScreenParams(chatUsersList![index], true),
+                              );
+                            },
+                          ),
+                        );
+                      },
+                      separatorBuilder: (BuildContext context, int index) =>
+                      const Padding(
+                        padding: EdgeInsets.only(right: 10, left: 70, bottom: 0, top: 0),
+                        child: Divider(
+                          color: Color(0xFFE5E5E5),
+                        ),
+                      ),
+                      itemCount: chatUsersList?.length ?? 0,
+                    )
+                        .expanded,
+              ],
+            )
+                .paddingOnly(left: 21, right: 21, bottom: 0, top: 21)
+                .expanded,
+            Container(width: double.infinity, height: 1, color: MyColors.lightGreyEFColor),
+            DefaultButton(
+              LocaleKeys.cancel.tr(),
+                  () {
+                Navigator.pop(context);
+              },
+              textColor: MyColors.grey3AColor,
+              colors: const [
+                Color(0xffE6E6E6),
+                Color(0xffE6E6E6),
+              ],
+            ).insideContainer
           ],
         ),
-      ),
-    );
-  }
+      );
+    }
 
-  Widget radioOption(String title, int value, int groupValue) {
-    return Row(
-      children: [
-        Container(
-          width: 24,
-          height: 24,
-          decoration: BoxDecoration(
-            color: Colors.transparent,
-            border: Border.all(color: MyColors.borderColor, width: 1),
-            borderRadius: const BorderRadius.all(
-              Radius.circular(100),
-            ),
+    Widget employeeItemView(ReplacementList replacement) {
+      return InkWell(
+        onTap: () {
+          Navigator.pop(context);
+          widget.onSelectEmployee(replacement);
+        },
+        child: SizedBox(
+          height: 50,
+          child: Row(
+            children: [
+              CircularAvatar(
+                url: replacement.employeeImage ?? "",
+                height: 30,
+                width: 30,
+                isImageBase64: true,
+              ),
+              16.width,
+              Expanded(
+                child: (replacement.employeeDisplayName ?? "").toText12(),
+              ),
+              Icon(Icons.star, size: 16, color: replacement.isFavorite! ? MyColors.yellowFavColor : MyColors.borderCEColor),
+            ],
           ),
-          padding: const EdgeInsets.all(4),
-          child: Container(
-            width: double.infinity,
-            height: double.infinity,
+        ),
+      );
+    }
+
+    Widget radioOption(String title, int value, int groupValue) {
+      return Row(
+        children: [
+          Container(
+            width: 24,
+            height: 24,
             decoration: BoxDecoration(
-              color: value == groupValue ? MyColors.grey3AColor : Colors.transparent,
+              color: Colors.transparent,
+              border: Border.all(color: MyColors.borderColor, width: 1),
               borderRadius: const BorderRadius.all(
                 Radius.circular(100),
               ),
             ),
+            padding: const EdgeInsets.all(4),
+            child: Container(
+              width: double.infinity,
+              height: double.infinity,
+              decoration: BoxDecoration(
+                color: value == groupValue ? MyColors.grey3AColor : Colors.transparent,
+                borderRadius: const BorderRadius.all(
+                  Radius.circular(100),
+                ),
+              ),
+            ),
           ),
-        ),
-        9.width,
-        title.toText12(color: MyColors.grey57Color)
-      ],
-    ).onPress(() {
-      _selectedSearchIndex = value;
-      setState(() {});
-    }).expanded;
+          9.width,
+          title.toText12(color: MyColors.grey57Color)
+        ],
+      ).onPress(() {
+        _selectedSearchIndex = value;
+        setState(() {});
+      }).expanded;
+    }
   }
-}

lib/widgets/shimmer/dashboard_shimmer_widget.dart

@@ -273,7 +273,7 @@ class ChatHomeShimmer extends StatelessWidget {
                           children: <Widget>[
                             Container(
                               width: double.infinity,
-                              height: 8.0,
+                              height: 20.0,
                               color: Colors.white,
                             ),
                             const Padding(
@@ -281,7 +281,7 @@ class ChatHomeShimmer extends StatelessWidget {
                             ),
                             Container(
                               width: double.infinity,
-                              height: 8.0,
+                              height: 15.0,
                               color: Colors.white,
                             ),
                             const Padding(
@@ -289,7 +289,7 @@ class ChatHomeShimmer extends StatelessWidget {
                             ),
                             Container(
                               width: 40.0,
-                              height: 8.0,
+                              height: 10.0,
                               color: Colors.white,
                             ),
                           ],