Added Ads Filter

lib/api/api_client.dart

@@ -135,9 +135,9 @@ class ApiClientImp implements ApiClient {
       response = await _post(Uri.parse(url), body: requestBody, headers: headers0).timeout(const Duration(seconds: 100));
 
       if (!kReleaseMode) {
-        log("Url:$url");
-        log("body:$requestBody");
-        log("res: ${response.body}");
+        logger.i(url);
+        logger.i(requestBody);
+        logger.i(jsonDecode(response.body));
       }
       if (response.statusCode >= 200 && response.statusCode < 500) {
         var jsonData = jsonDecode(response.body);
@@ -246,8 +246,8 @@ class ApiClientImp implements ApiClient {
       var response = await _get(Uri.parse(url), headers: headers0).timeout(const Duration(seconds: 60));
 
       if (!kReleaseMode) {
-        log("res: ${response.body}");
-        log("resCode: ${response.statusCode}");
+        logger.i("Url:$url");
+        logger.i(jsonDecode(response.body));
       }
       if (response.statusCode >= 200 && response.statusCode < 500) {
         var jsonData = jsonDecode(response.body);
@@ -315,9 +315,9 @@ class ApiClientImp implements ApiClient {
     SharedPrefManager.setRefreshToken(refresh.data!.refreshToken ?? "");
     String mdata = await SharedPrefManager.getData();
     UserInfo info = UserInfo.fromJson(jsonDecode(mdata));
-    User user =  User();
-    user.data =  UserData(accessToken: refresh.data!.accessToken ?? "", refreshToken: refresh.data!.refreshToken ?? "", userInfo: info);
+    User user = User();
+    user.data = UserData(accessToken: refresh.data!.accessToken ?? "", refreshToken: refresh.data!.refreshToken ?? "", userInfo: info);
     AppState().setUser = user;
-    return refresh.data!.accessToken??"";
+    return refresh.data!.accessToken ?? "";
   }
 }

lib/main.dart

@@ -9,15 +9,13 @@ import 'package:provider/provider.dart';
 import 'package:provider/single_child_widget.dart';
 import 'package:sizer/sizer.dart';
 
-
 //testing push
 final navigatorKey = GlobalKey<NavigatorState>();
 
 Logger logger = Logger(
-  printer: PrettyPrinter(
-    lineLength: 0,
-  ),
-);
+    // printer: PrettyPrinter(lineLength: 0, methodCount: 0,),
+
+    );
 
 class MyHttpOverrides extends HttpOverrides {
   @override

lib/view_models/ad_view_model.dart

@@ -235,6 +235,7 @@ class AdVM extends BaseVM {
     final myActiveAds = myAds.where((element) => element.adPostStatus == AdPostStatus.active).toList();
     myActiveAdsForHome = myActiveAds.length >= 3 ? myActiveAds.take(3).toList() : myActiveAds;
     await getMyReservedAds();
+    notifyListeners();
     setState(ViewState.idle);
   }
 
@@ -263,6 +264,7 @@ class AdVM extends BaseVM {
     setState(ViewState.busy);
     exploreAds = await adsRepo.getAllAds(isMyAds: false);
     exploreAdsFilteredList = exploreAds;
+    notifyListeners();
     setState(ViewState.idle);
   }
 
@@ -320,7 +322,7 @@ class AdVM extends BaseVM {
       return;
     }
     Utils.hideLoading(context);
-    Utils.showToast("A has been deleted successfully!");
+    Utils.showToast("Ad has been deleted successfully!");
     updateIsExploreAds(false);
     applyFilterOnMyAds(adPostStatusEnum: AdPostStatus.active); //pending for review
     navigateReplaceWithName(context, AppRoutes.dashboard);
@@ -352,7 +354,7 @@ class AdVM extends BaseVM {
       return;
     }
     Utils.hideLoading(context);
-    Utils.showToast("A has been deactivated successfully!");
+    Utils.showToast("Ad has been deactivated successfully!");
     updateIsExploreAds(false);
     applyFilterOnMyAds(adPostStatusEnum: AdPostStatus.cancelled); //pending for review
     navigateReplaceWithName(context, AppRoutes.dashboard);

lib/view_models/requests_view_model.dart

@@ -66,21 +66,8 @@ class RequestsVM extends BaseVM {
     };
     if (appType == AppType.provider) {
       paramsForGetRequests.addEntries([MapEntry("providerID", AppState().getUser.data!.userInfo!.providerId)]);
-      // paramsForGetRequests = {
-      //   "providerID": AppState().getUser.data!.userInfo!.providerId,
-      //   "pageSize": 100,
-      //   "pageIndex": 0,
-      //   "requestType": 0,
-      // };
     } else {
       paramsForGetRequests.addEntries([MapEntry("customerID", AppState().getUser.data!.userInfo!.customerId)]);
-
-      // paramsForGetRequests = {
-      //   "customerID": AppState().getUser.data!.userInfo!.customerId,
-      //   "pageSize": 100,
-      //   "pageIndex": 0,
-      //   "requestType": 0,
-      // };
     }
     myRequests = await requestRepo.getRequests(paramsForGetRequests);
     applyFilterOnRequestsVM(requestsTypeEnum: RequestsTypeEnum.specialCarRequest);
@@ -264,14 +251,23 @@ class RequestsVM extends BaseVM {
     return vehiclePostingImages;
   }
 
+  Future<List<VehiclePostingImages>> getVehiclePostingImageList() async {
+    List<VehiclePostingImages> vehicleImages = [];
+    log("vehicleImages: ${pickedVehicleImages.length}");
+
+    for (var image in pickedVehicleImages) {
+      var value = await convertFileToRequestPostingImages(file: image);
+      vehicleImages.add(value);
+    }
+
+    return vehicleImages;
+  }
+
   Future<void> onCreateRequestTapped(BuildContext context) async {
     if (validateCreateRequestForm()) {
       Utils.showLoading(context);
-      List<VehiclePostingImages> vehicleImages = [];
-      pickedVehicleImages.forEach((element) async {
-        vehicleImages.add(await convertFileToRequestPostingImages(file: element));
-      });
 
+      List<VehiclePostingImages> vehicleImages = await getVehiclePostingImageList();
       Map<String, dynamic> body = {
         "customerID": AppState().getUser.data!.userInfo!.customerId ?? 0,
         "requestType": requestTypeId.selectedId,

lib/views/requests/widget/request_item.dart

@@ -82,19 +82,19 @@ class RequestItem extends StatelessWidget {
               crossAxisAlignment: CrossAxisAlignment.end,
               children: [
                 request.price.toInt().toString().toText(
-                  fontSize: 20,
-                  color: Colors.black,
-                  isBold: true,
-                ),
+                      fontSize: 20,
+                      color: Colors.black,
+                      isBold: true,
+                    ),
                 2.width,
                 "SAR"
                     .toText(
-                  color: MyColors.lightTextColor,
-                  fontSize: 10,
-                )
+                      color: MyColors.lightTextColor,
+                      fontSize: 10,
+                    )
                     .paddingOnly(
-                  bottom: 3,
-                ),
+                      bottom: 3,
+                    ),
               ],
             ),
             const Icon(
@@ -106,6 +106,9 @@ class RequestItem extends StatelessWidget {
         ),
       ],
     ).toContainer(isShadowEnabled: true).onPress(() async {
+      if (request.requestStatus == RequestStatus.pending) {
+        return;
+      }
       if (appType == AppType.provider) {
         RequestDetailPageArguments requestDetailPageArguments = RequestDetailPageArguments(requestIndex: requestIndex, requestModel: request);
         navigateWithName(context, AppRoutes.requestsDetailPage, arguments: requestDetailPageArguments);

pubspec.lock

@@ -633,10 +633,10 @@ packages:
     dependency: "direct main"
     description:
       name: logger
-      sha256: "7ad7215c15420a102ec687bb320a7312afd449bac63bfb1c60d9787c27b9767f"
+      sha256: af05cc8714f356fd1f3888fb6741cbe9fbe25cdb6eedbab80e1a6db21047d4a4
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "2.3.0"
   logging:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -26,7 +26,7 @@ dependencies:
   file_picker: ^6.1.1
   image_picker: ^0.8.4+4
   equatable: ^2.0.3
-  logger: ^1.1.0
+  logger: 2.3.0
   auto_size_text: any
   shimmer: ^2.0.0
   local_auth: any