Merge branch 'develop' into feat/priceProductSelection

monsieurtanuki · Sep 4, 2024 · 18ca0aa · 18ca0aa
2 parents 2229069 + 65237de
commit 18ca0aa
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 24 deletions.
diff --git a/.github/workflows/github-projects-for-openfoodfacts-design.yml b/.github/workflows/github-projects-for-openfoodfacts-design.yml
@@ -1,10 +1,10 @@
-name: Add mockup-required and mockup-available issues to the openfoodfacts-design project
+name: 🎨 Add mockup-required and mockup-available issues to the openfoodfacts-design project
 
 on:
   issues:
     types:
+      - opened
       - labeled
-
 jobs:
   add-to-project:
     name: Add issue to the openfoodfacts-design project
@@ -14,7 +14,7 @@ jobs:
         with:
           project-url: https://github.com/orgs/openfoodfacts/projects/11
           github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
-          labeled: mockups available, needs mockup
+          labeled: 🎨 Mockups available, 🎨 Mockup required
           label-operator: OR
       - uses: actions/add-to-project@main
         with:

diff --git a/packages/smooth_app/lib/pages/image/product_image_other_page.dart b/packages/smooth_app/lib/pages/image/product_image_other_page.dart
@@ -243,10 +243,11 @@ class _ProductImageDetailsButton extends StatelessWidget {
                     body: Column(
                       children: <Widget>[
                         ListTile(
-                          title: Text(appLocalizations
-                              .photo_viewer_details_contributor_title),
-                          // TODO(g123k): add contributor
-                          subtitle: const Text('TODO'),
+                          title: Text(
+                            appLocalizations
+                                .photo_viewer_details_contributor_title,
+                          ),
+                          subtitle: Text(image.contributor ?? '-'),
                         ),
                         ListTile(
                           title: Text(

diff --git a/packages/smooth_app/lib/query/product_query.dart b/packages/smooth_app/lib/query/product_query.dart
@@ -252,5 +252,6 @@ abstract class ProductQuery {
         ProductField.ORIGINS,
         ProductField.WEBSITE,
         ProductField.OBSOLETE,
+        ProductField.OWNER_FIELDS,
       ];
 }
diff --git a/packages/smooth_app/pubspec.lock b/packages/smooth_app/pubspec.lock
@@ -964,18 +964,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -1028,10 +1028,10 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.1"
+    version: "0.8.0"
   matomo_tracker:
     dependency: "direct main"
     description:
@@ -1044,10 +1044,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.12.0"
   mgrs_dart:
     dependency: transitive
     description:
@@ -1100,10 +1100,10 @@ packages:
     dependency: "direct main"
     description:
       name: openfoodfacts
-      sha256: b8e90057fc04ecb407bdd48758172fc8200483ae15e926d6825fc3bd6a4d2468
+      sha256: "92aa365d668be6ead968b92b959e9e79447b24ba65e8267a7d4a3186d20dcdf2"
       url: "https://pub.dev"
     source: hosted
-    version: "3.12.0"
+    version: "3.13.0"
   openfoodfacts_flutter_lints:
     dependency: "direct dev"
     description:
@@ -1269,10 +1269,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.5"
+    version: "3.1.4"
   plugin_platform_interface:
     dependency: "direct dev"
     description:
@@ -1599,10 +1599,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.0"
   typed_data:
     dependency: transitive
     description:
@@ -1743,10 +1743,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.4"
+    version: "14.2.1"
   watcher:
     dependency: transitive
     description:

diff --git a/packages/smooth_app/pubspec.yaml b/packages/smooth_app/pubspec.yaml
@@ -99,7 +99,7 @@ dependencies:
     path: ../scanner/zxing
 
 
-  openfoodfacts: 3.12.0
+  openfoodfacts: 3.13.0
   # openfoodfacts:
   #   path: ../../../openfoodfacts-dart