chore: "Take a picture" button now distinguishes "Take a picture" VS …

…"Take a new picture" (#5396) * Difference between Take a picture / Take a new picture * Apply suggestions from code review --------- Co-authored-by: Pierre Slamich <pierre.slamich@gmail.com>
openfoodfacts · Jun 20, 2024 · 7ee3a26 · 7ee3a26
1 parent b322c68
commit 7ee3a26
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 15 deletions.
diff --git a/packages/smooth_app/lib/l10n/app_en.arb b/packages/smooth_app/lib/l10n/app_en.arb
@@ -2203,9 +2203,13 @@
             }
         }
     },
-    "capture": "Capture New",
+    "capture": "Take a new picture",
     "@capture": {
-        "description": "Button label for taking a photo"
+        "description": "Button label for taking a new photo (= there's already one)"
+    },
+    "capture_new_picture": "Take a picture",
+    "@capture_new_picture": {
+        "description": "Button label for taking a new photo (= the first one)"
     },
     "choose_from_gallery": "Choose from gallery",
     "@choose_from_gallery": {

diff --git a/packages/smooth_app/lib/pages/product/edit_ocr/edit_ocr_page.dart b/packages/smooth_app/lib/pages/product/edit_ocr/edit_ocr_page.dart
@@ -157,11 +157,16 @@ class _EditOcrPageState extends State<EditOcrPage> with UpToDateMixin {
     );
   }
 
-  Widget _getImageButton(final ProductImageButtonType type) => Padding(
+  Widget _getImageButton(
+    final ProductImageButtonType type,
+    final bool imageExists,
+  ) =>
+      Padding(
         padding: const EdgeInsets.symmetric(horizontal: SMALL_SPACE),
         child: type.getButton(
           product: upToDateProduct,
           imageField: _helper.getImageField(),
+          imageExists: imageExists,
           language: _multilingualHelper.getCurrentLanguage(),
           isLoggedInMandatory: widget.isLoggedInMandatory,
           borderWidth: 2,
@@ -223,6 +228,8 @@ class _EditOcrPageState extends State<EditOcrPage> with UpToDateMixin {
     final OpenFoodFactsLanguage language =
         _multilingualHelper.getCurrentLanguage();
     final ImageProvider? imageProvider = transientFile.getImageProvider();
+    final bool imageExists = imageProvider != null;
+
     return Align(
       alignment: AlignmentDirectional.bottomStart,
       child: Column(
@@ -245,10 +252,16 @@ class _EditOcrPageState extends State<EditOcrPage> with UpToDateMixin {
                     mainAxisSize: MainAxisSize.max,
                     children: <Widget>[
                       Expanded(
-                        child: _getImageButton(ProductImageButtonType.server),
+                        child: _getImageButton(
+                          ProductImageButtonType.server,
+                          imageExists,
+                        ),
                       ),
                       Expanded(
-                        child: _getImageButton(ProductImageButtonType.local),
+                        child: _getImageButton(
+                          ProductImageButtonType.local,
+                          imageExists,
+                        ),
                       ),
                     ],
                   ),
@@ -259,11 +272,16 @@ class _EditOcrPageState extends State<EditOcrPage> with UpToDateMixin {
                       mainAxisSize: MainAxisSize.max,
                       children: <Widget>[
                         Expanded(
-                          child:
-                              _getImageButton(ProductImageButtonType.unselect),
+                          child: _getImageButton(
+                            ProductImageButtonType.unselect,
+                            imageExists,
+                          ),
                         ),
                         Expanded(
-                          child: _getImageButton(ProductImageButtonType.edit),
+                          child: _getImageButton(
+                            ProductImageButtonType.edit,
+                            imageExists,
+                          ),
                         ),
                       ],
                     ),

diff --git a/packages/smooth_app/lib/pages/product/product_image_button.dart b/packages/smooth_app/lib/pages/product/product_image_button.dart
@@ -65,6 +65,7 @@ enum ProductImageButtonType {
     required final OpenFoodFactsLanguage language,
     required final bool isLoggedInMandatory,
     final double? borderWidth,
+    required bool imageExists,
   }) =>
       switch (this) {
         ProductImageButtonType.local => ProductImageLocalButton(
@@ -73,6 +74,7 @@ enum ProductImageButtonType {
             language: language,
             isLoggedInMandatory: isLoggedInMandatory,
             borderWidth: borderWidth,
+            imageExists: imageExists,
           ),
         ProductImageButtonType.server => ProductImageServerButton(
             product: product,

diff --git a/packages/smooth_app/lib/pages/product/product_image_local_button.dart b/packages/smooth_app/lib/pages/product/product_image_local_button.dart
@@ -11,15 +11,19 @@ class ProductImageLocalButton extends ProductImageButton {
     required super.imageField,
     required super.language,
     required super.isLoggedInMandatory,
+    required this.imageExists,
     super.borderWidth,
   });
 
+  final bool imageExists;
+
   @override
   IconData getIconData() => Icons.add_a_photo;
 
   @override
-  String getLabel(final AppLocalizations appLocalizations) =>
-      appLocalizations.capture;
+  String getLabel(final AppLocalizations appLocalizations) => imageExists
+      ? appLocalizations.capture
+      : appLocalizations.capture_new_picture;
 
   @override
   Future<void> action(final BuildContext context) async {

diff --git a/packages/smooth_app/lib/pages/product/product_image_viewer.dart b/packages/smooth_app/lib/pages/product/product_image_viewer.dart
@@ -44,11 +44,16 @@ class _ProductImageViewerState extends State<ProductImageViewer>
     initUpToDate(widget.product, context.read<LocalDatabase>());
   }
 
-  Widget _getImageButton(final ProductImageButtonType type) => Padding(
+  Widget _getImageButton(
+    final ProductImageButtonType type,
+    final bool imageExists,
+  ) =>
+      Padding(
         padding: const EdgeInsets.symmetric(horizontal: SMALL_SPACE),
         child: type.getButton(
           product: upToDateProduct,
           imageField: widget.imageField,
+          imageExists: imageExists,
           language: widget.language,
           isLoggedInMandatory: widget.isLoggedInMandatory,
         ),
@@ -65,6 +70,7 @@ class _ProductImageViewerState extends State<ProductImageViewer>
       widget.language,
     );
     final ImageProvider? imageProvider = _getTransientFile().getImageProvider();
+    final bool imageExists = imageProvider != null;
     final Iterable<OpenFoodFactsLanguage> selectedLanguages =
         getProductImageLanguages(
       upToDateProduct,
@@ -193,10 +199,16 @@ class _ProductImageViewerState extends State<ProductImageViewer>
             mainAxisSize: MainAxisSize.max,
             children: <Widget>[
               Expanded(
-                child: _getImageButton(ProductImageButtonType.server),
+                child: _getImageButton(
+                  ProductImageButtonType.server,
+                  imageExists,
+                ),
               ),
               Expanded(
-                child: _getImageButton(ProductImageButtonType.local),
+                child: _getImageButton(
+                  ProductImageButtonType.local,
+                  imageExists,
+                ),
               ),
             ],
           ),
@@ -207,10 +219,16 @@ class _ProductImageViewerState extends State<ProductImageViewer>
               mainAxisSize: MainAxisSize.max,
               children: <Widget>[
                 Expanded(
-                  child: _getImageButton(ProductImageButtonType.unselect),
+                  child: _getImageButton(
+                    ProductImageButtonType.unselect,
+                    imageExists,
+                  ),
                 ),
                 Expanded(
-                  child: _getImageButton(ProductImageButtonType.edit),
+                  child: _getImageButton(
+                    ProductImageButtonType.edit,
+                    imageExists,
+                  ),
                 ),
               ],
             ),