feat(#670): add own setting for drug selection

hpi-dhc · Dec 1, 2023 · 110408c · 110408c
1 parent 63bc4db
commit 110408c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/app/lib/login/pages/login.dart b/app/lib/login/pages/login.dart
@@ -115,7 +115,9 @@ class LoginPage extends HookWidget {
 
   Widget _buildLoadedScreen(BuildContext context) {
     return _buildColumnWrapper(
-      action: () => context.router.replace(OnboardingRouter()),
+      action: () => context.router.replace(
+        OnboardingRouter(nextPage: DrugSelectionRouter())
+      ),
       actionText: context.l10n.general_continue,
       children: [
         Icon(

diff --git a/app/lib/onboarding/pages/onboarding.dart b/app/lib/onboarding/pages/onboarding.dart
@@ -3,6 +3,10 @@
 import '../../../common/module.dart' hide MetaData;
 
 class OnboardingPage extends HookWidget {
+  OnboardingPage({ required this.nextPage });
+
+  final PageRouteInfo<dynamic> nextPage;
+
   final _pages = [
     OnboardingSubPage(
       illustrationPath: 'assets/images/onboarding/1.png',
@@ -163,7 +167,7 @@ class OnboardingPage extends HookWidget {
         if (isLastPage) {
             // Replace whole stack, see https://stackoverflow.com/a/73784156
             context.router.pushAndPopUntil(
-              DrugSelectionRouter(),
+              nextPage,
               predicate: (_) => false
             );
         } else {

diff --git a/app/lib/settings/pages/settings.dart b/app/lib/settings/pages/settings.dart
@@ -14,6 +14,11 @@ class SettingsPage extends StatelessWidget {
         ),
         dense: true,
       ),
+      ListTile(
+        title: Text(context.l10n.drug_selection_header),
+        trailing: Icon(Icons.chevron_right_rounded),
+        onTap: () => context.router.push(DrugSelectionRouter()),
+      ),
       ListTile(
         title: Text(context.l10n.settings_page_delete_data),
         trailing: Icon(Icons.chevron_right_rounded),
@@ -33,7 +38,7 @@ class SettingsPage extends StatelessWidget {
       ListTile(
         title: Text(context.l10n.settings_page_onboarding),
         trailing: Icon(Icons.chevron_right_rounded),
-        onTap: () => context.router.push(OnboardingRouter()),
+        onTap: () => context.router.push(OnboardingRouter(nextPage: MainRoute())),
       ),
       ListTile(
         title: Text(context.l10n.settings_page_about_us),