Skip to content

Commit 1c71cc8

Browse files
authored
Merge branch 'develop' into openfoodfacts#6139
2 parents a026b02 + d3696eb commit 1c71cc8

File tree

5 files changed

+45
-9
lines changed

5 files changed

+45
-9
lines changed

packages/smooth_app/lib/l10n/app_en.arb

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2606,6 +2606,18 @@
26062606
"description": "Top price locations: list tile title"
26072607
},
26082608
"prices_contribution_assistant": "Price Contribution Assistant",
2609+
"prices_validation_assistant": "Price Validation Assistant",
2610+
"@prices_validation_assistant": {
2611+
"description": "List of prices to validate"
2612+
},
2613+
"prices_challenges_page": "Challenges",
2614+
"@prices_challenges_page": {
2615+
"description": "Community challenges of open prices"
2616+
},
2617+
"prices_multiple_proof_addition_system": "Add Multiple Proofs",
2618+
"@prices_multiple_proof_addition_system":{
2619+
"description": "Upload multiple proofs"
2620+
},
26092621
"all_search_prices_top_location_single_title": "Prices in a store",
26102622
"@all_search_prices_top_location_single_title": {
26112623
"description": "Top price locations: list tile title"
@@ -2718,7 +2730,7 @@
27182730
"@add_basic_details_product_name_add_translation": {
27192731
"description": "Button to add a new translation for the product name"
27202732
},
2721-
"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**",
2733+
"add_basic_details_product_name_warning_translations": "Before validating, please ensure you only add a translation **if the language is present on the packaging**",
27222734
"@add_basic_details_product_name_warning_translations": {
27232735
"description": "Warning message displayed on top of new translations for the product name"
27242736
},
@@ -3746,8 +3758,8 @@
37463758
"guide_nutriscore_v2_new_logo_text": "From now on, the logo can display a mention \"**New calculation**\" to clarify that this is indeed the new calculation.",
37473759
"guide_nutriscore_v2_new_logo_image_caption": "The logo of the new Nutri-Score",
37483760
"guide_nutriscore_v2_where_title": "Where to find the new Nutri-Score calculation?",
3749-
"guide_nutriscore_v2_where_paragraph1": "The Nutri-Score is applied in several countries: Germany, Belgium, Spain, France, Luxembourg, the Netherlands and Switzerland.",
3750-
"guide_nutriscore_v2_where_paragraph2": "Manufacturers have until **2026** at the latest **to replace** the old calculation with the new one.",
3761+
"guide_nutriscore_v2_where_paragraph1": "The Nutri-Score is applied in 7 countries: France, Germany, Belgium, Spain, Luxembourg, the Netherlands and Switzerland.",
3762+
"guide_nutriscore_v2_where_paragraph2": "Manufacturers have at most **2 years** at the latest after the signature of the decree **to replace** the old calculation with the new one.",
37513763
"guide_nutriscore_v2_where_paragraph3": "Without waiting, you **will already find in the OpenFoodFacts application**, the new calculation, including if the manufacturers have not updated the score.",
37523764
"guide_nutriscore_v2_unchanged_title": "What doesn't change",
37533765
"guide_nutriscore_v2_unchanged_paragraph1": "The Nutri-Score is a score designed to **measure nutritional quality**. It is **complementary to the NOVA group** on **ultra-processed foods** (also present in the application).",
@@ -4159,4 +4171,4 @@
41594171
"@nutrition_facts_extract_failed": {
41604172
"description": "Message to indicate that the extraction of nutrients from a picture failed"
41614173
}
4162-
}
4174+
}

packages/smooth_app/lib/pages/preferences/user_preferences_prices.dart

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,27 @@ class UserPreferencesPrices extends AbstractUserPreferences {
150150
),
151151
Icons.open_in_new,
152152
),
153+
_getListTile(
154+
appLocalizations.prices_validation_assistant,
155+
() async => LaunchUrlHelper.launchURL(
156+
'https://prices.openfoodfacts.org/experiments/price-validation-assistant',
157+
),
158+
Icons.open_in_new,
159+
),
160+
_getListTile(
161+
appLocalizations.prices_multiple_proof_addition_system,
162+
() async => LaunchUrlHelper.launchURL(
163+
'https://prices.openfoodfacts.org/proofs/add/multiple',
164+
),
165+
Icons.open_in_new,
166+
),
167+
_getListTile(
168+
appLocalizations.prices_challenges_page,
169+
() async => LaunchUrlHelper.launchURL(
170+
'https://prices.openfoodfacts.org/experiments/challenge',
171+
),
172+
Icons.open_in_new,
173+
),
153174
];
154175
}
155176

packages/smooth_app/lib/pages/scan/scan_header.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,8 @@ class _ScanHeaderState extends State<ScanHeader> {
104104
MaterialPageRoute<void>(
105105
builder: (BuildContext context) =>
106106
PersonalizedRankingPage(
107-
barcodes: model
108-
.getAvailableBarcodes()
109-
.toList(growable: false),
107+
barcodes:
108+
model.getAvailableBarcodes().toList(),
110109
title: ProductQueryPageHelper
111110
.getProductListLabel(
112111
model.productList,

packages/smooth_app/lib/pages/user_management/login_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class _LoginPageState extends State<LoginPage> with TraceableClientMixin {
106106
padding: EdgeInsetsDirectional.only(
107107
start: size.width * 0.15,
108108
end: size.width * 0.15,
109-
bottom: size.width * 0.05,
109+
bottom: MediaQuery.viewInsetsOf(context).bottom * 0.25,
110110
),
111111
child: AutofillGroup(
112112
child: Center(

packages/smooth_app/lib/pages/user_management/sign_up_page.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,11 @@ class _SignUpPageState extends State<SignUpPage> with TraceableClientMixin {
8888
key: _formKey,
8989
child: Scrollbar(
9090
child: ListView(
91-
padding: EdgeInsets.symmetric(horizontal: size.width * 0.05),
91+
padding: EdgeInsetsDirectional.only(
92+
start: size.width * 0.05,
93+
end: size.width * 0.05,
94+
bottom: MediaQuery.viewInsetsOf(context).bottom * 0.25,
95+
),
9296
children: <Widget>[
9397
SmoothTextFormField(
9498
textInputType: TextInputType.name,

0 commit comments

Comments
 (0)