Merge branch 'develop' into dependabot/pub/packages/smooth_app/multi-…

…e2b697d350
openfoodfacts · Jul 7, 2024 · fdf94db · fdf94db
2 parents bfba29a + 5136e9d
commit fdf94db
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 273 deletions.
diff --git a/packages/smooth_app/assets/animations/off b/packages/smooth_app/assets/animations/off
diff --git a/packages/smooth_app/ios/Podfile b/packages/smooth_app/ios/Podfile
@@ -39,7 +39,7 @@ post_install do |installer|
     flutter_additional_ios_build_settings(target)
 
     target.build_configurations.each do |config|
-       config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+       config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
 
        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
                    '$(inherited)',

diff --git a/packages/smooth_app/ios/Podfile.lock b/packages/smooth_app/ios/Podfile.lock
@@ -282,7 +282,7 @@ SPEC CHECKSUMS:
   GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2
   image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
   in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d
-  integration_test: 13825b8a9334a850581300559b8839134b124670
+  integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4
   iso_countries: eb09d40f388e4c65e291e0bb36a701dfe7de6c74
   libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
@@ -311,6 +311,6 @@ SPEC CHECKSUMS:
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
   webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36
 
-PODFILE CHECKSUM: a2ded99d2ba03f677e98efb8fb92d57b3a65b96f
+PODFILE CHECKSUM: 31bd95b3ebe08a1371aec307f223993946c837a3
 
 COCOAPODS: 1.15.2
diff --git a/packages/smooth_app/lib/background/background_task_add_price.dart b/packages/smooth_app/lib/background/background_task_add_price.dart
@@ -360,6 +360,10 @@ class BackgroundTaskAddPrice extends BackgroundTask {
         HttpHelper().imagineMediaType(initialImageUri.path)!;
     final MaybeError<Proof> uploadProof = await OpenPricesAPIClient.uploadProof(
       proofType: proofType,
+      date: date,
+      currency: currency,
+      locationOSMId: locationOSMId,
+      locationOSMType: locationOSMType,
       imageUri: initialImageUri,
       mediaType: initialMediaType,
       bearerToken: bearerToken,

diff --git a/packages/smooth_app/lib/cards/category_cards/raster_cache.dart b/packages/smooth_app/lib/cards/category_cards/raster_cache.dart
@@ -17,6 +17,7 @@ class RasterCache extends AbstractCache {
     if (fullFilenames.isEmpty) {
       return getDefaultUnknown();
     }
+
     return Image.network(
       iconUrl!,
       width: width,
@@ -30,15 +31,25 @@ class RasterCache extends AbstractCache {
         if (loadingProgress == null) {
           return child;
         }
-        return RasterAsyncAsset(
-          AssetCacheHelper(
-            fullFilenames,
-            iconUrl!,
-            width: width,
-            height: height,
-          ),
-        );
+        return _localAssetWidget(fullFilenames);
       },
+      errorBuilder: (
+        final BuildContext context,
+        final Object error,
+        final StackTrace? stackTrace,
+      ) =>
+          _localAssetWidget(fullFilenames),
+    );
+  }
+
+  RasterAsyncAsset _localAssetWidget(List<String> fullFilenames) {
+    return RasterAsyncAsset(
+      AssetCacheHelper(
+        fullFilenames,
+        iconUrl!,
+        width: width,
+        height: height,
+      ),
     );
   }
 }
diff --git a/packages/smooth_app/lib/helpers/analytics_helper.dart b/packages/smooth_app/lib/helpers/analytics_helper.dart
@@ -221,9 +221,9 @@ class AnalyticsHelper {
           ..dsn =
               'https://[email protected]/5376745'
           ..beforeSend = (
-            SentryEvent event, {
-            Hint? hint,
-          }) async {
+            SentryEvent event,
+            Hint hint,
+          ) async {
             return event.copyWith(
               tags: <String, String>{
                 'store': GlobalVars.storeLabel.name,
@@ -265,8 +265,10 @@ class AnalyticsHelper {
   static bool get isEnabled =>
       _analyticsReporting == _AnalyticsTrackingMode.enabled;
 
-  static FutureOr<SentryEvent?> _beforeSend(SentryEvent event,
-      {dynamic hint}) async {
+  static FutureOr<SentryEvent?> _beforeSend(
+    SentryEvent event,
+    dynamic hint,
+  ) async {
     if (!_crashReports) {
       return null;
     }

diff --git a/packages/smooth_app/lib/pages/product/new_product_page.dart b/packages/smooth_app/lib/pages/product/new_product_page.dart
@@ -1,4 +1,3 @@
-import 'package:assorted_layout_widgets/assorted_layout_widgets.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
@@ -464,9 +463,7 @@ class _ProductPageState extends State<ProductPage>
               appLocalizations.user_list_subtitle_product,
               style: Theme.of(context).textTheme.displaySmall,
             ),
-            WrapSuper(
-              wrapType: WrapType.fit,
-              wrapFit: WrapFit.proportional,
+            Wrap(
               spacing: VERY_SMALL_SPACE,
               children: children,
             ),

diff --git a/packages/smooth_app/lib/smooth_category_picker_example.dart b/packages/smooth_app/lib/smooth_category_picker_example.dart
diff --git a/packages/smooth_app/macos/Podfile.lock b/packages/smooth_app/macos/Podfile.lock
@@ -15,7 +15,7 @@ PODS:
   - FlutterMacOS (1.0.0)
   - in_app_review (0.2.0):
     - FlutterMacOS
-  - mobile_scanner (3.5.2):
+  - mobile_scanner (3.5.6):
     - FlutterMacOS
   - package_info_plus (0.0.1):
     - FlutterMacOS
@@ -113,7 +113,7 @@ SPEC CHECKSUMS:
   flutter_secure_storage_macos: 59459653abe1adb92abbc8ea747d79f8d19866c9
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   in_app_review: a850789fad746e89bce03d4aeee8078b45a53fd0
-  mobile_scanner: 621cf2c34e1c74ae7ce5c6793638ab600723bdea
+  mobile_scanner: 54ceceae0c8da2457e26a362a6be5c61154b1829
   package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   ReachabilitySwift: 2128f3a8c9107e1ad33574c6e58e8285d460b149