Onboarding with main/home page from V2 (#5382)

openfoodfacts · Jun 15, 2024 · 3b88ac0 · 3b88ac0
1 parent 35a4ab0
commit 3b88ac0
Show file tree

Hide file tree

Showing 9 changed files with 405 additions and 216 deletions.
diff --git a/packages/smooth_app/assets/onboarding/birthday-cake.svg b/packages/smooth_app/assets/onboarding/birthday-cake.svg
diff --git a/packages/smooth_app/assets/onboarding/cloud.svg b/packages/smooth_app/assets/onboarding/cloud.svg
diff --git a/packages/smooth_app/assets/onboarding/reinvention.svg b/packages/smooth_app/assets/onboarding/reinvention.svg
diff --git a/packages/smooth_app/lib/data_models/onboarding_loader.dart b/packages/smooth_app/lib/data_models/onboarding_loader.dart
@@ -44,7 +44,7 @@ class OnboardingLoader {
         }
         return;
       case OnboardingPage.NOT_STARTED:
-      case OnboardingPage.REINVENTION:
+      case OnboardingPage.HOME_PAGE:
       case OnboardingPage.SCAN_EXAMPLE:
       case OnboardingPage.HEALTH_CARD_EXAMPLE:
       case OnboardingPage.ECO_CARD_EXAMPLE:

diff --git a/packages/smooth_app/lib/l10n/app_en.arb b/packages/smooth_app/lib/l10n/app_en.arb
@@ -1092,14 +1092,12 @@
             }
         }
     },
-    "onboarding_reinventing_text1": "We invented\nthe collaborative\nscanning app in 2012",
-    "@onboarding_reinventing_text1": {
-        "description": "Onboarding / Reinventing page: text 1/2. If possible, balanced on 3 lines."
-    },
-    "onboarding_reinventing_text2": "As we turn 10,\nwe're reinventing it\nfrom the ground up!",
-    "@onboarding_reinventing_text2": {
-        "description": "Onboarding / Reinventing page: text 2/2. If possible, balanced on 3 lines."
+    "onboarding_home_welcome_text1": "Welcome !",
+    "onboarding_home_welcome_text2": "The app that helps you choose food that is good for **you** and the **planet**!",
+    "@onboarding_home_welcome_text2": {
+      "description": "Onboarding home screen welcome text, text surrounded by * will be bold"
     },
+    "onboarding_continue_button": "Continue",
     "onboarding_welcome_loading_dialog_title": "Loading your first example product",
     "@onboarding_welcome_loading_dialog_title": {
         "description": "Title for the onboarding loading dialog"

diff --git a/packages/smooth_app/lib/pages/onboarding/onboarding_flow_navigator.dart b/packages/smooth_app/lib/pages/onboarding/onboarding_flow_navigator.dart
@@ -18,7 +18,7 @@ import 'package:smooth_app/widgets/will_pop_scope.dart';
 
 enum OnboardingPage {
   NOT_STARTED,
-  REINVENTION,
+  HOME_PAGE,
   WELCOME,
   SCAN_EXAMPLE,
   HEALTH_CARD_EXAMPLE,
@@ -52,7 +52,7 @@ enum OnboardingPage {
   Color getBackgroundColor() {
     switch (this) {
       case OnboardingPage.NOT_STARTED:
-      case OnboardingPage.REINVENTION:
+      case OnboardingPage.HOME_PAGE:
         return const Color(0xFFDFF4FF);
       case OnboardingPage.WELCOME:
         return const Color(0xFFFCFCFC);
@@ -79,8 +79,8 @@ enum OnboardingPage {
     final Color backgroundColor = getBackgroundColor();
     switch (this) {
       case OnboardingPage.NOT_STARTED:
-      case OnboardingPage.REINVENTION:
-        return ReinventionPage(backgroundColor);
+      case OnboardingPage.HOME_PAGE:
+        return const OnboardingHomePage();
       case OnboardingPage.WELCOME:
         return WelcomePage(backgroundColor);
       case OnboardingPage.SCAN_EXAMPLE: