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 6123a7da..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 @@ -51,6 +51,7 @@ class _NewHomeHealthCareStepOnePageState 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), + ), ], ); }