From 3d480bac5c0669fc60266c7b6092ebe4cfb5cd0b Mon Sep 17 00:00:00 2001 From: "Mirza.Shafique" Date: Wed, 20 Oct 2021 17:03:17 +0300 Subject: [PATCH] design fixes 3 --- lib/config/config.dart | 8 +- .../Dialog/confirm_dialog.dart | 15 ++- .../new_Home_health_care_step_one_page.dart | 95 ++++++++++--------- .../new_Home_health_care_step_three_page.dart | 94 +++++++++++------- .../orders_log_details_page.dart | 2 + .../fragments/home_page_fragment2.dart | 2 + lib/theme/colors.dart | 1 + lib/widgets/others/app_scaffold_widget.dart | 12 ++- 8 files changed, 142 insertions(+), 87 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index c27fe938..c0c7f681 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -16,12 +16,12 @@ const PACKAGES_ORDERS = '/api/orders'; const BASE_URL = 'https://hmgwebservices.com/'; // Pharmacy UAT URLs -const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; -const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; +// const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; +// const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; // // Pharmacy Production URLs -// const BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/'; -// const PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/'; +const BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/'; +const PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/'; const PING_SERVICE = 'Services/Weather.svc/REST/CheckConnectivity'; diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/Dialog/confirm_dialog.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/Dialog/confirm_dialog.dart index 5c0c5d3f..6d47c0cf 100644 --- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/Dialog/confirm_dialog.dart +++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/Dialog/confirm_dialog.dart @@ -13,7 +13,10 @@ Future showCMCConfirmDialog(BuildContext context, String requestId, {Funct child: Column( mainAxisSize: MainAxisSize.min, children: [ - ConfirmDialog(requestId,onClick: onClick,), + ConfirmDialog( + requestId, + onClick: onClick, + ), ], ), ); @@ -36,7 +39,16 @@ class ConfirmDialog extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, children: [ + Container( + width: 40, + height: 40, + margin: EdgeInsets.only(top: 20), + decoration: containerRadius(CustomColors.green, 200,), + child: Icon(Icons.done,color: Colors.white,), + ), mFlex(1), IconButton( icon: Icon( @@ -49,6 +61,7 @@ class ConfirmDialog extends StatelessWidget { ), ], ), + mHeight(12), Text( TranslationBase.of(context).RRTRequestSuccess, textAlign: TextAlign.start, diff --git a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart index 9797c384..b401a127 100644 --- a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart +++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart @@ -44,57 +44,58 @@ class _NewHomeHealthCareStepOnePageState extends State Divider( - height: 1, - color: Color(0xffE5E5E5), - ), - itemCount: widget.model.hhcAllServicesList.length), + ], + ), + ); + }, + separatorBuilder: (context, index) => Divider( + height: 1, + color: Color(0xffE5E5E5), + ), + itemCount: widget.model.hhcAllServicesList.length), + ), Container( color: Colors.white, - padding: EdgeInsets.only(top: 0, bottom: 16, right: 21, left: 21), - margin: EdgeInsets.only(top: 50.0), + padding: EdgeInsets.all(16), child: DefaultButton( TranslationBase.of(context).next, (this.widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.length == 0 || widget.model.state == ViewState.BusyLocal) diff --git a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_three_page.dart b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_three_page.dart index dda42a7e..d580f2bb 100644 --- a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_three_page.dart +++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_three_page.dart @@ -10,6 +10,7 @@ import 'package:diplomaticquarterapp/theme/colors.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; +import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; @@ -85,45 +86,60 @@ class _NewHomeHealthCareStepThreePageState extends State Container( @@ -139,13 +155,23 @@ class _NewHomeHealthCareStepThreePageState extends State { child: InkWell( onTap: () { Navigator.of(context).push(MaterialPageRoute(builder: (context) => PackagesHomePage())); + }, child: Container( width: double.infinity, diff --git a/lib/theme/colors.dart b/lib/theme/colors.dart index 0409222d..2987e6216 100644 --- a/lib/theme/colors.dart +++ b/lib/theme/colors.dart @@ -5,6 +5,7 @@ class CustomColors { static const Color purple = Color(0xFF6002EE); static const Color deepPurple = Color(0xFF3900B1); static const Color grey = Color(0xFF848484); + static const Color textColor = Color(0xFF575757); static const Color grey2 = Color(0xFFA5A5A5); static const Color darkGrey = Color(0xFF222222); static const Color black = Color(0xFF141414); diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index ef317092..735eb9af 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -252,7 +252,17 @@ class NewAppBarWidget extends StatelessWidget with PreferredSizeWidget { ], ), actions: [ - if (appBarIcons != null) ...appBarIcons, + if (appBarIcons != null) ...appBarIcons else + IconButton( + onPressed: () { + Navigator.pushAndRemoveUntil( + context, + MaterialPageRoute(builder: (context) => LandingPage()), + (Route route) => false, + ); + }, + icon: Icon(Icons.home), + ), ], ); }