feat(#259): only show intial drug selection instructions once

hpi-dhc · Apr 5, 2024 · 9ad98ce · 9ad98ce
1 parent 4d8d1ff
commit 9ad98ce
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/app/lib/common/models/metadata.dart b/app/lib/common/models/metadata.dart
@@ -39,9 +39,12 @@ class MetaData {
   bool? onboardingDone;
 
   @HiveField(3)
-  bool? initialDrugSelectionDone;
+  bool? initialDrugSelectionInitiated;
 
   @HiveField(4)
+  bool? initialDrugSelectionDone;
+
+  @HiveField(5)
   bool? tutorialDone;
 }
 

diff --git a/app/lib/common/widgets/tutorial/show.dart b/app/lib/common/widgets/tutorial/show.dart
@@ -4,7 +4,8 @@ import 'container.dart';
 Future<void> showTutorial({
   required BuildContext context,
   required List<TutorialContent> pages,
-  required bool concludesWholeTutorial,
+  String? lastNextButtonText,
+  required Function() updateMetadata,
 }) =>  showModalBottomSheet(
   context: context,
   enableDrag: true,
@@ -15,15 +16,11 @@ Future<void> showTutorial({
   elevation: 0,
   builder: (context) => TutorialContainer(
     pages: pages,
-    lastNextButtonText: concludesWholeTutorial
-      ? context.l10n.tutorial_to_the_app
-      : null,
+    lastNextButtonText: lastNextButtonText,
     finishTutorial: () async {
       final closeTutorial = Navigator.of(context).pop;
-      if (concludesWholeTutorial) {
-        MetaData.instance.tutorialDone = true;
-        await MetaData.save();
-      }
+      updateMetadata();
+      await MetaData.save();
       closeTutorial();
     },
   ),

diff --git a/app/lib/drug_selection/pages/drug_selection.dart b/app/lib/drug_selection/pages/drug_selection.dart
@@ -23,7 +23,9 @@ class DrugSelectionPage extends HookWidget {
         create: (context) => cubit ?? DrugSelectionCubit(activeDrugs),
         child: BlocBuilder<DrugSelectionCubit, DrugSelectionState>(
           builder: (context, state) {
-            if (concludesOnboarding) {
+            final initialDrugSelectionInitiated =
+              MetaData.instance.initialDrugSelectionInitiated ?? false;
+            if (concludesOnboarding && !initialDrugSelectionInitiated) {
               WidgetsBinding.instance.addPostFrameCallback((_) async {
                 await showTutorial(
                   context: context,
@@ -36,7 +38,8 @@ class DrugSelectionPage extends HookWidget {
                       ),
                     ),
                   ],
-                  concludesWholeTutorial: false,
+                  updateMetadata: () =>
+                    MetaData.instance.initialDrugSelectionInitiated = true,
                 );
               });
             }