diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index cd5030d2..d78abcc7 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -92,7 +92,6 @@
-
diff --git a/android/app/src/main2/AndroidManifest.xml b/android/app/src/main2/AndroidManifest.xml
index e07739b9..c9e8c67e 100644
--- a/android/app/src/main2/AndroidManifest.xml
+++ b/android/app/src/main2/AndroidManifest.xml
@@ -93,7 +93,6 @@
-
diff --git a/assets/fonts/cairo/Cairo-Bold.ttf b/assets/fonts/cairo/Cairo-Bold.ttf
new file mode 100644
index 00000000..041abaf6
Binary files /dev/null and b/assets/fonts/cairo/Cairo-Bold.ttf differ
diff --git a/assets/fonts/cairo/Cairo-Bold/Cairo-Bold.eot b/assets/fonts/cairo/Cairo-Bold/Cairo-Bold.eot
new file mode 100644
index 00000000..ed5f0c34
Binary files /dev/null and b/assets/fonts/cairo/Cairo-Bold/Cairo-Bold.eot differ
diff --git a/assets/fonts/cairo/Cairo-Bold/Cairo-Bold.otf b/assets/fonts/cairo/Cairo-Bold/Cairo-Bold.otf
new file mode 100644
index 00000000..8bc25fbb
Binary files /dev/null and b/assets/fonts/cairo/Cairo-Bold/Cairo-Bold.otf differ
diff --git a/assets/fonts/cairo/Cairo-Bold/Cairo-Bold.ttf b/assets/fonts/cairo/Cairo-Bold/Cairo-Bold.ttf
new file mode 100644
index 00000000..4f026897
Binary files /dev/null and b/assets/fonts/cairo/Cairo-Bold/Cairo-Bold.ttf differ
diff --git a/assets/fonts/cairo/Cairo-Bold/Cairo-Bold.woff b/assets/fonts/cairo/Cairo-Bold/Cairo-Bold.woff
new file mode 100644
index 00000000..91e3d063
Binary files /dev/null and b/assets/fonts/cairo/Cairo-Bold/Cairo-Bold.woff differ
diff --git a/assets/fonts/cairo/Cairo-ExtraBold.ttf b/assets/fonts/cairo/Cairo-ExtraBold.ttf
new file mode 100644
index 00000000..4fc547de
Binary files /dev/null and b/assets/fonts/cairo/Cairo-ExtraBold.ttf differ
diff --git a/assets/fonts/cairo/Cairo-Light.ttf b/assets/fonts/cairo/Cairo-Light.ttf
new file mode 100644
index 00000000..7e0f9427
Binary files /dev/null and b/assets/fonts/cairo/Cairo-Light.ttf differ
diff --git a/assets/fonts/cairo/Cairo-Light/Cairo-Light.eot b/assets/fonts/cairo/Cairo-Light/Cairo-Light.eot
new file mode 100644
index 00000000..d76c5391
Binary files /dev/null and b/assets/fonts/cairo/Cairo-Light/Cairo-Light.eot differ
diff --git a/assets/fonts/cairo/Cairo-Light/Cairo-Light.otf b/assets/fonts/cairo/Cairo-Light/Cairo-Light.otf
new file mode 100644
index 00000000..f8812a9c
Binary files /dev/null and b/assets/fonts/cairo/Cairo-Light/Cairo-Light.otf differ
diff --git a/assets/fonts/cairo/Cairo-Light/Cairo-Light.ttf b/assets/fonts/cairo/Cairo-Light/Cairo-Light.ttf
new file mode 100644
index 00000000..840cbc3e
Binary files /dev/null and b/assets/fonts/cairo/Cairo-Light/Cairo-Light.ttf differ
diff --git a/assets/fonts/cairo/Cairo-Light/Cairo-Light.woff b/assets/fonts/cairo/Cairo-Light/Cairo-Light.woff
new file mode 100644
index 00000000..9534bb4b
Binary files /dev/null and b/assets/fonts/cairo/Cairo-Light/Cairo-Light.woff differ
diff --git a/assets/fonts/cairo/Cairo-Medium.ttf b/assets/fonts/cairo/Cairo-Medium.ttf
new file mode 100644
index 00000000..5b8d0f70
Binary files /dev/null and b/assets/fonts/cairo/Cairo-Medium.ttf differ
diff --git a/assets/fonts/cairo/Cairo-Regular.ttf b/assets/fonts/cairo/Cairo-Regular.ttf
new file mode 100644
index 00000000..36ac46bf
Binary files /dev/null and b/assets/fonts/cairo/Cairo-Regular.ttf differ
diff --git a/assets/fonts/cairo/Cairo-Regular/Cairo-Regular.ttf b/assets/fonts/cairo/Cairo-Regular/Cairo-Regular.ttf
new file mode 100644
index 00000000..3eb09f86
Binary files /dev/null and b/assets/fonts/cairo/Cairo-Regular/Cairo-Regular.ttf differ
diff --git a/assets/fonts/cairo/Cairo-SemiBold.ttf b/assets/fonts/cairo/Cairo-SemiBold.ttf
new file mode 100644
index 00000000..fd01d422
Binary files /dev/null and b/assets/fonts/cairo/Cairo-SemiBold.ttf differ
diff --git a/assets/images/svg/appointment_rating_icon.svg b/assets/images/svg/appointment_rating_icon.svg
new file mode 100644
index 00000000..83d89feb
--- /dev/null
+++ b/assets/images/svg/appointment_rating_icon.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json
index ff0d3e0e..65ff39cf 100644
--- a/assets/langs/ar-SA.json
+++ b/assets/langs/ar-SA.json
@@ -1669,5 +1669,9 @@
"enterAmount": "يرجى إدخال المبلغ للمتابعة.",
"selectHospitalContinue": "يرجى اختيار المستشفى للمتابعة.",
"year": "سنة",
- "notifyPrescription": "أبلغني قبل وقت الاستهلاك"
+ "notifyPrescription": "أبلغني قبل وقت الاستهلاك",
+ "doctorRatingAppointment": "طبيب\nتصنيف",
+ "ratingSubmitted": "تم إرسال التقييم",
+ "rateTheDoctor": "يرجى تقييم الطبيب",
+ "downloadInvoice": "تحميل الفاتورة"
}
diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json
index 9623b34e..9ecf7f6a 100644
--- a/assets/langs/en-US.json
+++ b/assets/langs/en-US.json
@@ -1661,5 +1661,9 @@
"enterAmount": "Please enter amount to continue.",
"selectHospitalContinue": "Please select hospital to continue.",
"year": "Year",
- "notifyPrescription": "Notify me before the consumption time"
+ "notifyPrescription": "Notify me before the consumption time",
+ "doctorRatingAppointment": "Doctor\nRating",
+ "ratingSubmitted": "Rating Submitted",
+ "rateTheDoctor": "Please rate the doctor",
+ "downloadInvoice": "Download Invoice"
}
diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart
index 9546250d..dde77704 100644
--- a/lib/core/api_consts.dart
+++ b/lib/core/api_consts.dart
@@ -4,7 +4,7 @@ import 'package:hmg_patient_app_new/core/enums.dart';
class ApiConsts {
static const maxSmallScreen = 660;
- static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod;
+ static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.preProd;
// static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT
@@ -455,6 +455,7 @@ var IS_LAST_APPOITMENT_RATED = 'Services/Doctors.svc/REST/IsLastAppoitmentRated_
var GET_APPOINTMENT_DETAILS_BY_NO = 'Services/MobileNotifications.svc/REST/GetAppointmentDetailsByApptNo';
var NEW_RATE_APPOINTMENT_URL = "Services/Doctors.svc/REST/AppointmentsRating_InsertAppointmentRate";
var NEW_RATE_DOCTOR_URL = "Services/Doctors.svc/REST/DoctorsRating_InsertDoctorRate";
+var GET_DOCTORS_RATING_CHECK = "Services/Doctors.svc/REST/GetDoctorsRatingCheck";
//var GET_QR_PARKING = 'Services/SWP.svc/REST/GetQRParkingByID';
diff --git a/lib/core/app_assets.dart b/lib/core/app_assets.dart
index b8b7f177..e4308bd5 100644
--- a/lib/core/app_assets.dart
+++ b/lib/core/app_assets.dart
@@ -356,6 +356,7 @@ class AppAssets {
static const String darkModeIcon = '$svgBasePath/dark_mode_icon.svg';
static const String biometricLockIcon = '$svgBasePath/biometric_lock_icon.svg';
static const String imageIcon = '$svgBasePath/image_icon.svg';
+ static const String appointmentRatingIcon = '$svgBasePath/appointment_rating_icon.svg';
// PNGS //
static const String hmgLogo = '$pngBasePath/hmg_logo.png';
diff --git a/lib/core/utils/utils.dart b/lib/core/utils/utils.dart
index 18a8d6c8..89cc4996 100644
--- a/lib/core/utils/utils.dart
+++ b/lib/core/utils/utils.dart
@@ -355,7 +355,7 @@ class Utils {
repeat: false, reverse: false, frameRate: FrameRate(60), width: width.w, height: height.h, fit: BoxFit.fill),
SizedBox(height: 16.h),
(noDataText ?? LocaleKeys.noDataAvailable.tr())
- .toText14(weight: FontWeight.w500, color: AppColors.greyTextColor, isCenter: true)
+ .toText14(isBold: true, color: AppColors.greyTextColor, isCenter: true)
.paddingSymmetrical(64.w, 0.h),
SizedBox(height: 16.h),
callToActionButton
diff --git a/lib/extensions/string_extensions.dart b/lib/extensions/string_extensions.dart
index a04685da..5db5b289 100644
--- a/lib/extensions/string_extensions.dart
+++ b/lib/extensions/string_extensions.dart
@@ -34,7 +34,7 @@ extension EmailValidator on String {
fontWeight: fontWeight ?? (isBold ? FontWeight.bold : FontWeight.normal),
color: color ?? AppColors.blackColor,
letterSpacing: 0,
- fontFamily: isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins',
+ fontFamily: getIt.get().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins',
),
);
@@ -61,7 +61,7 @@ extension EmailValidator on String {
color: color ?? AppColors.blackColor,
letterSpacing: letterSpacing,
decoration: isUnderLine ? TextDecoration.underline : null,
- fontFamily: isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins',
+ fontFamily: getIt.get().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins',
decorationColor: color ?? AppColors.blackColor),
);
@@ -81,7 +81,7 @@ extension EmailValidator on String {
maxLines: maxlines,
overflow: textOverflow,
style: TextStyle(
- fontFamily: isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins',
+ fontFamily: getIt.get().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins',
fontSize: 9.f,
fontStyle: fontStyle ?? FontStyle.normal,
fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal),
@@ -102,7 +102,7 @@ extension EmailValidator on String {
color: color ?? AppColors.blackColor,
letterSpacing: letterSpacing,
decoration: isUnderLine ? TextDecoration.underline : null,
- fontFamily: isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins',
+ fontFamily: getIt.get().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins',
),
);
@@ -128,7 +128,7 @@ extension EmailValidator on String {
height: height,
decorationColor: isUnderLine ? AppColors.blackColor : null,
decoration: isUnderLine ? TextDecoration.underline : null,
- fontFamily: isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins',
+ fontFamily: getIt.get().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins',
),
);
@@ -211,7 +211,7 @@ extension EmailValidator on String {
height: height,
fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal),
decoration: isUnderLine ? TextDecoration.underline : null,
- fontFamily: fontFamily ?? (isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins'),
+ fontFamily: fontFamily ?? (isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins'),
decorationColor: color ?? AppColors.blackColor),
);
@@ -252,14 +252,14 @@ extension EmailValidator on String {
overflow: textOverflow,
fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal),
decoration: isUnderLine ? TextDecoration.underline : null,
- fontFamily: fontFamily ?? (isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins'),
+ fontFamily: fontFamily ?? (isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins'),
decorationColor: decorationColor ?? AppColors.errorColor),
);
Widget toText17({bool isEnglishOnly = false, Color? color, bool isBold = false, bool isCenter = false}) => Text(
this,
textAlign: isCenter ? TextAlign.center : null,
- style: TextStyle(color: color ?? AppColors.blackColor, fontSize: 17.f, letterSpacing: -1, fontWeight: isBold ? FontWeight.bold : FontWeight.normal, fontFamily: isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins'),
+ style: TextStyle(color: color ?? AppColors.blackColor, fontSize: 17.f, letterSpacing: -1, fontWeight: isBold ? FontWeight.bold : FontWeight.normal, fontFamily: getIt.get().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins'),
);
Widget toText18({Color? color, FontWeight? weight, bool isBold = false, bool isCenter = false, int? maxlines, TextOverflow? textOverflow, bool isEnglishOnly = false,}) => Text(
@@ -267,7 +267,7 @@ extension EmailValidator on String {
textAlign: isCenter ? TextAlign.center : null,
this,
overflow: textOverflow,
- style: TextStyle(fontSize: 18.f, fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal), color: color ?? AppColors.blackColor, letterSpacing: -0.4, fontFamily: (isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins'),),
+ style: TextStyle(fontSize: 18.f, fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal), color: color ?? AppColors.blackColor, letterSpacing: -0.4, fontFamily: (isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins'),),
);
Widget toText19({Color? color, bool isBold = false}) => Text(
@@ -301,7 +301,7 @@ extension EmailValidator on String {
this,
textAlign: isCenter ? TextAlign.center : null,
style: TextStyle(
- fontFamily: (isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins'),
+ fontFamily: (isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins'),
height: 23 / 24, color: color ?? AppColors.blackColor, fontSize: 24.f, letterSpacing: letterSpacing ?? -1, fontWeight: isBold ? FontWeight.bold : fontWeight ?? FontWeight.normal),
);
@@ -309,26 +309,26 @@ extension EmailValidator on String {
this,
textAlign: isCenter ? TextAlign.center : null,
style: TextStyle(
- fontFamily: (isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins'),
+ fontFamily: (isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins'),
height: height ?? 23 / 26, color: color ?? AppColors.blackColor, fontSize: 26.f, letterSpacing: letterSpacing ?? -1, fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal)),
);
Widget toText28({bool isEnglishOnly = false, Color? color, bool isBold = false, double? height, bool isCenter = false, double? letterSpacing}) => Text(
this,
textAlign: isCenter ? TextAlign.center : null,
- style: TextStyle(height: height ?? 23 / 28, color: color ?? AppColors.blackColor, fontSize: 28.f, letterSpacing: letterSpacing ?? -1, fontWeight: isBold ? FontWeight.bold : FontWeight.normal, fontFamily: isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins'),
+ style: TextStyle(height: height ?? 23 / 28, color: color ?? AppColors.blackColor, fontSize: 28.f, letterSpacing: letterSpacing ?? -1, fontWeight: isBold ? FontWeight.bold : FontWeight.normal, fontFamily: getIt.get().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins'),
);
Widget toText32({bool isEnglishOnly = false, FontWeight? weight, Color? color, bool isBold = false, bool isCenter = false}) => Text(
this,
textAlign: isCenter ? TextAlign.center : null,
style: TextStyle(
- height: 32 / 32, color: color ?? AppColors.blackColor, fontSize: 32.f, letterSpacing: -1, fontFamily: isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins', fontWeight: isBold ? FontWeight.bold : weight ?? FontWeight.normal),
+ height: 32 / 32, color: color ?? AppColors.blackColor, fontSize: 32.f, letterSpacing: -1, fontFamily: getIt.get().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins', fontWeight: isBold ? FontWeight.bold : weight ?? FontWeight.normal),
);
Widget toText44({Color? color, bool isBold = false, bool isEnglishOnly = false,}) => Text(
this,
- style: TextStyle(height: 32 / 32, color: color ?? AppColors.blackColor, fontSize: 44.f, letterSpacing: -1, fontWeight: isBold ? FontWeight.bold : FontWeight.normal, fontFamily: (isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins'),),
+ style: TextStyle(height: 32 / 32, color: color ?? AppColors.blackColor, fontSize: 44.f, letterSpacing: -1, fontWeight: isBold ? FontWeight.bold : FontWeight.normal, fontFamily: (isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins'),),
);
Widget toSectionHeading({String upperHeading = "", String lowerHeading = ""}) {
@@ -434,7 +434,7 @@ extension DynamicTextStyleExtension on BuildContext {
String? fontFamily,
bool isLanguageSwitcher = false}) {
AppState appState = getIt.get();
- final family = appState.getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins';
+ final family = appState.getLanguageCode() == "ar" ? 'CairoArabic' : 'Poppins';
return TextStyle(
fontFamily: fontFamily ?? family,
fontSize: fontSize,
@@ -465,7 +465,7 @@ class FontUtils {
/// Get the appropriate font family for a specific language
static String getFontFamilyForLanguage(bool isArabic) {
- return isArabic ? 'GESSTwo' : 'Poppins';
+ return isArabic ? 'CairoArabic' : 'Poppins';
}
}
diff --git a/lib/features/blood_donation/widgets/hospital_selection.dart b/lib/features/blood_donation/widgets/hospital_selection.dart
index f49b42d6..c7313228 100644
--- a/lib/features/blood_donation/widgets/hospital_selection.dart
+++ b/lib/features/blood_donation/widgets/hospital_selection.dart
@@ -26,7 +26,7 @@ class HospitalBottomSheetBodySelection extends StatelessWidget {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- if(!isHideTitle) LocaleKeys.selectHospital.tr(context: context).toText16(weight: FontWeight.w500, color: AppColors.greyTextColor),
+ if(!isHideTitle) LocaleKeys.selectHospital.tr(context: context).toText16(isBold: true, color: AppColors.greyTextColor),
SizedBox(height: 16.h),
SizedBox(
height: MediaQuery.sizeOf(context).height * .4,
@@ -75,7 +75,8 @@ class HospitalBottomSheetBodySelection extends StatelessWidget {
children: [
Utils.buildSvgWithAssets(icon: AppAssets.hmg).paddingOnly(right: 10),
Expanded(
- child: Text(hospital.projectName ?? "", style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16.f, color: AppColors.blackColor)),
+ child: (hospital.projectName ?? "").toString().toText16(isBold: true, color: AppColors.blackColor),
+ // Text(hospital.projectName ?? "", style: TextStyle(isBold: true, fontSize: 16.f, color: AppColors.blackColor)),
)
],
);
diff --git a/lib/features/my_appointments/models/resp_models/appointment_rated_response_model.dart b/lib/features/my_appointments/models/resp_models/appointment_rated_response_model.dart
new file mode 100644
index 00000000..2096a1e1
--- /dev/null
+++ b/lib/features/my_appointments/models/resp_models/appointment_rated_response_model.dart
@@ -0,0 +1,30 @@
+class AppointmentRatedResponseModel {
+ int? appointmentNo;
+ int? clinicID;
+ int? doctorID;
+ bool? isAllowedToRate;
+ bool? isAppointmentRated;
+ int? projectID;
+
+ AppointmentRatedResponseModel({this.appointmentNo, this.clinicID, this.doctorID, this.isAllowedToRate, this.isAppointmentRated, this.projectID});
+
+ AppointmentRatedResponseModel.fromJson(Map json) {
+ appointmentNo = json['AppointmentNo'];
+ clinicID = json['ClinicID'];
+ doctorID = json['DoctorID'];
+ isAllowedToRate = json['IsAllowedToRate'];
+ isAppointmentRated = json['IsAppointmentRated'];
+ projectID = json['ProjectID'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['AppointmentNo'] = this.appointmentNo;
+ data['ClinicID'] = this.clinicID;
+ data['DoctorID'] = this.doctorID;
+ data['IsAllowedToRate'] = this.isAllowedToRate;
+ data['IsAppointmentRated'] = this.isAppointmentRated;
+ data['ProjectID'] = this.projectID;
+ return data;
+ }
+}
diff --git a/lib/features/my_appointments/my_appointments_repo.dart b/lib/features/my_appointments/my_appointments_repo.dart
index 4c7c41e2..45c28c45 100644
--- a/lib/features/my_appointments/my_appointments_repo.dart
+++ b/lib/features/my_appointments/my_appointments_repo.dart
@@ -9,6 +9,7 @@ import 'package:hmg_patient_app_new/core/exceptions/api_failure.dart';
import 'package:hmg_patient_app_new/core/utils/date_util.dart';
import 'package:hmg_patient_app_new/core/utils/utils.dart';
import 'package:hmg_patient_app_new/features/book_appointments/models/resp_models/get_favorite_doctors_list.dart';
+import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/appointment_rated_response_model.dart';
import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/rate_appointment_resp_model.dart';
import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/ask_doctor_request_type_response_model.dart';
import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/get_tamara_installments_details_response_model.dart';
@@ -81,6 +82,13 @@ abstract class MyAppointmentsRepo {
Future>> convertPatientToCash({required int projectID});
Future>> sendPatientUpdateRequest();
+
+ Future>> getDoctorsRatingCheck({
+ required int doctorID,
+ required int projectID,
+ required int clinicID,
+ required int appointmentNo,
+ });
}
class MyAppointmentsRepoImp implements MyAppointmentsRepo {
@@ -1077,4 +1085,50 @@ class MyAppointmentsRepoImp implements MyAppointmentsRepo {
return Left(UnknownFailure(e.toString()));
}
}
+
+ @override
+ Future>> getDoctorsRatingCheck({
+ required int doctorID,
+ required int projectID,
+ required int clinicID,
+ required int appointmentNo,
+ }) async {
+ Map mapDevice = {
+ "DoctorID": doctorID,
+ "ProjectID": projectID,
+ "ClinicID": clinicID,
+ "AppointmentNo": appointmentNo,
+ };
+
+ try {
+ GenericApiModel? apiResponse;
+ Failure? failure;
+ await apiClient.post(
+ GET_DOCTORS_RATING_CHECK,
+ body: mapDevice,
+ onFailure: (error, statusCode, {messageStatus, failureType}) {
+ failure = failureType;
+ },
+ onSuccess: (response, statusCode, {messageStatus, errorMessage}) {
+ try {
+ AppointmentRatedResponseModel appointmentRatedResponseModel = AppointmentRatedResponseModel.fromJson(response['DoctorsRatingResponseModel'][0]);
+
+ apiResponse = GenericApiModel(
+ messageStatus: messageStatus,
+ statusCode: statusCode,
+ errorMessage: errorMessage,
+ data: appointmentRatedResponseModel,
+ );
+ } catch (e) {
+ failure = DataParsingFailure(e.toString());
+ }
+ },
+ );
+ if (failure != null) return Left(failure!);
+ if (apiResponse == null) return Left(ServerFailure("Unknown error"));
+ return Right(apiResponse!);
+ } catch (e) {
+ return Left(UnknownFailure(e.toString()));
+ }
+ }
}
diff --git a/lib/features/my_appointments/my_appointments_view_model.dart b/lib/features/my_appointments/my_appointments_view_model.dart
index a1c48867..6ba27522 100644
--- a/lib/features/my_appointments/my_appointments_view_model.dart
+++ b/lib/features/my_appointments/my_appointments_view_model.dart
@@ -7,6 +7,7 @@ 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/features/book_appointments/models/resp_models/get_favorite_doctors_list.dart';
import 'package:hmg_patient_app_new/features/my_appointments/models/appointemnet_filters.dart';
+import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/appointment_rated_response_model.dart';
import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/ask_doctor_request_type_response_model.dart';
import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/get_tamara_installments_details_response_model.dart';
import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_history_response_model.dart';
@@ -87,6 +88,11 @@ class MyAppointmentsViewModel extends ChangeNotifier {
bool isShowNotEligibleDialog = false;
String notEligibleErrorMsg = "";
+ bool isAppointmentAlreadyRated = false;
+
+ AppointmentRatedResponseModel? appointmentRatedResponseModel;
+ bool isAppointmentRatedResponseLoading = false;
+
MyAppointmentsViewModel({required this.myAppointmentsRepo, required this.errorHandlerService, required this.appState});
void onTabChange(int index) {
@@ -670,9 +676,9 @@ class MyAppointmentsViewModel extends ChangeNotifier {
Future 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();
@@ -995,4 +1001,79 @@ class MyAppointmentsViewModel extends ChangeNotifier {
},
);
}
+
+ Future getDoctorsRatingCheck({
+ required int doctorID,
+ required int projectID,
+ required int clinicID,
+ required int appointmentNo,
+ Function(dynamic)? onSuccess,
+ Function(String)? onError,
+ }) async {
+ isAppointmentRatedResponseLoading = true;
+ notifyListeners();
+
+ final result = await myAppointmentsRepo.getDoctorsRatingCheck(
+ doctorID: doctorID,
+ projectID: projectID,
+ clinicID: clinicID,
+ appointmentNo: appointmentNo,
+ );
+
+ result.fold(
+ (failure) async {
+ // await errorHandlerService.handleError(failure: failure);
+ if (onError != null) onError(failure.message);
+ isAppointmentRatedResponseLoading = false;
+ notifyListeners();
+ },
+ (apiResponse) {
+ if (apiResponse.messageStatus == 2) {
+ if (onError != null) onError(apiResponse.errorMessage ?? "Unknown error");
+ isAppointmentRatedResponseLoading = false;
+ notifyListeners();
+ } else if (apiResponse.messageStatus == 1) {
+ appointmentRatedResponseModel = apiResponse.data!;
+ isAppointmentRatedResponseLoading = false;
+ notifyListeners();
+ if (onSuccess != null) {
+ onSuccess(apiResponse.data);
+ }
+ }
+ },
+ );
+ }
+
+ Future submitDoctorRating(
+ {required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel,
+ required int docRate,
+ required String docNote,
+ Function(dynamic)? onSuccess,
+ Function(String)? onError}) async {
+ final result = await myAppointmentsRepo.sendDoctorRate(
+ docRate,
+ patientAppointmentHistoryResponseModel.appointmentNo!,
+ patientAppointmentHistoryResponseModel.projectID!,
+ patientAppointmentHistoryResponseModel.doctorID!,
+ patientAppointmentHistoryResponseModel.clinicID!,
+ docNote,
+ patientAppointmentHistoryResponseModel.appointmentDate!,
+ patientAppointmentHistoryResponseModel.doctorNameObj!,
+ patientAppointmentHistoryResponseModel.projectName!,
+ patientAppointmentHistoryResponseModel.clinicName!);
+
+ result.fold(
+ (failure) async => await errorHandlerService.handleError(failure: failure),
+ (apiResponse) {
+ if (apiResponse.messageStatus == 2) {
+ onError?.call(apiResponse.errorMessage ?? 'Unknown error');
+ } else if (apiResponse.messageStatus == 1) {
+ notifyListeners();
+ if (onSuccess != null) {
+ // onSuccess(apiResponse.data);
+ }
+ }
+ },
+ );
+ }
}
diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart
index 82bc2ff8..7bc82108 100644
--- a/lib/generated/locale_keys.g.dart
+++ b/lib/generated/locale_keys.g.dart
@@ -1662,5 +1662,9 @@ abstract class LocaleKeys {
static const selectHospitalContinue = 'selectHospitalContinue';
static const year = 'year';
static const notifyPrescription = 'notifyPrescription';
+ static const doctorRatingAppointment = 'doctorRatingAppointment';
+ static const ratingSubmitted = 'ratingSubmitted';
+ static const rateTheDoctor = 'rateTheDoctor';
+ static const downloadInvoice = 'downloadInvoice';
}
diff --git a/lib/main.dart b/lib/main.dart
index 5f5ae201..c44a3a45 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -98,7 +98,7 @@ Future callInitializations() async {
await EasyLocalization.ensureInitialized();
// Download the latest JSONs from your server
- await TranslationService.downloadTranslations();
+ // await TranslationService.downloadTranslations();
// await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
diff --git a/lib/presentation/active_medication/active_medication_page.dart b/lib/presentation/active_medication/active_medication_page.dart
index ae46d402..a893d7c0 100644
--- a/lib/presentation/active_medication/active_medication_page.dart
+++ b/lib/presentation/active_medication/active_medication_page.dart
@@ -137,7 +137,7 @@ class _ActiveMedicationPageState extends State {
style: TextStyle(
color: AppColors.textColor,
fontSize: 27.f,
- fontWeight: FontWeight.w600)),
+ fontWeight: FontWeight.w600,)),
SizedBox(height: 16.h),
SizedBox(
height: 65.h,
@@ -163,7 +163,7 @@ class _ActiveMedicationPageState extends State {
style: TextStyle(
color: AppColors.textColor,
fontSize: 16,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
),
),
WidgetSpan(
@@ -174,7 +174,7 @@ class _ActiveMedicationPageState extends State {
style: TextStyle(
fontSize: 12,
color: AppColors.textColor,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
),
),
),
@@ -184,7 +184,7 @@ class _ActiveMedicationPageState extends State {
style: TextStyle(
color: AppColors.textColor,
fontSize: 16,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
),
),
],
@@ -194,7 +194,7 @@ class _ActiveMedicationPageState extends State {
style: TextStyle(
color: AppColors.primaryRedBorderColor,
fontSize: 12.f,
- fontWeight: FontWeight.w500)),
+ fontWeight: FontWeight.w600,)),
SizedBox(height: 16.h),
Expanded(
child: SingleChildScrollView(
@@ -630,7 +630,7 @@ class _ActiveMedicationPageState extends State {
style: TextStyle(
fontSize: 12.f,
color: AppColors.greyTextColor,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
),
),
],
@@ -722,7 +722,7 @@ class _ActiveMedicationPageState extends State {
? AppColors.primaryRedBorderColor
: AppColors.greyTextColor,
fontSize: 11.f,
- fontWeight: FontWeight.w500),
+ fontWeight: FontWeight.w600,),
),
SizedBox(height: 5.h),
Text("${date.day}",
diff --git a/lib/presentation/appointments/appointment_details_page.dart b/lib/presentation/appointments/appointment_details_page.dart
index 165caacd..9048d924 100644
--- a/lib/presentation/appointments/appointment_details_page.dart
+++ b/lib/presentation/appointments/appointment_details_page.dart
@@ -31,6 +31,7 @@ import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
import 'package:hmg_patient_app_new/presentation/appointments/appointment_payment_page.dart';
import 'package:hmg_patient_app_new/presentation/appointments/widgets/appointment_checkin_bottom_sheet.dart';
import 'package:hmg_patient_app_new/presentation/appointments/widgets/appointment_doctor_card.dart';
+import 'package:hmg_patient_app_new/presentation/appointments/widgets/appointment_rating_widget.dart';
import 'package:hmg_patient_app_new/presentation/appointments/widgets/ask_doctor_request_type_select.dart';
import 'package:hmg_patient_app_new/presentation/ask_doctor/ask_doctor_page.dart';
import 'package:hmg_patient_app_new/presentation/ask_doctor/doctor_response_page.dart';
@@ -74,11 +75,12 @@ class _AppointmentDetailsPageState extends State {
@override
void initState() {
scheduleMicrotask(() async {
- if (!AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel)) {
- // CalenderUtilsNew calendarUtils = await CalenderUtilsNew.instance;
- // var doesExist = await calendarUtils.checkIfEventExist("${widget.patientAppointmentHistoryResponseModel.appointmentNo}");
- // myAppointmentsViewModel.setAppointmentReminder(doesExist, widget.patientAppointmentHistoryResponseModel);
- // setState(() {});
+ if (AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel)) {
+ myAppointmentsViewModel.getDoctorsRatingCheck(
+ doctorID: widget.patientAppointmentHistoryResponseModel.doctorID,
+ clinicID: widget.patientAppointmentHistoryResponseModel.clinicID,
+ projectID: widget.patientAppointmentHistoryResponseModel.projectID,
+ appointmentNo: widget.patientAppointmentHistoryResponseModel.appointmentNo);
}
});
@@ -231,53 +233,53 @@ class _AppointmentDetailsPageState extends State {
LocaleKeys.appointmentStatus.tr(context: context).toText16(isBold: true),
SizedBox(height: 4.h),
(!AppointmentType.isConfirmed(widget.patientAppointmentHistoryResponseModel)
- ? LocaleKeys.notConfirmed.tr(context: context).toText12(color: AppColors.primaryRedColor, fontWeight: FontWeight.w500)
- : LocaleKeys.confirmed.tr(context: context).toText12(color: AppColors.successColor, fontWeight: FontWeight.w500)),
+ ? LocaleKeys.notConfirmed.tr(context: context).toText12(color: AppColors.primaryRedColor, isBold: true)
+ : LocaleKeys.confirmed.tr(context: context).toText12(color: AppColors.successColor, isBold: true)),
SizedBox(height: 16.h),
],
),
- ((!AppointmentType.isConfirmed(widget.patientAppointmentHistoryResponseModel) && widget.patientAppointmentHistoryResponseModel.nextAction != 10)
- ? CustomButton(
- text: LocaleKeys.confirm.tr(),
- onPressed: () async {
- LoaderBottomSheet.showLoader(loadingText: LocaleKeys.confirmingAppointmentPleaseWait.tr(context: context));
- await myAppointmentsViewModel.confirmAppointment(
- patientAppointmentHistoryResponseModel: widget.patientAppointmentHistoryResponseModel,
- onSuccess: (apiResponse) {
- LoaderBottomSheet.hideLoader();
- myAppointmentsViewModel.setIsAppointmentDataToBeLoaded(true);
- myAppointmentsViewModel.initAppointmentsViewModel();
- // myAppointmentsViewModel.getPatientAppointments(true, false);
- showCommonBottomSheetWithoutHeight(
- title: "",
- context,
- child: Utils.getSuccessWidget(loadingText: LocaleKeys.appointmentConfirmedSuccessfully.tr(context: context)),
- callBackFunc: () {
- Navigator.pushAndRemoveUntil(
- context,
- CustomPageRoute(
- page: LandingNavigation(),
- ),
- (r) => false);
- },
- isFullScreen: false,
- isCloseButtonVisible: false,
- isAutoDismiss: true
- );
- });
- },
- backgroundColor: AppColors.successColor,
- borderColor: AppColors.successColor,
- textColor: Colors.white,
- fontSize: 14.f,
- fontWeight: FontWeight.w500,
- borderRadius: 12.r,
- height: 40.h,
- icon: AppAssets.confirm_appointment_icon,
- iconColor: Colors.white,
- iconSize: 16.h,
- )
- : SizedBox.shrink())
+ // ((!AppointmentType.isConfirmed(widget.patientAppointmentHistoryResponseModel) && widget.patientAppointmentHistoryResponseModel.nextAction != 10)
+ // ? CustomButton(
+ // text: LocaleKeys.confirm.tr(),
+ // onPressed: () async {
+ // LoaderBottomSheet.showLoader(loadingText: LocaleKeys.confirmingAppointmentPleaseWait.tr(context: context));
+ // await myAppointmentsViewModel.confirmAppointment(
+ // patientAppointmentHistoryResponseModel: widget.patientAppointmentHistoryResponseModel,
+ // onSuccess: (apiResponse) {
+ // LoaderBottomSheet.hideLoader();
+ // myAppointmentsViewModel.setIsAppointmentDataToBeLoaded(true);
+ // myAppointmentsViewModel.initAppointmentsViewModel();
+ // // myAppointmentsViewModel.getPatientAppointments(true, false);
+ // showCommonBottomSheetWithoutHeight(
+ // title: "",
+ // context,
+ // child: Utils.getSuccessWidget(loadingText: LocaleKeys.appointmentConfirmedSuccessfully.tr(context: context)),
+ // callBackFunc: () {
+ // Navigator.pushAndRemoveUntil(
+ // context,
+ // CustomPageRoute(
+ // page: LandingNavigation(),
+ // ),
+ // (r) => false);
+ // },
+ // isFullScreen: false,
+ // isCloseButtonVisible: false,
+ // isAutoDismiss: true
+ // );
+ // });
+ // },
+ // backgroundColor: AppColors.successColor,
+ // borderColor: AppColors.successColor,
+ // textColor: Colors.white,
+ // fontSize: 14.f,
+ // isBold: true,
+ // borderRadius: 12.r,
+ // height: 40.h,
+ // icon: AppAssets.confirm_appointment_icon,
+ // iconColor: Colors.white,
+ // iconSize: 16.h,
+ // )
+ // : SizedBox.shrink())
],
),
//TODO Add countdown timer in case of LiveCare Appointment
@@ -290,7 +292,7 @@ class _AppointmentDetailsPageState extends State {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.doctorWillCallYou.tr(context: context).toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.doctorWillCallYou.tr(context: context).toText14(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -336,7 +338,7 @@ class _AppointmentDetailsPageState extends State {
borderColor: AppointmentType.getNextActionButtonColor(widget.patientAppointmentHistoryResponseModel.nextAction).withValues(alpha: 0.01),
textColor: Colors.white,
fontSize: 14.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
height: 40.h,
@@ -386,7 +388,7 @@ class _AppointmentDetailsPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.setReminder.tr(context: context).toText13(isBold: true),
- LocaleKeys.notifyMeBeforeAppointment.tr(context: context).toText11(color: AppColors.textColorLight, weight: FontWeight.w500),
+ LocaleKeys.notifyMeBeforeAppointment.tr(context: context).toText11(color: AppColors.textColorLight, isBold: true),
],
),
const Spacer(),
@@ -451,15 +453,16 @@ class _AppointmentDetailsPageState extends State {
],
)
// : SizedBox.shrink()
- : GridView(
- gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
- crossAxisCount: 3,
- crossAxisSpacing: 16.h,
- mainAxisSpacing: 16.w,
- mainAxisExtent: 115.h,
- ),
- physics: NeverScrollableScrollPhysics(),
- padding: EdgeInsets.zero,
+ : Consumer(builder: (context, myAppointmentsVM, child) {
+ return GridView(
+ gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+ crossAxisCount: 3,
+ crossAxisSpacing: 16.h,
+ mainAxisSpacing: 16.w,
+ mainAxisExtent: 115.h,
+ ),
+ physics: NeverScrollableScrollPhysics(),
+ padding: EdgeInsets.zero,
shrinkWrap: true,
children: [
MedicalFileCard(
@@ -597,9 +600,46 @@ class _AppointmentDetailsPageState extends State {
page: DoctorResponsePage(),
),
);
- }),
- ],
- ),
+ }),
+ myAppointmentsVM.isAppointmentRatedResponseLoading
+ ? MedicalFileCard(
+ label: "Medical File",
+ textColor: AppColors.blackColor,
+ backgroundColor: AppColors.whiteColor,
+ svgIcon: AppAssets.appointmentRatingIcon,
+ isLargeText: true,
+ iconSize: 36.w,
+ isLocked: false,
+ ).toShimmer2()
+ : MedicalFileCard(
+ label: !((myAppointmentsVM.appointmentRatedResponseModel!).isAppointmentRated ?? true)
+ ? LocaleKeys.ratingSubmitted.tr(context: context)
+ : LocaleKeys.doctorRatingAppointment.tr(context: context),
+ textColor: AppColors.blackColor,
+ backgroundColor: AppColors.whiteColor,
+ svgIcon: AppAssets.appointmentRatingIcon,
+ isLargeText: true,
+ iconSize: 36.w,
+ isLocked: !(myAppointmentsVM.appointmentRatedResponseModel!.isAppointmentRated ?? true),
+ ).onPress(() {
+ showCommonBottomSheetWithoutHeight(
+ context,
+ title: LocaleKeys.doctorRating.tr(context: context),
+ isCloseButtonVisible: true,
+ child: StatefulBuilder(
+ builder: (context, setState) {
+ return AppointmentRatingWidget(
+ patientAppointmentHistoryResponseModel: widget.patientAppointmentHistoryResponseModel,
+ );
+ },
+ ),
+ isFullScreen: false,
+ );
+ }),
+ ],
+ );
+ }),
+
// Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
@@ -686,7 +726,7 @@ class _AppointmentDetailsPageState extends State {
// // "Prescribed By: ${widget.patientAppointmentHistoryResponseModel.doctorTitle} ${widget.patientAppointmentHistoryResponseModel.doctorNameObj}"
// // .needTranslation
// // .toText10(
- // // weight: FontWeight.w500,
+ // // weight: FontWeight.w600,
// // color: AppColors.greyTextColor,
// // letterSpacing: -0.4),
// // ],
@@ -733,7 +773,7 @@ class _AppointmentDetailsPageState extends State {
// // // borderColor: AppColors.secondaryLightRedColor,
// // // textColor: AppColors.primaryRedColor,
// // // fontSize: 14,
- // // // fontWeight: FontWeight.w500,
+ // // // isBold: true,
// // // borderRadius: 12.h,
// // // height: 40.h,
// // // icon: AppAssets.appointment_calendar_icon,
@@ -761,7 +801,7 @@ class _AppointmentDetailsPageState extends State {
// // borderColor: AppColors.secondaryLightRedColor,
// // textColor: AppColors.primaryRedColor,
// // fontSize: 14.f,
- // // fontWeight: FontWeight.w500,
+ // // isBold: true,
// // borderRadius: 12.r,
// // height: 40.h,
// // icon: AppAssets.requests,
@@ -790,7 +830,7 @@ class _AppointmentDetailsPageState extends State {
// // borderColor: AppColors.secondaryLightRedColor,
// // textColor: AppColors.primaryRedColor,
// // fontSize: 14.f,
- // // fontWeight: FontWeight.w500,
+ // // isBold: true,
// // borderRadius: 12.r,
// // height: 40.h,
// // icon: AppAssets.requests,
@@ -843,8 +883,7 @@ class _AppointmentDetailsPageState extends State {
children: [
Expanded(
child: LocaleKeys.upcomingPaymentNow
- .tr(context: context)
- .toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor)),
+ .tr(context: context).toText12(isBold: true, color: AppColors.greyTextColor)),
"VAT 15%(${widget.patientAppointmentHistoryResponseModel.patientTaxAmount})".toText14(isBold: true, color: AppColors.greyTextColor, letterSpacing: -0.64),
],
),
@@ -885,8 +924,8 @@ class _AppointmentDetailsPageState extends State {
borderColor: AppColors.primaryRedColor,
textColor: Colors.white,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
- borderRadius: 12.r,
+ fontWeight: FontWeight.w600,
+ borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
height: 50.h,
icon: AppAssets.add_icon,
@@ -903,7 +942,7 @@ class _AppointmentDetailsPageState extends State {
AppointmentType.getNextActionButtonColor(widget.patientAppointmentHistoryResponseModel.nextAction).withOpacity(0.01),
textColor: widget.patientAppointmentHistoryResponseModel.nextAction == 15 ? AppColors.textColor : Colors.white,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
height: 56.h,
@@ -933,7 +972,7 @@ class _AppointmentDetailsPageState extends State {
SizedBox(height: 4.h),
LocaleKeys.confirmYourLocationDesc.tr(context: context).toText12(
color: AppColors.greyTextColor,
- fontWeight: FontWeight.w500,
+ isBold: true,
),
SizedBox(height: 24.h),
CustomButton(
@@ -947,7 +986,7 @@ class _AppointmentDetailsPageState extends State {
borderColor: AppColors.primaryRedColor,
textColor: Colors.white,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
// padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 56.h,
@@ -973,7 +1012,7 @@ class _AppointmentDetailsPageState extends State {
borderColor: AppColors.chipSecondaryLightRedColor,
textColor: AppColors.primaryRedColor,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
// padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 56.h,
diff --git a/lib/presentation/appointments/appointment_payment_page.dart b/lib/presentation/appointments/appointment_payment_page.dart
index e755cfeb..11f651ff 100644
--- a/lib/presentation/appointments/appointment_payment_page.dart
+++ b/lib/presentation/appointments/appointment_payment_page.dart
@@ -249,7 +249,7 @@ class _AppointmentPaymentPageState extends State {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
LocaleKeys.insuranceExpiredOrInactive.tr(context: context)
- .toText14(color: AppColors.primaryRedColor, weight: FontWeight.w500)
+ .toText14(color: AppColors.primaryRedColor, isBold: true)
.paddingSymmetrical(24.h, 0.h),
CustomButton(
text: LocaleKeys.updateInsurance.tr(context: context),
@@ -265,7 +265,7 @@ class _AppointmentPaymentPageState extends State {
borderColor: AppColors.secondaryLightRedBorderColor,
textColor: AppColors.whiteColor,
fontSize: 10.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 8,
padding: EdgeInsets.fromLTRB(15, 0, 15, 0),
height: 30.h,
diff --git a/lib/presentation/appointments/appointment_queue_page.dart b/lib/presentation/appointments/appointment_queue_page.dart
index f205aeb9..a07a19dd 100644
--- a/lib/presentation/appointments/appointment_queue_page.dart
+++ b/lib/presentation/appointments/appointment_queue_page.dart
@@ -72,7 +72,7 @@ class AppointmentQueuePage extends StatelessWidget {
.toShimmer2(isShow: myAppointmentsVM.isAppointmentQueueDetailsLoading),
SizedBox(height: 8.h),
LocaleKeys.thankYouForPatience.tr(context: context)
- .toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight)
+ .toText12(isBold: true, color: AppColors.textColorLight)
.toShimmer2(isShow: myAppointmentsVM.isAppointmentQueueDetailsLoading),
SizedBox(height: 8.h),
myAppointmentsVM.currentPatientQueueDetails.queueNo!
@@ -130,7 +130,7 @@ class AppointmentQueuePage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
"Room: ${myAppointmentsVM.patientQueueDetailsList[index].roomNo}"
- .toText12(fontWeight: FontWeight.w500),
+ .toText12(isBold: true),
SizedBox(width: 8.w),
AppCustomChipWidget(
deleteIcon: myAppointmentsVM.patientQueueDetailsList[index].callType == 1
@@ -184,19 +184,19 @@ class AppointmentQueuePage extends StatelessWidget {
),
SizedBox(height: 8.h),
"• ${LocaleKeys.improveOverallHealth.tr(context: context)}"
- .toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight),
+ .toText12(isBold: true, color: AppColors.textColorLight),
SizedBox(height: 4.h),
"• ${LocaleKeys.routineScreenings.tr(context: context)}"
- .toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight),
+ .toText12(isBold: true, color: AppColors.textColorLight),
SizedBox(height: 4.h),
"• ${LocaleKeys.whatIsThisMedicationFor.tr(context: context)}"
- .toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight),
+ .toText12(isBold: true, color: AppColors.textColorLight),
SizedBox(height: 4.h),
"• ${LocaleKeys.sideEffectsToKnow.tr(context: context)}"
- .toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight),
+ .toText12(isBold: true, color: AppColors.textColorLight),
SizedBox(height: 4.h),
"• ${LocaleKeys.whenFollowUp.tr(context: context)}"
- .toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight),
+ .toText12(isBold: true, color: AppColors.textColorLight),
SizedBox(height: 16.h),
],
@@ -229,7 +229,7 @@ class AppointmentQueuePage extends StatelessWidget {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
height: 50.h,
diff --git a/lib/presentation/appointments/my_appointments_page.dart b/lib/presentation/appointments/my_appointments_page.dart
index 2359a34b..1f54e3d1 100644
--- a/lib/presentation/appointments/my_appointments_page.dart
+++ b/lib/presentation/appointments/my_appointments_page.dart
@@ -113,7 +113,7 @@ class _MyAppointmentsPageState extends State {
borderColor: myAppointmentsVM.isAppointmentsSortByClinic ? AppColors.primaryRedColor : AppColors.textColor.withValues(alpha: 0.2),
textColor: myAppointmentsVM.isAppointmentsSortByClinic ? AppColors.primaryRedColor : AppColors.blackColor,
fontSize: 12,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 10,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 40.h,
@@ -128,7 +128,7 @@ class _MyAppointmentsPageState extends State {
borderColor: myAppointmentsVM.isAppointmentsSortByClinic ? AppColors.textColor.withValues(alpha: 0.2) : AppColors.primaryRedColor,
textColor: myAppointmentsVM.isAppointmentsSortByClinic ? AppColors.blackColor : AppColors.primaryRedColor,
fontSize: 12,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 10,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 40.h,
@@ -266,7 +266,7 @@ class _MyAppointmentsPageState extends State {
borderColor: Color(0xffFEE9EA),
textColor: Color(0xffED1C2B),
fontSize: 14.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 12.r,
padding: EdgeInsets.fromLTRB(10.w, 0, 10.w, 0),
height: 40.h,
diff --git a/lib/presentation/appointments/my_doctors_page.dart b/lib/presentation/appointments/my_doctors_page.dart
index 26e5927b..1a98964b 100644
--- a/lib/presentation/appointments/my_doctors_page.dart
+++ b/lib/presentation/appointments/my_doctors_page.dart
@@ -89,7 +89,7 @@ class _MyDoctorsPageState extends State {
borderColor: isSortByClinic ? AppColors.primaryRedColor : AppColors.textColor.withValues(alpha: 0.2),
textColor: isSortByClinic ? AppColors.primaryRedColor : AppColors.blackColor,
fontSize: 12,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 10,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 40.h,
@@ -107,7 +107,7 @@ class _MyDoctorsPageState extends State {
borderColor: isSortByClinic ? AppColors.textColor.withValues(alpha: 0.2) : AppColors.primaryRedColor,
textColor: isSortByClinic ? AppColors.blackColor : AppColors.primaryRedColor,
fontSize: 12,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 10,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 40.h,
@@ -234,7 +234,7 @@ class _MyDoctorsPageState extends State {
SizedBox(height: 8.h),
Text(
displayName,
- style: TextStyle(fontSize: 16.h, fontWeight: FontWeight.w600),
+ style: TextStyle(fontSize: 16.h, fontWeight: FontWeight.w600,),
overflow: TextOverflow.ellipsis,
),
],
@@ -276,7 +276,7 @@ class _MyDoctorsPageState extends State {
).circle(100),
SizedBox(width: 8.h),
Expanded(
- child: (doctor?.doctorName ?? "").toString().toText14(weight: FontWeight.w500),
+ child: (doctor?.doctorName ?? "").toString().toText14(isBold: true),
),
],
),
@@ -336,7 +336,7 @@ class _MyDoctorsPageState extends State {
borderColor: doctor?.isActiveDoctorProfile == false ? AppColors.inputLabelTextColor.withValues(alpha: 0.01) : AppColors.secondaryLightRedColor,
textColor: doctor?.isActiveDoctorProfile == false ? AppColors.inputLabelTextColor.withValues(alpha: 1.0) : AppColors.primaryRedColor,
fontSize: 14,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 12,
padding: const EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 40.h,
diff --git a/lib/presentation/appointments/widgets/appointment_card.dart b/lib/presentation/appointments/widgets/appointment_card.dart
index 679c4bac..c69a2bc4 100644
--- a/lib/presentation/appointments/widgets/appointment_card.dart
+++ b/lib/presentation/appointments/widgets/appointment_card.dart
@@ -270,7 +270,7 @@ class AppointmentCard extends StatelessWidget {
borderColor: AppColors.secondaryLightRedColor,
textColor: AppColors.primaryRedColor,
fontSize: (isFoldable || isTablet) ? 12.f : 14.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
// height: isTablet || isFoldable ? 46.h : 40.h,
@@ -298,7 +298,7 @@ class AppointmentCard extends StatelessWidget {
borderColor: AppColors.secondaryLightRedColor,
textColor: AppColors.primaryRedColor,
fontSize: (isFoldable || isTablet) ? 12.f : 14.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
// height: isTablet || isFoldable ? 46.h : 40.h,
@@ -323,7 +323,7 @@ class AppointmentCard extends StatelessWidget {
borderColor: AppointmentType.getNextActionButtonColor(patientAppointmentHistoryResponseModel.nextAction).withValues(alpha: 0.01),
textColor: AppointmentType.getNextActionTextColor(patientAppointmentHistoryResponseModel.nextAction),
fontSize: (isFoldable || isTablet) ? 12.f : 14.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
height: 40.h,
@@ -403,7 +403,7 @@ class AppointmentCard extends StatelessWidget {
borderColor: AppColors.secondaryLightRedColor,
textColor: AppColors.primaryRedColor,
fontSize: (isFoldable || isTablet) ? 12.f : 14.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
// height: isTablet || isFoldable ? 46.h : 40.h,
@@ -422,7 +422,7 @@ class AppointmentCard extends StatelessWidget {
textColor: AppColors.blackColor,
borderWidth: 1.h,
fontSize: (isFoldable || isTablet) ? 12.f : 14.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
height: 40.h,
diff --git a/lib/presentation/appointments/widgets/appointment_checkin_bottom_sheet.dart b/lib/presentation/appointments/widgets/appointment_checkin_bottom_sheet.dart
index 2acc076e..da50b3c7 100644
--- a/lib/presentation/appointments/widgets/appointment_checkin_bottom_sheet.dart
+++ b/lib/presentation/appointments/widgets/appointment_checkin_bottom_sheet.dart
@@ -120,7 +120,7 @@ class AppointmentCheckinBottomSheet extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
title.toText16(isBold: true, color: AppColors.textColor),
- subTitle.toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor),
+ subTitle.toText12(isBold: true, color: AppColors.greyTextColor),
],
),
),
diff --git a/lib/presentation/appointments/widgets/appointment_doctor_card.dart b/lib/presentation/appointments/widgets/appointment_doctor_card.dart
index f00284c0..99f40b67 100644
--- a/lib/presentation/appointments/widgets/appointment_doctor_card.dart
+++ b/lib/presentation/appointments/widgets/appointment_doctor_card.dart
@@ -202,7 +202,7 @@ class AppointmentDoctorCard extends StatelessWidget {
borderColor: AppColors.secondaryLightRedColor,
textColor: AppColors.primaryRedColor,
fontSize: 14.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 12.r,
padding: EdgeInsets.fromLTRB(10.w, 0, 10.w, 0),
height: 40.h,
@@ -221,7 +221,7 @@ class AppointmentDoctorCard extends StatelessWidget {
// borderColor: AppColors.greyColor,
// textColor: AppColors.blackColor,
// fontSize: 12.f,
- // fontWeight: FontWeight.w500,
+ // isBold: true,
// borderRadius: 12.r,
// padding: EdgeInsets.fromLTRB(10.w, 0, 10.w, 0),
// height: 40.h,
@@ -242,7 +242,7 @@ class AppointmentDoctorCard extends StatelessWidget {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 14.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 12.r,
height: 40.h,
icon: AppAssets.cancel,
@@ -261,7 +261,7 @@ class AppointmentDoctorCard extends StatelessWidget {
borderColor: AppColors.secondaryLightRedColor,
textColor: AppColors.primaryRedColor,
fontSize: 14.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 12.r,
height: 40.h,
icon: AppAssets.appointment_calendar_icon,
@@ -280,7 +280,7 @@ class AppointmentDoctorCard extends StatelessWidget {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 14.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 12.r,
height: 40.h,
icon: AppAssets.cancel,
diff --git a/lib/presentation/appointments/widgets/appointment_rating_widget.dart b/lib/presentation/appointments/widgets/appointment_rating_widget.dart
new file mode 100644
index 00000000..735895a0
--- /dev/null
+++ b/lib/presentation/appointments/widgets/appointment_rating_widget.dart
@@ -0,0 +1,181 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hmg_patient_app_new/core/app_export.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/book_appointments/book_appointments_view_model.dart';
+import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_history_response_model.dart';
+import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart';
+import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
+import 'package:hmg_patient_app_new/presentation/appointments/widgets/doctor_row_appointment_rating.dart';
+import 'package:hmg_patient_app_new/theme/colors.dart';
+import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
+import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart';
+import 'package:provider/provider.dart';
+
+class AppointmentRatingWidget extends StatefulWidget {
+ const AppointmentRatingWidget({super.key, required this.patientAppointmentHistoryResponseModel});
+
+ final PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel;
+
+ @override
+ State createState() => _AppointmentRatingWidgetState();
+}
+
+class _AppointmentRatingWidgetState extends State {
+ late MyAppointmentsViewModel myAppointmentsViewModel;
+ late BookAppointmentsViewModel bookAppointmentsViewModel;
+
+ int rating = 0;
+ String notes = "";
+
+ @override
+ Widget build(BuildContext context) {
+ myAppointmentsViewModel = Provider.of(context, listen: false);
+ bookAppointmentsViewModel = Provider.of(context, listen: false);
+ return SizedBox(
+ height: MediaQuery.of(context).size.height * 0.6,
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ // Scrollable main content
+ Expanded(
+ child: Padding(
+ padding: const EdgeInsets.only(top: 0.0, left: 0, right: 0),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ // Doctor row
+ Container(
+ decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
+ color: AppColors.whiteColor,
+ borderRadius: 24.r,
+ hasShadow: false,
+ ),
+ child: BuildDoctorRowAppointmentRating(
+ patientAppointmentHistoryResponseModel: widget.patientAppointmentHistoryResponseModel,
+ )),
+
+ SizedBox(height: 16),
+
+ // Rating box
+ Container(
+ decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
+ color: AppColors.whiteColor,
+ borderRadius: 24.r,
+ hasShadow: false,
+ ),
+ width: double.infinity,
+ child: Padding(
+ padding: const EdgeInsets.all(12.0),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ LocaleKeys.rateTheDoctor.tr(context: context).toText16(isBold: true),
+ SizedBox(height: 12),
+ Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ ...List.generate(
+ 5,
+ (index) => AnimatedSwitcher(
+ duration: Duration(milliseconds: 1000),
+ switchInCurve: Curves.elasticOut,
+ switchOutCurve: Curves.elasticIn,
+ transitionBuilder: (Widget child, Animation animation) {
+ return ScaleTransition(child: child, scale: animation);
+ },
+ child: Container(
+ key: ValueKey(rating),
+ child: IconButton(
+ iconSize: 45.0,
+ onPressed: () {
+ setState(() {
+ rating = index + 1;
+ });
+ },
+ color: rating >= (index + 1) ? Color.fromRGBO(255, 186, 0, 1.0) : Colors.grey[400],
+ icon: Icon(rating >= (index + 1) ? Icons.star : Icons.star)),
+ ),
+ ),
+ )
+ ],
+ ),
+ ],
+ ),
+ ),
+ ),
+
+ SizedBox(height: 12),
+
+ // Note text field
+ Container(
+ decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
+ color: AppColors.whiteColor,
+ borderRadius: 24.r,
+ hasShadow: false,
+ ),
+ child: Padding(
+ padding: EdgeInsets.all(16.0),
+ child: TextField(
+ maxLines: 4,
+ decoration: InputDecoration.collapsed(
+ hintText: LocaleKeys.notes.tr(context: context),
+ hintStyle: TextStyle(fontSize: 16.f, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.64, height: 23 / 16)),
+ onChanged: (value) {
+ setState(() {
+ notes = value;
+ });
+ },
+ ))),
+ ],
+ ),
+ ),
+ ),
+ // Bottom action buttons pinned to bottom
+ SafeArea(
+ top: false,
+ child: Padding(
+ padding: const EdgeInsets.symmetric(vertical: 12.0),
+ child: Row(
+ children: [
+ Expanded(
+ child: CustomButton(
+ text: LocaleKeys.later.tr(context: context),
+ backgroundColor: Color(0xffFEE9EA),
+ borderColor: Color(0xffFEE9EA),
+ textColor: Color(0xffED1C2B),
+ onPressed: () {
+ Navigator.pop(context);
+ },
+ ),
+ ),
+ SizedBox(width: 10),
+ Expanded(
+ child: CustomButton(
+ text: LocaleKeys.submit.tr(context: context),
+ onPressed: () async {
+ // Set up clinic rating and show clinic rating view
+ // appointmentRatingViewModel!.setTitle(LocaleKeys.rateDoctor.tr(context: context),);
+ // appointmentRatingViewModel!.setSubTitle(LocaleKeys.howWasYourLastVisitWithDoctor.tr(context: context),);
+ // appointmentRatingViewModel!.setClinicOrDoctor(true);
+
+ LoaderBottomSheet.showLoader();
+ await myAppointmentsViewModel.submitDoctorRating(docRate: rating, docNote: notes, patientAppointmentHistoryResponseModel: widget.patientAppointmentHistoryResponseModel);
+ // await appointmentRatingViewModel!.submitClinicRating(clinicRate: rating, clinicNote: note);
+ LoaderBottomSheet.hideLoader();
+ Navigator.pop(context);
+
+ setState(() {});
+ },
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/presentation/appointments/widgets/ask_doctor_request_type_select.dart b/lib/presentation/appointments/widgets/ask_doctor_request_type_select.dart
index 3002c1c9..35b15399 100644
--- a/lib/presentation/appointments/widgets/ask_doctor_request_type_select.dart
+++ b/lib/presentation/appointments/widgets/ask_doctor_request_type_select.dart
@@ -47,7 +47,7 @@ class AskDoctorRequestTypeSelect extends StatelessWidget {
listTileTheme: ListTileThemeData(horizontalTitleGap: 4),
),
child: RadioListTile(
- title: (askDoctorRequestTypeList[index].description ?? '').toText14(weight: FontWeight.w500),
+ title: (askDoctorRequestTypeList[index].description ?? '').toText14(isBold: true),
value: index,
fillColor: WidgetStateProperty.resolveWith((states) {
if (states.contains(WidgetState.selected)) {
diff --git a/lib/presentation/appointments/widgets/doctor_row_appointment_rating.dart b/lib/presentation/appointments/widgets/doctor_row_appointment_rating.dart
new file mode 100644
index 00000000..8872f4ea
--- /dev/null
+++ b/lib/presentation/appointments/widgets/doctor_row_appointment_rating.dart
@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+import 'package:hmg_patient_app_new/core/app_assets.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/extensions/string_extensions.dart';
+import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
+import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/appointment_details_resp_model.dart';
+import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_history_response_model.dart';
+import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart';
+
+import 'dart:ui' as ui;
+
+class BuildDoctorRowAppointmentRating extends StatelessWidget {
+ final PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel;
+
+ BuildDoctorRowAppointmentRating({super.key, required this.patientAppointmentHistoryResponseModel});
+
+ @override
+ Widget build(BuildContext context) {
+ return Padding(
+ padding: EdgeInsets.all(16),
+ child: Row(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Image.network(
+ patientAppointmentHistoryResponseModel.doctorImageURL!,
+ width: 63.h,
+ height: 63.h,
+ fit: BoxFit.cover,
+ ).circle(100),
+ SizedBox(width: 16.h),
+ Expanded(
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ patientAppointmentHistoryResponseModel.doctorNameObj!.toString().toText16(isBold: true, maxlines: 1),
+ SizedBox(height: 8.h),
+ Wrap(
+ direction: Axis.horizontal,
+ spacing: 3.h,
+ runSpacing: 4.h,
+ children: [
+ AppCustomChipWidget(
+ labelText: patientAppointmentHistoryResponseModel.projectName.toString(),
+ ),
+ AppCustomChipWidget(
+ labelText: patientAppointmentHistoryResponseModel.clinicName.toString(),
+ ),
+ Directionality(
+ textDirection: ui.TextDirection.ltr,
+ child: AppCustomChipWidget(
+ labelPadding: EdgeInsetsDirectional.only(start: -8.w, end: 6.w),
+ icon: AppAssets.ic_date_filter,
+ labelText: DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false),
+ isEnglishOnly: true,
+ ),
+ ),
+ ],
+ ),
+ ],
+ ),
+ ),
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/presentation/appointments/widgets/faculity_selection/facility_selection_item.dart b/lib/presentation/appointments/widgets/faculity_selection/facility_selection_item.dart
index 2f5589c8..a6e3e8d2 100644
--- a/lib/presentation/appointments/widgets/faculity_selection/facility_selection_item.dart
+++ b/lib/presentation/appointments/widgets/faculity_selection/facility_selection_item.dart
@@ -82,7 +82,7 @@ class FacilitySelectionItem extends StatelessWidget {
subTitle,
style: TextStyle(
fontSize: 12.h,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
color: AppColors.greyTextColor,
),
),
diff --git a/lib/presentation/appointments/widgets/faculity_selection/facility_type_selection_widget.dart b/lib/presentation/appointments/widgets/faculity_selection/facility_type_selection_widget.dart
index b6366dbf..eb084ca7 100644
--- a/lib/presentation/appointments/widgets/faculity_selection/facility_type_selection_widget.dart
+++ b/lib/presentation/appointments/widgets/faculity_selection/facility_type_selection_widget.dart
@@ -39,7 +39,7 @@ class FacilityTypeSelectionWidget extends StatelessWidget {
LocaleKeys.selectFacilitiesSubTitle.tr(),
style: TextStyle(
fontSize: 16,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
color: AppColors.greyTextColor,
),
),
diff --git a/lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart b/lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
index 8904e585..4264ba17 100644
--- a/lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
+++ b/lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
@@ -36,7 +36,7 @@ import '../../../emergency_services/call_ambulance/widgets/type_selection_widget
// LocaleKeys.selectHospital.tr(context: context),
// style: TextStyle(
// fontSize: 21,
-// fontWeight: FontWeight.w600,
+// isBold: true,
// color: AppColors.blackColor,
// ),
// ),
@@ -44,7 +44,7 @@ import '../../../emergency_services/call_ambulance/widgets/type_selection_widget
// LocaleKeys.selectHospitalSubTitle.tr(context: context),
// style: TextStyle(
// fontSize: 16,
-// fontWeight: FontWeight.w500,
+// isBold: true,
// color: AppColors.greyTextColor,
// ),
// ),
@@ -186,7 +186,7 @@ class HospitalBottomSheetBody extends StatelessWidget {
children: [
LocaleKeys.sortByLocation.tr(context: context).toText14(isBold: true),
// SizedBox(height: 4.h),
- LocaleKeys.sortByNearestLocation.tr(context: context).toText11(color: AppColors.textColorLight, weight: FontWeight.w500),
+ LocaleKeys.sortByNearestLocation.tr(context: context).toText11(color: AppColors.textColorLight, isBold: true),
],
),
],
diff --git a/lib/presentation/appointments/widgets/region_bottomsheet/region_list_item.dart b/lib/presentation/appointments/widgets/region_bottomsheet/region_list_item.dart
index 99f31be6..7f88074c 100644
--- a/lib/presentation/appointments/widgets/region_bottomsheet/region_list_item.dart
+++ b/lib/presentation/appointments/widgets/region_bottomsheet/region_list_item.dart
@@ -68,7 +68,7 @@ class RegionListItem extends StatelessWidget {
text: TextSpan(
text: count,
style: TextStyle(fontSize: 12.h, fontWeight: FontWeight.w700, color: AppColors.blackColor),
- children: [TextSpan(text: title, style: TextStyle(fontSize: 12.h, fontWeight: FontWeight.w500, color: AppColors.blackColor))])),
+ children: [TextSpan(text: title, style: TextStyle(fontSize: 12.h, fontWeight: FontWeight.w600, color: AppColors.blackColor))])),
);
}
@@ -93,7 +93,7 @@ class RegionListItem extends StatelessWidget {
subTitle,
style: TextStyle(
fontSize: 12.h,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
color: AppColors.greyTextColor,
),
),
diff --git a/lib/presentation/appointments/widgets/region_bottomsheet/region_list_widget.dart b/lib/presentation/appointments/widgets/region_bottomsheet/region_list_widget.dart
index ef80ec7b..b689162c 100644
--- a/lib/presentation/appointments/widgets/region_bottomsheet/region_list_widget.dart
+++ b/lib/presentation/appointments/widgets/region_bottomsheet/region_list_widget.dart
@@ -133,7 +133,7 @@ class _RegionBottomSheetBodyState extends State {
// children: [
// LocaleKeys.sortByLocation.tr(context: context).toText14(isBold: true),
// // SizedBox(height: 4.h),
- // LocaleKeys.sortByNearestLocation.tr(context: context).toText11(color: AppColors.textColorLight, weight: FontWeight.w500),
+ // LocaleKeys.sortByNearestLocation.tr(context: context).toText11(color: AppColors.textColorLight, isBold: true),
// ],
// ),
// ],
diff --git a/lib/presentation/ask_doctor/widgets/ask_doctor_appointment_card.dart b/lib/presentation/ask_doctor/widgets/ask_doctor_appointment_card.dart
index d58b75e9..4ebd9b74 100644
--- a/lib/presentation/ask_doctor/widgets/ask_doctor_appointment_card.dart
+++ b/lib/presentation/ask_doctor/widgets/ask_doctor_appointment_card.dart
@@ -203,7 +203,7 @@ class AskDoctorAppointmentCard extends StatelessWidget {
borderColor: AppColors.secondaryLightRedColor,
textColor: AppColors.primaryRedColor,
fontSize: 14.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
// height: isTablet || isFoldable ? 46.h : 40.h,
diff --git a/lib/presentation/ask_doctor/widgets/doctor_response_transactions.dart b/lib/presentation/ask_doctor/widgets/doctor_response_transactions.dart
index 33b544d7..59516d15 100644
--- a/lib/presentation/ask_doctor/widgets/doctor_response_transactions.dart
+++ b/lib/presentation/ask_doctor/widgets/doctor_response_transactions.dart
@@ -77,7 +77,7 @@ class DoctorResponseTransactions extends StatelessWidget {
borderColor: AppColors.greyColor,
textColor: AppColors.textColor,
fontSize: 14.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 10.r,
height: 40.h,
).paddingSymmetrical(16.w, 0.h),
@@ -93,7 +93,7 @@ class DoctorResponseTransactions extends StatelessWidget {
color: AppColors.infoColor.withAlpha(20),
borderRadius: BorderRadius.circular(8.r),
),
- child: doctorResponseModel.requestTypeDescription!.toText12(color: AppColors.infoColor, fontWeight: FontWeight.w500),
+ child: doctorResponseModel.requestTypeDescription!.toText12(color: AppColors.infoColor, isBold: true),
),
],
),
@@ -115,7 +115,7 @@ class DoctorResponseTransactions extends StatelessWidget {
color: AppColors.infoColor.withAlpha(20),
borderRadius: BorderRadius.circular(8.r),
),
- child: doctorResponseModel.transactions![index].doctorResponse!.toText12(color: AppColors.textColor, fontWeight: FontWeight.w500),
+ child: doctorResponseModel.transactions![index].doctorResponse!.toText12(color: AppColors.textColor, isBold: true),
),
SizedBox(width: 8.w),
Image.network("https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown.png", fit: BoxFit.cover, width: 42.w, height: 42.h).circle(100.r),
diff --git a/lib/presentation/authentication/login.dart b/lib/presentation/authentication/login.dart
index 62d0c9e2..d559ebbc 100644
--- a/lib/presentation/authentication/login.dart
+++ b/lib/presentation/authentication/login.dart
@@ -116,7 +116,7 @@ class LoginScreenState extends State {
child: RichText(
textAlign: TextAlign.center,
text: TextSpan(
- style: context.dynamicTextStyle(color: AppColors.textColor, fontSize: 14.f, height: 26 / 16, fontWeight: FontWeight.w500),
+ style: context.dynamicTextStyle(color: AppColors.textColor, fontSize: 14.f, height: 26 / 16, fontWeight: FontWeight.w600,),
children: [
TextSpan(text: LocaleKeys.dontHaveAccount.tr(context: context), style: context.dynamicTextStyle()),
TextSpan(text: " "),
@@ -126,7 +126,7 @@ class LoginScreenState extends State {
color: AppColors.primaryRedColor,
fontSize: 14.f, // Adjusted to sizer unit
height: 26 / 16, // Ratio
- fontWeight: FontWeight.w500),
+ fontWeight: FontWeight.w600,),
recognizer: TapGestureRecognizer()
..onTap = () {
Navigator.of(context).push(
diff --git a/lib/presentation/authentication/quick_login.dart b/lib/presentation/authentication/quick_login.dart
index 19e90d64..319402b0 100644
--- a/lib/presentation/authentication/quick_login.dart
+++ b/lib/presentation/authentication/quick_login.dart
@@ -49,13 +49,13 @@ class QuickLoginState extends State {
],
),
Utils.showLottie(context: context, assetPath: AppAnimations.checkmark, width: 120, height: 120, repeat: true),
- LocaleKeys.allSet.tr(context: context).toText16(textAlign: TextAlign.center, weight: FontWeight.w500)
+ LocaleKeys.allSet.tr(context: context).toText16(textAlign: TextAlign.center, isBold: true)
// Text(
// ' TranslationBase.of(context).allSet',
// textAlign: TextAlign.center,
// style: context.dynamicTextStyle(
// fontSize: 16,
- // fontWeight: FontWeight.w500,
+ // isBold: true,
// color: Colors.black,
// ),
// ),
diff --git a/lib/presentation/authentication/register.dart b/lib/presentation/authentication/register.dart
index 535cdff1..2f181e16 100644
--- a/lib/presentation/authentication/register.dart
+++ b/lib/presentation/authentication/register.dart
@@ -160,7 +160,7 @@ class _RegisterNew extends State {
children: [
Text(
LocaleKeys.iAcceptThe.tr(context: context),
- style: context.dynamicTextStyle(fontSize: 14.f, fontWeight: FontWeight.w500, color: Color(0xFF2E3039)),
+ style: context.dynamicTextStyle(fontSize: 14.f, fontWeight: FontWeight.w600, color: Color(0xFF2E3039)),
),
GestureDetector(
onTap: () {
@@ -173,7 +173,7 @@ class _RegisterNew extends State {
" ${LocaleKeys.termsConditoins.tr(context: context)}",
style: context.dynamicTextStyle(
fontSize: 14.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
color: AppColors.primaryRedColor,
decoration: TextDecoration.underline,
decorationColor: AppColors.primaryRedBorderColor,
@@ -185,7 +185,7 @@ class _RegisterNew extends State {
// Expanded(
// child: Text(
// LocaleKeys.iAcceptTermsConditions.tr(context: context).split("the").first,
- // style: context.dynamicTextStyle(fontSize: 14.fSize, fontWeight: FontWeight.w500, color: Color(0xFF2E3039)),
+ // style: context.dynamicTextStyle(fontSize: 14.fSize, isBold: true, color: Color(0xFF2E3039)),
// ),
// ),
],
@@ -222,7 +222,7 @@ class _RegisterNew extends State {
color: Colors.black,
fontSize: 16.f,
height: 26 / 16,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
),
children: [
TextSpan(text: LocaleKeys.alreadyHaveAccount.tr(context: context), style: context.dynamicTextStyle()),
@@ -233,7 +233,7 @@ class _RegisterNew extends State {
color: AppColors.primaryRedColor,
fontSize: 16.f,
height: 26 / 16,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
),
recognizer: TapGestureRecognizer()
..onTap = () {
diff --git a/lib/presentation/authentication/register_step2.dart b/lib/presentation/authentication/register_step2.dart
index dc87aa1d..f01dd036 100644
--- a/lib/presentation/authentication/register_step2.dart
+++ b/lib/presentation/authentication/register_step2.dart
@@ -140,7 +140,7 @@ class _RegisterNew extends State {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.personalDetailsVerification.tr(context: context).toText26(color: AppColors.textColor, weight: FontWeight.w600, letterSpacing: -2),
+ LocaleKeys.personalDetailsVerification.tr(context: context).toText26(color: AppColors.textColor, isBold: true, letterSpacing: -2),
SizedBox(height: 24.h),
// Insurance Card Section
diff --git a/lib/presentation/authentication/saved_login_screen.dart b/lib/presentation/authentication/saved_login_screen.dart
index 9ae9174e..bd29e3d2 100644
--- a/lib/presentation/authentication/saved_login_screen.dart
+++ b/lib/presentation/authentication/saved_login_screen.dart
@@ -145,7 +145,7 @@ class _SavedLogin extends State {
borderColor: AppColors.primaryRedColor,
textColor: Colors.white,
fontSize: 12.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
height: 40.h,
padding: EdgeInsets.symmetric(vertical: 10.h),
@@ -162,7 +162,7 @@ class _SavedLogin extends State {
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Text(
LocaleKeys.oR.tr(),
- style: context.dynamicTextStyle(fontSize: 16.f, fontWeight: FontWeight.w500),
+ style: context.dynamicTextStyle(fontSize: 16.f, fontWeight: FontWeight.w600,),
),
),
SizedBox(height: 24.h),
@@ -305,7 +305,7 @@ class _SavedLogin extends State {
borderColor: Color(0xffFEE9EA),
textColor: Color(0xffED1C2B),
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
padding: EdgeInsets.fromLTRB(0, 10.h, 0, 10.h),
// icon: "assets/images/svg/apple-finder.svg",
@@ -330,7 +330,7 @@ class _SavedLogin extends State {
borderColor: Color(0xffFEE9EA),
textColor: Color(0xffED1C2B),
fontSize: 15.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
padding: EdgeInsets.fromLTRB(0, 10.h, 0, 10.h),
// icon: "assets/images/svg/apple-finder.svg",
diff --git a/lib/presentation/blood_donation/blood_donation_page.dart b/lib/presentation/blood_donation/blood_donation_page.dart
index 7c6c625f..277d78c0 100644
--- a/lib/presentation/blood_donation/blood_donation_page.dart
+++ b/lib/presentation/blood_donation/blood_donation_page.dart
@@ -146,11 +146,11 @@ class _BloodDonationPageState extends State {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.city.tr().toText16(color: AppColors.textColor, weight: FontWeight.w500),
+ LocaleKeys.city.tr().toText16(color: AppColors.textColor, isBold: true),
(appState.isArabic()
? (bloodDonationVM.selectedCity?.descriptionN ?? LocaleKeys.select.tr())
: bloodDonationVM.selectedCity?.description ?? LocaleKeys.select.tr(context: context))
- .toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ .toText14(color: AppColors.greyTextColor, isBold: true),
],
),
],
@@ -174,11 +174,11 @@ class _BloodDonationPageState extends State {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.gender.tr().toText16(color: AppColors.textColor, weight: FontWeight.w500),
+ LocaleKeys.gender.tr().toText16(color: AppColors.textColor, isBold: true),
(appState.isArabic()
? (bloodDonationVM.selectedGender?.typeAr ?? LocaleKeys.select.tr())
: bloodDonationVM.selectedGender?.type ?? LocaleKeys.select.tr(context: context))
- .toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ .toText14(color: AppColors.greyTextColor, isBold: true),
],
),
],
@@ -205,12 +205,12 @@ class _BloodDonationPageState extends State {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.bloodType.tr().toText16(color: AppColors.textColor, weight: FontWeight.w500),
- // bloodDonationVM.selectedBloodType?.toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.bloodType.tr().toText16(color: AppColors.textColor, isBold: true),
+ // bloodDonationVM.selectedBloodType?.toText14(color: AppColors.greyTextColor, isBold: true),
(appState.isArabic()
? (bloodDonationVM.selectedBloodType ?? LocaleKeys.select.tr())
: bloodDonationVM.selectedBloodType ?? LocaleKeys.select.tr(context: context))
- .toText14(color: AppColors.greyTextColor, weight: FontWeight.w500)
+ .toText14(color: AppColors.greyTextColor, isBold: true)
],
),
],
@@ -264,7 +264,7 @@ class _BloodDonationPageState extends State {
children: [
Text(
"${LocaleKeys.iAcceptThe.tr()} ",
- style: context.dynamicTextStyle(fontSize: 14.f, fontWeight: FontWeight.w500, color: Color(0xFF2E3039)),
+ style: context.dynamicTextStyle(fontSize: 14.f, fontWeight: FontWeight.w600, color: Color(0xFF2E3039)),
),
GestureDetector(
onTap: () {
@@ -282,7 +282,7 @@ class _BloodDonationPageState extends State {
LocaleKeys.termsConditoins.tr(),
style: context.dynamicTextStyle(
fontSize: 14.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
color: AppColors.primaryRedColor,
decoration: TextDecoration.underline,
decorationColor: AppColors.primaryRedBorderColor,
@@ -294,7 +294,7 @@ class _BloodDonationPageState extends State {
// Expanded(
// child: Text(
// LocaleKeys.iAcceptTermsConditions.tr().split("the").first,
- // style: context.dynamicTextStyle(fontSize: 14.fSize, fontWeight: FontWeight.w500, color: Color(0xFF2E3039)),
+ // style: context.dynamicTextStyle(fontSize: 14.fSize, isBold: true, color: Color(0xFF2E3039)),
// ),
// ),
],
@@ -365,7 +365,7 @@ class _BloodDonationPageState extends State {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
height: 50.h,
diff --git a/lib/presentation/book_appointment/book_appointment_page.dart b/lib/presentation/book_appointment/book_appointment_page.dart
index 556dce6d..3d82387b 100644
--- a/lib/presentation/book_appointment/book_appointment_page.dart
+++ b/lib/presentation/book_appointment/book_appointment_page.dart
@@ -138,7 +138,7 @@ class _BookAppointmentPageState extends State {
fit: BoxFit.cover,
).circle(100).toShimmer2(isShow: true, radius: 50.r),
SizedBox(height: 8.h),
- ("Dr. John").toString().toText12(fontWeight: FontWeight.w500, isCenter: true, maxLine: 2).toShimmer2(isShow: true),
+ ("Dr. John").toString().toText12(isBold: true, isCenter: true, maxLine: 2).toShimmer2(isShow: true),
],
);
},
@@ -157,7 +157,7 @@ class _BookAppointmentPageState extends State {
LocaleKeys.recentVisits.tr(context: context).toText18(isBold: true).paddingSymmetrical(24.w, 0.h),
Row(
children: [
- LocaleKeys.viewAll.tr(context: context).toText14(color: AppColors.primaryRedColor, weight: FontWeight.w500),
+ LocaleKeys.viewAll.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true),
SizedBox(width: 2.h),
Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 14.h),
],
@@ -201,7 +201,7 @@ class _BookAppointmentPageState extends State {
width: 80.w,
child: (myAppointmentsVM.patientMyDoctorsList[index].doctorName)
.toString()
- .toText12(fontWeight: FontWeight.w500, isCenter: true, maxLine: 2)
+ .toText12(isBold: true, isCenter: true, maxLine: 2)
.toShimmer2(isShow: false),
),
],
@@ -312,7 +312,7 @@ class _BookAppointmentPageState extends State {
child: Column(
children: [
Center(
- child: LocaleKeys.noFavouriteDoctors.tr(context: context).toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ child: LocaleKeys.noFavouriteDoctors.tr(context: context).toText14(color: AppColors.greyTextColor, isBold: true),
),
SizedBox(height: 12.h),
CustomButton(
@@ -324,7 +324,7 @@ class _BookAppointmentPageState extends State {
borderColor: Color(0xffFEE9EA),
textColor: Color(0xffED1C2B),
fontSize: 14.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
padding: EdgeInsets.fromLTRB(10.h, 0, 10.h, 0),
icon: AppAssets.add_icon,
iconColor: AppColors.primaryRedColor,
@@ -342,16 +342,33 @@ class _BookAppointmentPageState extends State {
SizedBox(height: 24.h),
LocaleKeys.favourites.tr(context: context).toText18(isBold: true).paddingSymmetrical(24.w, 0.h),
SizedBox(height: 16.h),
- Row(
- children: [
- SizedBox(
+ SizedBox(
height: 110.h,
child: ListView.separated(
scrollDirection: Axis.horizontal,
- itemCount: myAppointmentsVM.patientFavouriteDoctorsList.length,
+ itemCount: myAppointmentsVM.patientFavouriteDoctorsList.length + 1,
shrinkWrap: true,
padding: EdgeInsets.only(left: 24.w, right: 24.w),
itemBuilder: (context, index) {
+ // Last item: static "Add" button
+ if (index == myAppointmentsVM.patientFavouriteDoctorsList.length) {
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ Utils.buildSvgWithAssets(icon: AppAssets.add_new_family_icon, height: 64.h, width: 64.h),
+ SizedBox(
+ width: 80.w,
+ child: LocaleKeys.add.tr(context: context).toText12(
+ color: AppColors.textColor,
+ isBold: true,
+ isCenter: true,
+ ).paddingOnly(top: 4.h),
+ ),
+ ],
+ ).onPress(() {
+ Navigator.of(context).push(CustomPageRoute(page: SearchDoctorByName()));
+ });
+ }
return AnimationConfiguration.staggeredList(
position: index,
duration: const Duration(milliseconds: 1000),
@@ -373,7 +390,7 @@ class _BookAppointmentPageState extends State {
width: 80.w,
child: (myAppointmentsVM.patientFavouriteDoctorsList[index].doctorName)
.toString()
- .toText12(fontWeight: FontWeight.w500, isCenter: true, maxLine: 2)
+ .toText12(isBold: true, isCenter: true, maxLine: 2)
.toShimmer2(isShow: false),
),
],
@@ -410,17 +427,6 @@ class _BookAppointmentPageState extends State {
separatorBuilder: (BuildContext cxt, int index) => SizedBox(width: 8.h),
),
),
- Column(
- crossAxisAlignment: CrossAxisAlignment.center,
- children: [
- Utils.buildSvgWithAssets(icon: AppAssets.add_new_family_icon, height: 64.h, width: 64.h),
- SizedBox(width: 80.w, child: LocaleKeys.add.tr(context: context).toText12(color: AppColors.textColor, fontWeight: FontWeight.w500, isCenter: true).paddingOnly(top: 4.h)),
- ],
- ).onPress(() {
- Navigator.of(context).push(CustomPageRoute(page: SearchDoctorByName()));
- }),
- ],
- ),
],
);
}),
@@ -465,8 +471,8 @@ class _BookAppointmentPageState extends State {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.searchByClinic.tr(context: context).toText14(color: AppColors.textColor, weight: FontWeight.w500),
- LocaleKeys.tapToSelectClinic.tr(context: context).toText12(color: AppColors.primaryRedColor, fontWeight: FontWeight.w500),
+ LocaleKeys.searchByClinic.tr(context: context).toText14(color: AppColors.textColor, isBold: true),
+ LocaleKeys.tapToSelectClinic.tr(context: context).toText12(color: AppColors.primaryRedColor, isBold: true),
],
),
],
@@ -497,8 +503,8 @@ class _BookAppointmentPageState extends State {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.searchByDoctor.tr(context: context).toText14(color: AppColors.textColor, weight: FontWeight.w500),
- LocaleKeys.tapToSelect.tr(context: context).toText12(color: AppColors.primaryRedColor, fontWeight: FontWeight.w500),
+ LocaleKeys.searchByDoctor.tr(context: context).toText14(color: AppColors.textColor, isBold: true),
+ LocaleKeys.tapToSelect.tr(context: context).toText12(color: AppColors.primaryRedColor, isBold: true),
],
),
],
@@ -527,8 +533,8 @@ class _BookAppointmentPageState extends State {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.searchByRegion.tr(context: context).toText14(color: AppColors.textColor, weight: FontWeight.w500),
- LocaleKeys.centralRegion.tr(context: context).toText12(color: AppColors.primaryRedColor, fontWeight: FontWeight.w500),
+ LocaleKeys.searchByRegion.tr(context: context).toText14(color: AppColors.textColor, isBold: true),
+ LocaleKeys.centralRegion.tr(context: context).toText12(color: AppColors.primaryRedColor, isBold: true),
],
),
],
@@ -571,8 +577,8 @@ class _BookAppointmentPageState extends State {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.immediateConsultation.tr(context: context).toText14(color: AppColors.textColor, weight: FontWeight.w500),
- LocaleKeys.tapToSelectClinic.tr(context: context).toText12(color: AppColors.primaryRedColor, fontWeight: FontWeight.w500),
+ LocaleKeys.immediateConsultation.tr(context: context).toText14(color: AppColors.textColor, isBold: true),
+ LocaleKeys.tapToSelectClinic.tr(context: context).toText12(color: AppColors.primaryRedColor, isBold: true),
],
),
],
@@ -613,8 +619,8 @@ class _BookAppointmentPageState extends State {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.scheduledConsultation.tr(context: context).toText14(color: AppColors.textColor, weight: FontWeight.w500),
- LocaleKeys.tapToSelectClinic.tr(context: context).toText12(color: AppColors.primaryRedColor, fontWeight: FontWeight.w500),
+ LocaleKeys.scheduledConsultation.tr(context: context).toText14(color: AppColors.textColor, isBold: true),
+ LocaleKeys.tapToSelectClinic.tr(context: context).toText12(color: AppColors.primaryRedColor, isBold: true),
],
),
],
@@ -654,10 +660,10 @@ class _BookAppointmentPageState extends State {
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.notSureHelpMeChooseClinic.tr(context: context).toText16(weight: FontWeight.w600, color: AppColors.textColor),
+ LocaleKeys.notSureHelpMeChooseClinic.tr(context: context).toText16(isBold: true, color: AppColors.textColor),
SizedBox(height: 8.h),
LocaleKeys.mentionYourSymptomsAndFindDoctors.tr(context: context).toText12(
- fontWeight: FontWeight.w500,
+ isBold: true,
color: AppColors.greyTextColor,
),
],
@@ -817,7 +823,7 @@ class _BookAppointmentPageState extends State {
getTitle(AppointmentViaRegionViewmodel data) {
if (data.selectedRegionId == null) {
- return LocaleKeys.selectRegion.tr(context: context).toText20(weight: FontWeight.w600);
+ return LocaleKeys.selectRegion.tr(context: context).toText20(isBold: true);
} else {
return Transform.flip(
flipX: data.isArabic ? true : false,
@@ -845,7 +851,7 @@ class _BookAppointmentPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.immediateService.tr(context: context).toText18(color: AppColors.textColor, isBold: true),
- LocaleKeys.noNeedToWaitGetMedicalConsultation.tr(context: context).toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.noNeedToWaitGetMedicalConsultation.tr(context: context).toText14(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -861,7 +867,7 @@ class _BookAppointmentPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.noVisitRequired.tr(context: context).toText18(color: AppColors.textColor, isBold: true),
- LocaleKeys.livecarePoint5.tr(context: context).toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.livecarePoint5.tr(context: context).toText14(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -877,7 +883,7 @@ class _BookAppointmentPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.doctorWillContact.tr(context: context).toText18(color: AppColors.textColor, isBold: true),
- LocaleKeys.specialisedDoctorWillContactYou.tr(context: context).toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.specialisedDoctorWillContactYou.tr(context: context).toText14(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -893,7 +899,7 @@ class _BookAppointmentPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.freeMedicineDelivery.tr(context: context).toText18(color: AppColors.textColor, isBold: true),
- LocaleKeys.offersFreeMedicineDelivery.tr(context: context).toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.offersFreeMedicineDelivery.tr(context: context).toText14(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -909,7 +915,7 @@ class _BookAppointmentPageState extends State {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 12.r,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
@@ -932,7 +938,7 @@ class _BookAppointmentPageState extends State {
children: [
LocaleKeys.notSureHelpMeChooseClinic.tr(context: context).toText28(color: AppColors.textColor, isBold: true, height: 1.5),
SizedBox(height: 4.h),
- LocaleKeys.mentionYourSymptomsAndFindDoctors.tr(context: context).toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500,),
+ LocaleKeys.mentionYourSymptomsAndFindDoctors.tr(context: context).toText12(color: AppColors.greyTextColor, isBold: true,),
SizedBox(height: 24.h),
CustomButton(
text: LocaleKeys.yesPleaseINeedHelp.tr(context: context),
@@ -944,7 +950,7 @@ class _BookAppointmentPageState extends State {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 12.r,
// padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 56.h,
@@ -959,7 +965,7 @@ class _BookAppointmentPageState extends State {
borderColor: AppColors.chipSecondaryLightRedColor,
textColor: AppColors.primaryRedColor,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 12.r,
// padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 56.h,
diff --git a/lib/presentation/book_appointment/doctor_filter/doctors_filter.dart b/lib/presentation/book_appointment/doctor_filter/doctors_filter.dart
index 9cfcc1f8..02dd9b97 100644
--- a/lib/presentation/book_appointment/doctor_filter/doctors_filter.dart
+++ b/lib/presentation/book_appointment/doctor_filter/doctors_filter.dart
@@ -60,7 +60,7 @@ class DoctorsFilters extends StatelessWidget{
LocaleKeys.filters.tr(),
style:TextStyle(
fontFamily: 'Poppins',
- fontWeight: FontWeight.w600,
+ fontWeight: FontWeight.w600,
fontSize: 27.f,
color: AppColors.textColor,
letterSpacing: -1
@@ -70,7 +70,7 @@ class DoctorsFilters extends StatelessWidget{
LocaleKeys.clearAllFilters.tr(),
style:TextStyle(
fontFamily: 'Poppins',
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
fontSize: 14.f,
color: AppColors.errorColor
)
@@ -181,7 +181,7 @@ class DoctorsFilters extends StatelessWidget{
textColor: Colors.white,
fontSize: 16.f,
padding: EdgeInsets.zero,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 10.r,
icon: AppAssets.add_icon,
iconColor: AppColors.primaryRedColor,
diff --git a/lib/presentation/book_appointment/doctor_profile_page.dart b/lib/presentation/book_appointment/doctor_profile_page.dart
index 2bad1af9..713ee2c0 100644
--- a/lib/presentation/book_appointment/doctor_profile_page.dart
+++ b/lib/presentation/book_appointment/doctor_profile_page.dart
@@ -98,7 +98,7 @@ class DoctorProfilePage extends StatelessWidget {
),
(bookAppointmentsViewModel.doctorsProfileResponseModel.specialty!.isNotEmpty ? bookAppointmentsViewModel.doctorsProfileResponseModel.specialty!.first : "")
.toString()
- .toText18(weight: FontWeight.w500, color: AppColors.primaryRedColor),
+ .toText18(isBold: true, color: AppColors.primaryRedColor),
],
),
],
@@ -137,7 +137,7 @@ class DoctorProfilePage extends StatelessWidget {
children: [
Utils.buildSvgWithAssets(icon: AppAssets.doctor_profile_rating_icon, width: 48.w, height: 48.h, fit: BoxFit.contain, applyThemeColor: false),
SizedBox(height: 16.h),
- LocaleKeys.ratings.tr(context: context).toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor),
+ LocaleKeys.ratings.tr(context: context).toText12(isBold: true, color: AppColors.greyTextColor),
bookAppointmentsViewModel.doctorsProfileResponseModel.decimalDoctorRate
.toString()
.toText16(isBold: true, color: AppColors.textColor, isUnderLine: true, decorationColor: AppColors.textColor, fontFamily: "Poppins"),
@@ -158,7 +158,7 @@ class DoctorProfilePage extends StatelessWidget {
children: [
Utils.buildSvgWithAssets(icon: AppAssets.doctor_profile_reviews_icon, width: 48.w, height: 48.h, fit: BoxFit.contain, applyThemeColor: false),
SizedBox(height: 16.h),
- LocaleKeys.reviews.tr(context: context).toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor),
+ LocaleKeys.reviews.tr(context: context).toText12(isBold: true, color: AppColors.greyTextColor),
NumberFormat.decimalPattern().format(bookAppointmentsViewModel.doctorsProfileResponseModel.noOfPatientsRate ?? 0)
.toText16(isBold: true, color: AppColors.textColor, isUnderLine: true, decorationColor: AppColors.textColor, fontFamily: "Poppins"),
],
@@ -178,9 +178,9 @@ class DoctorProfilePage extends StatelessWidget {
SizedBox(height: 16.h),
Divider(color: AppColors.borderOnlyColor.withValues(alpha: 0.1), height: 1.h),
SizedBox(height: 16.h),
- LocaleKeys.information.tr(context: context).toText14(weight: FontWeight.w600, color: AppColors.textColor),
+ LocaleKeys.information.tr(context: context).toText14(isBold: true, color: AppColors.textColor),
SizedBox(height: 6.h),
- (bookAppointmentsViewModel.doctorsProfileResponseModel.doctorProfileInfo ?? "").trim().toText12(fontWeight: FontWeight.w600, color: AppColors.greyTextColor),
+ (bookAppointmentsViewModel.doctorsProfileResponseModel.doctorProfileInfo ?? "").trim().toText12(isBold: true, color: AppColors.greyTextColor),
SizedBox(height: 24.h),
],
).paddingSymmetrical(24.h, 0.h),
@@ -257,7 +257,7 @@ class DoctorProfilePage extends StatelessWidget {
borderColor: AppColors.primaryRedColor,
textColor: Colors.white,
fontSize: 16,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
diff --git a/lib/presentation/book_appointment/laser/widgets/body_part_listing.dart b/lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
index c01899cb..51d964eb 100644
--- a/lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
+++ b/lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
@@ -118,7 +118,7 @@ class BodyPartsListing extends StatelessWidget {
textColor: _isSelected ? AppColors.chipPrimaryRedBorderColor : AppColors.blackColor,
// labelText: "${parts[index].timeDuration!} ${LocaleKeys.mins.tr()}",
richText: "${parts[index].timeDuration!} ${LocaleKeys.mins.tr()}".toText12(
- fontWeight: FontWeight.w500,
+ isBold: true,
color: _isSelected ? AppColors.chipPrimaryRedBorderColor : AppColors.blackColor,
),
icon: AppAssets.waiting_time_clock,
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 917f334a..29ac4a5d 100644
--- a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart
+++ b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart
@@ -169,7 +169,7 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
- LocaleKeys.insuranceExpiredOrInactive.tr(context: context).toText14(color: AppColors.primaryRedColor, weight: FontWeight.w500).paddingSymmetrical(24.h, 0.h),
+ LocaleKeys.insuranceExpiredOrInactive.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true).paddingSymmetrical(24.h, 0.h),
CustomButton(
text: LocaleKeys.updateInsurance.tr(context: context),
onPressed: () {
@@ -198,7 +198,7 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget {
borderColor: AppColors.secondaryLightRedBorderColor,
textColor: AppColors.whiteColor,
fontSize: 10,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 8,
padding: EdgeInsets.fromLTRB(15, 0, 15, 0),
height: 30.h,
@@ -295,7 +295,7 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget {
borderColor: AppColors.successColor,
textColor: AppColors.whiteColor,
fontSize: 16,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
@@ -338,7 +338,7 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget {
borderColor: AppColors.infoColor,
textColor: AppColors.whiteColor,
fontSize: 16,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
@@ -364,7 +364,8 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget {
bool cameraGranted = statuses[Permission.camera]?.isGranted ?? false;
bool micGranted = statuses[Permission.microphone]?.isGranted ?? false;
bool notifGranted = statuses[Permission.notification]?.isGranted ?? false;
- bool alertWindowGranted = Platform.isAndroid ? (statuses[Permission.systemAlertWindow]?.isGranted ?? false) : true;
+ // bool alertWindowGranted = Platform.isAndroid ? (statuses[Permission.systemAlertWindow]?.isGranted ?? false) : true;
+ bool alertWindowGranted = true;
// If all required permissions are already granted
if (cameraGranted && micGranted && notifGranted && alertWindowGranted) return 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 4018b42a..0341796f 100644
--- a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart
+++ b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart
@@ -234,7 +234,7 @@ class _ImmediateLiveCarePaymentPageState extends State {
SizedBox(height: 2.h),
(bookAppointmentsViewModel.selectedDoctor.speciality!.isNotEmpty ? bookAppointmentsViewModel.selectedDoctor.speciality!.first : "")
.toString()
- .toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor, maxLine: 1),
+ .toText12(isBold: true, color: AppColors.greyTextColor, maxLine: 1),
],
),
],
@@ -235,7 +235,7 @@ class _ReviewAppointmentPageState extends State {
borderColor: AppColors.primaryRedColor,
textColor: Colors.white,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
diff --git a/lib/presentation/book_appointment/search_doctor_by_name.dart b/lib/presentation/book_appointment/search_doctor_by_name.dart
index 533229a0..e2ab6808 100644
--- a/lib/presentation/book_appointment/search_doctor_by_name.dart
+++ b/lib/presentation/book_appointment/search_doctor_by_name.dart
@@ -154,7 +154,7 @@ class _SearchDoctorByNameState extends State {
// borderColor: bookAppointmentsVM.isSortByClinic ? AppColors.primaryRedColor : AppColors.textColor.withOpacity(0.2),
// textColor: bookAppointmentsVM.isSortByClinic ? AppColors.primaryRedColor : AppColors.blackColor,
// fontSize: 12,
- // fontWeight: FontWeight.w500,
+ // isBold: true,
// borderRadius: 10,
// padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
// height: 40.h,
@@ -169,7 +169,7 @@ class _SearchDoctorByNameState extends State {
// borderColor: bookAppointmentsVM.isSortByClinic ? AppColors.textColor.withOpacity(0.2) : AppColors.primaryRedColor,
// textColor: bookAppointmentsVM.isSortByClinic ? AppColors.blackColor : AppColors.primaryRedColor,
// fontSize: 12,
- // fontWeight: FontWeight.w500,
+ // isBold: true,
// borderRadius: 10,
// padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
// height: 40.h,
@@ -306,7 +306,7 @@ class _SearchDoctorByNameState extends State {
// borderColor: AppColors.greyColor,
// textColor: AppColors.blackColor,
// fontSize: 10,
- // fontWeight: FontWeight.w500,
+ // isBold: true,
// borderRadius: 8,
// padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
// height: 30.h),
@@ -319,7 +319,7 @@ class _SearchDoctorByNameState extends State {
// bookAppointmentsVM.isSortByClinic
// ? (groupedDoctors[index].first.clinicName ?? 'Unknown')
// : (groupedDoctors[index].first.projectName ?? 'Unknown'),
- // style: TextStyle(fontSize: 16.h, fontWeight: FontWeight.w600),
+ // style: TextStyle(fontSize: 16.h, isBold: true),
// overflow: TextOverflow.ellipsis,
// ),
// // Expanded content - list of doctors in this group
@@ -440,7 +440,7 @@ class _SearchDoctorByNameState extends State {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 10.r,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
diff --git a/lib/presentation/book_appointment/select_clinic_page.dart b/lib/presentation/book_appointment/select_clinic_page.dart
index 0db1fb38..b08564ca 100644
--- a/lib/presentation/book_appointment/select_clinic_page.dart
+++ b/lib/presentation/book_appointment/select_clinic_page.dart
@@ -98,7 +98,7 @@ class _SelectClinicPageState extends State {
backgroundColor: AppColors.primaryRedColor,
borderColor: AppColors.primaryRedColor,
borderRadius: 12.r,
- fontWeight: FontWeight.w500),
+ fontWeight: FontWeight.w600,),
),
child: getCalculatorResultWidget(type: widget.calculatorType!, calculatedResult: widget.calculatedResult).paddingSymmetrical(18.w, 24.h),
);
@@ -619,7 +619,7 @@ class _SelectClinicPageState extends State {
SizedBox(
width: 8.w,
),
- calculatedResult["lastPeriodDate"].toString().toText16(color: AppColors.successColor, weight: FontWeight.w600),
+ calculatedResult["lastPeriodDate"].toString().toText16(color: AppColors.successColor, isBold: true),
],
),
],
@@ -641,7 +641,7 @@ class _SelectClinicPageState extends State {
SizedBox(
width: 8.w,
),
- calculatedResult["ovulationDate"].toString().toText16(color: AppColors.successColor, weight: FontWeight.w600),
+ calculatedResult["ovulationDate"].toString().toText16(color: AppColors.successColor, isBold: true),
],
),
SizedBox(height: 8.h),
@@ -655,7 +655,7 @@ class _SelectClinicPageState extends State {
borderRadius: 8.h,
textColor: AppColors.textColor),
SizedBox(height: 16.h),
- "Fertility Window".toText16(color: AppColors.textColor, weight: FontWeight.w600),
+ "Fertility Window".toText16(color: AppColors.textColor, isBold: true),
SizedBox(height: 8.h),
Row(
children: [
@@ -663,7 +663,7 @@ class _SelectClinicPageState extends State {
SizedBox(
width: 8.w,
),
- calculatedResult["fertileWindowStart"].toString().toText13(color: AppColors.successColor, weight: FontWeight.w600),
+ calculatedResult["fertileWindowStart"].toString().toText13(color: AppColors.successColor, isBold: true),
SizedBox(
width: 4.w,
),
@@ -671,12 +671,12 @@ class _SelectClinicPageState extends State {
SizedBox(
width: 4.w,
),
- calculatedResult["fertileWindowEnd"].toString().toText13(color: AppColors.successColor, weight: FontWeight.w600),
+ calculatedResult["fertileWindowEnd"].toString().toText13(color: AppColors.successColor, isBold: true),
],
),
SizedBox(height: 8.h),
"This is your fertile window. Maintaining a healthy calorie range supports your body during this period, considering your Basal Metabolic Rate and activity. Your Body Mass Index is within the healthy range."
- .toText12(height: 1.5, color: AppColors.textColorLight, fontWeight: FontWeight.w500)
+ .toText12(height: 1.5, color: AppColors.textColorLight, isBold: true)
],
),
),
@@ -697,7 +697,7 @@ class _SelectClinicPageState extends State {
),
Row(
children: [
- "Tips to keep in mind".toText16(color: AppColors.textColor, weight: FontWeight.w600),
+ "Tips to keep in mind".toText16(color: AppColors.textColor, isBold: true),
],
),
],
@@ -735,7 +735,7 @@ class _SelectClinicPageState extends State {
children: [
Utils.buildSvgWithAssets(icon: AppAssets.pregnancyDueDateAccordion, width: 30.h, height: 30.h),
SizedBox(width: 8.w),
- calculatedResult["dueDate"].toString().toText16(color: AppColors.successColor, weight: FontWeight.w600),
+ calculatedResult["dueDate"].toString().toText16(color: AppColors.successColor, isBold: true),
],
),
Expanded(child: SizedBox(width: 8.w)),
@@ -762,7 +762,7 @@ class _SelectClinicPageState extends State {
children: [
Row(
children: [
- "First Trimester".toText16(color: AppColors.textColor, weight: FontWeight.w600),
+ "First Trimester".toText16(color: AppColors.textColor, isBold: true),
Expanded(child: SizedBox(width: 8.h)),
CustomChipWidget(
height: 30.h,
@@ -782,7 +782,7 @@ class _SelectClinicPageState extends State {
SizedBox(
width: 8.w,
),
- calculatedResult["firstTrimester"]["start"].toString().toText13(color: AppColors.successColor, weight: FontWeight.w600),
+ calculatedResult["firstTrimester"]["start"].toString().toText13(color: AppColors.successColor, isBold: true),
SizedBox(
width: 4.w,
),
@@ -790,7 +790,7 @@ class _SelectClinicPageState extends State {
SizedBox(
width: 4.w,
),
- calculatedResult["firstTrimester"]["end"].toString().toText13(color: AppColors.successColor, weight: FontWeight.w600),
+ calculatedResult["firstTrimester"]["end"].toString().toText13(color: AppColors.successColor, isBold: true),
],
),
SizedBox(height: 8.h),
@@ -806,7 +806,7 @@ class _SelectClinicPageState extends State {
children: [
Row(
children: [
- "Second Trimester".toText16(color: AppColors.textColor, weight: FontWeight.w600),
+ "Second Trimester".toText16(color: AppColors.textColor, isBold: true),
Expanded(child: SizedBox(width: 8.h)),
CustomChipWidget(
height: 30.h,
@@ -826,7 +826,7 @@ class _SelectClinicPageState extends State {
SizedBox(
width: 8.w,
),
- calculatedResult["secondTrimester"]["start"].toString().toText13(color: AppColors.successColor, weight: FontWeight.w600),
+ calculatedResult["secondTrimester"]["start"].toString().toText13(color: AppColors.successColor, isBold: true),
SizedBox(
width: 4.w,
),
@@ -834,7 +834,7 @@ class _SelectClinicPageState extends State {
SizedBox(
width: 4.w,
),
- calculatedResult["secondTrimester"]["end"].toString().toText13(color: AppColors.successColor, weight: FontWeight.w600),
+ calculatedResult["secondTrimester"]["end"].toString().toText13(color: AppColors.successColor, isBold: true),
],
),
SizedBox(height: 8.h),
@@ -850,7 +850,7 @@ class _SelectClinicPageState extends State {
children: [
Row(
children: [
- "Third Trimester".toText16(color: AppColors.textColor, weight: FontWeight.w600),
+ "Third Trimester".toText16(color: AppColors.textColor, isBold: true),
Expanded(child: SizedBox(width: 8.h)),
CustomChipWidget(
height: 30.h,
@@ -870,7 +870,7 @@ class _SelectClinicPageState extends State {
SizedBox(
width: 8.w,
),
- calculatedResult["thirdTrimester"]["start"].toString().toText13(color: AppColors.successColor, weight: FontWeight.w600),
+ calculatedResult["thirdTrimester"]["start"].toString().toText13(color: AppColors.successColor, isBold: true),
SizedBox(
width: 4.w,
),
@@ -878,7 +878,7 @@ class _SelectClinicPageState extends State {
SizedBox(
width: 4.w,
),
- calculatedResult["thirdTrimester"]["end"].toString().toText13(color: AppColors.successColor, weight: FontWeight.w600),
+ calculatedResult["thirdTrimester"]["end"].toString().toText13(color: AppColors.successColor, isBold: true),
],
),
SizedBox(height: 8.h),
@@ -904,7 +904,7 @@ class _SelectClinicPageState extends State {
),
),
Expanded(
- child: text.toText12(color: AppColors.textColorLight, fontWeight: FontWeight.w500, height: 1.2.h),
+ child: text.toText12(color: AppColors.textColorLight, isBold: true, height: 1.2.h),
),
],
);
@@ -924,7 +924,7 @@ class _SelectClinicPageState extends State {
children: [
('${calories.toStringAsFixed(0)}').toText32(color: getTextColor(title), isBold: true),
SizedBox(width: 10.w),
- hide ? SizedBox() : 'kcal/day'.toText12(color: AppColors.inputLabelTextColor, isBold: true, fontWeight: FontWeight.w600)
+ hide ? SizedBox() : 'kcal/day'.toText12(color: AppColors.inputLabelTextColor, isBold: true)
],
),
_buildStatusIcon(title)
@@ -950,9 +950,9 @@ class _SelectClinicPageState extends State {
),
SizedBox(height: 8.h),
],
- title.toText16(color: AppColors.textColor, weight: FontWeight.w600),
+ title.toText16(color: AppColors.textColor, isBold: true),
SizedBox(height: 8.h),
- description.toText12(height: 1.2.h, color: AppColors.textColorLight, fontWeight: FontWeight.w500)
+ description.toText12(height: 1.2.h, color: AppColors.textColorLight, isBold: true)
],
),
);
@@ -1191,7 +1191,7 @@ class _SelectClinicPageState extends State {
getTitle(AppointmentViaRegionViewmodel data) {
if (data.selectedRegionId == null) {
- return LocaleKeys.selectRegion.tr(context: context).toText20(weight: FontWeight.w600);
+ return LocaleKeys.selectRegion.tr(context: context).toText20(isBold: true);
} else {
return Transform.flip(
flipX: data.isArabic ? true : false,
@@ -1219,7 +1219,7 @@ class _SelectClinicPageState extends State {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.youHaveExistingTreatmentPlan.tr(context: context).toText14(weight: FontWeight.w500),
+ LocaleKeys.youHaveExistingTreatmentPlan.tr(context: context).toText14(isBold: true),
SizedBox(height: 8.h),
Container(
width: double.infinity,
@@ -1274,7 +1274,7 @@ class _SelectClinicPageState extends State {
),
),
SizedBox(height: 16.h),
- LocaleKeys.wouldYouLikeToContinue.tr(context: context).toText14(weight: FontWeight.w500),
+ LocaleKeys.wouldYouLikeToContinue.tr(context: context).toText14(isBold: true),
SizedBox(height: 16.h),
Row(
children: [
diff --git a/lib/presentation/book_appointment/select_doctor_page.dart b/lib/presentation/book_appointment/select_doctor_page.dart
index a730e0d0..6c3427e7 100644
--- a/lib/presentation/book_appointment/select_doctor_page.dart
+++ b/lib/presentation/book_appointment/select_doctor_page.dart
@@ -88,7 +88,7 @@ class _SelectDoctorPageState extends State {
// backgroundColor: AppColors.primaryRedColor,
// borderColor: AppColors.primaryRedColor,
// borderRadius: 12.r,
- // fontWeight: FontWeight.w500),
+ // isBold: true),
// ),
child: SingleChildScrollView(
controller: _scrollController,
@@ -197,7 +197,7 @@ class _SelectDoctorPageState extends State {
borderColor: bookAppointmentsVM.isSortByClinic ? AppColors.primaryRedColor : AppColors.textColor.withOpacity(0.2),
textColor: bookAppointmentsVM.isSortByClinic ? AppColors.primaryRedColor : AppColors.blackColor,
fontSize: 12,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 10,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 40.h,
@@ -212,7 +212,7 @@ class _SelectDoctorPageState extends State {
borderColor: bookAppointmentsVM.isSortByClinic ? AppColors.textColor.withOpacity(0.2) : AppColors.primaryRedColor,
textColor: bookAppointmentsVM.isSortByClinic ? AppColors.blackColor : AppColors.primaryRedColor,
fontSize: 12,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 10,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 40.h,
@@ -229,7 +229,7 @@ class _SelectDoctorPageState extends State {
children: [
LocaleKeys.nearestAppo.tr(context: context).toText13(isBold: true),
SizedBox(height: 4.h),
- LocaleKeys.viewNearestAppos.tr(context: context).toText11(color: AppColors.textColorLight, weight: FontWeight.w500),
+ LocaleKeys.viewNearestAppos.tr(context: context).toText11(color: AppColors.textColorLight, isBold: true),
],
),
const Spacer(),
@@ -303,7 +303,7 @@ class _SelectDoctorPageState extends State {
borderColor: AppColors.greyColor,
textColor: AppColors.blackColor,
fontSize: 10,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 8,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 30.h,
@@ -317,7 +317,7 @@ class _SelectDoctorPageState extends State {
bookAppointmentsVM.isSortByClinic
? (bookAppointmentsVM.doctorsListGrouped[index].first.clinicName ?? 'Unknown')
: (bookAppointmentsVM.doctorsListGrouped[index].first.projectName ?? 'Unknown'),
- style: TextStyle(fontSize: 16.h, fontWeight: FontWeight.w600),
+ style: TextStyle(fontSize: 16.h, fontWeight: FontWeight.w600,),
overflow: TextOverflow.ellipsis,
),
// Expanded content - list of doctors in this group
diff --git a/lib/presentation/book_appointment/select_livecare_clinic_page.dart b/lib/presentation/book_appointment/select_livecare_clinic_page.dart
index 87ab0eb5..bd2b6462 100644
--- a/lib/presentation/book_appointment/select_livecare_clinic_page.dart
+++ b/lib/presentation/book_appointment/select_livecare_clinic_page.dart
@@ -55,7 +55,7 @@ class SelectLivecareClinicPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.immediateService.tr(context: context).toText18(color: AppColors.textColor, isBold: true),
- LocaleKeys.noNeedToWaitGetMedicalConsultation.tr(context: context).toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.noNeedToWaitGetMedicalConsultation.tr(context: context).toText14(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -71,7 +71,7 @@ class SelectLivecareClinicPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.noVisitRequired.tr(context: context).toText18(color: AppColors.textColor, isBold: true),
- LocaleKeys.livecarePoint5.tr(context: context).toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.livecarePoint5.tr(context: context).toText14(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -87,7 +87,7 @@ class SelectLivecareClinicPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.doctorWillContact.tr(context: context).toText18(color: AppColors.textColor, isBold: true),
- LocaleKeys.specialisedDoctorWillContactYou.tr(context: context).toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.specialisedDoctorWillContactYou.tr(context: context).toText14(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -103,7 +103,7 @@ class SelectLivecareClinicPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.freeMedicineDelivery.tr(context: context).toText18(color: AppColors.textColor, isBold: true),
- LocaleKeys.offersFreeMedicineDelivery.tr(context: context).toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.offersFreeMedicineDelivery.tr(context: context).toText14(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -152,7 +152,7 @@ class SelectLivecareClinicPage extends StatelessWidget {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 10.r,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
@@ -171,7 +171,7 @@ class SelectLivecareClinicPage extends StatelessWidget {
borderColor: AppColors.secondaryLightRedColor,
textColor: AppColors.primaryRedColor,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 10.r,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
diff --git a/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_info.dart b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_info.dart
index 19d0fb41..500167eb 100644
--- a/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_info.dart
+++ b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_info.dart
@@ -98,7 +98,7 @@ class WaitingAppointmentInfo extends StatelessWidget {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 16,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
diff --git a/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_online_checkin_sheet.dart b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_online_checkin_sheet.dart
index f762ae0a..11c79c10 100644
--- a/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_online_checkin_sheet.dart
+++ b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_online_checkin_sheet.dart
@@ -111,7 +111,7 @@ class WaitingAppointmentOnlineCheckinSheet extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
title.toText16(isBold: true, color: AppColors.textColor),
- subTitle.toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor),
+ subTitle.toText12(isBold: true, color: AppColors.greyTextColor),
],
),
),
diff --git a/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart
index 663fd5b4..4d136cdd 100644
--- a/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart
+++ b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart
@@ -244,7 +244,7 @@ class _WaitingAppointmentPaymentPageState extends State {
// Row(
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
- // "Pick a Date".toText20(weight: FontWeight.w600).expanded,
+ // "Pick a Date".toText20(isBold: true).expanded,
// Utils.buildSvgWithAssets(icon: AppAssets.close_bottom_sheet_icon, iconColor: Color(0xff2B353E)).onPress(() {
// Navigator.of(context).pop();
// }),
@@ -147,7 +147,7 @@ class _AppointmentCalendarState extends State {
SizedBox(height: 10.h),
Transform.translate(
offset: const Offset(0.0, -10.0),
- child: selectedDateDisplay.toText16(weight: FontWeight.w500, isEnglishOnly: true),
+ child: selectedDateDisplay.toText16(isBold: true, isEnglishOnly: true),
),
//TODO: Add Next Day Span here
dayEvents.isNotEmpty
@@ -269,7 +269,7 @@ class _AppointmentCalendarState extends State {
borderColor: AppColors.primaryRedColor,
textColor: Colors.white,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 10.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
height: 50.h,
@@ -349,14 +349,14 @@ class TimeSlotChip extends StatelessWidget {
? Container(
padding: EdgeInsets.symmetric(horizontal: 14.h, vertical: 8.h),
decoration: ShapeDecoration(
- color: isSelected ? AppColors.warningColorYellow : AppColors.textColor,
+ color: isSelected ? AppColors.warningColorYellow : AppColors.whiteColor,
shape: SmoothRectangleBorder(
borderRadius: BorderRadius.circular(8.h),
smoothness: 1,
side: BorderSide(color: isSelected ? AppColors.warningColorYellow : AppColors.borderOnlyColor.withOpacity(0.2), width: 1),
),
),
- child: label.toText12(color: isSelected ? AppColors.whiteColor : Colors.black87, fontWeight: FontWeight.w500, isEnglishOnly: true),
+ child: label.toText12(color: isSelected ? AppColors.whiteColor : Colors.black87, isBold: true, isEnglishOnly: true),
)
: Container(
padding: EdgeInsets.symmetric(horizontal: 14.h, vertical: 8.h),
@@ -368,7 +368,7 @@ class TimeSlotChip extends StatelessWidget {
side: BorderSide(color: isSelected ? AppColors.primaryRedColor : AppColors.borderOnlyColor.withOpacity(0.2), width: 1),
),
),
- child: label.toText12(color: isSelected ? AppColors.primaryRedColor : AppColors.textColor, fontWeight: FontWeight.w500, isEnglishOnly: true),
+ child: label.toText12(color: isSelected ? AppColors.primaryRedColor : AppColors.textColor, isBold: true, isEnglishOnly: true),
),
);
}
diff --git a/lib/presentation/book_appointment/widgets/doctor_card.dart b/lib/presentation/book_appointment/widgets/doctor_card.dart
index 25458b74..11042a57 100644
--- a/lib/presentation/book_appointment/widgets/doctor_card.dart
+++ b/lib/presentation/book_appointment/widgets/doctor_card.dart
@@ -118,7 +118,7 @@ class DoctorCard extends StatelessWidget {
: doctorsListResponseModel.speciality!.first) : ""
: "")
.toString()
- .toText12(fontWeight: FontWeight.w500, color: AppColors.textColor, maxLine: 2, isEnglishOnly: true)
+ .toText12(isBold: true, color: AppColors.textColor, maxLine: 2, isEnglishOnly: true)
.toShimmer2(isShow: isLoading),
),
SizedBox(width: 6.w),
@@ -262,7 +262,7 @@ class DoctorCard extends StatelessWidget {
borderColor: Color(0xffFEE9EA),
textColor: Color(0xffED1C2B),
fontSize: 14.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 10.r,
padding: EdgeInsets.fromLTRB(10.h, 0, 10.h, 0),
height: 40.h,
diff --git a/lib/presentation/book_appointment/widgets/doctor_rating_details.dart b/lib/presentation/book_appointment/widgets/doctor_rating_details.dart
index 10c35072..df88b366 100644
--- a/lib/presentation/book_appointment/widgets/doctor_rating_details.dart
+++ b/lib/presentation/book_appointment/widgets/doctor_rating_details.dart
@@ -151,12 +151,12 @@ class DoctorRatingDialog extends StatelessWidget {
child: Row(
children: [
NumberFormat.decimalPattern().format(totalReviews).toText12(
- fontWeight: FontWeight.w500,
+ isBold: true,
color: averageRating == 0 || averageRating == 0.0 ? AppColors.textColor : AppColors.whiteColor,
isEnglishOnly: true
),
' ${LocaleKeys.reviews.tr(context: context)}'.toText12(
- fontWeight: FontWeight.w500,
+ isBold: true,
color: averageRating == 0 || averageRating == 0.0 ? AppColors.textColor : AppColors.whiteColor,
),
],
@@ -165,7 +165,7 @@ class DoctorRatingDialog extends StatelessWidget {
// '${NumberFormat.decimalPattern().format(totalReviews)} ${LocaleKeys.reviews.tr(context: context)}',
// style: TextStyle(
// fontSize: 12.f,
- // fontWeight: FontWeight.w500,
+ // isBold: true,
// color: averageRating == 0 || averageRating == 0.0 ? AppColors.textColor : AppColors.whiteColor,
// ),
// ),
diff --git a/lib/presentation/child_vaccine/my_child_vaccine_page.dart b/lib/presentation/child_vaccine/my_child_vaccine_page.dart
index 6a226ab4..3ec6a09e 100644
--- a/lib/presentation/child_vaccine/my_child_vaccine_page.dart
+++ b/lib/presentation/child_vaccine/my_child_vaccine_page.dart
@@ -84,11 +84,11 @@
// Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
-// LocaleKeys.city.tr().toText16(color: AppColors.textColor, weight: FontWeight.w500),
+// LocaleKeys.city.tr().toText16(color: AppColors.textColor, isBold: true),
// (appState.isArabic()
// ? (bloodDonationVM.selectedCity?.descriptionN ?? LocaleKeys.select.tr())
// : bloodDonationVM.selectedCity?.description ?? LocaleKeys.select.tr(context: context))
-// .toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+// .toText14(color: AppColors.greyTextColor, isBold: true),
// ],
// ),
// ],
@@ -112,11 +112,11 @@
// Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
-// LocaleKeys.gender.tr().toText16(color: AppColors.textColor, weight: FontWeight.w500),
+// LocaleKeys.gender.tr().toText16(color: AppColors.textColor, isBold: true),
// (appState.isArabic()
// ? (bloodDonationVM.selectedGender?.typeAr ?? LocaleKeys.select.tr())
// : bloodDonationVM.selectedGender?.type ?? LocaleKeys.select.tr(context: context))
-// .toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+// .toText14(color: AppColors.greyTextColor, isBold: true),
// ],
// ),
// ],
@@ -143,12 +143,12 @@
// Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
-// LocaleKeys.bloodType.tr().toText16(color: AppColors.textColor, weight: FontWeight.w500),
-// // bloodDonationVM.selectedBloodType?.toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+// LocaleKeys.bloodType.tr().toText16(color: AppColors.textColor, isBold: true),
+// // bloodDonationVM.selectedBloodType?.toText14(color: AppColors.greyTextColor, isBold: true),
// (appState.isArabic()
// ? (bloodDonationVM.selectedBloodType ?? LocaleKeys.select.tr())
// : bloodDonationVM.selectedBloodType ?? LocaleKeys.select.tr(context: context))
-// .toText14(color: AppColors.greyTextColor, weight: FontWeight.w500)
+// .toText14(color: AppColors.greyTextColor, isBold: true)
// ],
// ),
// ],
@@ -307,7 +307,7 @@ class _MyChildVaccinePageState extends State {
"${children[index]['name']} (${children[index]['gender']})",
style: TextStyle(
color: isSelected ? AppColors.primaryRedColor : AppColors.textColor,
- fontWeight: isSelected ? FontWeight.w600 : FontWeight.w500,
+ fontWeight: isSelected ? FontWeight.w600 : FontWeight.w600,
fontSize: 14.f,
),
),
@@ -343,7 +343,7 @@ class _MyChildVaccinePageState extends State {
children: [
Utils.buildSvgWithAssets(icon: AppAssets.calendar, width: 16.h, height: 16.h, iconColor: AppColors.textColor),
SizedBox(width: 8.w),
- "Due Date : ${data['dueDate']}".toText12(fontWeight: FontWeight.w500, color: AppColors.textColor),
+ "Due Date : ${data['dueDate']}".toText12(isBold: true, color: AppColors.textColor),
],
),
),
@@ -354,7 +354,7 @@ class _MyChildVaccinePageState extends State {
children: [
Utils.buildSvgWithAssets(icon: AppAssets.tickIcon, width: 20.h, height: 20.h, iconColor: Colors.green),
SizedBox(width: 12.w),
- vaccine.toString().toText14(weight: FontWeight.w500, color: AppColors.textColor),
+ vaccine.toString().toText14(isBold: true, color: AppColors.textColor),
],
),
)),
diff --git a/lib/presentation/comprehensive_checkup/cmc_order_detail_page.dart b/lib/presentation/comprehensive_checkup/cmc_order_detail_page.dart
index dd836a64..fa0fdcdb 100644
--- a/lib/presentation/comprehensive_checkup/cmc_order_detail_page.dart
+++ b/lib/presentation/comprehensive_checkup/cmc_order_detail_page.dart
@@ -105,7 +105,7 @@ class _CmcOrderDetailPageState extends State {
child: (isLoading ? "Processing" : order.statusText ?? '')
.toText12(
color: statusColor,
- fontWeight: FontWeight.w600,
+ isBold: true,
)
.toShimmer2(isShow: isLoading),
),
@@ -113,7 +113,7 @@ class _CmcOrderDetailPageState extends State {
(isLoading ? "Jan 15, 2024" : _formatDate(order.created))
.toText12(
color: AppColors.textColorLight,
- fontWeight: FontWeight.w500,
+ isBold: true,
)
.toShimmer2(isShow: isLoading),
],
@@ -127,7 +127,7 @@ class _CmcOrderDetailPageState extends State {
if (!isLoading) ...[
LocaleKeys.requestID.tr(context: context).toText14(
color: AppColors.textColorLight,
- weight: FontWeight.w500,
+ weight: FontWeight.w600,
),
SizedBox(width: 4.w),
],
@@ -171,7 +171,7 @@ class _CmcOrderDetailPageState extends State {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 14.f,
- fontWeight: FontWeight.w600,
+ isBold: true,
borderRadius: 10.r,
height: 44.h,
).toShimmer2(isShow: isLoading),
diff --git a/lib/presentation/comprehensive_checkup/cmc_selection_review_page.dart b/lib/presentation/comprehensive_checkup/cmc_selection_review_page.dart
index 8dcf6183..94bc0e13 100644
--- a/lib/presentation/comprehensive_checkup/cmc_selection_review_page.dart
+++ b/lib/presentation/comprehensive_checkup/cmc_selection_review_page.dart
@@ -356,7 +356,7 @@ class _CmcSelectionReviewPageState extends State {
children: [
LocaleKeys.hereIsYourRequestNumber.tr(context: context).toText14(
color: AppColors.textColorLight,
- weight: FontWeight.w500,
+ weight: FontWeight.w600,
),
SizedBox(width: 4.w),
("$requestId").toText16(isBold: true),
diff --git a/lib/presentation/comprehensive_checkup/comprehensive_checkup_page.dart b/lib/presentation/comprehensive_checkup/comprehensive_checkup_page.dart
index da926cd2..589764c1 100644
--- a/lib/presentation/comprehensive_checkup/comprehensive_checkup_page.dart
+++ b/lib/presentation/comprehensive_checkup/comprehensive_checkup_page.dart
@@ -112,14 +112,14 @@ class _ComprehensiveCheckupPageState extends State {
),
child: statusDisp.toText12(
color: statusColor,
- fontWeight: FontWeight.w600,
+ isBold: true,
),
),
SizedBox(width: 8.w),
if (order.created != null)
DateFormat('MMM dd, yyyy').format(DateTime.parse(order.created!)).toText12(
color: AppColors.textColorLight,
- fontWeight: FontWeight.w500,
+ isBold: true,
),
],
),
@@ -129,7 +129,7 @@ class _ComprehensiveCheckupPageState extends State {
// Request ID
Row(
children: [
- LocaleKeys.requestID.tr(context: context).toText14(color: AppColors.textColorLight, weight: FontWeight.w500),
+ LocaleKeys.requestID.tr(context: context).toText14(color: AppColors.textColorLight, isBold: true),
SizedBox(width: 4.w),
"${order.iD ?? '-'}".toText16(isBold: true),
],
@@ -182,7 +182,7 @@ class _ComprehensiveCheckupPageState extends State {
Expanded(
child: LocaleKeys.pendingOrderWait.tr(context: context).toText12(
color: AppColors.infoBannerTextColor,
- fontWeight: FontWeight.w500,
+ isBold: true,
),
),
],
@@ -200,7 +200,7 @@ class _ComprehensiveCheckupPageState extends State {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 14.f,
- fontWeight: FontWeight.w600,
+ isBold: true,
borderRadius: 10.r,
height: 44.h,
),
diff --git a/lib/presentation/comprehensive_checkup/widgets/cmc_hospital_bottom_sheet_body.dart b/lib/presentation/comprehensive_checkup/widgets/cmc_hospital_bottom_sheet_body.dart
index 93c8d5fd..6f24e5e4 100644
--- a/lib/presentation/comprehensive_checkup/widgets/cmc_hospital_bottom_sheet_body.dart
+++ b/lib/presentation/comprehensive_checkup/widgets/cmc_hospital_bottom_sheet_body.dart
@@ -85,7 +85,7 @@ class CmcHospitalBottomSheetBody extends StatelessWidget {
? _buildLoadingShimmer()
: hmgServicesViewModel.filteredHospitalsList.isEmpty
? Center(
- child: LocaleKeys.noHospitalsFound.tr(context: context).toText16(weight: FontWeight.w500, color: AppColors.greyTextColor),
+ child: LocaleKeys.noHospitalsFound.tr(context: context).toText16(isBold: true, color: AppColors.greyTextColor),
)
: ListView.separated(
itemCount: hmgServicesViewModel.filteredHospitalsList.length,
diff --git a/lib/presentation/contact_us/contact_us.dart b/lib/presentation/contact_us/contact_us.dart
index fbbd11bc..f4b16ec4 100644
--- a/lib/presentation/contact_us/contact_us.dart
+++ b/lib/presentation/contact_us/contact_us.dart
@@ -126,7 +126,7 @@ class ContactUs extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
title.toText16(isBold: true, color: AppColors.textColor),
- subTitle.toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor),
+ subTitle.toText12(isBold: true, color: AppColors.greyTextColor),
],
),
),
diff --git a/lib/presentation/contact_us/feedback_page.dart b/lib/presentation/contact_us/feedback_page.dart
index 2c216cc1..cc70f28e 100644
--- a/lib/presentation/contact_us/feedback_page.dart
+++ b/lib/presentation/contact_us/feedback_page.dart
@@ -125,7 +125,7 @@ class FeedbackPage extends StatelessWidget {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 16,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
@@ -146,7 +146,7 @@ class FeedbackPage extends StatelessWidget {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.likeToHear.tr().toText14(weight: FontWeight.w500),
+ LocaleKeys.likeToHear.tr().toText14(isBold: true),
SizedBox(height: 16.h),
Container(
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
@@ -167,9 +167,9 @@ class FeedbackPage extends StatelessWidget {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.feedbackType.tr().toText16(color: AppColors.textColor, weight: FontWeight.w500),
+ LocaleKeys.feedbackType.tr().toText16(color: AppColors.textColor, isBold: true),
(getIt.get().isArabic() ? contactUsViewModel.selectedFeedbackType.nameAR : contactUsViewModel.selectedFeedbackType.nameEN)
- .toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ .toText14(color: AppColors.greyTextColor, isBold: true),
],
),
],
@@ -197,7 +197,7 @@ class FeedbackPage extends StatelessWidget {
getIt.get().isArabic() ? contactUsViewModel.feedbackTypeList[index].nameAR : contactUsViewModel.feedbackTypeList[index].nameEN,
style: TextStyle(
fontSize: 16.h,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
),
),
value: contactUsViewModel.feedbackTypeList[index],
@@ -352,7 +352,7 @@ class FeedbackPage extends StatelessWidget {
borderColor: AppColors.secondaryLightRedColor,
textColor: AppColors.primaryRedColor,
fontSize: 14.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 10.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
height: 40.h,
@@ -478,7 +478,7 @@ class FeedbackPage extends StatelessWidget {
.toText16(weight: FontWeight.bold, fontFamily: Utils.isArabicText(contactUsViewModel.cocItemsList[index].cOCTitle ?? "") ? "GESSTwo" : "Poppins"),
SizedBox(height: 8.h),
"${contactUsViewModel.cocItemsList[index].detail}".toText14(
- weight: FontWeight.w500,
+ weight: FontWeight.w600,
color: AppColors.textColorLight,
fontFamily: Utils.isArabicText(contactUsViewModel.cocItemsList[index].detail ?? "") ? "GESSTwo" : "Poppins"),
],
diff --git a/lib/presentation/contact_us/find_us_page.dart b/lib/presentation/contact_us/find_us_page.dart
index 4b272f50..e1dff5e7 100644
--- a/lib/presentation/contact_us/find_us_page.dart
+++ b/lib/presentation/contact_us/find_us_page.dart
@@ -59,7 +59,7 @@ class FindUsPage extends StatelessWidget {
children: [
LocaleKeys.sortByLocation.tr(context: context).toText14(isBold: true),
SizedBox(height: 4.h),
- LocaleKeys.sortByNearestLocation.tr(context: context).toText11(color: AppColors.textColorLight, weight: FontWeight.w500),
+ LocaleKeys.sortByNearestLocation.tr(context: context).toText11(color: AppColors.textColorLight, isBold: true),
],
),
const Spacer(),
diff --git a/lib/presentation/contact_us/live_chat_page.dart b/lib/presentation/contact_us/live_chat_page.dart
index 98fc9954..0fd14b6c 100644
--- a/lib/presentation/contact_us/live_chat_page.dart
+++ b/lib/presentation/contact_us/live_chat_page.dart
@@ -239,7 +239,7 @@ class LiveChatPage extends StatelessWidget {
borderColor: contactUsVM.selectedLiveChatProjectIndex == -1 ? AppColors.greyColor : AppColors.primaryRedColor,
textColor: Colors.white,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
diff --git a/lib/presentation/contact_us/widgets/find_us_item_card.dart b/lib/presentation/contact_us/widgets/find_us_item_card.dart
index 1cc21939..1f7f2443 100644
--- a/lib/presentation/contact_us/widgets/find_us_item_card.dart
+++ b/lib/presentation/contact_us/widgets/find_us_item_card.dart
@@ -123,7 +123,7 @@ class FindUsItemCard extends StatelessWidget {
textColor: AppColors.blackColor,
borderWidth: 1.h,
fontSize: (isFoldable || isTablet) ? 12.f : 14.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
height: 40.h,
diff --git a/lib/presentation/covid19test/covid19_landing_page.dart b/lib/presentation/covid19test/covid19_landing_page.dart
index a241da60..63ebe8f5 100644
--- a/lib/presentation/covid19test/covid19_landing_page.dart
+++ b/lib/presentation/covid19test/covid19_landing_page.dart
@@ -102,7 +102,7 @@ class _Covid19LandingPageState extends State {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
height: 50.h,
@@ -259,7 +259,7 @@ class _Covid19LandingPageState extends State {
: AppColors.greyTextColor.withValues(alpha: 0.3),
textColor: AppColors.whiteColor,
fontSize: 16.f,
- fontWeight: FontWeight.w600,
+ isBold: true,
borderRadius: 12.r,
height: 56.h,
),
diff --git a/lib/presentation/covid19test/covid_19_questionnaire.dart b/lib/presentation/covid19test/covid_19_questionnaire.dart
index f7b1f4c0..bb12e448 100644
--- a/lib/presentation/covid19test/covid_19_questionnaire.dart
+++ b/lib/presentation/covid19test/covid_19_questionnaire.dart
@@ -71,7 +71,7 @@ class _Covid19QuestionnaireState extends State {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 16.f,
- fontWeight: FontWeight.w600,
+ isBold: true,
borderRadius: 12.r,
height: 56.h,
)),
@@ -93,7 +93,7 @@ class _Covid19QuestionnaireState extends State {
children: [
"Please answer below questionnaire:".toText14(
color: AppColors.textColor,
- weight: FontWeight.w500,
+ weight: FontWeight.w600,
),
SizedBox(height: 20.h),
// Question list
diff --git a/lib/presentation/covid19test/covid_payment_screen.dart b/lib/presentation/covid19test/covid_payment_screen.dart
index 40bf2863..a846828f 100644
--- a/lib/presentation/covid19test/covid_payment_screen.dart
+++ b/lib/presentation/covid19test/covid_payment_screen.dart
@@ -178,7 +178,7 @@ class _CovidPaymentScreenState extends State {
// borderColor: AppColors.primaryRedColor,
// textColor: AppColors.whiteColor,
// fontSize: 16.f,
- // fontWeight: FontWeight.w500,
+ // isBold: true,
// borderRadius: 12.r,
// padding: EdgeInsets.symmetric(horizontal: 10.w),
// icon: AppAssets.add_icon,
diff --git a/lib/presentation/covid19test/covid_review_screen.dart b/lib/presentation/covid19test/covid_review_screen.dart
index 34401298..be6bdb71 100644
--- a/lib/presentation/covid19test/covid_review_screen.dart
+++ b/lib/presentation/covid19test/covid_review_screen.dart
@@ -279,7 +279,7 @@ class _CovidReviewScreenState extends State {
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
// icon: AppAssets.add_icon,
@@ -305,7 +305,7 @@ class _CovidReviewScreenState extends State {
"Please select the procedure:".toText14(
color: AppColors.textColor,
- weight: FontWeight.w500,
+ weight: FontWeight.w600,
),
SizedBox(height: 16.h),
diff --git a/lib/presentation/e_referral/e_referral_search_result.dart b/lib/presentation/e_referral/e_referral_search_result.dart
index 6a4b8318..29c7a294 100644
--- a/lib/presentation/e_referral/e_referral_search_result.dart
+++ b/lib/presentation/e_referral/e_referral_search_result.dart
@@ -75,7 +75,7 @@ class _SearchResultPageState extends State {
// style: TextStyle(
// color: Colors.white,
// fontSize: 12,
- // fontWeight: FontWeight.w500,
+ // isBold: true,
// ),
),
),
diff --git a/lib/presentation/e_referral/new_e_referral.dart b/lib/presentation/e_referral/new_e_referral.dart
index 844ef5d5..61796dbd 100644
--- a/lib/presentation/e_referral/new_e_referral.dart
+++ b/lib/presentation/e_referral/new_e_referral.dart
@@ -227,7 +227,7 @@ class _NewReferralPageState extends State {
children: [
LocaleKeys.hereIsYourReferralNumber.tr(context: context).toText14(
color: AppColors.textColorLight,
- weight: FontWeight.w500,
+ weight: FontWeight.w600,
),
SizedBox(width: 4.w),
("$requestId").toText16(isBold: true),
diff --git a/lib/presentation/e_referral/widget/e_referral_other_details.dart b/lib/presentation/e_referral/widget/e_referral_other_details.dart
index 114b3b24..579f281f 100644
--- a/lib/presentation/e_referral/widget/e_referral_other_details.dart
+++ b/lib/presentation/e_referral/widget/e_referral_other_details.dart
@@ -183,7 +183,7 @@ class _OtherDetailsStepState extends State {
color: Colors.black,
weight: FontWeight.w600,
),
- // style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600),
+ // style: TextStyle(fontSize: 14, isBold: true),
//),
),
],
diff --git a/lib/presentation/emergency_services/RRT/rrt_map_screen.dart b/lib/presentation/emergency_services/RRT/rrt_map_screen.dart
index 530152b1..7c0487bb 100644
--- a/lib/presentation/emergency_services/RRT/rrt_map_screen.dart
+++ b/lib/presentation/emergency_services/RRT/rrt_map_screen.dart
@@ -139,7 +139,7 @@ class RrtMapScreen extends StatelessWidget {
color: AppColors.textColor,
),
LocaleKeys.pleaseSelectTheLocation.tr().toText12(
- fontWeight: FontWeight.w500,
+ isBold: true,
color: AppColors.greyTextColor,
)
],
@@ -370,7 +370,7 @@ class RrtMapScreen extends StatelessWidget {
children: [
title.toText12(
color: AppColors.greyTextColor,
- fontWeight: FontWeight.w500,
+ isBold: true,
),
SizedBox(height: 2.h),
],
@@ -378,7 +378,7 @@ class RrtMapScreen extends StatelessWidget {
),
subTitle.toText14(
color: AppColors.textColor,
- weight: FontWeight.w500,
+ weight: FontWeight.w600,
),
],
),
@@ -423,7 +423,7 @@ class RrtMapScreen extends StatelessWidget {
height: 18.h, width: 18.h),
SizedBox(width: 4.h,),
LocaleKeys.amountPaidAtHospital.tr().toText12(
- fontWeight: FontWeight.w500,
+ isBold: true,
color: AppColors.greyTextColor,
),
],
@@ -437,7 +437,7 @@ class RrtMapScreen extends StatelessWidget {
.getTotalPrice() ??
0))
.toText24(
- fontWeight: FontWeight.w600,
+ isBold: true,
color: AppColors.textColor,
letterSpacing: -2),
AppColors.blackColor,
diff --git a/lib/presentation/emergency_services/RRT/rrt_request_type_select.dart b/lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
index 12996bd6..3b095ecf 100644
--- a/lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
+++ b/lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
@@ -79,7 +79,7 @@ class RrtRequestTypeSelect extends StatelessWidget {
),
Utils.getPaymentAmountWithSymbol(
(Utils.formatNumberToInternationalFormat(context.read().selectedRRTProcedure?.patientShare ?? 0))
- .toText24(fontWeight: FontWeight.w600, color: AppColors.textColor, letterSpacing: -2),
+ .toText24(isBold: true, color: AppColors.textColor, letterSpacing: -2),
AppColors.blackColor,
17.h)
],
@@ -101,7 +101,7 @@ class RrtRequestTypeSelect extends StatelessWidget {
Row(
children: [
LocaleKeys.vat15.tr(context: context).toText12(
- fontWeight: FontWeight.w500,
+ isBold: true,
color: AppColors.greyTextColor,
),
"${emergencyServicesVM.selectedRRTProcedure?.patientTaxAmount})".toText14(
@@ -131,7 +131,7 @@ class RrtRequestTypeSelect extends StatelessWidget {
),
Utils.getPaymentAmountWithSymbol(
(Utils.formatNumberToInternationalFormat(context.read().selectedRRTProcedure?.patientShareWithTax ?? 0))
- .toText24(fontWeight: FontWeight.w600, color: AppColors.textColor, letterSpacing: -2),
+ .toText24(isBold: true, color: AppColors.textColor, letterSpacing: -2),
AppColors.blackColor,
17.h),
],
@@ -177,7 +177,7 @@ class RrtRequestTypeSelect extends StatelessWidget {
final indexOfSelectedItem = selectedProcedure != null ? procedureList.indexOf(selectedProcedure) : -1;
return RadioListTile(
- title: (procedure.procedureName ?? "").toText16(color: AppColors.textColor, weight: FontWeight.w500),
+ title: (procedure.procedureName ?? "").toText16(color: AppColors.textColor, isBold: true),
value: index,
fillColor: WidgetStateProperty.resolveWith((states) {
if (states.contains(WidgetState.selected)) {
@@ -243,8 +243,8 @@ class RrtRequestTypeSelect extends StatelessWidget {
spacing: 4.w,
children: [
SizedBox.shrink(),
- LocaleKeys.agreeTo.tr().toText16(color: AppColors.textColor, weight: FontWeight.w500),
- LocaleKeys.termsConditoins.tr().toText16(color: AppColors.errorColor, isUnderLine: true, weight: FontWeight.w500).onPress(() {
+ LocaleKeys.agreeTo.tr().toText16(color: AppColors.textColor, isBold: true),
+ LocaleKeys.termsConditoins.tr().toText16(color: AppColors.errorColor, isUnderLine: true, isBold: true).onPress(() {
emergencyServicesVM.getTermsAndConditions();
}),
],
diff --git a/lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart b/lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
index e5578a3e..462fb20a 100644
--- a/lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
+++ b/lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
@@ -161,7 +161,7 @@ class CallAmbulancePage extends StatelessWidget {
color: AppColors.textColor,
),
LocaleKeys.pleaseSelectDetailsOfPickup.tr(context: context).toText12(
- fontWeight: FontWeight.w500,
+ isBold: true,
color: AppColors.greyTextColor,
)
],
@@ -384,7 +384,7 @@ class CallAmbulancePage extends StatelessWidget {
children: [
title.toText12(
color: AppColors.greyTextColor,
- fontWeight: FontWeight.w500,
+ isBold: true,
),
SizedBox(height: 2.h),
],
@@ -392,7 +392,7 @@ class CallAmbulancePage extends StatelessWidget {
),
subTitle.toText14(
color: AppColors.textColor,
- weight: FontWeight.w500,
+ weight: FontWeight.w600,
),
],
),
@@ -437,7 +437,7 @@ class CallAmbulancePage extends StatelessWidget {
width: 4.h,
),
LocaleKeys.amountPaidAtHospital.tr(context: context).toText12(
- fontWeight: FontWeight.w500,
+ isBold: true,
color: AppColors.greyTextColor,
),
],
@@ -447,7 +447,7 @@ class CallAmbulancePage extends StatelessWidget {
),
Utils.getPaymentAmountWithSymbol(
(Utils.formatNumberToInternationalFormat(context.read().getTotalPrice() ?? 0))
- .toText24(fontWeight: FontWeight.w600, color: AppColors.textColor, letterSpacing: -2),
+ .toText24(isBold: true, color: AppColors.textColor, letterSpacing: -2),
AppColors.blackColor,
17.h)
diff --git a/lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart b/lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
index bc6d9b03..15d1d552 100644
--- a/lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
+++ b/lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
@@ -30,7 +30,7 @@ class RequestingServicesPage extends StatelessWidget {
Positioned(
bottom: 1,
child: LocaleKeys.submitRequest.tr(context: context)
- .toText16(color: AppColors.textColor, weight: FontWeight.w500)
+ .toText16(color: AppColors.textColor, isBold: true)
.paddingOnly(bottom: 100.h, left: 100.h, right: 100.h))
],
),
diff --git a/lib/presentation/emergency_services/call_ambulance/tracking_screen.dart b/lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
index 9a49dd06..abe9c81b 100644
--- a/lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
+++ b/lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
@@ -220,9 +220,9 @@ class TrackingScreen extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- "Dr. John Doe".toText16(color: AppColors.textColor, weight: FontWeight.w600),
+ "Dr. John Doe".toText16(color: AppColors.textColor, isBold: true),
SizedBox(height: 4.h),
- "MBBS, MD - General Medicine".toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500),
+ "MBBS, MD - General Medicine".toText12(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -268,7 +268,7 @@ class TrackingScreen extends StatelessWidget {
informationRegardingTrackingSection() {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
- children: [currentStatus(), SizedBox(height: 4.h), "You will receive a call from HMG for confirmation ".toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500)],
+ children: [currentStatus(), SizedBox(height: 4.h), "You will receive a call from HMG for confirmation ".toText12(color: AppColors.greyTextColor, isBold: true)],
);
}
@@ -293,7 +293,7 @@ class TrackingScreen extends StatelessWidget {
text: "...",
style: TextStyle(
fontSize: 21.f,
- fontWeight: FontWeight.w600,
+ fontWeight: FontWeight.w600,
color: AppColors.errorColor,
),
),
@@ -306,7 +306,7 @@ class TrackingScreen extends StatelessWidget {
text: "15:30",
style: TextStyle(
fontSize: 21.f,
- fontWeight: FontWeight.w600,
+ fontWeight: FontWeight.w600,
color: AppColors.textColor,
),
),
@@ -314,7 +314,7 @@ class TrackingScreen extends StatelessWidget {
text: LocaleKeys.mins.tr(),
style: TextStyle(
fontSize: 21.f,
- fontWeight: FontWeight.w600,
+ fontWeight: FontWeight.w600,
color: AppColors.errorColor,
),
),
@@ -322,7 +322,7 @@ class TrackingScreen extends StatelessWidget {
text: LocaleKeys.toHospitalLower.tr(),
style: TextStyle(
fontSize: 21.f,
- fontWeight: FontWeight.w600,
+ fontWeight: FontWeight.w600,
color: AppColors.textColor,
),
),
@@ -330,7 +330,7 @@ class TrackingScreen extends StatelessWidget {
);
case OrderTrackingState.ended:
- return LocaleKeys.arrived.tr().toText21(color: AppColors.textColor, weight: FontWeight.w600);
+ return LocaleKeys.arrived.tr().toText21(color: AppColors.textColor, isBold: true);
case OrderTrackingState.failed:
case OrderTrackingState.cancel:
return SizedBox.shrink();
@@ -354,7 +354,7 @@ class TrackingScreen extends StatelessWidget {
spacing: 8.h,
children: [
- Visibility(visible:(order != null || rrtOrder != null) ,child: "Req ID: ${order?.iD?? rrtOrder?.iD}".toText16(color: AppColors.textColor, weight: FontWeight.w600)),
+ Visibility(visible:(order != null || rrtOrder != null) ,child: "Req ID: ${order?.iD?? rrtOrder?.iD}".toText16(color: AppColors.textColor, isBold: true)),
if(order != null) ambulanceOrderData()
// else rrtOrderData()
@@ -388,8 +388,8 @@ class TrackingScreen extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 4.h,
children: [
- LocaleKeys.contact.tr().toText14(color: AppColors.textColor, weight: FontWeight.w600),
- "0115259555".toText12(color: AppColors.primaryRedColor, fontWeight: FontWeight.w500).onPress((){
+ LocaleKeys.contact.tr().toText14(color: AppColors.textColor, isBold: true),
+ "0115259555".toText12(color: AppColors.primaryRedColor, isBold: true).onPress((){
launchUrl(
Uri.parse("tel://0115259555"),
);
@@ -432,23 +432,23 @@ class TrackingScreen extends StatelessWidget {
getTitle(OrderTrackingState? state) {
if(state == null) {
- return LocaleKeys.failed.tr().toText16(color: AppColors.textColor, weight: FontWeight.w600);
+ return LocaleKeys.failed.tr().toText16(color: AppColors.textColor, isBold: true);
}
switch (state) {
case OrderTrackingState.waitingForCall:
- return LocaleKeys.confirmationCall.tr().toText16(color: AppColors.textColor, weight: FontWeight.w600);
+ return LocaleKeys.confirmationCall.tr().toText16(color: AppColors.textColor, isBold: true);
case OrderTrackingState.dispactched:
- return LocaleKeys.pickupFromHome.tr().toText16(color: AppColors.textColor, weight: FontWeight.w600);
+ return LocaleKeys.pickupFromHome.tr().toText16(color: AppColors.textColor, isBold: true);
case OrderTrackingState.returning:
- return LocaleKeys.onTheWayToHospital.tr().toText16(color: AppColors.textColor, weight: FontWeight.w600);
+ return LocaleKeys.onTheWayToHospital.tr().toText16(color: AppColors.textColor, isBold: true);
case OrderTrackingState.ended:
- return LocaleKeys.arrivedAtHospital.tr().toText16(color: AppColors.textColor, weight: FontWeight.w600);
+ return LocaleKeys.arrivedAtHospital.tr().toText16(color: AppColors.textColor, isBold: true);
case OrderTrackingState.failed:
- return LocaleKeys.failed.tr().toText16(color: AppColors.textColor, weight: FontWeight.w600);
+ return LocaleKeys.failed.tr().toText16(color: AppColors.textColor, isBold: true);
case OrderTrackingState.cancel:
- return LocaleKeys.orderCancel.tr().toText16(color: AppColors.textColor, weight: FontWeight.w600);
+ return LocaleKeys.orderCancel.tr().toText16(color: AppColors.textColor, isBold: true);
}
}
diff --git a/lib/presentation/emergency_services/call_ambulance/widgets/AddressItem.dart b/lib/presentation/emergency_services/call_ambulance/widgets/AddressItem.dart
index 13e32561..f9d39434 100644
--- a/lib/presentation/emergency_services/call_ambulance/widgets/AddressItem.dart
+++ b/lib/presentation/emergency_services/call_ambulance/widgets/AddressItem.dart
@@ -48,7 +48,7 @@ class AddressItem extends StatelessWidget {
children: [
title.toText12(
color: AppColors.greyTextColor,
- fontWeight: FontWeight.w500,
+ isBold: true,
),
Row(
mainAxisSize: MainAxisSize.max,
@@ -56,7 +56,7 @@ class AddressItem extends StatelessWidget {
Expanded(
child: address.toText14(
color: AppColors.textColor,
- weight: FontWeight.w500,
+ weight: FontWeight.w600,
textOverflow : TextOverflow.ellipsis,
maxlines: 2
),
diff --git a/lib/presentation/emergency_services/call_ambulance/widgets/WayPickup.dart b/lib/presentation/emergency_services/call_ambulance/widgets/WayPickup.dart
index 039241a8..ad28122c 100644
--- a/lib/presentation/emergency_services/call_ambulance/widgets/WayPickup.dart
+++ b/lib/presentation/emergency_services/call_ambulance/widgets/WayPickup.dart
@@ -31,7 +31,7 @@ class WayPickup extends StatelessWidget {
height: 16.h,
),
// LocaleKeys.selectDirection.tr(context: context)
- // .toText16(color: AppColors.textColor, weight: FontWeight.w600),
+ // .toText16(color: AppColors.textColor, isBold: true),
// SizedBox(
// height: 12.h,
// ),
@@ -83,7 +83,7 @@ class WayPickup extends StatelessWidget {
// children: [
// SizedBox(height: 16.h),
// LocaleKeys.selectWay.tr(context: context)
- // .toText16(color: AppColors.textColor, weight: FontWeight.w600),
+ // .toText16(color: AppColors.textColor, isBold: true),
// SizedBox(height: 12.h),
// Row(
// mainAxisAlignment: MainAxisAlignment.start,
@@ -105,7 +105,7 @@ class WayPickup extends StatelessWidget {
// fillColor: MaterialStateProperty.all(AppColors.primaryRedColor),
// ),
// LocaleKeys.oneWay.tr(context: context)
- // .toText12(color: AppColors.textColor, fontWeight: FontWeight.w500)
+ // .toText12(color: AppColors.textColor, isBold: true)
// ],
// ).onPress(() {
// context
@@ -130,7 +130,7 @@ class WayPickup extends StatelessWidget {
// fillColor: MaterialStateProperty.all(AppColors.primaryRedColor),
// ),
// LocaleKeys.twoWay.tr(context: context)
- // .toText14(color: AppColors.textColor, weight: FontWeight.w500)
+ // .toText14(color: AppColors.textColor, isBold: true)
// ],
// ).onPress(() {
// context
diff --git a/lib/presentation/emergency_services/call_ambulance/widgets/pickup_location.dart b/lib/presentation/emergency_services/call_ambulance/widgets/pickup_location.dart
index d76e6192..fa4eefe1 100644
--- a/lib/presentation/emergency_services/call_ambulance/widgets/pickup_location.dart
+++ b/lib/presentation/emergency_services/call_ambulance/widgets/pickup_location.dart
@@ -29,7 +29,7 @@ class PickupLocation extends StatelessWidget {
height: 16.h,
),
// LocaleKeys.selectDirection.tr(context: context)
- // .toText16(color: AppColors.textColor, weight: FontWeight.w600),
+ // .toText16(color: AppColors.textColor, isBold: true),
// SizedBox(
// height: 12.h,
// ),
@@ -83,7 +83,7 @@ class PickupLocation extends StatelessWidget {
// fillColor: MaterialStateProperty.all(AppColors.primaryRedColor),
// ),
// LocaleKeys.toHospital.tr(context: context)
- // .toText14(color: AppColors.textColor, weight: FontWeight.w500)
+ // .toText14(color: AppColors.textColor, isBold: true)
// ],
// ).onPress(() {
// context
@@ -108,7 +108,7 @@ class PickupLocation extends StatelessWidget {
// fillColor: MaterialStateProperty.all(AppColors.primaryRedColor),
// ),
// LocaleKeys.fromHospital.tr(context: context)
- // .toText14(color: AppColors.textColor, weight: FontWeight.w500)
+ // .toText14(color: AppColors.textColor, isBold: true)
// ],
// ).onPress(() {
// context
@@ -128,7 +128,7 @@ class PickupLocation extends StatelessWidget {
// children: [
// SizedBox(height: 16.h),
// LocaleKeys.selectWay.tr(context: context)
- // .toText16(color: AppColors.textColor, weight: FontWeight.w600),
+ // .toText16(color: AppColors.textColor, isBold: true),
// SizedBox(height: 12.h),
// Row(
// mainAxisAlignment: MainAxisAlignment.start,
@@ -150,7 +150,7 @@ class PickupLocation extends StatelessWidget {
// fillColor: MaterialStateProperty.all(AppColors.primaryRedColor),
// ),
// LocaleKeys.oneWay.tr(context: context)
- // .toText12(color: AppColors.textColor, fontWeight: FontWeight.w500)
+ // .toText12(color: AppColors.textColor, isBold: true)
// ],
// ).onPress(() {
// context
@@ -175,7 +175,7 @@ class PickupLocation extends StatelessWidget {
// fillColor: MaterialStateProperty.all(AppColors.primaryRedColor),
// ),
// LocaleKeys.twoWay.tr(context: context)
- // .toText14(color: AppColors.textColor, weight: FontWeight.w500)
+ // .toText14(color: AppColors.textColor, isBold: true)
// ],
// ).onPress(() {
// context
diff --git a/lib/presentation/emergency_services/call_ambulance/widgets/transport_option_Item.dart b/lib/presentation/emergency_services/call_ambulance/widgets/transport_option_Item.dart
index 13c4c919..81085ed6 100644
--- a/lib/presentation/emergency_services/call_ambulance/widgets/transport_option_Item.dart
+++ b/lib/presentation/emergency_services/call_ambulance/widgets/transport_option_Item.dart
@@ -59,8 +59,8 @@ class TransportOptionItem extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
title.toText16(
- color: AppColors.textColor, weight: FontWeight.w600),
- subTitle.toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500),
+ color: AppColors.textColor, isBold: true),
+ subTitle.toText12(color: AppColors.greyTextColor, isBold: true),
],
),
),
diff --git a/lib/presentation/emergency_services/emergency_services_page.dart b/lib/presentation/emergency_services/emergency_services_page.dart
index 8e58b105..ef0fa2d5 100644
--- a/lib/presentation/emergency_services/emergency_services_page.dart
+++ b/lib/presentation/emergency_services/emergency_services_page.dart
@@ -90,7 +90,7 @@ class _EmergencyServicesPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.callAmbulance.tr().toText16(isBold: true, color: AppColors.blackColor),
- LocaleKeys.requestAmbulanceInEmergency.tr().toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500),
+ LocaleKeys.requestAmbulanceInEmergency.tr().toText12(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -133,7 +133,7 @@ class _EmergencyServicesPageState extends State {
SizedBox(height: 8.h),
LocaleKeys.confirmation.tr().toText28(color: Colors.white, isBold: true),
SizedBox(height: 8.h),
- LocaleKeys.areYouSureYouWantToCallAmbulance.tr().toText14(color: Colors.white, weight: FontWeight.w500),
+ LocaleKeys.areYouSureYouWantToCallAmbulance.tr().toText14(color: Colors.white, isBold: true),
SizedBox(height: 24.h),
CustomButton(
text: LocaleKeys.confirm.tr(context: context),
@@ -189,7 +189,7 @@ class _EmergencyServicesPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.nearester.tr(context: context).toText16(isBold: true, color: AppColors.blackColor),
- LocaleKeys.getDetailsOfNearestBranch.tr().toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500),
+ LocaleKeys.getDetailsOfNearestBranch.tr().toText12(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -220,7 +220,7 @@ class _EmergencyServicesPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.rapidResponseTeam.tr(context: context).toText16(isBold: true, color: AppColors.blackColor),
- "Comprehensive medical service for all sorts of urgent and stable cases".toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500),
+ "Comprehensive medical service for all sorts of urgent and stable cases".toText12(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -260,7 +260,7 @@ class _EmergencyServicesPageState extends State {
SizedBox(height: 8.h),
LocaleKeys.confirm.tr().toText28(color: Colors.white, isBold: true),
SizedBox(height: 8.h),
- LocaleKeys.areYouSureYouWantToCallRRT.tr().toText14(color: Colors.white, weight: FontWeight.w500),
+ LocaleKeys.areYouSureYouWantToCallRRT.tr().toText14(color: Colors.white, isBold: true),
SizedBox(height: 24.h),
CustomButton(
text: LocaleKeys.confirm.tr(context: context),
@@ -342,7 +342,7 @@ class _EmergencyServicesPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.emergencyCheckIn.tr(context: context).toText16(isBold: true, color: AppColors.blackColor),
- LocaleKeys.priorERCheckInToSkipLine.tr().toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500),
+ LocaleKeys.priorERCheckInToSkipLine.tr().toText12(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -382,7 +382,7 @@ class _EmergencyServicesPageState extends State {
SizedBox(height: 8.h),
LocaleKeys.confirm.tr().toText28(color: Colors.white, isBold: true),
SizedBox(height: 8.h),
- LocaleKeys.areYouSureYouWantToMakeERCheckIn.tr().toText14(color: Colors.white, weight: FontWeight.w500),
+ LocaleKeys.areYouSureYouWantToMakeERCheckIn.tr().toText14(color: Colors.white, isBold: true),
SizedBox(height: 24.h),
CustomButton(
text: LocaleKeys.confirm.tr(context: context),
diff --git a/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_home.dart b/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_home.dart
index 7f206c17..bb9f3ffd 100644
--- a/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_home.dart
+++ b/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_home.dart
@@ -57,7 +57,7 @@ class ErOnlineCheckinHome extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.onlineCheckIn.tr().toText18(color: AppColors.textColor, isBold: true),
- LocaleKeys.erOnlineCheckInDescription.tr().toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.erOnlineCheckInDescription.tr().toText14(color: AppColors.greyTextColor, isBold: true),
],
),
),
@@ -136,7 +136,7 @@ class ErOnlineCheckinHome extends StatelessWidget {
borderColor: emergencyServicesViewModel.patientHasAdvanceERBalance ? AppColors.alertColor : AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 10.r,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
diff --git a/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_payment_details_page.dart b/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_payment_details_page.dart
index eee31da7..913fe562 100644
--- a/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_payment_details_page.dart
+++ b/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_payment_details_page.dart
@@ -117,7 +117,7 @@ class ErOnlineCheckinPaymentDetailsPage extends StatelessWidget {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
- Expanded(child: "".toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor)),
+ Expanded(child: "".toText12(isBold: true, color: AppColors.greyTextColor)),
LocaleKeys.vatWithAmount
.tr(namedArgs: {"amount": emergencyServicesViewModel.erOnlineCheckInPaymentDetailsResponse.patientTaxAmount.toString()})
.toText14(isBold: true, color: AppColors.greyTextColor, letterSpacing: -1),
@@ -154,7 +154,7 @@ class ErOnlineCheckinPaymentDetailsPage extends StatelessWidget {
borderColor: AppColors.infoColor.withOpacity(0.01),
textColor: AppColors.whiteColor,
fontSize: 16.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w),
height: 56.h,
diff --git a/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_payment_page.dart b/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_payment_page.dart
index bc0e7344..b47ccc33 100644
--- a/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_payment_page.dart
+++ b/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_payment_page.dart
@@ -230,7 +230,7 @@ class _ErOnlineCheckinPaymentPageState extends State
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
- LocaleKeys.insuranceExpiredOrInactive.tr(context: context).toText14(color: AppColors.primaryRedColor, weight: FontWeight.w500).paddingSymmetrical(24.h, 0.h),
+ LocaleKeys.insuranceExpiredOrInactive.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true).paddingSymmetrical(24.h, 0.h),
CustomButton(
text: LocaleKeys.updateInsurance.tr(context: context),
onPressed: () {
@@ -244,7 +244,7 @@ class _ErOnlineCheckinPaymentPageState extends State
borderColor: AppColors.secondaryLightRedBorderColor,
textColor: AppColors.whiteColor,
fontSize: 10,
- fontWeight: FontWeight.w500,
+ isBold: true,
borderRadius: 8,
padding: EdgeInsets.fromLTRB(15, 0, 15, 0),
height: 30.h,
diff --git a/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_select_checkin_bottom_sheet.dart b/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_select_checkin_bottom_sheet.dart
index f4bbe3af..aec10522 100644
--- a/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_select_checkin_bottom_sheet.dart
+++ b/lib/presentation/emergency_services/er_online_checkin/er_online_checkin_select_checkin_bottom_sheet.dart
@@ -109,7 +109,7 @@ class ErOnlineCheckinSelectCheckinBottomSheet extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
title.toText16(isBold: true, color: AppColors.textColor),
- subTitle.toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor),
+ subTitle.toText12(isBold: true, color: AppColors.greyTextColor),
],
),
),
diff --git a/lib/presentation/emergency_services/history/widget/ambulance_history_item.dart b/lib/presentation/emergency_services/history/widget/ambulance_history_item.dart
index 100c0cfa..67bdcbd8 100644
--- a/lib/presentation/emergency_services/history/widget/ambulance_history_item.dart
+++ b/lib/presentation/emergency_services/history/widget/ambulance_history_item.dart
@@ -38,7 +38,7 @@ class AmbulanceHistoryItem extends StatelessWidget {
spacing: 8.h,
children: [
RequestStatus(status: order.statusId ?? 0),
- "Req ID: ${order.iD}".toText16(color: AppColors.textColor, weight: FontWeight.w600, isEnglishOnly: true),
+ "Req ID: ${order.iD}".toText16(color: AppColors.textColor, isBold: true, isEnglishOnly: true),
Row(
spacing: 4.w,
children: [
diff --git a/lib/presentation/emergency_services/history/widget/rrt_item.dart b/lib/presentation/emergency_services/history/widget/rrt_item.dart
index 8e910231..c85f12a5 100644
--- a/lib/presentation/emergency_services/history/widget/rrt_item.dart
+++ b/lib/presentation/emergency_services/history/widget/rrt_item.dart
@@ -38,7 +38,7 @@ class RRTItem extends StatelessWidget {
spacing: 8.h,
children: [
RequestStatus(status: order.statusId ?? 0),
- "Req ID: ${order.iD}".toText16(color: AppColors.textColor, weight: FontWeight.w600, isEnglishOnly: true),
+ "Req ID: ${order.iD}".toText16(color: AppColors.textColor, isBold: true, isEnglishOnly: true),
Row(
spacing: 4.w,
children: [
diff --git a/lib/presentation/emergency_services/widgets/location_input_bottom_sheet.dart b/lib/presentation/emergency_services/widgets/location_input_bottom_sheet.dart
index db45654a..6bb81d87 100644
--- a/lib/presentation/emergency_services/widgets/location_input_bottom_sheet.dart
+++ b/lib/presentation/emergency_services/widgets/location_input_bottom_sheet.dart
@@ -82,7 +82,7 @@ class LocationInputBottomSheet extends StatelessWidget {
Expanded(
child: prediction.description.toText14(
color: AppColors.textColor,
- weight: FontWeight.w500),
+ weight: FontWeight.w600),
),
Utils.buildSvgWithAssets(
diff --git a/lib/presentation/emergency_services/widgets/nearestERItem.dart b/lib/presentation/emergency_services/widgets/nearestERItem.dart
index 423b887e..5579fd75 100644
--- a/lib/presentation/emergency_services/widgets/nearestERItem.dart
+++ b/lib/presentation/emergency_services/widgets/nearestERItem.dart
@@ -111,7 +111,7 @@ class NearestERItem extends StatelessWidget {
iconColor: AppColors.primaryRedColor,
height: 40.h,
fontSize: 14.f,
- fontWeight: FontWeight.w500,
+ isBold: true,
).toShimmer2(isShow: isLoading),
),
SizedBox(width: 8.h),
diff --git a/lib/presentation/habib_wallet/habib_wallet_page.dart b/lib/presentation/habib_wallet/habib_wallet_page.dart
index 2cdfc8b6..8e6230e8 100644
--- a/lib/presentation/habib_wallet/habib_wallet_page.dart
+++ b/lib/presentation/habib_wallet/habib_wallet_page.dart
@@ -74,14 +74,14 @@ class _HabibWalletState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
"${_appState.getAuthenticatedUser()!.firstName!} ${_appState.getAuthenticatedUser()!.lastName!}".toText19(isBold: true, color: Colors.white),
- "MRN: ${_appState.getAuthenticatedUser()!.patientId!}".toText14(weight: FontWeight.w500, color: AppColors.greyTextColor, isEnglishOnly: true),
+ "MRN: ${_appState.getAuthenticatedUser()!.patientId!}".toText14(isBold: true, color: AppColors.greyTextColor, isEnglishOnly: true),
],
).expanded,
Utils.buildSvgWithAssets(icon: AppAssets.habiblogo, width: 24.h, height: 24.h, applyThemeColor: false),
],
),
Spacer(),
- LocaleKeys.balanceAmount.tr(context: context).toText14(weight: FontWeight.w500, color: Colors.white),
+ LocaleKeys.balanceAmount.tr(context: context).toText14(isBold: true, color: Colors.white),
SizedBox(height: 4.h),
Consumer(builder: (context, habibWalletVM, child) {
return Utils.getPaymentAmountWithSymbol2(num.parse(NumberFormat.decimalPattern().format(habibWalletVM.habibWalletAmount)),
@@ -104,7 +104,7 @@ class _HabibWalletState extends State {
textColor: Colors.white,
text: LocaleKeys.recharge.tr(context: context),
borderWidth: 0.w,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderColor: Colors.transparent,
padding: EdgeInsets.fromLTRB(4, 0, 12, 0),
fontSize: 14.f,
@@ -138,9 +138,9 @@ class _HabibWalletState extends State {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
- Expanded(child: habibWalletVM.habibWalletBalanceList[index].projectDescription!.toText16(weight: FontWeight.w500, color: AppColors.textColor)),
+ Expanded(child: habibWalletVM.habibWalletBalanceList[index].projectDescription!.toText16(isBold: true, color: AppColors.textColor)),
Utils.getPaymentAmountWithSymbol2(num.parse(NumberFormat.decimalPattern().format(habibWalletVM.habibWalletBalanceList[index].patientAdvanceBalanceAmount!)),
- textColor: AppColors.textColor, iconColor: AppColors.textColor, iconSize: 18.h, isExpanded: false, fontSize: 28.f, fontWeight: FontWeight.w500),
+ textColor: AppColors.textColor, iconColor: AppColors.textColor, iconSize: 18.h, isExpanded: false, fontSize: 28.f, fontWeight: FontWeight.w600,),
],
).paddingSymmetrical(0, 12.h);
},
diff --git a/lib/presentation/habib_wallet/recharge_wallet_page.dart b/lib/presentation/habib_wallet/recharge_wallet_page.dart
index ba58f9fd..b5a5efed 100644
--- a/lib/presentation/habib_wallet/recharge_wallet_page.dart
+++ b/lib/presentation/habib_wallet/recharge_wallet_page.dart
@@ -83,7 +83,7 @@ class _RechargeWalletPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
//TODO: Check with hussain to show AED or SAR
- LocaleKeys.amount.tr(context: context).toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.amount.tr(context: context).toText14(color: AppColors.greyTextColor, isBold: true),
Spacer(),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
@@ -110,7 +110,7 @@ class _RechargeWalletPageState extends State {
),
),
const Spacer(),
- LocaleKeys.sar.tr(context: context).toText20(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.sar.tr(context: context).toText20(color: AppColors.greyTextColor, isBold: true),
],
),
],
@@ -140,9 +140,9 @@ class _RechargeWalletPageState extends State {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- (habibWalletVM.getSelectedRechargeTypeValue()).toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500),
+ (habibWalletVM.getSelectedRechargeTypeValue()).toText12(color: AppColors.greyTextColor, isBold: true),
"${LocaleKeys.medicalFile.tr(context: context)}: ${habibWalletVM.fileNumber}"
- .toText14(color: AppColors.textColor, weight: FontWeight.w500, letterSpacing: -0.2, isEnglishOnly: true),
+ .toText14(color: AppColors.textColor, isBold: true, letterSpacing: -0.2, isEnglishOnly: true),
],
),
],
@@ -160,7 +160,7 @@ class _RechargeWalletPageState extends State {
onPressed: () => habibWalletVM.setCurrentIndex(0),
highlightColor: Colors.transparent,
)
- : LocaleKeys.medicalFile.tr(context: context).toText20(weight: FontWeight.w600);
+ : LocaleKeys.medicalFile.tr(context: context).toText20(isBold: true);
}), child: Consumer(builder: (context, habibWalletVM, child) {
return MultiPageBottomSheet();
}), callBackFunc: () {}, isFullScreen: false, isCloseButtonVisible: true);
@@ -178,11 +178,11 @@ class _RechargeWalletPageState extends State {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.hospital.tr(context: context).toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500),
+ LocaleKeys.hospital.tr(context: context).toText12(color: AppColors.greyTextColor, isBold: true),
SizedBox(
width: MediaQuery.of(context).size.width * 0.55,
child: (habibWalletVM.selectedHospital != null ? habibWalletVM.selectedHospital!.name : LocaleKeys.selectHospital.tr(context: context))!
- .toText14(color: AppColors.textColor, weight: FontWeight.w500),
+ .toText14(color: AppColors.textColor, isBold: true),
),
],
),
@@ -204,8 +204,8 @@ class _RechargeWalletPageState extends State {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.email.tr(context: context).toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500),
- "${appState.getAuthenticatedUser()!.emailAddress}".toText14(color: AppColors.textColor, weight: FontWeight.w500, letterSpacing: -0.2, isEnglishOnly: true),
+ LocaleKeys.email.tr(context: context).toText12(color: AppColors.greyTextColor, isBold: true),
+ "${appState.getAuthenticatedUser()!.emailAddress}".toText14(color: AppColors.textColor, isBold: true, letterSpacing: -0.2, isEnglishOnly: true),
],
),
],
@@ -285,7 +285,7 @@ class _RechargeWalletPageState extends State {
borderColor: AppColors.primaryRedColor,
textColor: Colors.white,
fontSize: 16,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
diff --git a/lib/presentation/habib_wallet/widgets/select-medical_file.dart b/lib/presentation/habib_wallet/widgets/select-medical_file.dart
index 4a9e4c0a..0a97988c 100644
--- a/lib/presentation/habib_wallet/widgets/select-medical_file.dart
+++ b/lib/presentation/habib_wallet/widgets/select-medical_file.dart
@@ -78,7 +78,7 @@ class _MultiPageBottomSheetState extends State {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.pleaseEnterAFileNumber.tr(context: context).toText20(weight: FontWeight.w600),
+ LocaleKeys.pleaseEnterAFileNumber.tr(context: context).toText20(isBold: true),
SizedBox(height: 12.h),
TextInputWidget(
fontFamily: "Poppins",
@@ -140,11 +140,11 @@ class _MultiPageBottomSheetState extends State {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.myMedicalFile.tr(context: context).toText16(color: AppColors.textColor, weight: FontWeight.w500),
+ LocaleKeys.myMedicalFile.tr(context: context).toText16(color: AppColors.textColor, isBold: true),
Row(
children: [
- "${LocaleKeys.fileno.tr(context: context)}: ".toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500),
- appState.getAuthenticatedUser()!.patientId.toString().toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500, isEnglishOnly: true),
+ "${LocaleKeys.fileno.tr(context: context)}: ".toText12(color: AppColors.greyTextColor, isBold: true),
+ appState.getAuthenticatedUser()!.patientId.toString().toText12(color: AppColors.greyTextColor, isBold: true, isEnglishOnly: true),
],
),
],
@@ -172,8 +172,8 @@ class _MultiPageBottomSheetState extends State {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.familyTitle.tr(context: context).toText16(color: AppColors.textColor, weight: FontWeight.w500),
- LocaleKeys.selectMedicalFileFromFamily.tr(context: context).toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.familyTitle.tr(context: context).toText16(color: AppColors.textColor, isBold: true),
+ LocaleKeys.selectMedicalFileFromFamily.tr(context: context).toText14(color: AppColors.greyTextColor, isBold: true),
],
),
Transform.flip(flipX: appState.isArabic(), child: Utils.buildSvgWithAssets(icon: AppAssets.forward_chevron_icon, iconColor: AppColors.textColor, width: 15.h, height: 15.h)),
@@ -210,8 +210,8 @@ class _MultiPageBottomSheetState extends State {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- LocaleKeys.otherAccount.tr(context: context).toText16(color: AppColors.textColor, weight: FontWeight.w500),
- LocaleKeys.anyFileFromHMG.tr(context: context).toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+ LocaleKeys.otherAccount.tr(context: context).toText16(color: AppColors.textColor, isBold: true),
+ LocaleKeys.anyFileFromHMG.tr(context: context).toText14(color: AppColors.greyTextColor, isBold: true),
],
),
Transform.flip(flipX: appState.isArabic(), child: Utils.buildSvgWithAssets(icon: AppAssets.forward_chevron_icon, iconColor: AppColors.textColor, width: 15.h, height: 15.h)),
diff --git a/lib/presentation/habib_wallet/widgets/select_hospital_bottom_sheet.dart b/lib/presentation/habib_wallet/widgets/select_hospital_bottom_sheet.dart
index 5486b43f..e93b9cef 100644
--- a/lib/presentation/habib_wallet/widgets/select_hospital_bottom_sheet.dart
+++ b/lib/presentation/habib_wallet/widgets/select_hospital_bottom_sheet.dart
@@ -156,7 +156,7 @@ class _SelectHospitalBottomSheetState extends State {
LocaleKeys.selectHospitalForAdvancePayment.tr(context: context),
style: TextStyle(
fontSize: 16,
- fontWeight: FontWeight.w500,
+ fontWeight: FontWeight.w600,
color: AppColors.greyTextColor,
),
),
@@ -174,7 +174,7 @@ class _SelectHospitalBottomSheetState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.sortByLocation.tr(context: context).toText14(isBold: true),
- LocaleKeys.sortByNearestLocation.tr(context: context).toText11(color: AppColors.textColorLight, weight: FontWeight.w500),
+ LocaleKeys.sortByNearestLocation.tr(context: context).toText11(color: AppColors.textColorLight, isBold: true),
],
),
],
diff --git a/lib/presentation/health_calculators_and_converts/health_calculator_detailed_page.dart b/lib/presentation/health_calculators_and_converts/health_calculator_detailed_page.dart
index 8cccf031..3d8a60ee 100644
--- a/lib/presentation/health_calculators_and_converts/health_calculator_detailed_page.dart
+++ b/lib/presentation/health_calculators_and_converts/health_calculator_detailed_page.dart
@@ -72,7 +72,7 @@ class _HealthCalculatorDetailedPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
- LocaleKeys.generalHealth.tr().toText16(weight: FontWeight.w600),
- LocaleKeys.relatedToBMICalories.tr().toText12(fontWeight: FontWeight.w500, color: Color(0xFF8F9AA3))
+ LocaleKeys.generalHealth.tr().toText16(isBold: true),
+ LocaleKeys.relatedToBMICalories.tr().toText12(isBold: true, color: Color(0xFF8F9AA3))
],
),
),
@@ -83,8 +83,8 @@ class _HealthCalculatorsPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
- LocaleKeys.womensHealth.tr().toText16(weight: FontWeight.w600),
- LocaleKeys.relatedToPeriodsOvulation.tr().toText12(fontWeight: FontWeight.w500, color: Color(0xFF8F9AA3))
+ LocaleKeys.womensHealth.tr().toText16(isBold: true),
+ LocaleKeys.relatedToPeriodsOvulation.tr().toText12(isBold: true, color: Color(0xFF8F9AA3))
],
),
),
@@ -118,9 +118,9 @@ class _HealthCalculatorsPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
- LocaleKeys.bloodSugar.tr().toText16(weight: FontWeight.w600),
+ LocaleKeys.bloodSugar.tr().toText16(isBold: true),
LocaleKeys.trackYourGlucoseLevels.tr().toText12(
- fontWeight: FontWeight.w500,
+ isBold: true,
color: Color(0xFF8F9AA3),
)
],
@@ -152,9 +152,9 @@ class _HealthCalculatorsPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
- LocaleKeys.bloodCholesterol.tr().toText16(weight: FontWeight.w600),
+ LocaleKeys.bloodCholesterol.tr().toText16(isBold: true),
LocaleKeys.monitorCholesterolLevels.tr()
- .toText12(fontWeight: FontWeight.w500, color: Color(0xFF8F9AA3))
+ .toText12(isBold: true, color: Color(0xFF8F9AA3))
],
),
),
@@ -182,9 +182,9 @@ class _HealthCalculatorsPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
- LocaleKeys.triglyceridesFatBlood.tr().toText16(weight: FontWeight.w600),
+ LocaleKeys.triglyceridesFatBlood.tr().toText16(isBold: true),
LocaleKeys.understandTriglyceridesImpact.tr()
- .toText12(fontWeight: FontWeight.w500, color: Color(0xFF8F9AA3))
+ .toText12(isBold: true, color: Color(0xFF8F9AA3))
],
),
),
diff --git a/lib/presentation/health_calculators_and_converts/widgets/bf.dart b/lib/presentation/health_calculators_and_converts/widgets/bf.dart
index 481bfcbf..d71566a2 100644
--- a/lib/presentation/health_calculators_and_converts/widgets/bf.dart
+++ b/lib/presentation/health_calculators_and_converts/widgets/bf.dart
@@ -94,8 +94,8 @@ class _BodyFatWidgetState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
- LocaleKeys.selectGender.tr(context: context).toText12(fontWeight: FontWeight.w500, color: AppColors.inputLabelTextColor),
- selectedGender.toText12(fontWeight: FontWeight.w500, color: AppColors.textColor),
+ LocaleKeys.selectGender.tr(context: context).toText12(isBold: true, color: AppColors.inputLabelTextColor),
+ selectedGender.toText12(isBold: true, color: AppColors.textColor),
],
),
],
@@ -140,7 +140,7 @@ class _BodyFatWidgetState extends State {
},
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
- unit.toCamelCase.toText16(weight: FontWeight.w500, textOverflow: TextOverflow.ellipsis, maxlines: 1).expanded,
+ unit.toCamelCase.toText16(isBold: true, textOverflow: TextOverflow.ellipsis, maxlines: 1).expanded,
],
).onPress(() {
setState(() {
@@ -173,7 +173,7 @@ class _BodyFatWidgetState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
- "Height".toText12(fontWeight: FontWeight.w500, color: AppColors.inputLabelTextColor),
+ "Height".toText12(isBold: true, color: AppColors.inputLabelTextColor),
Container(
height: 20.w,
alignment: Alignment.centerLeft,
@@ -208,8 +208,8 @@ class _BodyFatWidgetState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
- "Unit".toText12(fontWeight: FontWeight.w500, color: AppColors.inputLabelTextColor),
- selectedHeightUnit.toText12(fontWeight: FontWeight.w500, color: AppColors.textColor),
+ "Unit".toText12(isBold: true, color: AppColors.inputLabelTextColor),
+ selectedHeightUnit.toText12(isBold: true, color: AppColors.textColor),
],
),
SizedBox(width: 12.w),
@@ -249,7 +249,7 @@ class _BodyFatWidgetState extends State {
},
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
- unit.toUpperCase().toText16(weight: FontWeight.w500, textOverflow: TextOverflow.ellipsis, maxlines: 1).expanded,
+ unit.toUpperCase().toText16(isBold: true, textOverflow: TextOverflow.ellipsis, maxlines: 1).expanded,
],
).onPress(() {
setState(() {
@@ -285,7 +285,7 @@ class _BodyFatWidgetState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
- "Neck".toText12(fontWeight: FontWeight.w500, color: AppColors.inputLabelTextColor),
+ "Neck".toText12(isBold: true, color: AppColors.inputLabelTextColor),
Container(
height: 20.w,
alignment: Alignment.centerLeft,
@@ -325,8 +325,8 @@ class _BodyFatWidgetState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
- LocaleKeys.unit.tr(context: context).toText12(fontWeight: FontWeight.w500, color: AppColors.inputLabelTextColor),
- selectedNeckUnit.toText12(fontWeight: FontWeight.w500, color: AppColors.textColor),
+ LocaleKeys.unit.tr(context: context).toText12(isBold: true, color: AppColors.inputLabelTextColor),
+ selectedNeckUnit.toText12(isBold: true, color: AppColors.textColor),
],
),
SizedBox(width: 12.w),
@@ -366,7 +366,7 @@ class _BodyFatWidgetState extends State {
},
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
- unit.toUpperCase().toText16(weight: FontWeight.w500, textOverflow: TextOverflow.ellipsis, maxlines: 1).expanded,
+ unit.toUpperCase().toText16(isBold: true, textOverflow: TextOverflow.ellipsis, maxlines: 1).expanded,
],
).onPress(() {
setState(() {
@@ -402,7 +402,7 @@ class _BodyFatWidgetState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
- "Waist".toText12(fontWeight: FontWeight.w500, color: AppColors.inputLabelTextColor),
+ "Waist".toText12(isBold: true, color: AppColors.inputLabelTextColor),
Container(
height: 20.w,
alignment: Alignment.centerLeft,
@@ -442,8 +442,8 @@ class _BodyFatWidgetState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
- "Unit".toText12(fontWeight: FontWeight.w500, color: AppColors.inputLabelTextColor),
- selectedWaistUnit.toText12(fontWeight: FontWeight.w500, color: AppColors.textColor),
+ "Unit".toText12(isBold: true, color: AppColors.inputLabelTextColor),
+ selectedWaistUnit.toText12(isBold: true, color: AppColors.textColor),
],
),
SizedBox(width: 12.w),
@@ -483,7 +483,7 @@ class _BodyFatWidgetState extends State {
},
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
- unit.toUpperCase().toText16(weight: FontWeight.w500, textOverflow: TextOverflow.ellipsis, maxlines: 1).expanded,
+ unit.toUpperCase().toText16(isBold: true, textOverflow: TextOverflow.ellipsis, maxlines: 1).expanded,
],
).onPress(() {
setState(() {
@@ -519,7 +519,7 @@ class _BodyFatWidgetState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
- "Hip".toText12(fontWeight: FontWeight.w500, color: AppColors.inputLabelTextColor),
+ "Hip".toText12(isBold: true, color: AppColors.inputLabelTextColor),
Container(
height: 20.w,
alignment: Alignment.centerLeft,
@@ -559,8 +559,8 @@ class _BodyFatWidgetState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
- LocaleKeys.unit.tr(context: context).toText12(fontWeight: FontWeight.w500, color: AppColors.inputLabelTextColor),
- selectedHipUnit.toText12(fontWeight: FontWeight.w500, color: AppColors.textColor),
+ LocaleKeys.unit.tr(context: context).toText12(isBold: true, color: AppColors.inputLabelTextColor),
+ selectedHipUnit.toText12(isBold: true, color: AppColors.textColor),
],
),
SizedBox(width: 12.w),
@@ -600,7 +600,7 @@ class _BodyFatWidgetState extends State {
},
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
- unit.toUpperCase().toText16(weight: FontWeight.w500, textOverflow: TextOverflow.ellipsis, maxlines: 1).expanded,
+ unit.toUpperCase().toText16(isBold: true, textOverflow: TextOverflow.ellipsis, maxlines: 1).expanded,
],
).onPress(() {
setState(() {
@@ -631,7 +631,7 @@ class _BodyFatWidgetState extends State {
Utils.buildSvgWithAssets(icon: AppAssets.globe, width: 18.w, height: 18.w),
SizedBox(width: 12.w),
Expanded(
- child: "Estimate the total body fat based on the size.".toText12(fontWeight: FontWeight.w500, color: AppColors.inputLabelTextColor),
+ child: "Estimate the total body fat based on the size.".toText12(isBold: true, color: AppColors.inputLabelTextColor),
),
],
).paddingSymmetrical(0.w, 16.w),
diff --git a/lib/presentation/health_calculators_and_converts/widgets/blood_cholesterol.dart b/lib/presentation/health_calculators_and_converts/widgets/blood_cholesterol.dart
index e3bc7ff7..53bdf1bf 100644
--- a/lib/presentation/health_calculators_and_converts/widgets/blood_cholesterol.dart
+++ b/lib/presentation/health_calculators_and_converts/widgets/blood_cholesterol.dart
@@ -121,7 +121,7 @@ class _BloodCholesterolWidgetState extends State {
Utils.buildSvgWithAssets(icon: AppAssets.globe, width: 18.w, height: 18.w),
SizedBox(width: 12.w),
Expanded(
- child: "Convert blood cholesterol values between mg/dL and mmol/L. ".toText12(fontWeight: FontWeight.w500, color: AppColors.inputLabelTextColor),
+ child: "Convert blood cholesterol values between mg/dL and mmol/L. ".toText12(isBold: true, color: AppColors.inputLabelTextColor),
),
],
).paddingSymmetrical(0.w, 16.w),
@@ -144,7 +144,7 @@ class _BloodCholesterolWidgetState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
label.toText12(
- fontWeight: FontWeight.w500,
+ isBold: true,
color: AppColors.inputLabelTextColor,
),
SizedBox(
diff --git a/lib/presentation/health_calculators_and_converts/widgets/blood_sugar.dart b/lib/presentation/health_calculators_and_converts/widgets/blood_sugar.dart
index cf7cc61b..f2110646 100644
--- a/lib/presentation/health_calculators_and_converts/widgets/blood_sugar.dart
+++ b/lib/presentation/health_calculators_and_converts/widgets/blood_sugar.dart
@@ -130,7 +130,7 @@ class _BloodSugarWidgetState extends State {
SizedBox(width: 12.w),
Expanded(
child: "Convert blood glucose values between mg/dL and mmol/L. (1 mmol/L ≈ 18.0182 mg/dL)".toText12(
- fontWeight: FontWeight.w500,
+ isBold: true,
color: AppColors.inputLabelTextColor,
),
),
@@ -155,7 +155,7 @@ class _BloodSugarWidgetState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
label.toText12(
- fontWeight: FontWeight.w500,
+ isBold: true,
color: AppColors.inputLabelTextColor,
),
SizedBox(
diff --git a/lib/presentation/health_calculators_and_converts/widgets/bmi.dart b/lib/presentation/health_calculators_and_converts/widgets/bmi.dart
index a5ea06d1..9e9d1bed 100644
--- a/lib/presentation/health_calculators_and_converts/widgets/bmi.dart
+++ b/lib/presentation/health_calculators_and_converts/widgets/bmi.dart
@@ -75,7 +75,7 @@ class _BMIWidgetState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
- "Height".toText12(fontWeight: FontWeight.w500, color: AppColors.inputLabelTextColor),
+ "Height".toText12(isBold: true, color: AppColors.inputLabelTextColor),
Container(
height: 20.w,
alignment: Alignment.centerLeft,
@@ -110,8 +110,8 @@ class _BMIWidgetState extends State