Merge branch 'develop' into feat/5741

monsieurtanuki · Nov 7, 2024 · 2e1bdd6 · 2e1bdd6
2 parents 52dc7f5 + cc874d2
commit 2e1bdd6
Show file tree

Hide file tree

Showing 12 changed files with 503 additions and 194 deletions.
diff --git a/packages/smooth_app/lib/cards/product_cards/smooth_product_card_found.dart b/packages/smooth_app/lib/cards/product_cards/smooth_product_card_found.dart
@@ -114,7 +114,7 @@ class SmoothProductCardFound extends StatelessWidget {
                               Icon(
                                 Icons.circle,
                                 size: 15,
-                                color: helper.getButtonColor(isDarkMode),
+                                color: helper.getColor(context),
                               ),
                               const Padding(
                                 padding: EdgeInsetsDirectional.only(

diff --git a/packages/smooth_app/lib/helpers/product_compatibility_helper.dart b/packages/smooth_app/lib/helpers/product_compatibility_helper.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:openfoodfacts/openfoodfacts.dart';
-import 'package:smooth_app/generic_lib/design_constants.dart';
+import 'package:smooth_app/themes/smooth_theme_colors.dart';
 
 class ProductCompatibilityHelper {
   ProductCompatibilityHelper.product(final MatchedProductV2 product)
@@ -11,20 +11,18 @@ class ProductCompatibilityHelper {
 
   final MatchedProductStatusV2 status;
 
-  Color getHeaderBackgroundColor(bool darkMode) {
-    if (darkMode) {
-      return _getDarkColors();
-    } else {
-      return _getLightColors();
-    }
-  }
+  Color getColor(BuildContext context) {
+    final SmoothColorsThemeExtension theme =
+        Theme.of(context).extension<SmoothColorsThemeExtension>()!;
 
-  Color getButtonColor(bool darkMode) {
-    if (darkMode) {
-      return _getLightColors();
-    } else {
-      return _getDarkColors();
-    }
+    return switch (status) {
+      MatchedProductStatusV2.VERY_GOOD_MATCH => theme.green,
+      MatchedProductStatusV2.GOOD_MATCH => theme.green,
+      MatchedProductStatusV2.POOR_MATCH => theme.orange,
+      MatchedProductStatusV2.MAY_NOT_MATCH => theme.orange,
+      MatchedProductStatusV2.DOES_NOT_MATCH => theme.red,
+      MatchedProductStatusV2.UNKNOWN_MATCH => theme.greyNormal,
+    };
   }
 
   Color getHeaderForegroundColor(bool darkMode) =>
@@ -33,30 +31,6 @@ class ProductCompatibilityHelper {
   Color getButtonForegroundColor(bool darkMode) =>
       getHeaderForegroundColor(darkMode);
 
-  // According to color contrast tool https://material.io/resources/color
-  // on all those background colors the best is to write in black.
-  Color _getDarkColors() {
-    switch (status) {
-      case MatchedProductStatusV2.VERY_GOOD_MATCH:
-        return DARK_GREEN_COLOR;
-      case MatchedProductStatusV2.GOOD_MATCH:
-        return LIGHT_GREEN_COLOR;
-      case MatchedProductStatusV2.POOR_MATCH:
-        return DARK_YELLOW_COLOR;
-      case MatchedProductStatusV2.MAY_NOT_MATCH:
-        return DARK_ORANGE_COLOR;
-      case MatchedProductStatusV2.DOES_NOT_MATCH:
-        return RED_COLOR;
-      case MatchedProductStatusV2.UNKNOWN_MATCH:
-        return FAIR_GREY_COLOR;
-    }
-  }
-
-  Color _getLightColors() {
-    // TODO(monsieurtanuki): difference between dark and light
-    return _getDarkColors();
-  }
-
   String getHeaderText(final AppLocalizations appLocalizations) {
     switch (status) {
       case MatchedProductStatusV2.VERY_GOOD_MATCH:

diff --git a/packages/smooth_app/lib/l10n/app_en.arb b/packages/smooth_app/lib/l10n/app_en.arb
@@ -3073,5 +3073,9 @@
     "photo_viewer_details_url_title": "URL",
     "@photo_viewer_details_url_title": {
         "description": "Label for the link of a photo"
+    },
+    "product_page_compatibility_score": "Compatible",
+    "@product_page_compatibility_score": {
+        "description": "Compatibility score on top of the product page. The sentence is \"100%\" Compatible"
     }
 }
diff --git a/packages/smooth_app/lib/pages/personalized_ranking_page.dart b/packages/smooth_app/lib/pages/personalized_ranking_page.dart
@@ -241,7 +241,7 @@ class _PersonalizedRankingPageState extends State<PersonalizedRankingPage>
           barcode: matchedProduct.barcode,
           backgroundColor:
               ProductCompatibilityHelper.status(matchedProduct.status)
-                  .getHeaderBackgroundColor(darkMode)
+                  .getColor(context)
                   .withAlpha(_backgroundAlpha),
         ),
       );

diff --git a/packages/smooth_app/lib/pages/product/compare_products3_page.dart b/packages/smooth_app/lib/pages/product/compare_products3_page.dart
@@ -69,8 +69,6 @@ class _CompareProducts3PageState extends State<CompareProducts3Page> {
     final AppLocalizations appLocalizations = AppLocalizations.of(context);
     context.watch<LocalDatabase>();
 
-    final bool darkMode = Theme.of(context).brightness == Brightness.dark;
-
     final ProductPreferences productPreferences =
         context.watch<ProductPreferences>();
     final List<List<Attribute>> scoreAttributesArray = <List<Attribute>>[];
@@ -85,7 +83,7 @@ class _CompareProducts3PageState extends State<CompareProducts3Page> {
       scoreWidgets.add(
         Expanded(
           child: Container(
-            color: helper.getHeaderBackgroundColor(darkMode),
+            color: helper.getColor(context),
             child: Center(
               child: Text(
                 matchedProduct.score.toInt().toString(),

diff --git a/packages/smooth_app/lib/pages/product/product_compatibility_header.dart b/packages/smooth_app/lib/pages/product/product_compatibility_header.dart
@@ -25,6 +25,7 @@ class ProductCompatibilityHeader extends StatelessWidget {
       product,
       productPreferences,
     );
+
     final ProductCompatibilityHelper helper =
         ProductCompatibilityHelper.product(matchedProduct);
     final AppLocalizations appLocalizations = AppLocalizations.of(context);
@@ -33,7 +34,7 @@ class ProductCompatibilityHeader extends StatelessWidget {
 
     return Ink(
       decoration: BoxDecoration(
-        color: helper.getHeaderBackgroundColor(isDarkMode),
+        color: helper.getColor(context),
         // Ensure that the header has the same circular radius as the SmoothCard.
         borderRadius: const BorderRadiusDirectional.only(
           topStart: ROUNDED_RADIUS,

diff --git a/packages/smooth_app/lib/pages/product/product_page/new_product_footer.dart b/packages/smooth_app/lib/pages/product/product_page/new_product_footer.dart
@@ -365,6 +365,8 @@ class _ProductFooterFilledButton extends StatelessWidget {
   Widget build(BuildContext context) {
     final SmoothColorsThemeExtension themeExtension =
         Theme.of(context).extension<SmoothColorsThemeExtension>()!;
+    final ProductPageCompatibility compatibility =
+        context.watch<ProductPageCompatibility>();
 
     return Semantics(
       excludeSemantics: true,
@@ -374,9 +376,11 @@ class _ProductFooterFilledButton extends StatelessWidget {
         onPressed: onTap,
         style: OutlinedButton.styleFrom(
           foregroundColor: Colors.white,
-          backgroundColor: context.lightTheme()
-              ? themeExtension.primaryBlack
-              : themeExtension.primarySemiDark,
+          backgroundColor: compatibility.score > 0
+              ? compatibility.color
+              : context.lightTheme()
+                  ? themeExtension.primaryBlack
+                  : themeExtension.primarySemiDark,
           side: BorderSide.none,
         ),
         child: Row(