From 2fbf48e676f89943cd9139d8bf731c35d74dbfd7 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 6 Apr 2021 20:21:09 +0300 Subject: [PATCH] fix font size --- lib/screens/doctor/doctor_reply_screen.dart | 17 +++++------ .../patients/insurance_approvals_details.dart | 28 ++++++++----------- .../radiology/radiology_details_page.dart | 1 - .../radiology/radiology_home_page.dart | 1 - ...ent-profile-header-new-design-app-bar.dart | 2 +- .../patient-profile-header-new-design.dart | 2 +- ..._profile_header_with_appointment_card.dart | 2 +- ..._header_with_appointment_card_app_bar.dart | 2 +- 8 files changed, 25 insertions(+), 30 deletions(-) diff --git a/lib/screens/doctor/doctor_reply_screen.dart b/lib/screens/doctor/doctor_reply_screen.dart index 62d46d5e..2f5549fb 100644 --- a/lib/screens/doctor/doctor_reply_screen.dart +++ b/lib/screens/doctor/doctor_reply_screen.dart @@ -39,14 +39,15 @@ class DoctorReplyScreen extends StatelessWidget { children: model.listDoctorWorkingHoursTable.map((reply) { return InkWell( - onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (BuildContext context) => - DoctorReplayChat(reply: reply))); - }, - child: DoctorReplyWidget(reply: reply)); + onTap: () { + // Navigator.push( + // context, + // MaterialPageRoute( + // builder: (BuildContext context) => + // DoctorReplayChat(reply: reply))); + }, + child: DoctorReplyWidget(reply: reply), + ); }).toList(), ) ], diff --git a/lib/screens/patients/insurance_approvals_details.dart b/lib/screens/patients/insurance_approvals_details.dart index e83428fd..8903b704 100644 --- a/lib/screens/patients/insurance_approvals_details.dart +++ b/lib/screens/patients/insurance_approvals_details.dart @@ -93,14 +93,12 @@ class _InsuranceApprovalsDetailsState extends State { Row( children: [ Texts( - model.insuranceApproval[indexInsurance] - .approvalDetails.status, + model.insuranceApproval[indexInsurance].approvalDetails!=null? + model.insuranceApproval[indexInsurance].approvalDetails.status ??"":"", color: - model.insuranceApproval[indexInsurance] - .approvalDetails.status == - "Approved" - ? Color(0xff359846) - : Color(0xffD02127), + model.insuranceApproval[indexInsurance].approvalDetails!=null? + "${model.insuranceApproval[indexInsurance].approvalDetails.status}" + == "Approved" ? Color(0xff359846) : Color(0xffD02127): Color(0xffD02127), ), ], ), @@ -210,9 +208,7 @@ class _InsuranceApprovalsDetailsState extends State { Texts('Sample') ], ), - SizedBox( - height: 25.0, - ), + Row( children: [ Texts( @@ -315,8 +311,8 @@ class _InsuranceApprovalsDetailsState extends State { child: Texts(model .insuranceApproval[ indexInsurance] - .approvalDetails - .procedureName), + ?.approvalDetails + ?.procedureName??""), ), Container( height: MediaQuery.of(context) @@ -330,8 +326,8 @@ class _InsuranceApprovalsDetailsState extends State { child: Texts(model .insuranceApproval[ indexInsurance] - .approvalDetails - .status), + ?.approvalDetails + ?.status??""), ), Container( height: MediaQuery.of(context) @@ -345,8 +341,8 @@ class _InsuranceApprovalsDetailsState extends State { child: Texts(model .insuranceApproval[ indexInsurance] - .approvalDetails - .isInvoicedDesc), + ?.approvalDetails + ?.isInvoicedDesc??""), ), ], ), diff --git a/lib/screens/patients/profile/radiology/radiology_details_page.dart b/lib/screens/patients/profile/radiology/radiology_details_page.dart index d2b93eaf..308f8536 100644 --- a/lib/screens/patients/profile/radiology/radiology_details_page.dart +++ b/lib/screens/patients/profile/radiology/radiology_details_page.dart @@ -40,7 +40,6 @@ class RadiologyDetailsPage extends StatelessWidget { patient: patient, patientType: patientType ?? "0", arrivalType: arrivalType ?? "0", - orderNo: finalRadiology.orderNo.toString(), appointmentDate: finalRadiology.orderDate, doctorName: finalRadiology.doctorName, profileUrl: finalRadiology.doctorImageURL, diff --git a/lib/screens/patients/profile/radiology/radiology_home_page.dart b/lib/screens/patients/profile/radiology/radiology_home_page.dart index 27c58e99..5cb14b8a 100644 --- a/lib/screens/patients/profile/radiology/radiology_home_page.dart +++ b/lib/screens/patients/profile/radiology/radiology_home_page.dart @@ -124,7 +124,6 @@ class RadiologyHomePage extends StatelessWidget { invoiceNO: '${model.radiologyList[index].invoiceNo}', branch: '${model.radiologyList[index].projectName}', appointmentDate: model.radiologyList[index].orderDate, - orderNo: model.radiologyList[index].orderNo.toString(), ), )), diff --git a/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart b/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart index bb5943ee..5a284435 100644 --- a/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart +++ b/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart @@ -54,7 +54,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with Preferred " " + Helpers.capitalize( patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName), - fontSize: SizeConfig.textMultiplier *2.3, + fontSize: SizeConfig.textMultiplier *2.2, fontWeight: FontWeight.bold, backGroundcolor: Colors.white, fontFamily: 'Poppins', diff --git a/lib/widgets/patients/profile/patient-profile-header-new-design.dart b/lib/widgets/patients/profile/patient-profile-header-new-design.dart index 47bf19c4..4f96ac67 100644 --- a/lib/widgets/patients/profile/patient-profile-header-new-design.dart +++ b/lib/widgets/patients/profile/patient-profile-header-new-design.dart @@ -57,7 +57,7 @@ class PatientProfileHeaderNewDesign extends StatelessWidget { " " + Helpers.capitalize(patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName), - fontSize: SizeConfig.textMultiplier * 2.5, + fontSize: SizeConfig.textMultiplier * 2.2, fontWeight: FontWeight.bold, backGroundcolor: Colors.white, fontFamily: 'Poppins', diff --git a/lib/widgets/patients/profile/patient_profile_header_with_appointment_card.dart b/lib/widgets/patients/profile/patient_profile_header_with_appointment_card.dart index dc60e560..61cb7b52 100644 --- a/lib/widgets/patients/profile/patient_profile_header_with_appointment_card.dart +++ b/lib/widgets/patients/profile/patient_profile_header_with_appointment_card.dart @@ -77,7 +77,7 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget { " " + Helpers.capitalize( patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName), - fontSize: SizeConfig.textMultiplier *2.5, + fontSize: SizeConfig.textMultiplier *2.2, fontWeight: FontWeight.bold, backGroundcolor: Colors.white, fontFamily: 'Poppins', diff --git a/lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart b/lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart index 5047a56a..d63754df 100644 --- a/lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart +++ b/lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart @@ -77,7 +77,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre " " + Helpers.capitalize( patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName), - fontSize: SizeConfig.textMultiplier *2.3, + fontSize: SizeConfig.textMultiplier *2.2, fontWeight: FontWeight.bold, backGroundcolor: Colors.white, fontFamily: 'Poppins',