From f874e1fcb0561fb98b32ccadeda51c52b90efb7c Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Thu, 16 May 2024 09:26:36 +0300 Subject: [PATCH] Added Ads Filter --- lib/api/api_client.dart | 16 +++++------ lib/main.dart | 8 +++--- lib/view_models/ad_view_model.dart | 6 +++-- lib/view_models/requests_view_model.dart | 30 +++++++++------------ lib/views/requests/widget/request_item.dart | 21 ++++++++------- pubspec.lock | 4 +-- pubspec.yaml | 2 +- 7 files changed, 43 insertions(+), 44 deletions(-) diff --git a/lib/api/api_client.dart b/lib/api/api_client.dart index 8b0d887..c32e3b3 100644 --- a/lib/api/api_client.dart +++ b/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 ?? ""; } } diff --git a/lib/main.dart b/lib/main.dart index 7ea71be..58e8deb 100644 --- a/lib/main.dart +++ b/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(); Logger logger = Logger( - printer: PrettyPrinter( - lineLength: 0, - ), -); + // printer: PrettyPrinter(lineLength: 0, methodCount: 0,), + + ); class MyHttpOverrides extends HttpOverrides { @override diff --git a/lib/view_models/ad_view_model.dart b/lib/view_models/ad_view_model.dart index 6ac7603..0f5e3c2 100644 --- a/lib/view_models/ad_view_model.dart +++ b/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); diff --git a/lib/view_models/requests_view_model.dart b/lib/view_models/requests_view_model.dart index 56a164b..8096c08 100644 --- a/lib/view_models/requests_view_model.dart +++ b/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> getVehiclePostingImageList() async { + List vehicleImages = []; + log("vehicleImages: ${pickedVehicleImages.length}"); + + for (var image in pickedVehicleImages) { + var value = await convertFileToRequestPostingImages(file: image); + vehicleImages.add(value); + } + + return vehicleImages; + } + Future onCreateRequestTapped(BuildContext context) async { if (validateCreateRequestForm()) { Utils.showLoading(context); - List vehicleImages = []; - pickedVehicleImages.forEach((element) async { - vehicleImages.add(await convertFileToRequestPostingImages(file: element)); - }); + List vehicleImages = await getVehiclePostingImageList(); Map body = { "customerID": AppState().getUser.data!.userInfo!.customerId ?? 0, "requestType": requestTypeId.selectedId, diff --git a/lib/views/requests/widget/request_item.dart b/lib/views/requests/widget/request_item.dart index e5cf4c1..4117e00 100644 --- a/lib/views/requests/widget/request_item.dart +++ b/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); diff --git a/pubspec.lock b/pubspec.lock index be6d778..e906654 100644 --- a/pubspec.lock +++ b/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: diff --git a/pubspec.yaml b/pubspec.yaml index 7286ce3..2ba18fc 100644 --- a/pubspec.yaml +++ b/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