feat: Multi-lingual input for product name + help banner (#6286)

* Explanation banner for the product name * Bad examples with the wrong title * Reorder header icons * Oops… dark mode * Dark mode x2 * Fix "Nesquik" typo * With banner * Remove the warning icon from the Help modal sheet (too ugly)
openfoodfacts · Jan 27, 2025 · 74fe856 · 74fe856
1 parent 4cef8f0
commit 74fe856
Show file tree

Hide file tree

Showing 16 changed files with 790 additions and 97 deletions.
diff --git a/packages/smooth_app/lib/data_models/preferences/user_preferences.dart b/packages/smooth_app/lib/data_models/preferences/user_preferences.dart
@@ -128,6 +128,10 @@ class UserPreferences extends ChangeNotifier {
       'taglineFeedNewsDisplayed';
   static const String _TAG_TAGLINE_FEED_NEWS_CLICKED = 'taglineFeedNewsClicked';
 
+  /// Info messages
+  static const String _TAG_SHOW_BANNER_INPUT_PRODUCT_NAME =
+      'bannerInputProductName';
+
   Future<void> init(final ProductPreferences productPreferences) async {
     await _onMigrate();
 
@@ -483,6 +487,17 @@ class UserPreferences extends ChangeNotifier {
     }
   }
 
+  bool showInputProductNameBanner() =>
+      _sharedPreferences.getBool(_TAG_SHOW_BANNER_INPUT_PRODUCT_NAME) ?? true;
+
+  Future<void> hideInputProductNameBanner() async {
+    await _sharedPreferences.setBool(
+      _TAG_SHOW_BANNER_INPUT_PRODUCT_NAME,
+      false,
+    );
+    notifyListeners();
+  }
+
   ProductType get latestProductType =>
       ProductType.fromOffTag(
           _sharedPreferences.getString(_TAG_LATEST_PRODUCT_TYPE)) ??

diff --git a/packages/smooth_app/lib/generic_lib/bottom_sheets/smooth_bottom_sheet.dart b/packages/smooth_app/lib/generic_lib/bottom_sheets/smooth_bottom_sheet.dart
@@ -682,20 +682,34 @@ abstract class SizeWidget implements Widget {
 class SmoothModalSheetBodyContainer extends StatelessWidget {
   const SmoothModalSheetBodyContainer({
     required this.child,
+    this.padding,
+    this.safeArea = true,
     super.key,
   });
 
   final Widget child;
+  final EdgeInsetsGeometry? padding;
+  final bool safeArea;
 
   @override
   Widget build(BuildContext context) {
+    EdgeInsetsGeometry padding = this.padding ??
+        const EdgeInsetsDirectional.only(
+          start: MEDIUM_SPACE,
+          end: MEDIUM_SPACE,
+          top: VERY_SMALL_SPACE,
+          bottom: VERY_SMALL_SPACE,
+        );
+
+    if (safeArea) {
+      padding = padding.add(
+        EdgeInsetsDirectional.only(
+          bottom: MediaQuery.viewPaddingOf(context).bottom,
+        ),
+      );
+    }
     return Padding(
-      padding: EdgeInsetsDirectional.only(
-        start: MEDIUM_SPACE,
-        end: MEDIUM_SPACE,
-        top: VERY_SMALL_SPACE,
-        bottom: VERY_SMALL_SPACE + MediaQuery.viewPaddingOf(context).bottom,
-      ),
+      padding: padding,
       child: DefaultTextStyle.merge(
         style: const TextStyle(
           fontSize: 15.0,

diff --git a/packages/smooth_app/lib/generic_lib/html/smooth_html_marker_chip.dart b/packages/smooth_app/lib/generic_lib/html/smooth_html_marker_chip.dart
@@ -16,7 +16,7 @@ class SmoothHtmlChip extends StatelessWidget {
     return CustomPaint(
       painter: _HtmlChipPainter(
         color:
-            context.lightTheme() ? extension.greyLight : extension.greyNormal,
+            context.lightTheme() ? extension.greyMedium : extension.greyNormal,
         textDirection: Directionality.of(context),
       ),
       child: const SizedBox.square(dimension: 10.0),

diff --git a/packages/smooth_app/lib/generic_lib/html/smooth_html_marker_decimal.dart b/packages/smooth_app/lib/generic_lib/html/smooth_html_marker_decimal.dart
@@ -19,7 +19,7 @@ class SmoothHtmlDecimal extends StatelessWidget {
     return CustomPaint(
       painter: _HtmlDecimalPainter(
         color:
-            context.lightTheme() ? extension.greyLight : extension.greyNormal,
+            context.lightTheme() ? extension.greyMedium : extension.greyNormal,
         index: index,
         textDirection: Directionality.of(context),
         textStyle: const TextStyle(

diff --git a/packages/smooth_app/lib/l10n/app_en.arb b/packages/smooth_app/lib/l10n/app_en.arb
@@ -2517,11 +2517,73 @@
     "basic_details": "Basic Details",
     "product_name": "Product Name",
     "product_names": "Product Names",
+    "@product_names": {
+        "description": "Title for the section to edit the product name (in multiple languages)"
+    },
     "add_basic_details_product_name_add_translation": "Add a new translation",
+    "@add_basic_details_product_name_add_translation": {
+        "description": "Button to add a new translation for the product name"
+    },
+    "add_basic_details_product_name_warning_translations": "Before validating, please ensure you only add a translation **if the language is not present on the packaging**",
+    "@add_basic_details_product_name_warning_translations": {
+        "description": "Warning message displayed on top of new translations for the product name"
+    },
     "add_basic_details_product_name_open_photo": "View front photo",
+    "@add_basic_details_product_name_open_photo": {
+        "description": "Button to view the front photo of the product (on top of the screen)"
+    },
     "add_basic_details_product_name_take_photo": "Take front photo",
-    "add_basic_details_product_name_error": "Please enter the product name",
+    "@add_basic_details_product_name_take_photo": {
+        "description": "Button to take a photo of the front of the product (when there is no photo yet)"
+    },
     "add_basic_details_product_name_hint": "Input the name of the product (eg: Nutella)",
+    "@add_basic_details_product_name_hint": {
+        "description": "Placeholder when the product name text-field is empty"
+    },
+    "add_basic_details_product_name_help_title": "Good practices: product name",
+    "@add_basic_details_product_name_help_title": {
+        "description": "Title for the help section about the product name"
+    },
+    "add_basic_details_product_name_help_info1": "The product name is the **main name printed on the packaging**. It can be a registered trademark.",
+    "@add_basic_details_product_name_help_info1": {
+        "description": "Text explaining how to write the product name"
+    },
+    "add_basic_details_product_name_help_info2": "**Note:** Please don't add a translation **if the language is not present on the packaging**.",
+    "@add_basic_details_product_name_help_info2": {
+        "description": "Text explaining how to write the product name"
+    },
+    "explanation_section_good_examples": "Good examples",
+    "@explanation_section_good_examples": {
+        "description": "Title for the section with good examples"
+    },
+    "explanation_section_bad_examples": "Bad examples",
+    "@explanation_section_bad_examples": {
+        "description": "Title for the section with bad examples"
+    },
+    "add_basic_details_product_name_help_good_examples_1": "Nesquik",
+    "@add_basic_details_product_name_help_good_examples_1": {
+        "description": "A 1st good example for the product name (you can change it if necessary)"
+    },
+    "add_basic_details_product_name_help_good_examples_2": "Tomato Ketchup",
+    "@add_basic_details_product_name_help_good_examples_2": {
+        "description": "A 2nd good example for the product name (you can change it if necessary)"
+    },
+    "add_basic_details_product_name_help_bad_examples_1_explanation": "Don't include the brand in the name",
+    "@add_basic_details_product_name_help_bad_examples_1_explanation": {
+        "description": "Explanation for the first bad example"
+    },
+    "add_basic_details_product_name_help_bad_examples_1_example": "Tomato Ketchup **by Heinz**",
+    "@add_basic_details_product_name_help_bad_examples_1_example": {
+        "description": "First bad example for the product name"
+    },
+    "add_basic_details_product_name_help_bad_examples_2_explanation": "Don't use symbols ®, ™, © or similar",
+    "@add_basic_details_product_name_help_bad_examples_2_explanation": {
+        "description": "Explanation for the second bad example"
+    },
+    "add_basic_details_product_name_help_bad_examples_2_example": "Nesquik**®**",
+    "@add_basic_details_product_name_help_bad_examples_2_example": {
+        "description": "Second bad example for the product name"
+    },
     "add_basic_details_product_name_other_translations": "{count,plural, one{{count} other translation} other{{count} other translations}}",
     "@add_basic_details_product_name_other_translations": {
         "description": "The number of other translations for a product name (count is always >= 1)",

diff --git a/packages/smooth_app/lib/pages/prices/product_price_add_page.dart b/packages/smooth_app/lib/pages/prices/product_price_add_page.dart
@@ -304,7 +304,7 @@ class _ProductPriceAddPageState extends State<ProductPriceAddPage>
         const SizedBox(width: MEDIUM_SPACE),
         CircleAvatar(
           radius: radius,
-          backgroundColor: extension.greyLight,
+          backgroundColor: extension.greyMedium,
           child: const app_icons.Arrow.right(
             color: Colors.white,
             size: defaultIconSize,