From 1655bab9ad48dd4ad4568d4042f813ac8af3cfd0 Mon Sep 17 00:00:00 2001 From: "muhammad.abbasi" Date: Sun, 6 Oct 2024 11:44:42 +0300 Subject: [PATCH] verify arrival fixes --- lib/l10n/app_ar.arb | 2 +- lib/l10n/app_en.arb | 4 +- .../service_request_bottomsheet.dart | 2 +- .../views/components/verify_arrival_view.dart | 100 +++++++++--------- 4 files changed, 54 insertions(+), 54 deletions(-) diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb index d7591a23..633c7377 100644 --- a/lib/l10n/app_ar.arb +++ b/lib/l10n/app_ar.arb @@ -248,7 +248,7 @@ "setVisitDate": "تحديد تاريخ الزيارة", "verifyArrival": "التحقق من الوصول", "scanQr": "مسح رمز QR", - "scanQrDetail": "قم بمسح رمز QR الخاص بالجهاز أو التقط صورة للجهاز من الموقع", + "scanQrDetail": "امسح رمز الاستجابة السريعة للجهاز", "askRequester": "اطلب من مقدم الطلب التحقق", "askRequesterDetail": "اطلب من مقدم الطلب التحقق من وصولك من خلال تطبيق Atoms.", "askOtp": "اطلب رمز OTP من مقدم الطلب", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index c37403ec..a59ed6fe 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -333,13 +333,13 @@ "setVisitDate": "Set Date Of Visit", "verifyArrival": "Verify Arrival", "scanQr": "Scan QR", - "scanQrDetail": "Scan QR Code of the device or take the photo of the device from location", + "scanQrDetail": "Scan QR Code of the device", "askRequester": "Ask Requester to Verify", "askRequesterDetail": "Ask requester to verify your arrival through Atoms Application.", "askOtp": "Ask OTP From Requester", "askOtpDetail": "Ask OTP from requester to verify you arrival", "takeDevicePhoto": "Take Device Photo", - "takeDevicePhotoDetail": "Scan QR Code of the device or take the photo of the device from location", + "takeDevicePhotoDetail": "Take the photo of the device from location", "priority" : "Request Priority", "equipmentStatus" : "Equipment Status", "jopStatus" : "Jop Status", diff --git a/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart b/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart index 9628e084..bd2d8dc7 100644 --- a/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart +++ b/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart @@ -441,7 +441,7 @@ class ServiceRequestBottomSheet { await requestDetailProvider.engineerUpdateNeedVisit(); } else { requestDetailProvider.needVisitHelperModel?.workOrderId = requestDetailProvider.currentWorkOrder!.data!.requestId; - await requestDetailProvider.engineerNeedVisit(); + requestDetailProvider.engineerNeedVisit(); requestDetailProvider.needVisitHelperModel = NeedVisitHelperModel(); } Navigator.pop(context); diff --git a/lib/service_request_latest/views/components/verify_arrival_view.dart b/lib/service_request_latest/views/components/verify_arrival_view.dart index a6a87534..a038bcde 100644 --- a/lib/service_request_latest/views/components/verify_arrival_view.dart +++ b/lib/service_request_latest/views/components/verify_arrival_view.dart @@ -211,57 +211,57 @@ class _VerifyArrivalViewState extends State { } Future onFilePicker() async { - ImageSource? source = await showModalBottomSheet( - context: context, - builder: (BuildContext context) { - Widget listCard({required String icon, required String label, required VoidCallback onTap}) { - return GestureDetector( - onTap: onTap, - child: Container( - constraints: BoxConstraints(minWidth: 111.toScreenWidth, minHeight: 111.toScreenHeight), - padding: EdgeInsets.symmetric(horizontal: 12.toScreenWidth, vertical: 12.toScreenHeight), - decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), border: Border.all(width: 1, color: AppColor.white70)), - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - icon.toSvgAsset(), - 24.height, - label.bodyText2(context).custom(color: AppColor.black20), - ], - ), - ), - ); - } - - return Container( - padding: const EdgeInsets.all(16.0), - child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - listCard( - icon: 'camera_icon', - label: '${context.translation.open}\n${context.translation.camera}', - onTap: () { - Navigator.of(context).pop(ImageSource.camera); - }, - ), - 20.width, - listCard( - icon: 'gallery_icon', - label: '${context.translation.open}\n${context.translation.gallery}', - onTap: () { - Navigator.of(context).pop(ImageSource.gallery); - }, - ), - ], - ), - ); - }, - ); - if (source == null) return null; + // ImageSource? source = await showModalBottomSheet( + // context: context, + // builder: (BuildContext context) { + // Widget listCard({required String icon, required String label, required VoidCallback onTap}) { + // return GestureDetector( + // onTap: onTap, + // child: Container( + // constraints: BoxConstraints(minWidth: 111.toScreenWidth, minHeight: 111.toScreenHeight), + // padding: EdgeInsets.symmetric(horizontal: 12.toScreenWidth, vertical: 12.toScreenHeight), + // decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), border: Border.all(width: 1, color: AppColor.white70)), + // child: Column( + // mainAxisSize: MainAxisSize.min, + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // icon.toSvgAsset(), + // 24.height, + // label.bodyText2(context).custom(color: AppColor.black20), + // ], + // ), + // ), + // ); + // } + // + // return Container( + // padding: const EdgeInsets.all(16.0), + // child: Row( + // // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // listCard( + // icon: 'camera_icon', + // label: '${context.translation.open}\n${context.translation.camera}', + // onTap: () { + // Navigator.of(context).pop(ImageSource.camera); + // }, + // ), + // 20.width, + // listCard( + // icon: 'gallery_icon', + // label: '${context.translation.open}\n${context.translation.gallery}', + // onTap: () { + // Navigator.of(context).pop(ImageSource.gallery); + // }, + // ), + // ], + // ), + // ); + // }, + // ); + // if (source == null) return null; File ?fileImage; - final pickedFile = await ImagePicker().pickImage(source: source, imageQuality: 70, maxWidth: 800, maxHeight: 800); + final pickedFile = await ImagePicker().pickImage(source: ImageSource.camera, imageQuality: 70, maxWidth: 800, maxHeight: 800); if (pickedFile != null) { fileImage = File(pickedFile.path);