From 2ab0d0b682608244ef1c032346c8458e28308bff Mon Sep 17 00:00:00 2001 From: sultan khan Date: Tue, 18 Feb 2025 10:02:00 +0300 Subject: [PATCH] WD:get current location place change and live care ui changes --- lib/config/localized_values.dart | 2 +- .../SearchResultsByRegion.dart | 2 +- .../components/LiveCareBookAppointment.dart | 267 +++++++++--------- .../components/search_by_hospital_name.dart | 9 +- 4 files changed, 141 insertions(+), 139 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 4cf6030e..459b514d 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -2143,5 +2143,5 @@ const Map localizedValues = { "hmgHospital": {"en": "HMG Hospital", "ar": "مستشفى HMG"}, "hmcHospital": {"en": "HMC", "ar": "HMC"}, "hmcHospitalCount": {"en": "@ HMC", "ar": "@ HMC"}, - "hmgHospitalCount": {"en": "@ HMG Hospital", "ar": "@ مستشفى HMC"}, + "hmgHospitalCount": {"en": "@ HMG Hospital", "ar": "@ مستشفى HMG"}, }; diff --git a/lib/pages/BookAppointment/SearchResultsByRegion.dart b/lib/pages/BookAppointment/SearchResultsByRegion.dart index 563b9355..effbb7f0 100644 --- a/lib/pages/BookAppointment/SearchResultsByRegion.dart +++ b/lib/pages/BookAppointment/SearchResultsByRegion.dart @@ -369,7 +369,7 @@ class HospitalTitle extends StatelessWidget { Text( isHMC ? "${TranslationBase.of(context).hmcHospitalCount.replaceAll("@", itemCount)}" - : "${TranslationBase.of(context).hmgHospitalCount.replaceAll("@", itemCount)} ,", + : "${TranslationBase.of(context).hmgHospitalCount.replaceAll("@", itemCount)}", style: TextStyle( fontSize: 12, color: Colors.black, fontWeight: FontWeight.w600), ), diff --git a/lib/pages/BookAppointment/components/LiveCareBookAppointment.dart b/lib/pages/BookAppointment/components/LiveCareBookAppointment.dart index 3a3f8270..28c07be1 100644 --- a/lib/pages/BookAppointment/components/LiveCareBookAppointment.dart +++ b/lib/pages/BookAppointment/components/LiveCareBookAppointment.dart @@ -63,142 +63,141 @@ class _LiveCareBookAppointmentState extends State { child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - child: SvgPicture.asset( + SvgPicture.asset( "assets/images/new-design/liveCare_mobile_care.svg", - width: 150.0), - ), - Container( - margin: EdgeInsets.only(left: 10.0, right: 8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - margin: EdgeInsets.only(bottom: 7.0), - child: Text( - TranslationBase.of(context).whyLivecare, - style: TextStyle( - fontSize: 20.0, - fontWeight: FontWeight.w600, - letterSpacing: 1.0, - color: Colors.black)), - ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - child: SvgPicture.asset( - "assets/images/new-design/ionic-ios-checkmark-circle.svg"), - ), - Container( - width: - MediaQuery.of(context).size.width * 0.4, - margin: EdgeInsets.only( - left: 5.0, right: 5.0, bottom: 10.0), - child: Text( - TranslationBase.of(context) - .livecarePoint1, - overflow: TextOverflow.clip, - style: TextStyle( - fontSize: 12.0, - letterSpacing: 0.5, - color: Colors.black)), - ), - ], - ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - child: SvgPicture.asset( - "assets/images/new-design/ionic-ios-checkmark-circle.svg"), - ), - Container( - width: - MediaQuery.of(context).size.width * 0.4, - margin: EdgeInsets.only( - left: 5.0, right: 5.0, bottom: 10.0), - child: Text( - TranslationBase.of(context) - .livecarePoint5, - overflow: TextOverflow.clip, - style: TextStyle( - fontSize: 12.0, - letterSpacing: 0.5, - color: Colors.black)), - ), - ], - ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - child: SvgPicture.asset( - "assets/images/new-design/ionic-ios-checkmark-circle.svg"), - ), - Container( - width: - MediaQuery.of(context).size.width * 0.4, - margin: EdgeInsets.only( - left: 5.0, right: 5.0, bottom: 10.0), - child: Text( - TranslationBase.of(context) - .livecarePoint2, - overflow: TextOverflow.clip, - style: TextStyle( - fontSize: 12.0, - letterSpacing: 0.5, - color: Colors.black)), - ), - ], - ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - child: SvgPicture.asset( - "assets/images/new-design/ionic-ios-checkmark-circle.svg"), - ), - Container( - width: - MediaQuery.of(context).size.width * 0.4, - margin: EdgeInsets.only( - left: 5.0, right: 5.0, bottom: 10.0), - child: Text( - TranslationBase.of(context) - .livecarePoint3, - overflow: TextOverflow.clip, - style: TextStyle( - fontSize: 12.0, - letterSpacing: 0.5, - color: Colors.black)), - ), - ], ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - child: SvgPicture.asset( - "assets/images/new-design/ionic-ios-checkmark-circle.svg"), - ), - Container( - width: - MediaQuery.of(context).size.width * 0.4, - margin: - EdgeInsets.only(left: 5.0, right: 5.0), - child: Text( - TranslationBase.of(context) - .livecarePoint4, - overflow: TextOverflow.clip, - style: TextStyle( - fontSize: 12.0, - letterSpacing: 0.5, - color: Colors.black)), - ), - ], - ), - ], + Flexible( + child: Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.only(bottom: 7.0), + child: Text( + TranslationBase.of(context).whyLivecare, + style: TextStyle( + fontSize: 20.0, + fontWeight: FontWeight.w600, + letterSpacing: 1.0, + color: Colors.black)), + ), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + child: SvgPicture.asset( + "assets/images/new-design/ionic-ios-checkmark-circle.svg"), + ), + Container( + width: + MediaQuery.of(context).size.width * 0.4, + margin: EdgeInsets.only( + left: 5.0, right: 5.0, bottom: 10.0), + child: Text( + TranslationBase.of(context) + .livecarePoint1, + overflow: TextOverflow.clip, + style: TextStyle( + fontSize: 12.0, + letterSpacing: 0.5, + color: Colors.black)), + ), + ], + ), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + child: SvgPicture.asset( + "assets/images/new-design/ionic-ios-checkmark-circle.svg"), + ), + Container( + width: + MediaQuery.of(context).size.width * 0.4, + margin: EdgeInsets.only( + left: 5.0, right: 5.0, bottom: 10.0), + child: Text( + TranslationBase.of(context) + .livecarePoint5, + overflow: TextOverflow.clip, + style: TextStyle( + fontSize: 12.0, + letterSpacing: 0.5, + color: Colors.black)), + ), + ], + ), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + child: SvgPicture.asset( + "assets/images/new-design/ionic-ios-checkmark-circle.svg"), + ), + Container( + width: + MediaQuery.of(context).size.width * 0.4, + margin: EdgeInsets.only( + left: 5.0, right: 5.0, bottom: 10.0), + child: Text( + TranslationBase.of(context) + .livecarePoint2, + overflow: TextOverflow.clip, + style: TextStyle( + fontSize: 12.0, + letterSpacing: 0.5, + color: Colors.black)), + ), + ], + ), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + child: SvgPicture.asset( + "assets/images/new-design/ionic-ios-checkmark-circle.svg"), + ), + Container( + width: + MediaQuery.of(context).size.width * 0.4, + margin: EdgeInsets.only( + left: 5.0, right: 5.0, bottom: 10.0), + child: Text( + TranslationBase.of(context) + .livecarePoint3, + overflow: TextOverflow.clip, + style: TextStyle( + fontSize: 12.0, + letterSpacing: 0.5, + color: Colors.black)), + ), + ], + ), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + child: SvgPicture.asset( + "assets/images/new-design/ionic-ios-checkmark-circle.svg"), + ), + Container( + width: + MediaQuery.of(context).size.width * 0.4, + margin: + EdgeInsets.only(left: 5.0, right: 5.0), + child: Text( + TranslationBase.of(context) + .livecarePoint4, + overflow: TextOverflow.clip, + style: TextStyle( + fontSize: 12.0, + letterSpacing: 0.5, + color: Colors.black)), + ), + ], + ), + ], + ), ), ) ], diff --git a/lib/pages/BookAppointment/components/search_by_hospital_name.dart b/lib/pages/BookAppointment/components/search_by_hospital_name.dart index 704ef5bb..df220441 100644 --- a/lib/pages/BookAppointment/components/search_by_hospital_name.dart +++ b/lib/pages/BookAppointment/components/search_by_hospital_name.dart @@ -55,8 +55,9 @@ class _SearchByHospitalState extends State { void initState() { locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context); - locationUtils.getCurrentLocation(); - WidgetsBinding.instance.addPostFrameCallback((_) => getProjectsList()); + WidgetsBinding.instance.addPostFrameCallback((_) { + getProjectsList(); + }); } @override @@ -271,11 +272,13 @@ class _SearchByHospitalState extends State { projectsList = projectsListLocal; }); } else {} + locationUtils.getCurrentLocation(); }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); + locationUtils.getCurrentLocation(); }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); - + locationUtils.getCurrentLocation(); print(err); }); }