From 09480bc994b8a8f19ced4b09b89b3a72970b148f Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 8 Dec 2024 16:14:06 +0300 Subject: [PATCH] WD: button name change and action on vida screen. --- .../steper/steps_widget.dart | 87 +++++++++---------- .../assessment/widget/enter_diagnosis.dart | 2 +- .../assessment/widget/favotite_diagnosis.dart | 2 +- .../update_soap_index_vida_plus.dart | 10 +-- 4 files changed, 48 insertions(+), 53 deletions(-) diff --git a/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart b/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart index e2f21a7a..5c9e103e 100644 --- a/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart +++ b/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart @@ -209,52 +209,49 @@ class StepsWidget extends StatelessWidget { Positioned( top: circleTop, right: 0, - child: InkWell( - onTap: () => index >= 3 ? changeCurrentTab!(4) : null, - child: Column( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Container( - width: circleHeight, - height: circleHeight, - decoration: BoxDecoration( - border: index == 3 - ? Border.all(color: Color(0xFFCC9B14), width: 2) - : index > 3 - ? null - : Border.all(color: Color(0xFFCCCCCC), width: 0.75), - shape: BoxShape.circle, - color: index == 3 - ? Color(0xFFCC9B14) - : index > 3 - ? AppGlobal.appGreenColor - : Color(0xFFCCCCCC), - ), - child: Center( - child: Icon( - FontAwesomeIcons.check, - size: 20, - color: Colors.white, - )), - ), - SizedBox( - height: 5, - ), - Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - StepDetailsWidget( - stepLabel: "Plan", - marginLeft: 30, - ), - StatusLabel( - selectedStepId: index, - stepId: 3, - ), - ], + child: Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Container( + width: circleHeight, + height: circleHeight, + decoration: BoxDecoration( + border: index == 3 + ? Border.all(color: Color(0xFFCC9B14), width: 2) + : index > 3 + ? null + : Border.all(color: Color(0xFFCCCCCC), width: 0.75), + shape: BoxShape.circle, + color: index == 3 + ? Color(0xFFCC9B14) + : index > 3 + ? AppGlobal.appGreenColor + : Color(0xFFCCCCCC), ), - ], - ), + child: Center( + child: Icon( + FontAwesomeIcons.check, + size: 20, + color: Colors.white, + )), + ), + SizedBox( + height: 5, + ), + Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + StepDetailsWidget( + stepLabel: "Plan", + marginLeft: 30, + ), + StatusLabel( + selectedStepId: index, + stepId: 3, + ), + ], + ), + ], ), ), ], diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart index 28e67a93..42a649d3 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart @@ -365,7 +365,7 @@ class _EnterDiagnosisState extends State { children: [ Expanded( child: AppButton( - title: TranslationBase.of(context).previous, + title: TranslationBase.of(context).cancelSmall, color: Colors.grey[300]!, fontColor: Colors.black, fontWeight: FontWeight.w600, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart index 1756aa38..c65d145e 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart @@ -435,7 +435,7 @@ class _FavoriteDiagnosisState extends State { children: [ Expanded( child: AppButton( - title: TranslationBase.of(context).previous, + title: TranslationBase.of(context).cancelSmall, color: Colors.grey[300]!, fontColor: Colors.black, fontWeight: FontWeight.w600, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 21df4f06..315021a7 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/view_state.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; @@ -287,15 +288,12 @@ class _UpdateSoapIndexVidaPlusState extends State ), Expanded( child: AppButton( - title: model.isAddProgress - ? TranslationBase.of(context).next - : TranslationBase.of(context).finish, + title: TranslationBase.of(context).submit, fontWeight: FontWeight.w600, - color: Colors.red[700]!, + color: AppGlobal.appGreenColor, disabled: !model.isProgressAdded(), onPressed: () async { - changePageViewIndex(3); - // model.nextOnPlanPage(model); + Navigator.pop(context); }, ), ),