diff --git a/lib/core/api/api_client.dart b/lib/core/api/api_client.dart index 50fe4fe3..0c8a2314 100644 --- a/lib/core/api/api_client.dart +++ b/lib/core/api/api_client.dart @@ -211,7 +211,7 @@ class ApiClientImp implements ApiClient { } body['TokenID'] = "@dm!n"; - body['PatientID'] = 4774598; + // body['PatientID'] = 4774598; // body['PatientID'] = 89754444; // body['PatientTypeID'] = 1; // body['PatientOutSA'] = 0; @@ -260,7 +260,7 @@ class ApiClientImp implements ApiClient { body: requestBody, headers: headers, ); - log("response: ${response.body.toString()}"); + // log("response: ${response.body.toString()}"); } on SocketException catch (e) { final message = e.message.contains('Connection reset by peer') ? LocaleKeys.networkConnectionReset.tr() : LocaleKeys.networkErrorMessage.tr(); onFailure(message, -1, failureType: ConnectivityFailure(message)); diff --git a/lib/presentation/appointments/appointment_details_page.dart b/lib/presentation/appointments/appointment_details_page.dart index 515620a2..daf0839a 100644 --- a/lib/presentation/appointments/appointment_details_page.dart +++ b/lib/presentation/appointments/appointment_details_page.dart @@ -577,7 +577,7 @@ class _AppointmentDetailsPageState extends State { iconColor: AppColors.transparent, fit: BoxFit.cover, width: double.infinity, - ), + height: 180.h), ), ), Positioned( diff --git a/lib/presentation/appointments/appointment_payment_page.dart b/lib/presentation/appointments/appointment_payment_page.dart index 34bf6759..79b99a1e 100644 --- a/lib/presentation/appointments/appointment_payment_page.dart +++ b/lib/presentation/appointments/appointment_payment_page.dart @@ -115,8 +115,7 @@ class _AppointmentPaymentPageState extends State { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Utils.buildImgWithAssets(icon: AppAssets.mada, width: 72.h, height: 25.h) - .toShimmer2(isShow: myAppointmentsVM.isAppointmentPatientShareLoading), + Utils.buildImgWithAssets(icon: AppAssets.mada, width: 80.h, height: 30.h, fit: BoxFit.contain).toShimmer2(isShow: myAppointmentsVM.isAppointmentPatientShareLoading), SizedBox(height: 16.h), LocaleKeys.mada.tr(context: context).toText16(isBold: true).toShimmer2(isShow: myAppointmentsVM.isAppointmentPatientShareLoading), ], @@ -328,7 +327,7 @@ class _AppointmentPaymentPageState extends State { children: [ Utils.buildImgWithAssets(icon: AppAssets.visa, width: 50.h, height: 50.h), SizedBox(width: 8.h), - Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h), + Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h, fit: BoxFit.contain), ], ).toShimmer2(isShow: myAppointmentsVM.isAppointmentPatientShareLoading), SizedBox(height: 16.h), diff --git a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart index ed323629..8bbf23af 100644 --- a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart +++ b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart @@ -86,8 +86,8 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget { AppCustomChipWidget( richText: Row( children: [ - "${appState.getAuthenticatedUser()!.age} ".toText10(color: AppColors.blackColor, isEnglishOnly: true), - LocaleKeys.yearsOld.tr(context: context).toText10(color: AppColors.blackColor), + "${appState.getAuthenticatedUser()!.age} ".toText10(color: AppColors.blackColor, isBold: true), + LocaleKeys.yearsOld.tr(context: context).toText10(color: AppColors.blackColor, isBold: true), ], ), ), diff --git a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart index fd46ed70..aa23fef8 100644 --- a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart +++ b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart @@ -106,7 +106,7 @@ class _ImmediateLiveCarePaymentPageState extends State { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Utils.buildImgWithAssets(icon: AppAssets.mada, width: 72.h, height: 25.h).toShimmer2(isShow: false), + Utils.buildImgWithAssets(icon: AppAssets.mada, width: 72.h, height: 25.h, fit: BoxFit.contain).toShimmer2(isShow: false), SizedBox(height: 16.h), LocaleKeys.mada.tr(context: context).toText16(isBold: true).toShimmer2(isShow: false), ], @@ -263,7 +263,7 @@ class _WalletPaymentConfirmPageState extends State { children: [ Utils.buildImgWithAssets(icon: AppAssets.visa, width: 40.h, height: 40.h), SizedBox(width: 8.h), - Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h), + Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h, fit: BoxFit.contain), ], ).toShimmer2(isShow: false), SizedBox(height: 16.h), diff --git a/lib/presentation/todo_section/ancillary_order_payment_page.dart b/lib/presentation/todo_section/ancillary_order_payment_page.dart index 95a8c092..99ed0928 100644 --- a/lib/presentation/todo_section/ancillary_order_payment_page.dart +++ b/lib/presentation/todo_section/ancillary_order_payment_page.dart @@ -109,7 +109,7 @@ class _AncillaryOrderPaymentPageState extends State { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Utils.buildImgWithAssets(icon: AppAssets.mada, width: 50.h, height: 50.h), + Utils.buildImgWithAssets(icon: AppAssets.mada, width: 80.h, height: 30.h, fit: BoxFit.contain), SizedBox(height: 16.h), LocaleKeys.mada.tr(context: context).toText16(isBold: true).toShimmer2(isShow: todoVM.isProcessingPayment), ], @@ -222,7 +222,7 @@ class _AncillaryOrderPaymentPageState extends State { children: [ Utils.buildImgWithAssets(icon: AppAssets.visa, width: 50.h, height: 50.h), SizedBox(width: 8.h), - Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h), + Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h, fit: BoxFit.contain), ], ).toShimmer2(isShow: todoVM.isProcessingPayment), SizedBox(height: 16.h), diff --git a/lib/widgets/image_picker.dart b/lib/widgets/image_picker.dart index 4074bd19..6ab2b439 100644 --- a/lib/widgets/image_picker.dart +++ b/lib/widgets/image_picker.dart @@ -79,7 +79,7 @@ class ImageOptions { } }, onFilesTap: () async { - FilePickerResult? result = await FilePicker.pickFiles( + FilePickerResult? result = await FilePicker.platform.pickFiles( type: FileType.custom, allowedExtensions: [ 'jpg',