From f2dbfaf2be3cf0e77e26845e2ff82079c1c52f8f Mon Sep 17 00:00:00 2001
From: Elham Rababh <elham.a.rababah@gmail.com>
Date: Thu, 9 Sep 2021 15:30:46 +0300
Subject: [PATCH] fix issue after merge the dev

---
 lib/screens/patients/In_patient/in_patient_list_page.dart | 8 --------
 .../patients/In_patient/list_of_all_in_patient.dart       | 7 +------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/lib/screens/patients/In_patient/in_patient_list_page.dart b/lib/screens/patients/In_patient/in_patient_list_page.dart
index 251054e1..61abf434 100644
--- a/lib/screens/patients/In_patient/in_patient_list_page.dart
+++ b/lib/screens/patients/In_patient/in_patient_list_page.dart
@@ -30,20 +30,13 @@ class _InPatientListPageState extends State<InPatientListPage> {
   bool hasQuery = false;
   bool showBottomSheet = false;
   String selectedClinicName;
-  ScrollController _scrollController;
 
   @override
   void dispose() {
     _searchController.dispose();
-    _scrollController.dispose();
     super.dispose();
   }
 
-  @override
-  void initState() {
-    _scrollController = new ScrollController();
-    super.initState();
-  }
 
   @override
   Widget build(BuildContext context) {
@@ -200,7 +193,6 @@ class _InPatientListPageState extends State<InPatientListPage> {
                           : ListOfAllInPatient(
                               isAllClinic: isAllClinic,
                               hasQuery: hasQuery,
-                              scrollController: _scrollController,
                               patientSearchViewModel:
                                   widget.patientSearchViewModel)
                       : NoData()
diff --git a/lib/screens/patients/In_patient/list_of_all_in_patient.dart b/lib/screens/patients/In_patient/list_of_all_in_patient.dart
index 9c648e66..6aa13094 100644
--- a/lib/screens/patients/In_patient/list_of_all_in_patient.dart
+++ b/lib/screens/patients/In_patient/list_of_all_in_patient.dart
@@ -11,13 +11,11 @@ class ListOfAllInPatient extends StatelessWidget {
     @required this.isAllClinic,
     @required this.hasQuery,
     this.patientSearchViewModel,
-    this.scrollController,
   }) : super(key: key);
 
   final bool isAllClinic;
   final bool hasQuery;
 
-  final ScrollController scrollController;
 
   final PatientSearchViewModel patientSearchViewModel;
 
@@ -28,16 +26,13 @@ class ListOfAllInPatient extends StatelessWidget {
         margin: EdgeInsets.symmetric(horizontal: 16.0),
         child: patientSearchViewModel.filteredInPatientItems.length == 0
             ? NoData()
-            : NotificationListener<ScrollEndNotification>(
+            : NotificationListener(
                 child: ListView.builder(
-                    controller: scrollController,
                     itemCount:
                         patientSearchViewModel.filteredInPatientItems.length,
                     scrollDirection: Axis.vertical,
-                    // physics: ScrollPhysics(),
                     shrinkWrap: true,
                     itemBuilder: (context, index) {
-                      // if (!isMyInPatient)
                       return PatientCard(
                         patientInfo: patientSearchViewModel
                             .filteredInPatientItems[index],