Merge branch 'develop' into feat/5586_3

openfoodfacts · Oct 21, 2024 · 618a135 · 618a135
2 parents dcd7dab + a4b3632
commit 618a135
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/...es/smooth_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/black_icon-1024.png b/...es/smooth_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/black_icon-1024.png
diff --git a/...s/smooth_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/tinted_icon-1024.png b/...s/smooth_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/tinted_icon-1024.png
diff --git a/...es/smooth_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/white_icon-1024.png b/...es/smooth_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/white_icon-1024.png
diff --git a/packages/smooth_app/lib/pages/navigator/app_navigator.dart b/packages/smooth_app/lib/pages/navigator/app_navigator.dart
@@ -72,6 +72,13 @@ class AppNavigator extends InheritedWidget {
     _router.router.pushReplacement(routeName, extra: extra);
   }
 
+  /// Remove all the screens from the stack
+  void clearStack() {
+    while (_router.router.canPop() == true) {
+      _router.router.pop();
+    }
+  }
+
   void pop([dynamic result]) {
     _router.router.pop(result);
   }
@@ -286,7 +293,7 @@ class _SmoothGoRouter {
               externalLink = true;
             }
           } else if (path == _ExternalRoutes.MOBILE_APP_DOWNLOAD) {
-            return AppRoutes.HOME;
+            return AppRoutes.HOME();
           } else if (path == _ExternalRoutes.GUIDE_NUTRISCORE_V2) {
             return AppRoutes.GUIDE_NUTRISCORE_V2;
           } else if (path == _ExternalRoutes.SIGNUP) {
@@ -421,7 +428,8 @@ class AppRoutes {
   AppRoutes._();
 
   // Home page (or walkthrough during the onboarding)
-  static String get HOME => _InternalAppRoutes.HOME_PAGE;
+  static String HOME({bool redraw = false}) =>
+      '${_InternalAppRoutes.HOME_PAGE}?redraw:$redraw';
 
   // Product details (a [Product] is mandatory in the extra)
   static String PRODUCT(

diff --git a/packages/smooth_app/lib/pages/onboarding/onboarding_flow_navigator.dart b/packages/smooth_app/lib/pages/onboarding/onboarding_flow_navigator.dart
@@ -139,16 +139,23 @@ class OnboardingFlowNavigator {
   static final List<OnboardingPage> _historyOnboardingNav = <OnboardingPage>[];
 
   Future<void> navigateToPage(BuildContext context, OnboardingPage page) async {
-    _userPreferences.setLastVisitedOnboardingPage(page);
+    await _userPreferences.setLastVisitedOnboardingPage(page);
     _historyOnboardingNav.add(page);
 
-    final MaterialPageRoute<void> route = MaterialPageRoute<void>(
-      builder: (BuildContext context) => page.getPageWidget(context),
-    );
+    if (!context.mounted) {
+      return;
+    }
 
     if (page.isOnboardingComplete()) {
-      AppNavigator.of(context).pushReplacement(AppRoutes.HOME);
+      AppNavigator.of(context)
+        ..clearStack()
+        ..pushReplacement(
+          AppRoutes.HOME(redraw: true),
+        );
     } else {
+      final MaterialPageRoute<void> route = MaterialPageRoute<void>(
+        builder: (BuildContext context) => page.getPageWidget(context),
+      );
       await Navigator.of(context).push<void>(route);
     }
   }