From c54015c5c1eb4f8adbc1e12eb903b407d329eeea Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Wed, 29 Dec 2021 12:55:36 +0200 Subject: [PATCH] fix button inside our app --- .../project.xcworkspace/contents.xcworkspacedata | 2 +- lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart | 4 ++-- .../profile/referral/my-referral-detail-screen.dart | 3 +-- .../referral/referral_patient_detail_in-paint.dart | 1 - .../referral/referred_patient_detail_in-paint.dart | 1 - .../register_patient/RegisterConfirmationPatientPage.dart | 4 ++-- .../patients/register_patient/RegisterPatientPage.dart | 8 ++++---- .../register_patient/RegisterSearchPatientPage.dart | 4 ++-- .../patients/register_patient/VerifyMethodPage.dart | 4 ++-- lib/widgets/shared/buttons/app_buttons_widget.dart | 7 +++++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 1d526a16..919434a6 100644 --- a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart b/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart index b6fce680..4d4fee06 100644 --- a/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart +++ b/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart @@ -177,7 +177,7 @@ 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; @@ -199,7 +199,7 @@ 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/referral/my-referral-detail-screen.dart b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart index bd349f0f..dfdb492b 100644 --- a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart +++ b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart @@ -374,7 +374,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, @@ -401,7 +400,7 @@ 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 d88d5a95..64a7e293 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 @@ -486,7 +486,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 21634d0f..401da0aa 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 @@ -565,7 +565,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 6443e972..136e33ad 100644 --- a/lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart +++ b/lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart @@ -366,7 +366,7 @@ class _RegisterConfirmationPatientPageState borderColor: Color(0xFFeaeaea), color: Color(0xFFeaeaea), fontColor: Colors.black, - fontSize: 2.2, + onPressed: () { Navigator.of(context).pop(); }, @@ -386,7 +386,7 @@ class _RegisterConfirmationPatientPageState borderColor: Color(0xFFB8382B), color: HexColor("#D02127"), 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 e7423f89..902f98c6 100644 --- a/lib/screens/patients/register_patient/RegisterPatientPage.dart +++ b/lib/screens/patients/register_patient/RegisterPatientPage.dart @@ -143,7 +143,7 @@ class _RegisterPatientPageState extends State borderColor: Color(0xFFeaeaea), color: Color(0xFFeaeaea), fontColor: Colors.black, - fontSize: 2.2, + onPressed: () { Navigator.of(context).pop(); }, @@ -163,7 +163,7 @@ class _RegisterPatientPageState extends State borderColor: Color(0xFF359846), color: Color(0xFF359846), fontColor: Colors.white, - fontSize: 2.0, + onPressed: () {}, ), ), @@ -186,7 +186,7 @@ class _RegisterPatientPageState extends State borderColor: Color(0xFFeaeaea), color: Color(0xFFeaeaea), fontColor: Colors.black, - fontSize: 2.2, + onPressed: () { Navigator.of(context).pop(); }, @@ -206,7 +206,7 @@ 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 3947c3b7..6afeb0dc 100644 --- a/lib/screens/patients/register_patient/RegisterSearchPatientPage.dart +++ b/lib/screens/patients/register_patient/RegisterSearchPatientPage.dart @@ -326,7 +326,7 @@ class _RegisterSearchPatientPageState extends State { borderColor: Color(0xFFeaeaea), color: Color(0xFFeaeaea), fontColor: Colors.black, - fontSize: 2.2, + onPressed: () { Navigator.of(context).pop(); }, @@ -346,7 +346,7 @@ class _RegisterSearchPatientPageState extends State { borderColor: Color(0xFFB8382B), color: AppGlobal.appRedColor, 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 9636f2ca..d1915058 100644 --- a/lib/screens/patients/register_patient/VerifyMethodPage.dart +++ b/lib/screens/patients/register_patient/VerifyMethodPage.dart @@ -440,7 +440,7 @@ class _ActivationPageState extends State { borderColor: Color(0xFFeaeaea), color: Color(0xFFeaeaea), fontColor: Colors.black, - fontSize: 2.2, + onPressed: () { Navigator.of(context).pop(); }, @@ -460,7 +460,7 @@ 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/shared/buttons/app_buttons_widget.dart b/lib/widgets/shared/buttons/app_buttons_widget.dart index bb43dc8c..ec29c842 100644 --- a/lib/widgets/shared/buttons/app_buttons_widget.dart +++ b/lib/widgets/shared/buttons/app_buttons_widget.dart @@ -13,7 +13,7 @@ class AppButton extends StatefulWidget { final IconData iconData; final Widget icon; final Color color; - final double fontSize; + double fontSize; final double padding; final Color fontColor; final bool loading; @@ -32,7 +32,7 @@ class AppButton extends StatefulWidget { this.iconData, this.icon, this.color, - this.fontSize = 16, + this.fontSize, this.padding = 13, this.loading = false, this.disabled = false, @@ -52,6 +52,9 @@ class AppButton extends StatefulWidget { class _AppButtonState extends State { @override Widget build(BuildContext context) { + if(widget.fontSize == null ) { + widget.fontSize = SizeConfig.getHeightMultiplier() * 1.9; + } return Container( // height: MediaQuery.of(context).size.height * 0.075, height: widget.height,