Pull to refresh, Items for Sale & Offers n Discounts fixes

lib/provider/dashboard_provider_model.dart

@@ -72,6 +72,33 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
     return true;
   }
 
+  void initProvider() {
+    isAttendanceTrackingLoading = true;
+    endTime = 0;
+    isTimeRemainingInSeconds = 0;
+    progress = 0.0;
+    attendanceTracking = null;
+
+    isWorkListLoading = true;
+    workListCounter = 0;
+
+    isMissingSwipeLoading = true;
+    missingSwipeCounter = 0;
+
+    isLeaveTicketBalanceLoading = true;
+    accrualList = null;
+    leaveBalanceAccrual = null;
+
+    ticketBalance = 0;
+    isServicesMenusLoading = true;
+    homeMenus = null;
+    getMenuEntriesList = null;
+    isOffersLoading = true;
+    getOffersList = [];
+
+    notifyListeners();
+  }
+
   int calculateSeconds(String time) {
     int hour = int.parse(time.split(":")[0]);
     int mints = int.parse(time.split(":")[1]);
@@ -81,12 +108,6 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
 
   void update(context) {
     fetchAttendanceTracking(context);
-    // isAttendanceTrackingLoading = !isAttendanceTrackingLoading;
-    // isWorkListLoading = !isWorkListLoading;
-    // attendanceTracking?.pSwipeIn = "a";
-    // isTimeRemainingInSeconds = calculateSeconds("00:10:30");
-    // endTime = DateTime.now().millisecondsSinceEpoch + Duration(seconds: isTimeRemainingInSeconds).inMilliseconds;
-    // notifyListeners();
   }
 
   ItgFormsModel? itgFormsModel;

lib/ui/landing/dashboard_screen.dart

@@ -23,6 +23,7 @@ import 'package:mohem_flutter_app/widgets/mark_attendance_widget.dart';
 import 'package:mohem_flutter_app/widgets/shimmer/dashboard_shimmer_widget.dart';
 import 'package:mohem_flutter_app/widgets/shimmer/offers_shimmer_widget.dart';
 import 'package:provider/provider.dart';
+import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 class DashboardScreen extends StatefulWidget {
   DashboardScreen({Key? key}) : super(key: key);
@@ -37,12 +38,24 @@ class _DashboardScreenState extends State<DashboardScreen> {
   late DashboardProviderModel data;
   final GlobalKey<ScaffoldState> _scaffoldState = GlobalKey();
 
+  final RefreshController _refreshController = RefreshController(initialRefresh: false);
+
   int currentIndex = 0;
 
   @override
   void initState() {
     super.initState();
     data = Provider.of<DashboardProviderModel>(context, listen: false);
+    _onRefresh();
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  void _onRefresh() async {
+    data.initProvider();
     data.fetchListMenu();
     data.fetchAttendanceTracking(context);
     data.fetchWorkListCounter(context);
@@ -50,11 +63,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
     data.fetchLeaveTicketBalance(context, DateTime.now());
     data.fetchMenuEntries();
     data.getCategoryOffersListAPI(context);
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
+    _refreshController.refreshCompleted();
   }
 
   @override
@@ -122,6 +131,12 @@ class _DashboardScreenState extends State<DashboardScreen> {
             ],
           ).paddingOnly(left: 21, right: 21, top: 48, bottom: 7),
           Expanded(
+            child: SmartRefresher(
+              enablePullDown: true,
+              enablePullUp: false,
+              header: const MaterialClassicHeader(color: MyColors.gradiantEndColor,),
+              controller: _refreshController,
+              onRefresh: _onRefresh,
               child: SingleChildScrollView(
                 child: Column(
                   children: [
@@ -354,6 +369,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                   ],
                 ),
               ),
+            ),
           )
         ],
       ),

lib/ui/landing/widget/services_widget.dart

@@ -22,10 +22,10 @@ class ServicesWidget extends StatelessWidget {
       "assets/images/monthly_attendance.svg",
       "assets/images/ticket_request.svg",
       "assets/images/ticket_request.svg",
-      "assets/images/dynamic_screens.svg",
-      "assets/images/dynamic_screens.svg",
-      "assets/images/dynamic_screens.svg",
-      "assets/images/dynamic_screens.svg"
+      "assets/images/ticket_request.svg",
+      "assets/images/ticket_request.svg",
+      "assets/images/ticket_request.svg",
+      "assets/images/ticket_request.svg"
     ];
 
     return Consumer<DashboardProviderModel>(

lib/ui/screens/items_for_sale/fragments/items_for_sale.dart

@@ -25,6 +25,7 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
 
   List<GetSaleCategoriesList> getSaleCategoriesList = [];
   List<GetItemsForSaleList> getItemsForSaleList = [];
+  List<GetItemsForSaleList> _foundItemsForSaleList = [];
 
   ScrollController gridScrollController = ScrollController();
   int currentPageNo = 1;
@@ -61,20 +62,10 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
           isInputTypeNum: false,
           isReadOnly: false,
           onChange: (String value) {
-            // _runFilter(value);
+            _runFilter(value);
           },
         ).paddingOnly(left: 21, right: 21, top: 21),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            LocaleKeys.browseCategories.tr().toText17(),
-            // todo @haroon define the purpose of this icon button
-            IconButton(
-              icon: const Icon(Icons.filter_alt_sharp, color: MyColors.darkIconColor, size: 28.0),
-              onPressed: () => Navigator.pop(context),
-            ),
-          ],
-        ).paddingOnly(left: 21, right: 21),
+        LocaleKeys.browseCategories.tr().toText17().paddingOnly(left: 21, right: 21, top: 21),
         SizedBox(
           height: 105.0,
           child: getSaleCategoriesList.isNotEmpty
@@ -132,10 +123,22 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
     );
   }
 
+  void _runFilter(String enteredKeyword) {
+    List<GetItemsForSaleList> results = [];
+    if (enteredKeyword.isEmpty) {
+      results = getItemsForSaleList;
+    } else {
+      results = getItemsForSaleList.where((offer) => offer.title!.toLowerCase().contains(enteredKeyword.toLowerCase())).toList();
+    }
+    setState(() {
+      _foundItemsForSaleList = results;
+    });
+  }
+
   List<Widget> getItemsForSaleWidgets() {
     List<Widget> itemsList = [];
 
-    getItemsForSaleList.forEach((element) {
+    _foundItemsForSaleList.forEach((element) {
       itemsList.add(getItemCard(element));
     });
 
@@ -200,6 +203,7 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
       getItemsForSaleListLocal.clear();
       getItemsForSaleListLocal = await ItemsForSaleApiClient().getItemsForSale(itgPageNo, itgCategoryID);
       getItemsForSaleList.addAll(getItemsForSaleListLocal);
+      _foundItemsForSaleList = getItemsForSaleList;
       Utils.hideLoading(context);
       setState(() {});
     } catch (ex) {

lib/ui/screens/offers_and_discounts/offers_and_discounts_home.dart

@@ -25,6 +25,7 @@ class OffersAndDiscountsHome extends StatefulWidget {
 class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
   List<GetCategoriesList> getCategoriesList = [];
   List<OffersListModel> getOffersList = [];
+  List<OffersListModel> _foundOffersList = [];
 
   int currentCategoryID = 0;
 
@@ -54,18 +55,10 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
               isInputTypeNum: false,
               isReadOnly: false,
               onChange: (String value) {
-                // _runFilter(value);
+                _runFilter(value);
               },
             ).paddingOnly(left: 21, right: 21, top: 21),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                LocaleKeys.browseCategories.tr().toText17(),
-                const Icon(Icons.filter_alt_sharp, color: MyColors.darkIconColor, size: 28.0).onPress(() {
-                  Navigator.pop(context);
-                }),
-              ],
-            ).paddingOnly(left: 21, right: 21, top: 21),
+            LocaleKeys.browseCategories.tr().toText17().paddingOnly(left: 21, right: 21, top: 21),
             SizedBox(
               height: 110.0,
               child: getCategoriesList.isNotEmpty
@@ -81,6 +74,7 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
                             onTap: () {
                               setState(() {
                                 currentCategoryID = getCategoriesList[index].id!;
+                                getCategoryOffersListAPI();
                                 // getItemsForSaleList.clear();
                                 // currentPageNo = 1;
                                 // getItemsForSale(currentPageNo, currentCategoryID);
@@ -146,7 +140,7 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
   List<Widget> getItemsForSaleWidgets() {
     List<Widget> itemsList = [];
 
-    for (var element in getOffersList) {
+    for (var element in _foundOffersList) {
       itemsList.add(getItemCard(element));
     }
 
@@ -213,6 +207,18 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
     );
   }
 
+  void _runFilter(String enteredKeyword) {
+    List<OffersListModel> results = [];
+    if (enteredKeyword.isEmpty) {
+      results = getOffersList;
+    } else {
+      results = getOffersList.where((offer) => offer.title!.toLowerCase().contains(enteredKeyword.toLowerCase())).toList();
+    }
+    setState(() {
+      _foundOffersList = results;
+    });
+  }
+
   void navigateToDetails(OffersListModel offersListModelObj) {
     List<OffersListModel> getOffersDetailList = [];
     getOffersDetailList.clear();
@@ -258,6 +264,7 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
     try {
       Utils.showLoading(context);
       getOffersList = await OffersAndDiscountsApiClient().getOffersList(currentCategoryID, 100);
+      _foundOffersList = getOffersList;
       Utils.hideLoading(context);
       setState(() {});
     } catch (ex) {

pubspec.yaml

@@ -75,6 +75,7 @@ dependencies:
   url_launcher: ^6.0.15
   share: 2.0.4
   flutter_rating_bar: ^4.0.1
+  pull_to_refresh: ^2.0.0
 
 dev_dependencies:
   flutter_test: