diff --git a/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart b/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart index acaf3a98..54cdc6c3 100644 --- a/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart +++ b/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart @@ -183,7 +183,6 @@ class _UCAFPagerScreenState extends State borderColor: Colors.white, color: Colors.white, fontColor: Color(0xFFB8382B), - fontSize: 2.2, onPressed: () { Navigator.of(context).popUntil((route) { return route.settings.name == PATIENTS_PROFILE; @@ -205,7 +204,6 @@ class _UCAFPagerScreenState extends State borderColor: Color(0xFFB8382B), color: AppGlobal.appRedColor, fontColor: Colors.white, - fontSize: 2.0, onPressed: () { model.saveUCAFOnTap(); }, diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart index 21c964a5..0ababe81 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -253,7 +253,7 @@ class _PatientProfileScreenState extends State radius: 30, hPadding: 20, fontWeight: FontWeight.normal, - fontSize: 1.6, + // fontSize: 1.6, icon: Image.asset( "assets/images/create-episod.png", color: Colors.white, @@ -289,7 +289,7 @@ class _PatientProfileScreenState extends State radius: 30, hPadding: 20, fontWeight: FontWeight.normal, - fontSize: 1.6, + // fontSize: 1.6, icon: Image.asset( "assets/images/modilfy-episode.png", color: Colors.white, diff --git a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart index be7cbd91..73817fec 100644 --- a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart +++ b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart @@ -378,7 +378,6 @@ class MyReferralDetailScreen extends StatelessWidget { title: TranslationBase.of(context).accept, color: Color(0xFF4BA821), fontColor: Colors.white, - fontSize: 1.6, hPadding: 8, vPadding: 12, disabled: model.state == ViewState.Busy, @@ -406,7 +405,6 @@ class MyReferralDetailScreen extends StatelessWidget { title: TranslationBase.of(context).reject, color: AppGlobal.appRedColor, fontColor: Colors.white, - fontSize: 1.6, hPadding: 8, vPadding: 12, disabled: model.state == ViewState.Busy, diff --git a/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart b/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart index fb694a0d..7fe93958 100644 --- a/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart +++ b/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart @@ -484,7 +484,6 @@ class ReferralPatientDetailScreen extends StatelessWidget { color: Colors.red[700], fontColor: Colors.white, fontWeight: FontWeight.w700, - fontSize: 1.8, hPadding: 8, vPadding: 12, onPressed: () async { diff --git a/lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart b/lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart index 04cf6a1d..ae2e4fad 100644 --- a/lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart +++ b/lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart @@ -557,7 +557,6 @@ class ReferredPatientDetailScreen extends StatelessWidget { color: Colors.red[700], fontColor: Colors.white, fontWeight: FontWeight.w700, - fontSize: 1.8, hPadding: 8, vPadding: 12, disabled: referredPatient.referredDoctorRemarks == null diff --git a/lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart b/lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart index 08cec4a0..d0d211fb 100644 --- a/lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart +++ b/lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart @@ -363,7 +363,6 @@ class _RegisterConfirmationPatientPageState borderColor: Color(0xFFeaeaea), color: Color(0xFFeaeaea), fontColor: Colors.black, - fontSize: 2.2, onPressed: () { Navigator.of(context).pop(); }, @@ -383,7 +382,6 @@ class _RegisterConfirmationPatientPageState borderColor: Color(0xFFB8382B), color: Color(0xFFB8382B), fontColor: Colors.white, - fontSize: 2.0, onPressed: () async { setState(() { isSubmitted = true; diff --git a/lib/screens/patients/register_patient/RegisterPatientPage.dart b/lib/screens/patients/register_patient/RegisterPatientPage.dart index 5a65146c..ecea3188 100644 --- a/lib/screens/patients/register_patient/RegisterPatientPage.dart +++ b/lib/screens/patients/register_patient/RegisterPatientPage.dart @@ -143,7 +143,6 @@ class _RegisterPatientPageState extends State borderColor: Color(0xFFeaeaea), color: Color(0xFFeaeaea), fontColor: Colors.black, - fontSize: 2.2, onPressed: () { Navigator.of(context).pop(); }, @@ -163,7 +162,6 @@ class _RegisterPatientPageState extends State borderColor: Color(0xFF359846), color: Color(0xFF359846), fontColor: Colors.white, - fontSize: 2.0, onPressed: () {}, ), ), @@ -186,7 +184,6 @@ class _RegisterPatientPageState extends State borderColor: Color(0xFFeaeaea), color: Color(0xFFeaeaea), fontColor: Colors.black, - fontSize: 2.2, onPressed: () { Navigator.of(context).pop(); }, @@ -206,7 +203,6 @@ class _RegisterPatientPageState extends State borderColor: Color(0xFFB8382B), color: AppGlobal.appRedColor, fontColor: Colors.white, - fontSize: 2.0, onPressed: () { changePageViewIndex(_currentIndex + 1); }, diff --git a/lib/screens/patients/register_patient/RegisterSearchPatientPage.dart b/lib/screens/patients/register_patient/RegisterSearchPatientPage.dart index 975ef30e..96378773 100644 --- a/lib/screens/patients/register_patient/RegisterSearchPatientPage.dart +++ b/lib/screens/patients/register_patient/RegisterSearchPatientPage.dart @@ -283,7 +283,6 @@ class _RegisterSearchPatientPageState extends State { borderColor: Color(0xFFeaeaea), color: Color(0xFFeaeaea), fontColor: Colors.black, - fontSize: 2.2, onPressed: () { Navigator.of(context).pop(); }, @@ -303,7 +302,6 @@ class _RegisterSearchPatientPageState extends State { borderColor: Color(0xFFB8382B), color: Color(0xFFB8382B), fontColor: Colors.white, - fontSize: 2.0, onPressed: () async { setState(() { isSubmitted = true; diff --git a/lib/screens/patients/register_patient/VerifyMethodPage.dart b/lib/screens/patients/register_patient/VerifyMethodPage.dart index c60b5012..31c882f3 100644 --- a/lib/screens/patients/register_patient/VerifyMethodPage.dart +++ b/lib/screens/patients/register_patient/VerifyMethodPage.dart @@ -440,7 +440,6 @@ class _ActivationPageState extends State { borderColor: Color(0xFFeaeaea), color: Color(0xFFeaeaea), fontColor: Colors.black, - fontSize: 2.2, onPressed: () { Navigator.of(context).pop(); }, @@ -460,7 +459,6 @@ class _ActivationPageState extends State { borderColor: Color(0xFFB8382B), color: HexColor("#D02127"), fontColor: Colors.white, - fontSize: 2.0, onPressed: () async { GifLoaderDialogUtils.showMyDialog(context); await widget.model.checkActivationCode( diff --git a/lib/widgets/patients/profile/patient-profile-app-bar.dart b/lib/widgets/patients/profile/patient-profile-app-bar.dart index 2c7ee7ad..d362a8bb 100644 --- a/lib/widgets/patients/profile/patient-profile-app-bar.dart +++ b/lib/widgets/patients/profile/patient-profile-app-bar.dart @@ -402,19 +402,6 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget { @override Size get preferredSize => Size( double.maxFinite, - // height! == 0 - // ? isInpatient - // ? (isFromLabResult! ? 210 : 200) - // : isAppointmentHeader! - // ? 290 - // : SizeConfig.isHeightVeryShort - // ? 137 - // : SizeConfig.isHeightShort - // ? 190 - // : SizeConfig.heightMultiplier * - // (SizeConfig.isWidthLarge ? 25 : 20) - // : height! - // // TODO Elham*2 patientProfileAppBarModel!.height == 0 ? patientProfileAppBarModel!.isAppointmentHeader! ? 270