Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: 5570 - no nutriscore/ecoscore for non-food products #5629

Merged
merged 3 commits into from
Sep 27, 2024
+10 −5
Merged

fix: 5570 - no nutriscore/ecoscore for non-food products #5629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54cf7f7
fix: 5570 - no nutriscore ecoscore for non-food products
monsieurtanuki Sep 26, 2024
ab4c7de
Merge branch 'develop' into fix/5570
monsieurtanuki Sep 26, 2024
9b5427d
Merge branch 'develop' into fix/5570
monsieurtanuki Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions packages/smooth_app/lib/cards/product_cards/smooth_product_card_found.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,13 @@ class SmoothProductCardFound extends StatelessWidget {
padding:
EdgeInsetsDirectional.only(start: VERY_SMALL_SPACE),
),
Padding(
padding: const EdgeInsets.all(VERY_SMALL_SPACE),
child: Column(
children: scores,
if (scores.isNotEmpty)
Padding(
padding: const EdgeInsets.all(VERY_SMALL_SPACE),
child: Column(
children: scores,
),
),
),
],
),
),
Expand Down
4 changes: 4 additions & 0 deletions packages/smooth_app/lib/pages/product/product_incomplete_card.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ class ProductIncompleteCard extends StatelessWidget {
final bool isLoggedInMandatory;

static bool isProductIncomplete(final Product product) {
if (product.productType != null &&
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the name doesn't completely reflect what's actually going on

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the name doesn't completely reflect what's actually going on

You're right. The thing is that we display the "hey your product is incomplete" message only when the product is incomplete, for food products, therefore isProductIncomplete made sense.
I've just added an "if not food, consider as complete" test.
I can rename the method to isIncompleteFoodProduct: would that be OK with you?

product.productType != ProductType.food) {
return false;
}
bool checkScores = true;
if (_isNutriscoreNotApplicable(product)) {
AnalyticsHelper.trackEvent(
Expand Down
Loading