Use the same layout between the country and language picker (in the s…

…ettings)
openfoodfacts · Jan 18, 2025 · 5785c06 · 5785c06
1 parent 277eea2
commit 5785c06
Show file tree

Hide file tree

Showing 16 changed files with 1,098 additions and 567 deletions.
diff --git a/...eneric_lib/widgets/language_selector.dart → ...neric_lib/widgets/languages_selector.dart b/...eneric_lib/widgets/language_selector.dart → ...neric_lib/widgets/languages_selector.dart
@@ -12,8 +12,8 @@ import 'package:smooth_app/pages/preferences/user_preferences_languages_list.dar
 import 'package:smooth_app/query/product_query.dart';
 import 'package:smooth_app/widgets/smooth_text.dart';
 
-class LanguageSelector extends StatelessWidget {
-  const LanguageSelector({
+class LanguagesSelector extends StatelessWidget {
+  const LanguagesSelector({
     required this.setLanguage,
     this.selectedLanguages,
     this.displayedLanguage,

diff --git a/packages/smooth_app/lib/l10n/app_en.arb b/packages/smooth_app/lib/l10n/app_en.arb
@@ -2681,6 +2681,14 @@
     "@language_picker_label": {
         "description": "Choose Application Language"
     },
+    "country_picker_label": "Your country",
+    "@country_picker_label": {
+        "description": "Choose Application Country"
+    },
+    "currency_picker_label": "Your currency",
+    "@currency_picker_label": {
+        "description": "Choose Application Country"
+    },
     "help_with_openfoodfacts": "Help with OpenFoodFacts",
     "@help_with_openfoodfacts": {
         "description": "Label for the email title"

diff --git a/packages/smooth_app/lib/l10n/app_fr.arb b/packages/smooth_app/lib/l10n/app_fr.arb
@@ -2681,6 +2681,14 @@
     "@language_picker_label": {
         "description": "Choose Application Language"
     },
+    "country_picker_label": "Votre pays",
+    "@country_picker_label": {
+        "description": "Choose Application Country"
+    },
+    "currency_picker_label": "Votre devise",
+    "@currency_picker_label": {
+        "description": "Choose Application Country"
+    },
     "help_with_openfoodfacts": "Bienvenue sur OpenFoodFacts",
     "@help_with_openfoodfacts": {
         "description": "Label for the email title"

diff --git a/packages/smooth_app/lib/pages/onboarding/welcome_page.dart b/packages/smooth_app/lib/pages/onboarding/welcome_page.dart
@@ -105,10 +105,24 @@ class WelcomePage extends StatelessWidget {
                                   padding: const EdgeInsetsDirectional.only(
                                     start: SMALL_SPACE,
                                     end: LARGE_SPACE,
+                                    top: SMALL_SPACE,
+                                    bottom: SMALL_SPACE,
                                   ),
                                   inkWellBorderRadius: ANGULAR_BORDER_RADIUS,
-                                  icon: const icons.Arrow.right(
-                                    size: 15.0,
+                                  icon: const DecoratedBox(
+                                    decoration: BoxDecoration(
+                                      color: Colors.black,
+                                      shape: BoxShape.circle,
+                                    ),
+                                    child: Padding(
+                                      padding: EdgeInsetsDirectional.all(
+                                        SMALL_SPACE,
+                                      ),
+                                      child: icons.Arrow.right(
+                                        size: 15.0,
+                                        color: Colors.white,
+                                      ),
+                                    ),
                                   ),
                                   textStyle:
                                       TextStyle(color: theme.primaryColor),