haroon_dev
haroon amjad 14 hours ago
parent 021a835fa8
commit 695d6566a1

@ -1076,11 +1076,11 @@ class MyAppointmentsViewModel extends ChangeNotifier {
notifyListeners(); notifyListeners();
} else if (apiResponse.messageStatus == 1) { } else if (apiResponse.messageStatus == 1) {
appointmentRatedResponseModel = apiResponse.data!; appointmentRatedResponseModel = apiResponse.data!;
isAppointmentRatedResponseLoading = false;
notifyListeners(); notifyListeners();
if (onSuccess != null) { if (onSuccess != null) {
onSuccess(apiResponse.data); onSuccess(apiResponse.data);
} }
isAppointmentRatedResponseLoading = false;
} }
}, },
); );

@ -656,7 +656,7 @@ class _AppointmentDetailsPageState extends State<AppointmentDetailsPage> {
crossAxisCount: 3, crossAxisCount: 3,
crossAxisSpacing: 16.h, crossAxisSpacing: 16.h,
mainAxisSpacing: 16.w, mainAxisSpacing: 16.w,
childAspectRatio: isFoldable ? 1.2 : (isTablet ? 1.1 : 0.78), childAspectRatio: isFoldable ? 1.2 : (isTablet ? 1.4 : 0.98),
), ),
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
padding: EdgeInsets.zero, padding: EdgeInsets.zero,

@ -133,7 +133,7 @@ class _BookAppointmentPageState extends State<BookAppointmentPage> {
children: [ children: [
Image.network( Image.network(
"https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png", "https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png",
width: 64.w, width: 64.h,
height: 64.h, height: 64.h,
fit: BoxFit.cover, fit: BoxFit.cover,
).circle(100).toShimmer2(isShow: true, radius: 50.r), ).circle(100).toShimmer2(isShow: true, radius: 50.r),
@ -172,7 +172,7 @@ class _BookAppointmentPageState extends State<BookAppointmentPage> {
), ),
SizedBox(height: 16.h), SizedBox(height: 16.h),
SizedBox( SizedBox(
height: 110.h, height: 115.h,
child: ListView.separated( child: ListView.separated(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
itemCount: myAppointmentsVM.patientMyDoctorsList.length, itemCount: myAppointmentsVM.patientMyDoctorsList.length,

@ -475,7 +475,7 @@ class _ServicesPageState extends State<ServicesPage> {
ConstrainedBox( ConstrainedBox(
constraints: BoxConstraints( constraints: BoxConstraints(
minHeight: 320.h, minHeight: 320.h,
maxHeight: isFoldable ? 400.h : (isTablet ? 360.h : 340.h), maxHeight: isFoldable ? 380.h : (isTablet ? 370.h : 340.h),
), ),
child: ListView.separated( child: ListView.separated(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,

@ -418,7 +418,8 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
return ConstrainedBox( return ConstrainedBox(
constraints: BoxConstraints( constraints: BoxConstraints(
minHeight: 135.h, minHeight: 135.h,
maxHeight: isFoldable ? 160.h : (isTablet ? 165.h : 135.h), maxHeight: 150.h,
// maxHeight: isFoldable ? 150.h : (isTablet ? 140.h : 140.h),
), ),
child: PageView( child: PageView(
controller: hmgServicesVM.vitalSignPageController, controller: hmgServicesVM.vitalSignPageController,
@ -628,6 +629,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
crossAxisCount: 3, crossAxisCount: 3,
crossAxisSpacing: 10.h, crossAxisSpacing: 10.h,
mainAxisSpacing: 16.w, mainAxisSpacing: 16.w,
childAspectRatio: isFoldable ? 1.2 : (isTablet ? 1.4 : 0.98),
// mainAxisExtent: 120.h, // mainAxisExtent: 120.h,
), ),
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
@ -719,7 +721,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
return ConstrainedBox( return ConstrainedBox(
constraints: BoxConstraints( constraints: BoxConstraints(
minHeight: 150.h, minHeight: 150.h,
maxHeight: isFoldable ? 230.h : (isTablet ? 240.h : 180.h), maxHeight: isFoldable ? 210.h : (isTablet ? 200.h : 180.h),
), ),
child: myAppointmentsVM.isMyAppointmentsLoading child: myAppointmentsVM.isMyAppointmentsLoading
? MedicalFileAppointmentCard( ? MedicalFileAppointmentCard(
@ -1173,7 +1175,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
GridView( GridView(
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3, crossAxisCount: 3,
childAspectRatio: 1, childAspectRatio: isFoldable ? 1.2 : (isTablet ? 1.4 : 0.98),
crossAxisSpacing: 10.h, crossAxisSpacing: 10.h,
), ),
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
@ -1277,10 +1279,10 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
context, context,
noDataText: LocaleKeys.youDontHaveAnySickLeavesYet.tr(context: context), noDataText: LocaleKeys.youDontHaveAnySickLeavesYet.tr(context: context),
isSmallWidget: true, isSmallWidget: true,
width: 62.w, width: 62.h,
height: 62.h, height: 62.h,
), ),
).paddingSymmetrical(0.w, 0.h); );
}), }),
SizedBox(height: 16.h), SizedBox(height: 16.h),
Selector<MedicalFileViewModel, Selector<MedicalFileViewModel,
@ -1308,6 +1310,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
crossAxisCount: 3, crossAxisCount: 3,
crossAxisSpacing: 10.h, crossAxisSpacing: 10.h,
mainAxisSpacing: 16.w, mainAxisSpacing: 16.w,
childAspectRatio: isFoldable ? 1.2 : (isTablet ? 1.4 : 0.98),
), ),
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
padding: EdgeInsets.only(top: 12.h), padding: EdgeInsets.only(top: 12.h),
@ -1625,7 +1628,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
), ),
child: Utils.buildSvgWithAssets( child: Utils.buildSvgWithAssets(
icon: icon, icon: icon,
width: 22.w, width: 22.h,
height: 22.h, height: 22.h,
iconColor: scheme.iconFg, iconColor: scheme.iconFg,
fit: BoxFit.contain, fit: BoxFit.contain,
@ -1642,7 +1645,8 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
icon: getIt.get<AppState>().isArabic() ? AppAssets.arrow_back : AppAssets.arrow_forward, width: 18.w, height: 18.h), icon: getIt.get<AppState>().isArabic() ? AppAssets.arrow_back : AppAssets.arrow_forward, width: 18.w, height: 18.h),
], ],
), ),
SizedBox(height: 14.h), Spacer(),
// SizedBox(height: 14.h),
Container( Container(
padding: EdgeInsets.symmetric(horizontal: 6.w, vertical: 6.h), padding: EdgeInsets.symmetric(horizontal: 6.w, vertical: 6.h),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration( decoration: RoundedRectangleBorder().toSmoothCornerDecoration(

@ -34,11 +34,7 @@ class HealthToolsCard extends StatelessWidget {
padding: EdgeInsets.all(12.w), padding: EdgeInsets.all(12.w),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.min,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
// Icon container with white background and border // Icon container with white background and border
Container( Container(
@ -50,8 +46,8 @@ class HealthToolsCard extends StatelessWidget {
width: 1, width: 1,
), ),
), ),
height: 48.w, height: 48.h,
width: 48.w, width: 48.h,
child: Center( child: Center(
child: Utils.buildSvgWithAssets( child: Utils.buildSvgWithAssets(
icon: svgIcon, icon: svgIcon,
@ -67,8 +63,6 @@ class HealthToolsCard extends StatelessWidget {
label.toText13(color: textColor, isBold: true, maxLine: 2), label.toText13(color: textColor, isBold: true, maxLine: 2),
], ],
), ),
],
),
); );
} }
} }

@ -30,6 +30,10 @@ class LabRadCard extends StatelessWidget {
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 18.r, hasShadow: false), decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 18.r, hasShadow: false),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
children: [
Expanded(
child: Row(
children: [ children: [
Utils.buildSvgWithAssets( Utils.buildSvgWithAssets(
icon: icon, icon: icon,
@ -39,13 +43,15 @@ class LabRadCard extends StatelessWidget {
applyThemeColor: false applyThemeColor: false
).toShimmer2(isShow: false, radius: 12.r), ).toShimmer2(isShow: false, radius: 12.r),
SizedBox(width: 8.w), SizedBox(width: 8.w),
Flexible( Flexible(child: labelText.toText12(isBold: true, maxLine: 2)),
child: labelText.toText12(isBold: true, maxLine: 2), ],
), ),
),
SizedBox(width: 12.w), SizedBox(width: 12.w),
Transform.flip( Transform.flip(
flipX: appState.isArabic(), flipX: appState.isArabic(),
child: Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon_small, width: 10.w, height: 10.h, fit: BoxFit.contain, iconColor: AppColors.textColor), child: Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon_small, width: 12.h, height: 12.h, fit: BoxFit.contain, iconColor: AppColors.textColor),
), ),
], ],
).paddingAll(12.w), ).paddingAll(12.w),

@ -152,7 +152,7 @@ class _MedicalFileAppointmentCardState extends State<MedicalFileAppointmentCard>
backgroundColor: backgroundColor:
AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel) ? AppColors.greyColor : AppColors.secondaryLightRedColor, AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel) ? AppColors.greyColor : AppColors.secondaryLightRedColor,
textColor: AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel) ? AppColors.textColor : AppColors.primaryRedColor, textColor: AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel) ? AppColors.textColor : AppColors.primaryRedColor,
padding: EdgeInsets.only(top: 12.h, left: 8.w, right: 8.w, bottom: 8.h), padding: EdgeInsets.all(8.h),
).toShimmer2(isShow: widget.myAppointmentsViewModel.isMyAppointmentsLoading), ).toShimmer2(isShow: widget.myAppointmentsViewModel.isMyAppointmentsLoading),
SizedBox(height: 16.h), SizedBox(height: 16.h),
IntrinsicWidth( IntrinsicWidth(
@ -310,14 +310,14 @@ class _MedicalFileAppointmentCardState extends State<MedicalFileAppointmentCard>
borderRadius: 10.r, borderRadius: 10.r,
), ),
child: Padding( child: Padding(
padding: EdgeInsets.all(10.w), padding: EdgeInsets.all(10.h),
child: Transform.flip( child: Transform.flip(
flipX: appState.isArabic(), flipX: appState.isArabic(),
child: Utils.buildSvgWithAssets( child: Utils.buildSvgWithAssets(
iconColor: AppColors.whiteColor, iconColor: AppColors.whiteColor,
icon: AppAssets.forward_arrow_icon_small, icon: AppAssets.forward_arrow_icon_small,
width: 40.h, width: 36.h,
height: 40.h, height: 36.h,
fit: BoxFit.contain, fit: BoxFit.contain,
), ),
), ),

Loading…
Cancel
Save