diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json index 9c974574..958b717a 100644 --- a/assets/langs/ar-SA.json +++ b/assets/langs/ar-SA.json @@ -1655,7 +1655,8 @@ "toHospitalSubtitle": "نقل من موقعك الحالي إلى المستشفى", "fromHospitalSubtitle": "نقل من المستشفى إلى منزلك", "clinicSchedule": "جدول العيادة", - "doctorAddedToFavourite": "تمت إضافة الطبيب إلى قائمة المفضلة", - "doctorRemovedFromFavourite": "تمت إزالة الطبيب من قائمة الأطباء المفضلين", - "addNewFavorite": "إضافة مفضلة جديدة" + "doctorAddedToFavourite": "تمت إضافة إلى قائمة المفضلة", + "doctorRemovedFromFavourite": "تمت إزالة من قائمة الأطباء المفضلين", + "addNewFavorite": "إضافة مفضلة جديدة", + "favourites": "المفضلة" } diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json index 727cd16a..385dbdbf 100644 --- a/assets/langs/en-US.json +++ b/assets/langs/en-US.json @@ -1647,7 +1647,8 @@ "toHospitalSubtitle": "Transfer from your current location to the hospital", "fromHospitalSubtitle": "Transfer from the hospital back to your home", "clinicSchedule": "Clinic Schedule", - "doctorAddedToFavourite": "Doctor added to favorites list", - "doctorRemovedFromFavourite": "Doctor removed from favorites list", + "doctorAddedToFavourite": "Added to favorites list", + "doctorRemovedFromFavourite": "Removed from favorites list", + "favourites": "Favourites", "addNewFavorite": "Add new favourite" } diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index 07fb694a..56d71e33 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -1650,5 +1650,6 @@ abstract class LocaleKeys { static const doctorAddedToFavourite = 'doctorAddedToFavourite'; static const doctorRemovedFromFavourite = 'doctorRemovedFromFavourite'; static const addNewFavorite = 'addNewFavorite'; + static const favourites = 'favourites'; } diff --git a/lib/presentation/book_appointment/book_appointment_page.dart b/lib/presentation/book_appointment/book_appointment_page.dart index 5684b163..556dce6d 100644 --- a/lib/presentation/book_appointment/book_appointment_page.dart +++ b/lib/presentation/book_appointment/book_appointment_page.dart @@ -249,7 +249,7 @@ class _BookAppointmentPageState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox(height: 24.h), - LocaleKeys.favouriteDoctors.tr(context: context).toText18(isBold: true).paddingSymmetrical(24.w, 0.h), + LocaleKeys.favouriteList.tr(context: context).toText18(isBold: true).paddingSymmetrical(24.w, 0.h), SizedBox(height: 16.h), SizedBox( height: 110.h, @@ -340,8 +340,8 @@ class _BookAppointmentPageState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox(height: 24.h), - LocaleKeys.favouriteDoctors.tr(context: context).toText18(isBold: true).paddingSymmetrical(24.w, 0.h), - SizedBox(height: 16.h), + LocaleKeys.favourites.tr(context: context).toText18(isBold: true).paddingSymmetrical(24.w, 0.h), + SizedBox(height: 16.h), Row( children: [ SizedBox( diff --git a/lib/presentation/book_appointment/widgets/doctor_card.dart b/lib/presentation/book_appointment/widgets/doctor_card.dart index 307b73ad..19d52a92 100644 --- a/lib/presentation/book_appointment/widgets/doctor_card.dart +++ b/lib/presentation/book_appointment/widgets/doctor_card.dart @@ -1,6 +1,8 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart'; +import 'package:hmg_patient_app_new/core/app_state.dart'; +import 'package:hmg_patient_app_new/core/dependencies.dart'; import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; @@ -103,10 +105,16 @@ class DoctorCard extends StatelessWidget { SizedBox( child: (isLoading ? "Consultant Cardiologist" - : doctorsListResponseModel.speciality!.isNotEmpty - ? (doctorsListResponseModel.speciality!.first.length > 32 - ? '${doctorsListResponseModel.speciality!.first.substring(0, 32)}...' - : doctorsListResponseModel.speciality!.first) + : getIt.get().isArabic() + ? doctorsListResponseModel.specialityN!.isNotEmpty + ? (doctorsListResponseModel.specialityN!.first.length > 32 + ? '${doctorsListResponseModel.specialityN!.first.substring(0, 32)}...' + : doctorsListResponseModel.specialityN!.first) + : "" + : doctorsListResponseModel.speciality!.isNotEmpty + ? (doctorsListResponseModel.speciality!.first.length > 32 + ? '${doctorsListResponseModel.speciality!.first.substring(0, 32)}...' + : doctorsListResponseModel.speciality!.first) : "") .toString() .toText12(fontWeight: FontWeight.w500, color: AppColors.textColor, maxLine: 2, isEnglishOnly: true) diff --git a/lib/presentation/emergency_services/emergency_services_page.dart b/lib/presentation/emergency_services/emergency_services_page.dart index c8b01d16..8e58b105 100644 --- a/lib/presentation/emergency_services/emergency_services_page.dart +++ b/lib/presentation/emergency_services/emergency_services_page.dart @@ -503,7 +503,7 @@ class _EmergencyServicesPageState extends State { title: LocaleKeys.transportOptions.tr(), context, child: SizedBox( - height: 400.h, + height: 500.h, child: AmbulanceOptionSelectionBottomSheet(onTap: () { Navigator.of(context).pop(); openPickupDetailsBottomSheet(context); diff --git a/lib/presentation/home/widgets/habib_wallet_card.dart b/lib/presentation/home/widgets/habib_wallet_card.dart index a8ba04dd..7bbe74bd 100644 --- a/lib/presentation/home/widgets/habib_wallet_card.dart +++ b/lib/presentation/home/widgets/habib_wallet_card.dart @@ -76,67 +76,80 @@ class HabibWalletCard extends StatelessWidget { // ], // ), SizedBox(height: 4.h), - Consumer(builder: (context, habibWalletVM, child) { - return Row( - children: [ - Utils.buildSvgWithAssets( - icon: AppAssets.saudi_riyal_icon, - iconColor: AppColors.inputLabelTextColor, - width: 24.h, - height: 24.h, - fit: BoxFit.contain, - ), - SizedBox(width: 8.h), - NumberFormat.decimalPattern() - .format(habibWalletVM.habibWalletAmount) - .toString() - .toText32(isBold: true, isEnglishOnly: true) - .toShimmer2(isShow: habibWalletVM.isWalletAmountLoading, radius: 12.h, width: 80.h, height: 40.h), - ], - ); - }), - Padding( - padding: EdgeInsets.symmetric(horizontal: 50.h), - child: Row( - children: [ - LocaleKeys.viewDetails.tr(context: context).toText12(color: AppColors.primaryRedColor), - SizedBox(width: 2.h), - Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 10.h), - ], - ).onPress(() { - Navigator.of(context).push( - CustomPageRoute( - page: HabibWalletPage(), - ), - ); - }), - ), - SizedBox(height: 16.h), Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Consumer(builder: (context, habibWalletVM, child) { + return Row( + children: [ + Utils.buildSvgWithAssets( + icon: AppAssets.saudi_riyal_icon, + iconColor: AppColors.inputLabelTextColor, + width: 24.h, + height: 24.h, + fit: BoxFit.contain, + ), + SizedBox(width: 8.h), + NumberFormat.decimalPattern() + .format(habibWalletVM.habibWalletAmount) + .toString() + .toText32(isBold: true, isEnglishOnly: true) + .toShimmer2(isShow: habibWalletVM.isWalletAmountLoading, radius: 12.h, width: 80.h, height: 40.h), + ], + ); + }), + Padding( + padding: EdgeInsets.symmetric(horizontal: 35.h), + child: Row( + children: [ + LocaleKeys.viewDetails.tr(context: context).toText12(color: AppColors.primaryRedColor, fontWeight: FontWeight.w500), + Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 10.h), + ], + ).onPress(() { + Navigator.of(context).push( + CustomPageRoute( + page: HabibWalletPage(), + ), + ); + }), + ), + ], + ), SizedBox( - width: 200.h, + // width: 50.h, child: Utils.getPaymentMethods(), ), - CustomButton( - height: 40.h, - icon: AppAssets.recharge_icon, - iconSize: 24.h, - backgroundColor: AppColors.infoColor, - textColor: Colors.white, - text: LocaleKeys.recharge.tr(context: context), - borderWidth: 0.w, - fontWeight: FontWeight.w500, - borderColor: Colors.transparent, - padding: EdgeInsets.fromLTRB(4, 0, 12, 0), - fontSize: 14.f, - onPressed: () { - Navigator.of(context).push(CustomPageRoute(page: RechargeWalletPage())); - }, - ), ], ), + SizedBox(height: 16.h), + CustomButton( + height: 40.h, + icon: AppAssets.recharge_icon, + iconColor: AppColors.infoColor, + iconSize: 24.h, + backgroundColor: AppColors.infoColor.withAlpha(15), + textColor: AppColors.infoColor, + text: LocaleKeys.recharge.tr(context: context), + borderWidth: 0.w, + fontWeight: FontWeight.w500, + borderColor: AppColors.infoColor.withAlpha(15), + padding: EdgeInsets.fromLTRB(4, 0, 12, 0), + fontSize: 14.f, + onPressed: () { + Navigator.of(context).push(CustomPageRoute(page: RechargeWalletPage())); + }, + ), + // Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // SizedBox( + // width: 200.h, + // child: Utils.getPaymentMethods(), + // ), + // ], + // ), ], ), ), diff --git a/lib/presentation/symptoms_checker/triage_screen.dart b/lib/presentation/symptoms_checker/triage_screen.dart index b4ceff4c..cba565b7 100644 --- a/lib/presentation/symptoms_checker/triage_screen.dart +++ b/lib/presentation/symptoms_checker/triage_screen.dart @@ -491,7 +491,7 @@ class _TriagePageState extends State { text: TextSpan( text: "${probability.toStringAsFixed(1)}% ", style: TextStyle( - fontFamily: isArabic ? 'GESSTwo' : 'Poppins', + fontFamily: 'Poppins', color: AppColors.primaryRedColor, fontWeight: FontWeight.w600, fontSize: 14.f,