WD: button name change and action on vida screen.

update_flutter_3.24_vida_plus_episode_MDS
taha.alam 11 months ago
parent c69ada4aa1
commit 09480bc994

@ -209,52 +209,49 @@ class StepsWidget extends StatelessWidget {
Positioned( Positioned(
top: circleTop, top: circleTop,
right: 0, right: 0,
child: InkWell( child: Column(
onTap: () => index >= 3 ? changeCurrentTab!(4) : null, crossAxisAlignment: CrossAxisAlignment.end,
child: Column( children: [
crossAxisAlignment: CrossAxisAlignment.end, Container(
children: [ width: circleHeight,
Container( height: circleHeight,
width: circleHeight, decoration: BoxDecoration(
height: circleHeight, border: index == 3
decoration: BoxDecoration( ? Border.all(color: Color(0xFFCC9B14), width: 2)
border: index == 3 : index > 3
? Border.all(color: Color(0xFFCC9B14), width: 2) ? null
: index > 3 : Border.all(color: Color(0xFFCCCCCC), width: 0.75),
? null shape: BoxShape.circle,
: Border.all(color: Color(0xFFCCCCCC), width: 0.75), color: index == 3
shape: BoxShape.circle, ? Color(0xFFCC9B14)
color: index == 3 : index > 3
? Color(0xFFCC9B14) ? AppGlobal.appGreenColor
: index > 3 : Color(0xFFCCCCCC),
? 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: 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,
),
],
),
],
), ),
), ),
], ],

@ -365,7 +365,7 @@ class _EnterDiagnosisState extends State<EnterDiagnosis> {
children: [ children: [
Expanded( Expanded(
child: AppButton( child: AppButton(
title: TranslationBase.of(context).previous, title: TranslationBase.of(context).cancelSmall,
color: Colors.grey[300]!, color: Colors.grey[300]!,
fontColor: Colors.black, fontColor: Colors.black,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,

@ -435,7 +435,7 @@ class _FavoriteDiagnosisState extends State<FavoriteDiagnosis> {
children: [ children: [
Expanded( Expanded(
child: AppButton( child: AppButton(
title: TranslationBase.of(context).previous, title: TranslationBase.of(context).cancelSmall,
color: Colors.grey[300]!, color: Colors.grey[300]!,
fontColor: Colors.black, fontColor: Colors.black,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,

@ -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/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/view_state.dart'; import 'package:doctor_app_flutter/core/enum/view_state.dart';
import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
@ -287,15 +288,12 @@ class _UpdateSoapIndexVidaPlusState extends State<UpdateSoapIndexVidaPlus>
), ),
Expanded( Expanded(
child: AppButton( child: AppButton(
title: model.isAddProgress title: TranslationBase.of(context).submit,
? TranslationBase.of(context).next
: TranslationBase.of(context).finish,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.red[700]!, color: AppGlobal.appGreenColor,
disabled: !model.isProgressAdded(), disabled: !model.isProgressAdded(),
onPressed: () async { onPressed: () async {
changePageViewIndex(3); Navigator.pop(context);
// model.nextOnPlanPage(model);
}, },
), ),
), ),

Loading…
Cancel
Save