pull/212/head
haroon amjad 6 days ago
parent 21477f34dc
commit 1fa03fff5e

@ -1655,7 +1655,8 @@
"toHospitalSubtitle": "نقل من موقعك الحالي إلى المستشفى", "toHospitalSubtitle": "نقل من موقعك الحالي إلى المستشفى",
"fromHospitalSubtitle": "نقل من المستشفى إلى منزلك", "fromHospitalSubtitle": "نقل من المستشفى إلى منزلك",
"clinicSchedule": "جدول العيادة", "clinicSchedule": "جدول العيادة",
"doctorAddedToFavourite": "تمت إضافة الطبيب إلى قائمة المفضلة", "doctorAddedToFavourite": "تمت إضافة إلى قائمة المفضلة",
"doctorRemovedFromFavourite": "تمت إزالة الطبيب من قائمة الأطباء المفضلين", "doctorRemovedFromFavourite": "تمت إزالة من قائمة الأطباء المفضلين",
"addNewFavorite": "إضافة مفضلة جديدة" "addNewFavorite": "إضافة مفضلة جديدة",
"favourites": "المفضلة"
} }

@ -1647,7 +1647,8 @@
"toHospitalSubtitle": "Transfer from your current location to the hospital", "toHospitalSubtitle": "Transfer from your current location to the hospital",
"fromHospitalSubtitle": "Transfer from the hospital back to your home", "fromHospitalSubtitle": "Transfer from the hospital back to your home",
"clinicSchedule": "Clinic Schedule", "clinicSchedule": "Clinic Schedule",
"doctorAddedToFavourite": "Doctor added to favorites list", "doctorAddedToFavourite": "Added to favorites list",
"doctorRemovedFromFavourite": "Doctor removed from favorites list", "doctorRemovedFromFavourite": "Removed from favorites list",
"favourites": "Favourites",
"addNewFavorite": "Add new favourite" "addNewFavorite": "Add new favourite"
} }

@ -1650,5 +1650,6 @@ abstract class LocaleKeys {
static const doctorAddedToFavourite = 'doctorAddedToFavourite'; static const doctorAddedToFavourite = 'doctorAddedToFavourite';
static const doctorRemovedFromFavourite = 'doctorRemovedFromFavourite'; static const doctorRemovedFromFavourite = 'doctorRemovedFromFavourite';
static const addNewFavorite = 'addNewFavorite'; static const addNewFavorite = 'addNewFavorite';
static const favourites = 'favourites';
} }

@ -249,7 +249,7 @@ class _BookAppointmentPageState extends State<BookAppointmentPage> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
SizedBox(height: 24.h), 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: 16.h),
SizedBox( SizedBox(
height: 110.h, height: 110.h,
@ -340,8 +340,8 @@ class _BookAppointmentPageState extends State<BookAppointmentPage> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
SizedBox(height: 24.h), SizedBox(height: 24.h),
LocaleKeys.favouriteDoctors.tr(context: context).toText18(isBold: true).paddingSymmetrical(24.w, 0.h), LocaleKeys.favourites.tr(context: context).toText18(isBold: true).paddingSymmetrical(24.w, 0.h),
SizedBox(height: 16.h), SizedBox(height: 16.h),
Row( Row(
children: [ children: [
SizedBox( SizedBox(

@ -1,6 +1,8 @@
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:hmg_patient_app_new/core/app_assets.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/date_util.dart';
import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart';
@ -103,10 +105,16 @@ class DoctorCard extends StatelessWidget {
SizedBox( SizedBox(
child: (isLoading child: (isLoading
? "Consultant Cardiologist" ? "Consultant Cardiologist"
: doctorsListResponseModel.speciality!.isNotEmpty : getIt.get<AppState>().isArabic()
? (doctorsListResponseModel.speciality!.first.length > 32 ? doctorsListResponseModel.specialityN!.isNotEmpty
? '${doctorsListResponseModel.speciality!.first.substring(0, 32)}...' ? (doctorsListResponseModel.specialityN!.first.length > 32
: doctorsListResponseModel.speciality!.first) ? '${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() .toString()
.toText12(fontWeight: FontWeight.w500, color: AppColors.textColor, maxLine: 2, isEnglishOnly: true) .toText12(fontWeight: FontWeight.w500, color: AppColors.textColor, maxLine: 2, isEnglishOnly: true)

@ -503,7 +503,7 @@ class _EmergencyServicesPageState extends State<EmergencyServicesPage> {
title: LocaleKeys.transportOptions.tr(), title: LocaleKeys.transportOptions.tr(),
context, context,
child: SizedBox( child: SizedBox(
height: 400.h, height: 500.h,
child: AmbulanceOptionSelectionBottomSheet(onTap: () { child: AmbulanceOptionSelectionBottomSheet(onTap: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
openPickupDetailsBottomSheet(context); openPickupDetailsBottomSheet(context);

@ -76,67 +76,80 @@ class HabibWalletCard extends StatelessWidget {
// ], // ],
// ), // ),
SizedBox(height: 4.h), SizedBox(height: 4.h),
Consumer<HabibWalletViewModel>(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( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Consumer<HabibWalletViewModel>(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( SizedBox(
width: 200.h, // width: 50.h,
child: Utils.getPaymentMethods(), 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(),
// ),
// ],
// ),
], ],
), ),
), ),

@ -491,7 +491,7 @@ class _TriagePageState extends State<TriagePage> {
text: TextSpan( text: TextSpan(
text: "${probability.toStringAsFixed(1)}% ", text: "${probability.toStringAsFixed(1)}% ",
style: TextStyle( style: TextStyle(
fontFamily: isArabic ? 'GESSTwo' : 'Poppins', fontFamily: 'Poppins',
color: AppColors.primaryRedColor, color: AppColors.primaryRedColor,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14.f, fontSize: 14.f,

Loading…
Cancel
Save