Haroon6138
/
car_common_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

addnew service fix

Browse Source
aamir_dev
Faiz Hashmi 11 months ago
parent a97fc8c08d
commit 30cffc364b
18 changed files with 163 additions and 124 deletions
Show Stats Download Patch File Download Diff File

4
assets/langs/ar-SA.json
Unescape Escape View File

@ -752,5 +752,7 @@
"youCannotDeactivateThisServiceRightNow": "لا يمكنك تعطيل هذه الخدمة الآن لأن لديك مواعيد معلقة لهذه الخدمة. تفاصيل آخر موعد هي:", "youCannotDeactivateThisServiceRightNow": "لا يمكنك تعطيل هذه الخدمة الآن لأن لديك مواعيد معلقة لهذه الخدمة. تفاصيل آخر موعد هي:",
"done": "تم", "done": "تم",
"notice": "إشعار", "notice": "إشعار",
"serviceDeactivated": "تم تعطيل الخدمة" "serviceDeactivated": "تم تعطيل الخدمة",
"totalNumberOfServices": "إجمالي عدد الخدمات:",
"noAvailableOfficesInCity": "لا توجد مكاتب متاحة في مدينتك لخدمتك."
} }

4
assets/langs/en-US.json
Unescape Escape View File

@ -750,5 +750,7 @@
"youCannotDeactivateThisServiceRightNow": "You cannot deactivate this service right now because you have pending appointments for this service. The last appointment details are:", "youCannotDeactivateThisServiceRightNow": "You cannot deactivate this service right now because you have pending appointments for this service. The last appointment details are:",
"done": "Done", "done": "Done",
"notice": "Notice", "notice": "Notice",
"serviceDeactivated": "Service Deactivated" "serviceDeactivated": "Service Deactivated",
"totalNumberOfServices": "Total number of services:",
"noAvailableOfficesInCity": "There are no available offices in your city for your service."
} }

8
lib/generated/codegen_loader.g.dart
Unescape Escape View File

@ -768,7 +768,9 @@ class CodegenLoader extends AssetLoader{
"youCannotDeactivateThisServiceRightNow": "لا يمكنك تعطيل هذه الخدمة الآن لأن لديك مواعيد معلقة لهذه الخدمة. تفاصيل آخر موعد هي:", "youCannotDeactivateThisServiceRightNow": "لا يمكنك تعطيل هذه الخدمة الآن لأن لديك مواعيد معلقة لهذه الخدمة. تفاصيل آخر موعد هي:",
"done": "تم", "done": "تم",
"notice": "إشعار", "notice": "إشعار",
"serviceDeactivated": "تم تعطيل الخدمة" "serviceDeactivated": "تم تعطيل الخدمة",
"totalNumberOfServices": "إجمالي عدد الخدمات:",
"noAvailableOfficesInCity": "لا توجد مكاتب متاحة في مدينتك لخدمتك."
}; };
static const Map<String,dynamic> en_US = { static const Map<String,dynamic> en_US = {
"firstTimeLogIn": "First Time Log In", "firstTimeLogIn": "First Time Log In",
@ -1522,7 +1524,9 @@ static const Map<String,dynamic> en_US = {
"youCannotDeactivateThisServiceRightNow": "You cannot deactivate this service right now because you have pending appointments for this service. The last appointment details are:", "youCannotDeactivateThisServiceRightNow": "You cannot deactivate this service right now because you have pending appointments for this service. The last appointment details are:",
"done": "Done", "done": "Done",
"notice": "Notice", "notice": "Notice",
"serviceDeactivated": "Service Deactivated" "serviceDeactivated": "Service Deactivated",
"totalNumberOfServices": "Total number of services:",
"noAvailableOfficesInCity": "There are no available offices in your city for your service."
}; };
static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US}; static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US};
} }

2
lib/generated/locale_keys.g.dart
Unescape Escape View File

@ -732,5 +732,7 @@ abstract class LocaleKeys {
static const done = 'done'; static const done = 'done';
static const notice = 'notice'; static const notice = 'notice';
static const serviceDeactivated = 'serviceDeactivated'; static const serviceDeactivated = 'serviceDeactivated';
static const totalNumberOfServices = 'totalNumberOfServices';
static const noAvailableOfficesInCity = 'noAvailableOfficesInCity';
} }

2
lib/models/advertisment_models/ss_photo_schedule_model.dart
Unescape Escape View File

@ -12,7 +12,7 @@ class SSPhotoOfficeScheduleModel {
String? areaName; String? areaName;
String? latitude; String? latitude;
String? longitude; String? longitude;
int? distanceKM; double? distanceKM;
int? totalItemsCount; int? totalItemsCount;
List<PhotoOfficeScheduleSlots>? photoOfficeScheduleSlots; List<PhotoOfficeScheduleSlots>? photoOfficeScheduleSlots;
List<CustomTimeDateSlotModel>? customTimeDateSlotList; List<CustomTimeDateSlotModel>? customTimeDateSlotList;

7
lib/models/provider_branches_models/profile/categroy.dart
Unescape Escape View File

@ -51,15 +51,17 @@ class CategoryData extends Equatable {
this.services, this.services,
this.branchId, this.branchId,
this.branchName, this.branchName,
this.isDeactivated,
}); });
int? id; int? id;
String? categoryName; String? categoryName;
String? categoryNameN; String? categoryNameN;
dynamic? serviceCategoryIconUrl; String? serviceCategoryIconUrl;
dynamic? serviceCategoryImageUrl; String? serviceCategoryImageUrl;
String? branchId; String? branchId;
String? branchName; String? branchName;
bool? isDeactivated;
List<ServiceModel>? services; List<ServiceModel>? services;
factory CategoryData.fromJson(Map<String, dynamic> json) => CategoryData( factory CategoryData.fromJson(Map<String, dynamic> json) => CategoryData(
@ -69,6 +71,7 @@ class CategoryData extends Equatable {
serviceCategoryIconUrl: json["serviceCategoryIconUrl"], serviceCategoryIconUrl: json["serviceCategoryIconUrl"],
serviceCategoryImageUrl: json["serviceCategoryImageUrl"], serviceCategoryImageUrl: json["serviceCategoryImageUrl"],
services: [], services: [],
isDeactivated: false,
); );
Map<String, dynamic> toJson() => { Map<String, dynamic> toJson() => {

33
lib/view_models/appointments_view_model.dart
Unescape Escape View File

@ -252,17 +252,6 @@ class AppointmentsVM extends BaseVM {
notifyListeners(); notifyListeners();
} }
// String pickedHomeLocation = "";
//
// void updatePickedHomeLocation(String value) {
// pickedHomeLocation = value;
// pickHomeLocationError = "";
// if (currentServiceSelection != null) {
// currentServiceSelection!.homeLocation = value;
// }
// notifyListeners();
// }
SelectionModel branchSelectedCategoryId = SelectionModel(selectedOption: "", selectedId: -1, errorValue: ""); SelectionModel branchSelectedCategoryId = SelectionModel(selectedOption: "", selectedId: -1, errorValue: "");
void updateProviderCategoryId(SelectionModel id) { void updateProviderCategoryId(SelectionModel id) {
@ -305,9 +294,6 @@ class AppointmentsVM extends BaseVM {
return; return;
} }
servicesInCurrentAppointment.forEach((i) {
log("hlo1: ${i.serviceDescription} ${i.servicelocationInfo.homeChargesInCurrentService}");
});
if (!(currentServiceSelection!.isAllowAppointmentHome ?? false)) { if (!(currentServiceSelection!.isAllowAppointmentHome ?? false)) {
updateIsHomeTapped(false); updateIsHomeTapped(false);
return; return;
@ -321,19 +307,8 @@ class AppointmentsVM extends BaseVM {
distanceToBranch: currentLocationInfoModel!.distanceToBranch, distanceToBranch: currentLocationInfoModel!.distanceToBranch,
homeChargesInCurrentService: double.parse(currentServiceSelection!.rangePricePerKm ?? "0.0"), homeChargesInCurrentService: double.parse(currentServiceSelection!.rangePricePerKm ?? "0.0"),
); );
// for (var service in servicesInCurrentAppointment) {
// service.servicelocationInfo.address = currentLocationInfoModel!.address;
// service.servicelocationInfo.latitude = currentLocationInfoModel!.latitude;
// service.servicelocationInfo.longitude = currentLocationInfoModel!.longitude;
// service.servicelocationInfo.distanceToBranch = currentLocationInfoModel!.distanceToBranch;
// }
} }
servicesInCurrentAppointment.forEach((i) {
log("hlo2: ${i.serviceDescription} ${i.servicelocationInfo.homeChargesInCurrentService}");
});
notifyListeners(); notifyListeners();
} }
@ -384,7 +359,7 @@ class AppointmentsVM extends BaseVM {
} }
applyFilterOnAppointmentsVM({required AppointmentStatusEnum appointmentStatusEnum, bool isNeedCustomerFilter = false}) { applyFilterOnAppointmentsVM({required AppointmentStatusEnum appointmentStatusEnum, bool isNeedCustomerFilter = false}) {
log("appointmentStatusEnum: ${appointmentStatusEnum}"); log("appointmentStatusEnum: $appointmentStatusEnum");
// isNeedCustomerFilter IS ONLY FOR THE PROVIDER APP // isNeedCustomerFilter IS ONLY FOR THE PROVIDER APP
if (appointmentsFilterOptions.isEmpty) return; if (appointmentsFilterOptions.isEmpty) return;
for (var value in appointmentsFilterOptions) { for (var value in appointmentsFilterOptions) {
@ -467,13 +442,15 @@ class AppointmentsVM extends BaseVM {
myAppointments = await appointmentRepo.getMyAppointmentsForCustomersByFilters(); myAppointments = await appointmentRepo.getMyAppointmentsForCustomersByFilters();
// myFilteredAppointments = myAppointments; // myFilteredAppointments = myAppointments;
setState(ViewState.idle);
applyFilterOnAppointmentsVM(appointmentStatusEnum: AppointmentStatusEnum.allAppointments);
myUpComingAppointments = myAppointments myUpComingAppointments = myAppointments
.where((element) => .where((element) =>
(element.appointmentStatusEnum == AppointmentStatusEnum.booked || element.appointmentStatusEnum == AppointmentStatusEnum.confirmed) && (element.appointmentStatusEnum == AppointmentStatusEnum.booked || element.appointmentStatusEnum == AppointmentStatusEnum.confirmed) &&
(DateHelper.parseStringToDate(element.appointmentDate!).isAfter(DateTime.now()))) (DateHelper.parseStringToDate(element.appointmentDate!).isAfter(DateTime.now())))
.toList(); .toList();
setState(ViewState.idle);
applyFilterOnAppointmentsVM(appointmentStatusEnum: AppointmentStatusEnum.allAppointments);
notifyListeners(); notifyListeners();
} }

24
lib/view_models/requests_view_model.dart
Unescape Escape View File

@ -950,6 +950,14 @@ class RequestsVM extends BaseVM {
notifyListeners(); notifyListeners();
} }
bool isBase64String(String input) {
// This regex checks if the string is a valid Base64 string
final base64Regex = RegExp(r'^[A-Za-z0-9+/=]+$');
// Check if the string matches the Base64 pattern
return base64Regex.hasMatch(input) && (input.length % 4 == 0);
}
MessageImageModel convertFileToMessageImageModel({required ImageModel imageModel, required int offerId}) { MessageImageModel convertFileToMessageImageModel({required ImageModel imageModel, required int offerId}) {
MessageImageModel offerImages; MessageImageModel offerImages;
@ -961,15 +969,23 @@ class RequestsVM extends BaseVM {
reqOfferID: offerId, reqOfferID: offerId,
); );
} else { } else {
File file = File(imageModel.filePath!); File? file;
List<int> imageBytes = file.readAsBytesSync(); List<int> imageBytes = [];
String image = base64Encode(imageBytes); String image = '';
if (!isBase64String(imageModel.filePath!)) {
file = File(imageModel.filePath!);
imageBytes = file.readAsBytesSync();
image = base64Encode(imageBytes);
} else {
image = imageModel.filePath!;
}
offerImages = MessageImageModel( offerImages = MessageImageModel(
id: 0, id: 0,
imageStr: image, imageStr: image,
isFromNetwork: false, isFromNetwork: false,
reqOfferID: offerId, reqOfferID: offerId,
imagePath: file.path, imagePath: file?.path,
); );
} }

1
lib/view_models/service_view_model.dart
Unescape Escape View File

@ -164,6 +164,7 @@ class ServiceVM extends BaseVM {
final BranchDetailModel currentBranch = branches!.data!.serviceProviderBranch!.firstWhere((element) => element.id == selectedBranchId); final BranchDetailModel currentBranch = branches!.data!.serviceProviderBranch!.firstWhere((element) => element.id == selectedBranchId);
for (var element in currentBranch.branchServices!) { for (var element in currentBranch.branchServices!) {
// TODO: Here , we need to add the category deactivated status.
categories.add( categories.add(
CategoryData( CategoryData(
id: element.categoryId, id: element.categoryId,

36
lib/views/advertisement/ads_detail_view/components.dart
Unescape Escape View File

@ -293,24 +293,24 @@ class BuildAdDetailsActionButtonForMyAds extends StatelessWidget {
20.height, 20.height,
adVM.state == ViewState.busy adVM.state == ViewState.busy
? const Center(child: CircularProgressIndicator()) ? const Center(child: CircularProgressIndicator())
: Builder( : adVM.photoSSSchedulesByOffices.isEmpty
builder: (context) { ? LocaleKeys.noAvailableOfficesInCity.tr().toText(fontSize: 14, height: 1.2)
List<DropValue> vehicleCitiesDrop = []; : Builder(
for (int i = 0; i < adVM.photoSSSchedulesByOffices.length; i++) { builder: (context) {
var element = adVM.photoSSSchedulesByOffices[i]; List<DropValue> vehicleCitiesDrop = [];
vehicleCitiesDrop.add(DropValue(element.photoOfficeID?.toInt() ?? 0, element.photoOfficeName ?? "", i.toString())); for (int i = 0; i < adVM.photoSSSchedulesByOffices.length; i++) {
} var element = adVM.photoSSSchedulesByOffices[i];
vehicleCitiesDrop.add(DropValue(element.photoOfficeID?.toInt() ?? 0, element.photoOfficeName ?? "", i.toString()));
return DropdownField( }
(DropValue value) => adVM.updatePhotoOfficeSelectedId(SelectionModel(selectedId: value.id, selectedOption: value.value, itemPrice: value.subValue)), return DropdownField(
// here the item price is the index of the selected option (DropValue value) => adVM.updatePhotoOfficeSelectedId(SelectionModel(selectedId: value.id, selectedOption: value.value, itemPrice: value.subValue)),
list: vehicleCitiesDrop, list: vehicleCitiesDrop,
dropdownValue: adVM.photoOfficeSelectedId.selectedId != -1 ? DropValue(adVM.photoOfficeSelectedId.selectedId, adVM.photoOfficeSelectedId.selectedOption, "") : null, dropdownValue: adVM.photoOfficeSelectedId.selectedId != -1 ? DropValue(adVM.photoOfficeSelectedId.selectedId, adVM.photoOfficeSelectedId.selectedOption, "") : null,
hint: LocaleKeys.selectOffice.tr(), hint: LocaleKeys.selectOffice.tr(),
errorValue: adVM.photoOfficeSelectedId.errorValue, errorValue: adVM.photoOfficeSelectedId.errorValue,
); );
}, },
), ),
if (adVM.photoOfficeSelectedId.selectedId != -1) ...[ if (adVM.photoOfficeSelectedId.selectedId != -1) ...[
9.height, 9.height,
CustomCalenderAppointmentWidget( CustomCalenderAppointmentWidget(

40
lib/views/advertisement/components/picked_images_container_widget.dart
Unescape Escape View File

@ -1,5 +1,5 @@
import 'dart:developer'; import 'dart:convert';
import 'dart:io'; import 'dart:typed_data';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/classes/consts.dart';
@ -33,9 +33,6 @@ class PickedFilesContainer extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
pickedFiles.forEach((i) {
log("isFromNetwork: ${i.isFromNetwork}");
});
return GridView.count( return GridView.count(
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true, shrinkWrap: true,
@ -95,8 +92,20 @@ class BuildFilesContainer extends StatelessWidget {
this.isPdf = false, this.isPdf = false,
}); });
bool isBase64String(String input) {
// This regex checks if the string is a valid Base64 string
final base64Regex = RegExp(r'^[A-Za-z0-9+/=]+$');
// Check if the string matches the Base64 pattern
return base64Regex.hasMatch(input) && (input.length % 4 == 0);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Uint8List? bytes;
if ((image.isFromNetwork == null || image.isFromNetwork == false) && isBase64String(image.filePath ?? "")) {
bytes = (base64Decode(image.filePath!)) as Uint8List?;
}
return Stack( return Stack(
children: [ children: [
SizedBox( SizedBox(
@ -124,13 +133,20 @@ class BuildFilesContainer extends StatelessWidget {
width: 73, width: 73,
) )
.paddingAll(8) .paddingAll(8)
: image.filePath! : isBase64String(image.filePath!)
.buildFileImage( ? Image.memory(
fit: BoxFit.fill, bytes!,
height: 72, fit: BoxFit.fill,
width: 70, height: 72,
) width: 70,
.paddingAll(8), ).paddingAll(8)
: image.filePath!
.buildFileImage(
fit: BoxFit.fill,
height: 72,
width: 70,
)
.paddingAll(8),
if (!isReview) ...[ if (!isReview) ...[
Align( Align(
alignment: Alignment.topRight, alignment: Alignment.topRight,

1
lib/views/chat/chat_view.dart
Unescape Escape View File

@ -221,6 +221,7 @@ class _ChatViewState extends State<ChatView> {
size: 30, size: 30,
).onPress( ).onPress(
() { () {
requestVM.resetSendOfferBottomSheet();
RequestDetailPageArguments requestDetailArguments = RequestDetailPageArguments( RequestDetailPageArguments requestDetailArguments = RequestDetailPageArguments(
requestIndex: chatViewArgumentsForRequest!.requestIndex, requestIndex: chatViewArgumentsForRequest!.requestIndex,
requestModel: chatViewArgumentsForRequest!.requestModel!, requestModel: chatViewArgumentsForRequest!.requestModel!,

4
lib/views/chat/widgets/chat_message_widget.dart
Unescape Escape View File

@ -742,13 +742,13 @@ class _ChatMessageCustomWidgetState extends State<ChatMessageCustomWidget> {
requestVM.updateIsDeliveryAvailableStatus((offer.isDeliveryAvailable ?? false)); requestVM.updateIsDeliveryAvailableStatus((offer.isDeliveryAvailable ?? false));
if (offer.reqOfferImages != null && offer.reqOfferImages!.isNotEmpty) { if (offer.reqOfferImages != null && offer.reqOfferImages!.isNotEmpty) {
for (var element in offer.reqOfferImages!) { for (var element in offer.reqOfferImages!) {
log("element: ${element.imageStr != null && element.imageStr!.isNotEmpty}");
if (element.imageUrl != null || element.imageStr != null) { if (element.imageUrl != null || element.imageStr != null) {
ImageModel imageModel = ImageModel( ImageModel imageModel = ImageModel(
id: element.id, id: element.id,
filePath: element.imageStr != null && element.imageStr!.isNotEmpty ? element.imageStr : element.imageUrl, filePath: element.imageStr != null && element.imageStr!.isNotEmpty ? element.imageStr : element.imageUrl,
isFromNetwork: element.imageStr != null && element.imageStr!.isNotEmpty ? false : true); isFromNetwork: element.imageStr != null && element.imageStr!.isNotEmpty ? false : true);
log("imageModelimageModel: ${imageModel.toString()}");
requestVM.addImageToPickedVehicleImages(imageModel); requestVM.addImageToPickedVehicleImages(imageModel);
} }
} }

25
lib/views/common_fragments/requests_fragment.dart
Unescape Escape View File

@ -3,6 +3,7 @@ import 'package:mc_common_app/classes/app_state.dart';
import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/classes/consts.dart';
import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/config/routes.dart';
import 'package:mc_common_app/generated/locale_keys.g.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart';
import 'package:mc_common_app/models/requests_models/request_model.dart';
import 'package:mc_common_app/utils/dialogs_and_bottomsheets.dart'; import 'package:mc_common_app/utils/dialogs_and_bottomsheets.dart';
import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/utils/navigator.dart';
import 'package:mc_common_app/view_models/requests_view_model.dart'; import 'package:mc_common_app/view_models/requests_view_model.dart';
@ -156,11 +157,25 @@ class MyRequestsFragment extends StatelessWidget {
return; return;
}, },
child: RequestItem( child: RequestItem(
request: requestsVM.myFilteredRequests[index], request: requestsVM.myFilteredRequests[index],
appType: AppState().currentAppType, shouldShowStatuses: AppState().currentAppType == AppType.customer,
requestIndex: index, onTap: () async {
shouldShowStatuses: AppState().currentAppType == AppType.customer, RequestModel request = requestsVM.myFilteredRequests[index];
), requestsVM.updateCurrentSelectedRequest(request);
if (request.requestStatus == RequestStatusEnum.pending ||
request.requestStatus == RequestStatusEnum.cancelled ||
request.requestStatus == RequestStatusEnum.expired) {
return;
}
if (AppState().currentAppType == AppType.provider) {
RequestDetailPageArguments requestDetailPageArguments = RequestDetailPageArguments(requestIndex: index, requestModel: request);
navigateWithName(context, AppRoutes.requestsDetailPage, arguments: requestDetailPageArguments);
} else {
requestsVM.myFilteredRequests[index].offerCount = 0;
requestsVM.notifyListeners();
navigateWithName(context, AppRoutes.offersListPage, arguments: request.id);
}
}),
); );
}, },
separatorBuilder: (context, index) { separatorBuilder: (context, index) {

43
lib/views/requests/offer_list_page.dart
Unescape Escape View File

@ -80,19 +80,21 @@ class _OfferListPageState extends State<OfferListPage> {
fontSize: 16, fontSize: 16,
isBold: true, isBold: true,
), ),
Center( if (offersModel.offerCount != null && offersModel.offerCount! > 0) ...[
child: "${offersModel.offerCount}".toText( Center(
color: Colors.white, child: "${offersModel.offerCount}".toText(
isBold: true, color: Colors.white,
fontSize: 10, isBold: true,
fontSize: 10,
),
).toContainer(
backgroundColor: MyColors.cancelledColor,
borderRadius: 100,
paddingAll: 1,
width: 22,
height: 22,
), ),
).toContainer( ],
backgroundColor: MyColors.cancelledColor,
borderRadius: 100,
paddingAll: 1,
width: 22,
height: 22,
),
], ],
), ),
8.height, 8.height,
@ -131,13 +133,16 @@ class _OfferListPageState extends State<OfferListPage> {
await chatVM await chatVM
.getRequestsChatMessagesForCustomer( .getRequestsChatMessagesForCustomer(
context: context, context: context,
providerId: offersModel.providerId ?? 0, providerId: offersModel.providerId ?? 0,
requestOfferId: 0, requestOfferId: 0,
requestId: widget.requestId, requestId: widget.requestId,
providerOfferIndex: index, providerOfferIndex: index,
) )
.whenComplete(() => navigateWithName(context, AppRoutes.chatView, arguments: chatViewArguments)); .whenComplete(() {
chatVM.serviceProviderOffersList[index].offerCount = 0;
navigateWithName(context, AppRoutes.chatView, arguments: chatViewArguments);
});
}).toContainer(isShadowEnabled: true); }).toContainer(isShadowEnabled: true);
}, },
separatorBuilder: (context, index) => 16.height, separatorBuilder: (context, index) => 16.height,

25
lib/views/requests/widget/request_item.dart
Unescape Escape View File

@ -2,27 +2,22 @@
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/classes/app_state.dart';
import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/int_extensions.dart';
import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart';
import 'package:mc_common_app/generated/locale_keys.g.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart';
import 'package:mc_common_app/models/requests_models/request_model.dart'; import 'package:mc_common_app/models/requests_models/request_model.dart';
import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/theme/colors.dart';
import 'package:mc_common_app/utils/enums.dart'; import 'package:mc_common_app/utils/enums.dart';
import 'package:mc_common_app/utils/navigator.dart';
import 'package:mc_common_app/utils/utils.dart'; import 'package:mc_common_app/utils/utils.dart';
import 'package:mc_common_app/view_models/chat_view_model.dart';
import 'package:mc_common_app/view_models/requests_view_model.dart';
import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
import 'package:provider/provider.dart';
class RequestItem extends StatelessWidget { class RequestItem extends StatelessWidget {
final RequestModel request; final RequestModel request;
final AppType appType;
final int requestIndex;
final bool shouldShowStatuses; final bool shouldShowStatuses;
final Function() onTap;
const RequestItem({super.key, required this.request, required this.appType, required this.requestIndex, this.shouldShowStatuses = true}); const RequestItem({super.key, required this.request, this.shouldShowStatuses = true, required this.onTap});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -65,7 +60,7 @@ class RequestItem extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
if (request.offerCount > 0 && appType == AppType.customer && request.requestStatus == RequestStatusEnum.submitted) ...[ if (request.offerCount > 0 && AppState().currentAppType == AppType.customer && request.requestStatus == RequestStatusEnum.submitted) ...[
Center( Center(
child: "${request.offerCount}".toText( child: "${request.offerCount}".toText(
color: Colors.white, color: Colors.white,
@ -112,17 +107,7 @@ class RequestItem extends StatelessWidget {
// ), // ),
], ],
).toContainer(isShadowEnabled: true).onPress(() async { ).toContainer(isShadowEnabled: true).onPress(() async {
RequestsVM requestsVM = context.read<RequestsVM>(); onTap();
requestsVM.updateCurrentSelectedRequest(request);
if (request.requestStatus == RequestStatusEnum.pending || request.requestStatus == RequestStatusEnum.cancelled || request.requestStatus == RequestStatusEnum.expired) {
return;
}
if (appType == AppType.provider) {
RequestDetailPageArguments requestDetailPageArguments = RequestDetailPageArguments(requestIndex: requestIndex, requestModel: request);
navigateWithName(context, AppRoutes.requestsDetailPage, arguments: requestDetailPageArguments);
} else {
navigateWithName(context, AppRoutes.offersListPage, arguments: request.id);
}
}); });
} }

20
lib/views/setting_options/provider_accepted_requests_view.dart
Unescape Escape View File

@ -5,6 +5,7 @@ import 'package:mc_common_app/classes/app_state.dart';
import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/classes/consts.dart';
import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/config/routes.dart';
import 'package:mc_common_app/generated/locale_keys.g.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart';
import 'package:mc_common_app/models/requests_models/request_model.dart';
import 'package:mc_common_app/utils/dialogs_and_bottomsheets.dart'; import 'package:mc_common_app/utils/dialogs_and_bottomsheets.dart';
import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/utils/navigator.dart';
import 'package:mc_common_app/view_models/requests_view_model.dart'; import 'package:mc_common_app/view_models/requests_view_model.dart';
@ -80,7 +81,24 @@ class _ProviderAcceptedRequestsViewState extends State<ProviderAcceptedRequestsV
) )
: ListView.separated( : ListView.separated(
itemBuilder: (context, index) { itemBuilder: (context, index) {
return RequestItem(request: requestsVM.providersAcceptedRequestsList[index], appType: AppState().currentAppType, requestIndex: index); return RequestItem(
request: requestsVM.providersAcceptedRequestsList[index],
onTap: () async {
RequestModel request = requestsVM.myFilteredRequests[index];
requestsVM.updateCurrentSelectedRequest(request);
if (request.requestStatus == RequestStatusEnum.pending ||
request.requestStatus == RequestStatusEnum.cancelled ||
request.requestStatus == RequestStatusEnum.expired) {
return;
}
if (AppState().currentAppType == AppType.provider) {
RequestDetailPageArguments requestDetailPageArguments = RequestDetailPageArguments(requestIndex: index, requestModel: request);
navigateWithName(context, AppRoutes.requestsDetailPage, arguments: requestDetailPageArguments);
} else {
navigateWithName(context, AppRoutes.offersListPage, arguments: request.id);
}
},
);
}, },
separatorBuilder: (context, index) { separatorBuilder: (context, index) {
return 16.height; return 16.height;

8
lib/views/setting_options/widgets/custom_setting_options_tile.dart
Unescape Escape View File

@ -57,14 +57,6 @@ class CustomSettingOptionsTile extends StatelessWidget {
), ),
isForLanguage isForLanguage
? LocaleKeys.english.tr().toText(fontSize: 12, isUnderLine: true, color: MyColors.primaryColor) ? LocaleKeys.english.tr().toText(fontSize: 12, isUnderLine: true, color: MyColors.primaryColor)
// const Icon(
// Icons.language,
// size: 18,
// color: MyColors.primaryColor,
// )
//
: showTrailingArrow : showTrailingArrow
? const Icon(Icons.arrow_forward, size: 18) ? const Icon(Icons.arrow_forward, size: 18)
: const SizedBox() : const SizedBox()

Write Preview
Loading…
Cancel
Save