Revert "chore: Revert Flutter bump to 3.22 (#5463)"

This reverts commit 1a9091c.
openfoodfacts · Jul 4, 2024 · 2e3847a · 2e3847a
1 parent b1950ac
commit 2e3847a
Show file tree

Hide file tree

Showing 41 changed files with 135 additions and 145 deletions.
diff --git a/README.md b/README.md
@@ -88,7 +88,7 @@
 
 - Make sure you have installed flutter and all the requirements
   - [Official flutter installation guide](https://docs.flutter.dev/get-started/install)
-- Currently, the app uses the latest stable version of Flutter (3.19.x).
+- Currently, the app uses the following version of Flutter (3.22.x).
 
 
 We have predefined run configurations for Android Studio and Visual Studio Code

diff --git a/flutter-version.txt b/flutter-version.txt
@@ -1 +1 @@
-3.19.5
+3.22.2
diff --git a/packages/app_store/apple_app_store/pubspec.yaml b/packages/app_store/apple_app_store/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: "none"
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: '>=3.4.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/app_store/google_play/pubspec.yaml b/packages/app_store/google_play/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: "none"
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: '>=3.4.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/app_store/shared/pubspec.yaml b/packages/app_store/shared/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: '>=3.4.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/app_store/uri_store/pubspec.yaml b/packages/app_store/uri_store/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: "none"
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: '>=3.4.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/scanner/ml_kit/pubspec.yaml b/packages/scanner/ml_kit/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: '>=3.4.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/scanner/shared/pubspec.yaml b/packages/scanner/shared/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: '>=3.4.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/scanner/zxing/pubspec.yaml b/packages/scanner/zxing/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: '>=3.4.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/smooth_app/lib/generic_lib/buttons/smooth_simple_button.dart b/packages/smooth_app/lib/generic_lib/buttons/smooth_simple_button.dart
@@ -33,19 +33,19 @@ class SmoothSimpleButton extends StatelessWidget {
         style: ButtonStyle(
           backgroundColor: buttonColor == null
               ? null
-              : MaterialStateProperty.all<Color>(buttonColor!),
-          shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+              : WidgetStateProperty.all<Color>(buttonColor!),
+          shape: WidgetStateProperty.all<RoundedRectangleBorder>(
             RoundedRectangleBorder(borderRadius: borderRadius),
           ),
           overlayColor: context.read<ThemeProvider>().isAmoledTheme
-              ? MaterialStateProperty.resolveWith((Set<MaterialState> states) {
-                  return states.contains(MaterialState.pressed)
+              ? WidgetStateProperty.resolveWith((Set<WidgetState> states) {
+                  return states.contains(WidgetState.pressed)
                       ? Theme.of(context).colorScheme.primary.withOpacity(0.3)
                       : null;
                 })
               : null,
           side: context.read<ThemeProvider>().isAmoledTheme
-              ? MaterialStateProperty.all<BorderSide>(
+              ? WidgetStateProperty.all<BorderSide>(
                   const BorderSide(color: Colors.white),
                 )
               : null,

diff --git a/packages/smooth_app/lib/generic_lib/dialogs/smooth_alert_dialog.dart b/packages/smooth_app/lib/generic_lib/dialogs/smooth_alert_dialog.dart
@@ -213,7 +213,7 @@ class _SmoothDialogTitle extends StatelessWidget {
             ],
           ),
         ),
-        Divider(color: Theme.of(context).colorScheme.onBackground),
+        Divider(color: Theme.of(context).colorScheme.onSurface),
         const SizedBox(height: 12),
       ],
     );

diff --git a/packages/smooth_app/lib/pages/hunger_games/question_answers_options.dart b/packages/smooth_app/lib/pages/hunger_games/question_answers_options.dart
@@ -108,8 +108,8 @@ class QuestionAnswersOptions extends StatelessWidget {
         child: TextButton.icon(
           onPressed: () => onAnswer(insightAnnotation),
           style: ButtonStyle(
-            backgroundColor: MaterialStateProperty.all(backgroundColor),
-            shape: MaterialStateProperty.all(
+            backgroundColor: WidgetStateProperty.all(backgroundColor),
+            shape: WidgetStateProperty.all(
               const RoundedRectangleBorder(
                 borderRadius: ROUNDED_BORDER_RADIUS,
               ),

diff --git a/packages/smooth_app/lib/pages/image_crop_page.dart b/packages/smooth_app/lib/pages/image_crop_page.dart
@@ -225,13 +225,13 @@ class _ImageSourceButton extends StatelessWidget {
       child: OutlinedButton(
         onPressed: onPressed,
         style: ButtonStyle(
-          side: MaterialStatePropertyAll<BorderSide>(
+          side: WidgetStatePropertyAll<BorderSide>(
             BorderSide(color: primaryColor),
           ),
-          padding: const MaterialStatePropertyAll<EdgeInsetsGeometry>(
+          padding: const WidgetStatePropertyAll<EdgeInsetsGeometry>(
             EdgeInsets.symmetric(vertical: LARGE_SPACE),
           ),
-          shape: MaterialStatePropertyAll<OutlinedBorder>(
+          shape: WidgetStatePropertyAll<OutlinedBorder>(
             RoundedRectangleBorder(
               borderRadius: ROUNDED_BORDER_RADIUS,
               side: BorderSide(color: primaryColor),

diff --git a/packages/smooth_app/lib/pages/locations/location_query_page.dart b/packages/smooth_app/lib/pages/locations/location_query_page.dart
@@ -110,8 +110,8 @@ class _LocationQueryPageState extends State<LocationQueryPage>
           data: ListTileThemeData(
             titleTextStyle: const TextStyle(fontSize: 20.0),
             minLeadingWidth: 18.0,
-            iconColor: Theme.of(context).colorScheme.onBackground,
-            textColor: Theme.of(context).colorScheme.onBackground,
+            iconColor: Theme.of(context).colorScheme.onSurface,
+            textColor: Theme.of(context).colorScheme.onSurface,
           ),
           child: ListView.builder(
             itemBuilder: (BuildContext context, int index) =>

diff --git a/packages/smooth_app/lib/pages/onboarding/onboarding_bottom_bar.dart b/packages/smooth_app/lib/pages/onboarding/onboarding_bottom_bar.dart
@@ -90,12 +90,11 @@ class OnboardingBottomButton extends StatelessWidget {
           key: nextKey,
           onPressed: onPressed,
           style: ButtonStyle(
-            backgroundColor: MaterialStateProperty.all(backgroundColor),
+            backgroundColor: WidgetStateProperty.all(backgroundColor),
             overlayColor: backgroundColor == Colors.white
-                ? MaterialStateProperty.all<Color>(
-                    Theme.of(context).splashColor)
+                ? WidgetStateProperty.all<Color>(Theme.of(context).splashColor)
                 : null,
-            shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+            shape: WidgetStateProperty.all<RoundedRectangleBorder>(
               const RoundedRectangleBorder(
                   borderRadius: BorderRadius.all(Radius.circular(40))),
             ),

diff --git a/packages/smooth_app/lib/pages/onboarding/v2/onboarding_bottom_hills.dart b/packages/smooth_app/lib/pages/onboarding/v2/onboarding_bottom_hills.dart
@@ -62,31 +62,31 @@ class OnboardingBottomHills extends StatelessWidget {
               end: 15.0,
               child: TextButton(
                 style: ButtonStyle(
-                  backgroundColor: MaterialStateProperty.all<Color>(
+                  backgroundColor: WidgetStateProperty.all<Color>(
                     Colors.white,
                   ),
-                  padding: MaterialStateProperty.all<EdgeInsetsGeometry>(
+                  padding: WidgetStateProperty.all<EdgeInsetsGeometry>(
                     const EdgeInsetsDirectional.only(
                       start: LARGE_SPACE + 1.0,
                       end: LARGE_SPACE,
                       top: SMALL_SPACE,
                       bottom: SMALL_SPACE,
                     ),
                   ),
-                  elevation: MaterialStateProperty.all<double>(4.0),
-                  iconColor: MaterialStateProperty.all<Color>(
+                  elevation: WidgetStateProperty.all<double>(4.0),
+                  iconColor: WidgetStateProperty.all<Color>(
                     colors.orange,
                   ),
-                  foregroundColor: MaterialStateProperty.all<Color>(
+                  foregroundColor: WidgetStateProperty.all<Color>(
                     colors.orange,
                   ),
-                  iconSize: MaterialStateProperty.all<double>(21.0),
-                  shape: MaterialStateProperty.all<OutlinedBorder>(
+                  iconSize: WidgetStateProperty.all<double>(21.0),
+                  shape: WidgetStateProperty.all<OutlinedBorder>(
                     RoundedRectangleBorder(
                       borderRadius: BorderRadius.circular(20.0),
                     ),
                   ),
-                  shadowColor: MaterialStateProperty.all<Color>(
+                  shadowColor: WidgetStateProperty.all<Color>(
                     Colors.black.withOpacity(0.50),
                   ),
                 ),

diff --git a/packages/smooth_app/lib/pages/preferences/user_preferences_account.dart b/packages/smooth_app/lib/pages/preferences/user_preferences_account.dart
@@ -147,10 +147,10 @@ class UserPreferencesAccount extends AbstractUserPreferences {
             child: ElevatedButton(
               onPressed: () async => _goToLoginPage(),
               style: ButtonStyle(
-                minimumSize: MaterialStateProperty.all<Size>(
+                minimumSize: WidgetStateProperty.all<Size>(
                   Size(size.width * 0.5, themeData.buttonTheme.height + 10),
                 ),
-                shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+                shape: WidgetStateProperty.all<RoundedRectangleBorder>(
                   const RoundedRectangleBorder(
                     borderRadius: CIRCULAR_BORDER_RADIUS,
                   ),

diff --git a/packages/smooth_app/lib/pages/preferences/user_preferences_connect.dart b/packages/smooth_app/lib/pages/preferences/user_preferences_connect.dart
@@ -111,7 +111,7 @@ class UserPreferencesConnect extends AbstractUserPreferences {
             'assets/preferences/x-logo.svg',
             width: DEFAULT_ICON_SIZE,
             colorFilter: ui.ColorFilter.mode(
-              Theme.of(context).colorScheme.onBackground,
+              Theme.of(context).colorScheme.onSurface,
               ui.BlendMode.srcIn,
             ),
             package: AppHelper.APP_PACKAGE,

diff --git a/packages/smooth_app/lib/pages/preferences/user_preferences_rate_us.dart b/packages/smooth_app/lib/pages/preferences/user_preferences_rate_us.dart
@@ -50,10 +50,10 @@ class UserPreferencesRateUs extends StatelessWidget {
               content: Text(
                 appLocalizations.error_occurred,
                 textAlign: TextAlign.center,
-                style: TextStyle(color: themeData.colorScheme.background),
+                style: TextStyle(color: themeData.colorScheme.surface),
               ),
               behavior: SnackBarBehavior.floating,
-              backgroundColor: themeData.colorScheme.onBackground,
+              backgroundColor: themeData.colorScheme.onSurface,
             ),
           );
         }

diff --git a/packages/smooth_app/lib/pages/preferences/user_preferences_share_with_friends.dart b/packages/smooth_app/lib/pages/preferences/user_preferences_share_with_friends.dart
@@ -44,11 +44,11 @@ class UserPreferencesShareWithFriends extends StatelessWidget {
                   appLocalizations.error,
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: themeData.colorScheme.background,
+                    color: themeData.colorScheme.surface,
                   ),
                 ),
                 behavior: SnackBarBehavior.floating,
-                backgroundColor: themeData.colorScheme.onBackground,
+                backgroundColor: themeData.colorScheme.onSurface,
               ),
             );
           }

diff --git a/packages/smooth_app/lib/pages/product/common/product_list_page.dart b/packages/smooth_app/lib/pages/product/common/product_list_page.dart
@@ -267,7 +267,7 @@ class _ProductListPageState extends State<ProductListPage>
                       appLocalizations.product_list_empty_message,
                       textAlign: TextAlign.center,
                       style: themeData.textTheme.bodyMedium?.apply(
-                        color: themeData.colorScheme.onBackground,
+                        color: themeData.colorScheme.onSurface,
                       ),
                     ),
                     EMPTY_WIDGET,

diff --git a/packages/smooth_app/lib/pages/product/edit_image_button.dart b/packages/smooth_app/lib/pages/product/edit_image_button.dart
@@ -33,20 +33,20 @@ class EditImageButton extends StatelessWidget {
       child: OutlinedButton.icon(
         icon: Icon(iconData),
         style: ButtonStyle(
-          backgroundColor: MaterialStateProperty.all(colorScheme.onPrimary),
-          shape: MaterialStateProperty.all(
+          backgroundColor: WidgetStateProperty.all(colorScheme.onPrimary),
+          shape: WidgetStateProperty.all(
             const RoundedRectangleBorder(borderRadius: ROUNDED_BORDER_RADIUS),
           ),
           side: borderWidth == null
               ? null
-              : MaterialStateBorderSide.resolveWith(
+              : WidgetStateBorderSide.resolveWith(
                   (_) => BorderSide(
                     color: colorScheme.primary,
                     width: borderWidth!,
                   ),
                 ),
           padding: _centerContent
-              ? MaterialStateProperty.all(
+              ? WidgetStateProperty.all(
                   const EdgeInsets.symmetric(
                     vertical: LARGE_SPACE,
                   ),

diff --git a/packages/smooth_app/lib/pages/product/edit_new_packagings.dart b/packages/smooth_app/lib/pages/product/edit_new_packagings.dart
@@ -324,7 +324,7 @@ Color _getSmoothCardColorAlternate(final BuildContext context, int index) {
     if (index.isOdd) {
       cardColor = PRIMARY_GREY_COLOR;
     } else {
-      cardColor = darkColorScheme.background;
+      cardColor = darkColorScheme.surface;
     }
   }
 

diff --git a/packages/smooth_app/lib/pages/product/edit_ocr/edit_ocr_page.dart b/packages/smooth_app/lib/pages/product/edit_ocr/edit_ocr_page.dart
@@ -294,7 +294,7 @@ class _EditOcrPageState extends State<EditOcrPage> with UpToDateMixin {
             flex: 1,
             child: DecoratedBox(
               decoration: BoxDecoration(
-                color: Theme.of(context).colorScheme.background,
+                color: Theme.of(context).colorScheme.surface,
                 borderRadius: const BorderRadiusDirectional.only(
                   topStart: ANGULAR_RADIUS,
                   topEnd: ANGULAR_RADIUS,

diff --git a/packages/smooth_app/lib/pages/product/new_product_page.dart b/packages/smooth_app/lib/pages/product/new_product_page.dart
@@ -416,11 +416,11 @@ class _ProductPageState extends State<ProductPage>
           ),
           child: ElevatedButton(
             style: ButtonStyle(
-                padding: MaterialStateProperty.all(
+                padding: WidgetStateProperty.all(
                   const EdgeInsets.symmetric(
                       horizontal: VERY_LARGE_SPACE, vertical: MEDIUM_SPACE),
                 ),
-                shape: MaterialStateProperty.all(
+                shape: WidgetStateProperty.all(
                   const RoundedRectangleBorder(
                     borderRadius: ROUNDED_BORDER_RADIUS,
                   ),

diff --git a/packages/smooth_app/lib/pages/product/nutrition_add_nutrient_button.dart b/packages/smooth_app/lib/pages/product/nutrition_add_nutrient_button.dart
@@ -99,7 +99,7 @@ class NutritionAddNutrientButton extends StatelessWidget {
         }
       },
       style: ButtonStyle(
-        shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+        shape: WidgetStateProperty.all<RoundedRectangleBorder>(
           const RoundedRectangleBorder(
             borderRadius: ROUNDED_BORDER_RADIUS,
             side: BorderSide.none,

diff --git a/packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart b/packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart
@@ -322,7 +322,7 @@ class _NutritionPageLoadedState extends State<NutritionPageLoaded>
                 value: _nutritionContainer.noNutritionData,
                 onChanged: (final bool value) =>
                     setState(() => _nutritionContainer.noNutritionData = value),
-                trackColor: MaterialStateProperty.all(
+                trackColor: WidgetStateProperty.all(
                     Theme.of(context).colorScheme.onPrimary),
               ),
             ),

diff --git a/packages/smooth_app/lib/pages/product/product_incomplete_card.dart b/packages/smooth_app/lib/pages/product/product_incomplete_card.dart
@@ -111,13 +111,13 @@ class ProductIncompleteCard extends StatelessWidget {
           ),
         ),
         style: ButtonStyle(
-          backgroundColor: MaterialStateProperty.all<Color>(
+          backgroundColor: WidgetStateProperty.all<Color>(
             colorScheme.primary,
           ),
-          foregroundColor: MaterialStateProperty.all<Color>(
+          foregroundColor: WidgetStateProperty.all<Color>(
             colorScheme.onPrimary,
           ),
-          shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+          shape: WidgetStateProperty.all<RoundedRectangleBorder>(
             const RoundedRectangleBorder(borderRadius: ANGULAR_BORDER_RADIUS),
           ),
         ),

diff --git a/packages/smooth_app/lib/pages/product/product_question_answers_options.dart b/packages/smooth_app/lib/pages/product/product_question_answers_options.dart
@@ -91,7 +91,7 @@ class ProductQuestionAnswersOptions extends StatelessWidget {
       child: TextButton(
         onPressed: () => onAnswer(insightAnnotation),
         style: ButtonStyle(
-          backgroundColor: MaterialStateProperty.all(backgroundColor),
+          backgroundColor: WidgetStateProperty.all(backgroundColor),
         ),
         child: Text(
           buttonText,

diff --git a/packages/smooth_app/lib/pages/scan/scan_header.dart b/packages/smooth_app/lib/pages/scan/scan_header.dart
@@ -24,7 +24,7 @@ class _ScanHeaderState extends State<ScanHeader> {
     final ContinuousScanModel model = context.watch<ContinuousScanModel>();
 
     final ButtonStyle buttonStyle = ButtonStyle(
-      shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+      shape: WidgetStateProperty.all<RoundedRectangleBorder>(
         const RoundedRectangleBorder(
           borderRadius: BorderRadius.all(Radius.circular(18.0)),
         ),

diff --git a/packages/smooth_app/lib/pages/scan/scan_page.dart b/packages/smooth_app/lib/pages/scan/scan_page.dart
@@ -64,7 +64,7 @@ class _ScanPageState extends State<ScanPage> {
         color: Colors.white,
         child: SafeArea(
           child: Container(
-            color: Theme.of(context).colorScheme.background,
+            color: Theme.of(context).colorScheme.surface,
             child: Column(
               children: <Widget>[
                 if (hasACamera)

diff --git a/packages/smooth_app/lib/pages/scan/search_history_view.dart b/packages/smooth_app/lib/pages/scan/search_history_view.dart
@@ -46,8 +46,8 @@ class _SearchHistoryViewState extends State<SearchHistoryView> {
       data: ListTileThemeData(
         titleTextStyle: const TextStyle(fontSize: 20.0),
         minLeadingWidth: 18.0,
-        iconColor: Theme.of(context).colorScheme.onBackground,
-        textColor: Theme.of(context).colorScheme.onBackground,
+        iconColor: Theme.of(context).colorScheme.onSurface,
+        textColor: Theme.of(context).colorScheme.onSurface,
       ),
       child: ListView.builder(
         itemBuilder: (BuildContext context, int i) {