Merge branch 'develop' into fix/5744

monsieurtanuki · Nov 6, 2024 · d43ff8c · d43ff8c
2 parents 688cb0a + 104b3bf
commit d43ff8c
Show file tree

Hide file tree

Showing 31 changed files with 1,124 additions and 300 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -106,10 +106,6 @@ History:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/onboarding/**/*'
   - any-glob-to-any-file: 'packages/smooth_app/assets/onboarding/**/*'
 
-✏️ Editing - Nutrition input:
-- changed-files:
-  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart'
-
 🤳🥫 Scan:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/scan/**/*'
@@ -206,18 +202,6 @@ GitHub:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/user_preferences_attribute_group.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/helpers/user_management_helper.dart'
 
-#tag picker:
-
-✏️ Editing - Category picker:
-- changed-files:
-  - any-glob-to-any-file: 'packages/smooth_app/lib/data_models/category_tree_supplier.dart'
-  - any-glob-to-any-file: 'packages/smooth_app/example/smooth_category_picker_example.dart'
-  - any-glob-to-any-file: 'packages/smooth_app/generic_lib/dialogs/smooth_category_picker.dart'
-  - any-glob-to-any-file: 'packages/smooth_app/test/dialogs/smooth_category_picker_test.dart'
-  - any-glob-to-any-file: 'packages/smooth_app/lib/data_models/category_query_model.dart'
-  - any-glob-to-any-file: 'packages/smooth_app/lib/data_models/query_category_tree_supplier.dart'
-  - any-glob-to-any-file: 'packages/smooth_app/lib/data_models/smooth_category.dart'
-
 Ranking:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/helpers/product_compatibility_helper.dart'
@@ -242,22 +226,42 @@ Product scan carousel:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/scan/carousel/scan_carousel.dart'
 
+✏️ Editing:
+- changed-files:
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/edit_product_page.dart'
+
+✏️ Editing - Nutrition input:
+- changed-files:
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart'
+
+#tag picker:
+
+✏️ Editing - Category picker:
+- changed-files:
+  - any-glob-to-any-file: 'packages/smooth_app/lib/data_models/category_tree_supplier.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/example/smooth_category_picker_example.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/generic_lib/dialogs/smooth_category_picker.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/test/dialogs/smooth_category_picker_test.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/data_models/category_query_model.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/data_models/query_category_tree_supplier.dart'
+  - any-glob-to-any-file: 'packages/smooth_app/lib/data_models/smooth_category.dart'
+
 ✏️ Editing - 📦 Packaging input:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/edit_new_packagings.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/ocr_packaging_helper.dart'
 
+✏️ Editing - Basic info input:
+- changed-files:
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/add_basic_details_page.dart'
+
 OCR page:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/edit_ocr/edit_ocr_main_action.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/edit_ocr/edit_ocr_page.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/edit_ocr/ocr_ingredients_helper.dart'
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/edit_ocr/ocr_packaging_helper.dart'
 
-✏️ Editing - Basic info input:
-- changed-files:
-  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/add_basic_details_page.dart'
-
 Prices:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/background/background_task_add_price.dart'
@@ -287,3 +291,7 @@ Prices:
 router:
 - changed-files:
   - any-glob-to-any-file: 'packages/smooth_app/lib/pages/navigator/app_navigator.dart'
+
+🛣️ Road to scores:
+- changed-files:
+  - any-glob-to-any-file: 'packages/smooth_app/lib/pages/product/product_incomplete_card.dart'
diff --git a/...hub-projects-for-openfoodfacts-design.yml → ...workflows/github-projects-ventilation.yml b/...hub-projects-for-openfoodfacts-design.yml → ...workflows/github-projects-ventilation.yml
@@ -4,8 +4,21 @@ on:
   issues:
     types:
       - opened
-      - labeled
       - edited
+      - deleted
+      - transferred
+      - pinned
+      - unpinned
+      - closed
+      - reopened
+      - assigned
+      - unassigned
+      - labeled
+      - unlabeled
+      - locked
+      - unlocked
+      - milestoned
+      - demilestoned
 jobs:
   add-to-project:
     name: Add issues to the relevant GitHub projects

diff --git a/packages/scanner/shared/pubspec.yaml b/packages/scanner/shared/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_svg: 2.0.10+1
+  flutter_svg: 2.0.11
   visibility_detector: 0.4.0+2
   provider: 6.1.2
 

diff --git a/packages/smooth_app/android/app/src/main/kotlin/org/openfoodfacts/app/AppMainTile.kt b/packages/smooth_app/android/app/src/main/kotlin/org/openfoodfacts/app/AppMainTile.kt
@@ -1,5 +1,6 @@
 package org.openfoodfacts.app
 
+import android.app.PendingIntent
 import android.content.Intent
 import android.os.Build
 import android.service.quicksettings.Tile
@@ -24,7 +25,18 @@ class AppMainTile : TileService() {
             flags += Intent.FLAG_ACTIVITY_NEW_TASK
         }
 
-        startActivityAndCollapse(intent)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            startActivityAndCollapse(
+                PendingIntent.getActivity(
+                    applicationContext,
+                    0,
+                    intent,
+                    PendingIntent.FLAG_IMMUTABLE
+                )
+            )
+        } else {
+            startActivityAndCollapse(intent)
+        }
     }
 
 }
diff --git a/packages/smooth_app/assets/onboarding/sample_product_data.json b/packages/smooth_app/assets/onboarding/sample_product_data.json
@@ -1269,7 +1269,7 @@
                {
                   "element_type" : "text",
                   "text_element" : {
-                     "html" : "\n                Life cycle analysis score: 98<br>\n                Sum of bonuses and maluses:\n                    \n                        +13\n                    <br><br>\n                Final score: 100/100\n                \n                ",
+                     "html" : "\n                Life cycle analysis score: 98<br>\n                Sum of bonuses and maluses:\n                    \n                        +13\n                    <br><br>\n                Final score: 100/100\n                ",
                      "type" : "summary"
                   }
                }
@@ -2169,7 +2169,7 @@
                               },
                               {
                                  "evaluation" : "good",
-                                 "text" : "-68%"
+                                 "text" : "-69%"
                               }
                            ]
                         },
@@ -2185,7 +2185,7 @@
                               },
                               {
                                  "evaluation" : "good",
-                                 "text" : "-41%"
+                                 "text" : "-42%"
                               }
                            ]
                         },

diff --git a/packages/smooth_app/ios/Podfile.lock b/packages/smooth_app/ios/Podfile.lock
@@ -291,7 +291,7 @@ SPEC CHECKSUMS:
   mobile_scanner: 38dcd8a49d7d485f632b7de65e4900010187aef2
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   nanopb: 438bc412db1928dac798aa6fd75726007be04262
-  package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
+  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
@@ -302,7 +302,7 @@ SPEC CHECKSUMS:
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
   sentry_flutter: 0eb93e5279eb41e2392212afe1ccd2fecb4f8cbe
-  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
+  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe

diff --git a/packages/smooth_app/lib/cards/product_cards/product_title_card.dart b/packages/smooth_app/lib/cards/product_cards/product_title_card.dart
@@ -3,6 +3,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:openfoodfacts/openfoodfacts.dart';
 import 'package:provider/provider.dart';
 import 'package:smooth_app/cards/product_cards/smooth_product_base_card.dart';
+import 'package:smooth_app/generic_lib/design_constants.dart';
 import 'package:smooth_app/helpers/extension_on_text_helper.dart';
 import 'package:smooth_app/helpers/product_cards_helper.dart';
 
@@ -52,15 +53,30 @@ class ProductTitleCard extends StatelessWidget {
       ];
     } else {
       children = <Widget>[
-        _ProductTitleCardName(
-          selectable: isSelectable,
-          dense: dense,
-        ),
-        _ProductTitleCardBrand(
-          removable: isRemovable,
-          selectable: isSelectable,
+        Padding(
+          padding: const EdgeInsetsDirectional.only(top: VERY_SMALL_SPACE),
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: <Widget>[
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: <Widget>[
+                    _ProductTitleCardName(
+                      selectable: isSelectable,
+                      dense: dense,
+                    ),
+                    _ProductTitleCardBrand(
+                      removable: isRemovable,
+                      selectable: isSelectable,
+                    ),
+                  ],
+                ),
+              ),
+              title,
+            ],
+          ),
         ),
-        title,
       ];
     }
 
@@ -154,6 +170,11 @@ class _ProductTitleCardTrailing extends StatelessWidget {
         alignment: AlignmentDirectional.centerEnd,
         child: ProductCardCloseButton(
           onRemove: onRemove,
+          padding: const EdgeInsetsDirectional.only(
+            start: SMALL_SPACE,
+            top: SMALL_SPACE,
+            bottom: SMALL_SPACE,
+          ),
         ),
       );
     } else {

diff --git a/packages/smooth_app/lib/cards/product_cards/smooth_product_base_card.dart b/packages/smooth_app/lib/cards/product_cards/smooth_product_base_card.dart
@@ -59,10 +59,12 @@ class ProductCardCloseButton extends StatelessWidget {
   const ProductCardCloseButton({
     this.onRemove,
     this.iconData = Icons.clear_rounded,
+    this.padding,
   });
 
   final OnRemoveCallback? onRemove;
   final IconData iconData;
+  final EdgeInsetsGeometry? padding;
 
   @override
   Widget build(BuildContext context) {
@@ -79,7 +81,7 @@ class ProductCardCloseButton extends StatelessWidget {
         child: Tooltip(
           message: appLocalizations.product_card_remove_product_tooltip,
           child: Padding(
-            padding: const EdgeInsets.all(SMALL_SPACE),
+            padding: padding ?? const EdgeInsets.all(SMALL_SPACE),
             child: Icon(
               iconData,
               size: DEFAULT_ICON_SIZE,