From 356380cf0800e8421f631a04ca70f8c0f294cf24 Mon Sep 17 00:00:00 2001 From: tamara-slosarek Date: Mon, 13 Jan 2025 15:44:42 +0100 Subject: [PATCH] feat(app): add "back to app" button to edit medications --- .../drug_selection/pages/drug_selection.dart | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/app/lib/drug_selection/pages/drug_selection.dart b/app/lib/drug_selection/pages/drug_selection.dart index 878beeff..bf2c055c 100644 --- a/app/lib/drug_selection/pages/drug_selection.dart +++ b/app/lib/drug_selection/pages/drug_selection.dart @@ -43,7 +43,7 @@ class DrugSelectionPage extends HookWidget { ), ), Expanded(child: _buildDrugList(context, state)), - if (concludesOnboarding) _buildButton(context, state), + _buildButton(context, state), ], ), ); @@ -61,18 +61,26 @@ class DrugSelectionPage extends HookWidget { } Widget _buildButton(BuildContext context, DrugSelectionState state) { - return Padding( - padding: EdgeInsets.all(PharMeTheme.mediumSpace), - child: FullWidthButton( - context.l10n.action_proceed_to_app, - () async { + final buttonText = concludesOnboarding + ? context.l10n.action_proceed_to_app + : context.l10n.action_back_to_app; + final onButtonPressed = concludesOnboarding + ? () async { MetaData.instance.initialDrugSelectionDone = true; await MetaData.save(); // ignore: use_build_context_synchronously await context.router.push( MainRoute(), ); - }, + } + : () { + context.router.maybePop(); + }; + return Padding( + padding: EdgeInsets.all(PharMeTheme.mediumSpace), + child: FullWidthButton( + buttonText, + onButtonPressed, enabled: _isEditable(state), ) );