pull/219/head
Sultan khan 1 day ago
parent 18331f077e
commit 712e835176

@ -155,6 +155,7 @@ extension SmoothContainerExtension on ShapeBorder {
BorderRadius? customBorder,
bool hasShadow = false,
bool hasDenseShadow = false,
List<BoxShadow>? isCustomShadow,
}) {
final bgColor = backgroundColor ?? color;
return ShapeDecoration(
@ -174,7 +175,7 @@ extension SmoothContainerExtension on ShapeBorder {
offset: const Offset(1, 0),
)
]
: [],
: isCustomShadow ?? [],
);
}
}

@ -676,9 +676,9 @@ class MyAppointmentsViewModel extends ChangeNotifier {
Future<void> getPatientFavouriteDoctors({bool forceRefresh = false, Function(dynamic)? onSuccess, Function(String)? onError}) async {
// If data is already fetched and not forcing refresh, skip API call
// if (isFavouriteDoctorsDataFetched && !forceRefresh) {
// return;
// }
if (isFavouriteDoctorsDataFetched && !forceRefresh) {
return;
}
isPatientFavouriteDoctorsLoading = true;
patientFavouriteDoctorsList.clear();

@ -205,7 +205,7 @@ class AppointmentCard extends StatelessWidget {
richText: isLoading
? 'Cardiology'.toText10().toShimmer2(isShow: isLoading)
: "${DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false)} ${DateUtil.formatDateToTimeLang(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false)}"
.toText10(isEnglishOnly: true),
.toText10(isEnglishOnly: true, isBold: true),
).toShimmer2(isShow: isLoading),
),
@ -415,6 +415,10 @@ class AppointmentCard extends StatelessWidget {
}
return CustomButton(
borderSide: BorderSide(
color: AppColors.textColor,
width: 1.2,
),
text: LocaleKeys.rebookSameDoctor.tr(context: context),
onPressed: () => openDoctorScheduleCalendar(context),
backgroundColor: AppColors.transparent,

@ -8,6 +8,7 @@ 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';
import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
import 'package:hmg_patient_app_new/features/authentication/authentication_view_model.dart';
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
import 'package:hmg_patient_app_new/presentation/authentication/login.dart';
@ -89,15 +90,11 @@ class _SavedLogin extends State<SavedLogin> {
: SizedBox(),
SizedBox(height: 24.h),
Container(
padding: EdgeInsets.all(16.h),
decoration: BoxDecoration(
color: AppColors.whiteColor,
border: Border.all(color: AppColors.whiteColor),
borderRadius: BorderRadius.circular(24.h),
boxShadow: [
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 20.h, hasShadow: false, isCustomShadow: [
BoxShadow(color: Color(0x0D000000), blurRadius: 16.h, offset: Offset(0, 0), spreadRadius: 5.h),
],
),
]),
child: Column(
children: [
// Last login info - show WhatsApp only if isOther AND loginType is SMS

@ -272,7 +272,7 @@ class _LandingPageState extends State<LandingPage> {
Consumer<TodoSectionViewModel>(builder: (context, todoSectionVM, child) {
return Row(
mainAxisSize: MainAxisSize.min,
spacing: 18.h,
// spacing: 18.h,
children: [
Stack(clipBehavior: Clip.none, children: [
if (appState.isAuthenticated)
@ -292,7 +292,7 @@ class _LandingPageState extends State<LandingPage> {
}),
(appState.isAuthenticated && (int.parse(todoSectionVM.notificationsCount ?? "0") > 0))
? Positioned(
right: appState.isArabic() ? 8.w : -8.w,
// right: appState.isArabic() ? 8.w : -8.w,
top: -8.h,
// left: 4.h,
// bottom: 4.h,
@ -318,6 +318,7 @@ class _LandingPageState extends State<LandingPage> {
)
: SizedBox.shrink(),
]),
SizedBox(width: 24.w,),
Utils.buildSvgWithAssets(icon: AppAssets.location, height: 24.h, width: 24.w).onPress(() {
// openIndoorNavigationBottomSheet(context);
showCommonBottomSheetWithoutHeight(
@ -612,7 +613,7 @@ class _LandingPageState extends State<LandingPage> {
LocaleKeys.quickLinks.tr(context: context).toText16(isBold: true),
Row(
children: [
LocaleKeys.viewMedicalFile.tr(context: context).toText12(color: AppColors.primaryRedColor, isBold: true),
LocaleKeys.viewMedicalFile.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true),
SizedBox(width: 2.h),
Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 14.h),
],

File diff suppressed because one or more lines are too long

@ -50,7 +50,7 @@ class _LabAiAnalysisDetailedPageState extends State<LabAiAnalysisDetailedPage> {
children: [
SizedBox(height: 10.h),
Container(
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 12.r, side: BorderSide(width: 1, color: Color(0xFF0B85F7))),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.transparent, borderRadius: 12.r, side: BorderSide(width: 1, color: Color(0xFF0B85F7))),
padding: EdgeInsets.all(16.r),
child: (analysis.summary ?? "").toText14(color: AppColors.textColorLight, height: 1.5, weight: FontWeight.w400),
),
@ -88,7 +88,7 @@ class _LabAiAnalysisDetailedPageState extends State<LabAiAnalysisDetailedPage> {
children: [
SizedBox(height: 10.h),
Container(
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 12.r, side: BorderSide(width: 1, color: Color(0xFFFFAF15))),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.transparent, borderRadius: 12.r, side: BorderSide(width: 1, color: Color(0xFFFFAF15))),
padding: EdgeInsets.all(16.r),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -109,7 +109,8 @@ class _LabAiAnalysisDetailedPageState extends State<LabAiAnalysisDetailedPage> {
children: [
SizedBox(height: 10.h),
Container(
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 12.r),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.transparent
, borderRadius: 12.r),
padding: EdgeInsets.all(16.r),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,

@ -49,48 +49,38 @@ class LabOrderResultItem extends StatelessWidget {
SizedBox(height: 12.h),
Directionality(
textDirection: ui.TextDirection.ltr,
child: Row(
mainAxisSize: MainAxisSize.max,
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Flexible(
Text(
"${tests?.resultValue} ${tests?.uOM}",
style: TextStyle(
fontSize: 24.f,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
color: tests!.checkIfGraphShouldBeDisplayed()
? context.read<LabViewModel>().getColor(
tests?.calculatedResultFlag ?? "",
)
: Colors.grey.shade700,
letterSpacing: -1,
),
),
// SizedBox(
// height: 2.h,
// ),
Visibility(
visible: tests?.referanceRange != null,
child: Text(
"${tests?.resultValue} ${tests?.uOM}",
"(${LocaleKeys.referenceRange.tr(context: context)}: ${tests?.referanceRange})",
style: TextStyle(
fontSize: 24.f,
fontSize: 12.f,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
color: tests!.checkIfGraphShouldBeDisplayed()
? context.read<LabViewModel>().getColor(
tests?.calculatedResultFlag ?? "",
)
: Colors.grey.shade700,
letterSpacing: -2,
),
),
),
SizedBox(
width: 4.h,
),
Visibility(
// visible: tests?.checkIfGraphShouldBeDisplayed() == true,
visible: true,
child: Expanded(
flex: 2,
child: Visibility(
visible: tests?.referanceRange != null,
child: Text(
"(${LocaleKeys.referenceRange.tr(context: context)}: ${tests?.referanceRange})",
style: TextStyle(
fontSize: 12.f,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
color: AppColors.greyTextColor,
),
// overflow: TextOverflow.ellipsis,
// maxLines: 2,
softWrap: true,
),
color: AppColors.greyTextColor,
),
softWrap: true,
),
)
],

@ -1,5 +1,7 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.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/size_utils.dart';
import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
@ -90,7 +92,7 @@ class _RateAppointmentDoctorState extends State<RateAppointmentDoctor> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
"Please rate the doctor".toText16(isBold: true),
LocaleKeys.rateTheDoctor.tr(context: context).toText16(isBold: true),
SizedBox(height: 12),
Row(
mainAxisAlignment: MainAxisAlignment.center,
@ -139,10 +141,22 @@ class _RateAppointmentDoctorState extends State<RateAppointmentDoctor> {
child: Padding(
padding: EdgeInsets.all(16.0),
child: TextField(
maxLines: 4,
// style: TextStyle(
// fontSize: 14.f,
// fontWeight: FontWeight.w400,
// color: Color(0xff2B353E),
// letterSpacing: 0,
// fontFamily: getIt.get<AppState>().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins',
// ),
decoration: InputDecoration.collapsed(
hintText: LocaleKeys.notes.tr(context: context),
hintStyle: TextStyle(
fontSize: 16.f,
fontWeight: FontWeight.w600,
letterSpacing: -0.4,
fontFamily: getIt.get<AppState>().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins',
),
),
onChanged: (value) {
setState(() {

@ -57,7 +57,7 @@ class _SelectedOrgansSectionState extends State<SelectedOrgansSection> {
LocaleKeys.selectedOrgans.tr(context: context),
style: TextStyle(
fontSize: 16.f,
isBold: true,
// isBold: true,
color: AppColors.textColor,
),
),
@ -78,7 +78,7 @@ class _SelectedOrgansSectionState extends State<SelectedOrgansSection> {
style: TextStyle(
color: AppColors.whiteColor,
fontSize: 12.f,
isBold: true,
// isBold: true,
),
),
),

@ -55,7 +55,7 @@ class DatePickerWidget extends StatelessWidget {
labelText,
style: TextStyle(
fontSize: 12.f,
isBold: true,
// isBold: true,
color: Color(0xff898A8D),
letterSpacing: -0.2,
height: 18 / 12,
@ -102,7 +102,7 @@ class DatePickerWidget extends StatelessWidget {
style: TextStyle(
fontSize: 14.f,
height: 21 / 14,
isBold: true,
// isBold: true,
color: (selectedValue != null && selectedValue!.isNotEmpty) ? const Color(0xff2E3039) : const Color(0xffB0B0B0),
letterSpacing: -0.2,
),

Loading…
Cancel
Save