chore: Migration to Flutter 3.13

README.md

@@ -91,7 +91,7 @@ Starting this April, we invite all users and contributors to build a vision for
 
 - 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 previous version of Flutter (3.10). We plan to migrate soon.
+- Currently, the app uses the latest stable version of Flutter (3.13).
 
 
 We have predefined run configurations for Android Studio and Visual Studio Code

flutter-version.txt

@@ -1 +1 @@
-3.10.5
+3.13.6

packages/app_store/apple_app_store/pubspec.yaml

@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: "none"
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=3.1.0 <4.0.0'
 
 dependencies:
   flutter:
@@ -18,6 +18,6 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: 2.0.1
+  flutter_lints: 2.0.2
   openfoodfacts_flutter_lints:
     git: https://github.com/openfoodfacts/openfoodfacts_flutter_lints.git

packages/app_store/google_play/pubspec.yaml

@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: "none"
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=3.1.0 <4.0.0'
 
 dependencies:
   flutter:
@@ -18,7 +18,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: 2.0.1
+  flutter_lints: 2.0.2
   openfoodfacts_flutter_lints:
     git: https://github.com/openfoodfacts/openfoodfacts_flutter_lints.git
 

packages/app_store/shared/pubspec.yaml

@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=3.1.0 <4.0.0'
 
 dependencies:
   flutter:
@@ -13,7 +13,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: 2.0.1
+  flutter_lints: 2.0.2
   openfoodfacts_flutter_lints:
     git: https://github.com/openfoodfacts/openfoodfacts_flutter_lints.git
 

packages/app_store/uri_store/pubspec.yaml

@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: "none"
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=3.1.0 <4.0.0'
 
 dependencies:
   flutter:
@@ -18,6 +18,6 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: 2.0.1
+  flutter_lints: 2.0.2
   openfoodfacts_flutter_lints:
     git: https://github.com/openfoodfacts/openfoodfacts_flutter_lints.git

packages/data_importer/pubspec.yaml

@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: none
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=3.1.0 <4.0.0'
 
 dependencies:
   flutter:

packages/data_importer_shared/pubspec.yaml

@@ -3,7 +3,7 @@ description: A starting point for Dart libraries or applications.
 publish_to: none
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=3.1.0 <4.0.0'
 
 dev_dependencies:
   flutter_driver:

packages/scanner/ml_kit/lib/src/scanner_ml_kit.dart

@@ -304,7 +304,9 @@ class _SmoothBarcodeScannerMLKitState extends State<_SmoothBarcodeScannerMLKit>
                           try {
                             await _controller.toggleTorch();
                           } catch (err) {
-                            widget.onCameraFlashError?.call(context);
+                            if (context.mounted) {
+                              widget.onCameraFlashError?.call(context);
+                            }
                           }
                         },
                         child: ValueListenableBuilder<TorchState>(

packages/scanner/ml_kit/pubspec.yaml

@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=3.1.0 <4.0.0'
 
 dependencies:
   flutter:
@@ -23,6 +23,6 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: 2.0.1
+  flutter_lints: 2.0.2
   openfoodfacts_flutter_lints:
     git: https://github.com/openfoodfacts/openfoodfacts_flutter_lints.git

packages/scanner/shared/pubspec.yaml

@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=3.1.0 <4.0.0'
 
 dependencies:
   flutter:

packages/scanner/zxing/lib/src/scanner_zxing.dart

@@ -172,7 +172,9 @@ class _SmoothBarcodeScannerZXingState
                               await _controller?.toggleFlash();
                               setState(() {});
                             } catch (err) {
-                              widget.onCameraFlashError?.call(context);
+                              if (context.mounted) {
+                                widget.onCameraFlashError?.call(context);
+                              }
                             }
                           },
                           child: Icon(

packages/scanner/zxing/pubspec.yaml

@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=3.1.0 <4.0.0'
 
 dependencies:
   flutter:

packages/smooth_app/android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,12 +22,8 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdkVersion 33
+    compileSdkVersion flutter.compileSdkVersion
     ndkVersion "25.1.8937393"
 
     compileOptions {

packages/smooth_app/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

packages/smooth_app/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

packages/smooth_app/android/settings.gradle

@@ -1,11 +1,20 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    plugins {
+        id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+include ":app"
+
+apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"

packages/smooth_app/ios/Runner.xcodeproj/project.pbxproj

@@ -299,7 +299,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

packages/smooth_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

packages/smooth_app/lib/background/background_task.dart

@@ -121,16 +121,20 @@ abstract class BackgroundTask {
       return;
     }
 
-    if (getFloatingMessage(AppLocalizations.of(widget.context))
-        case (
-          final String message,
-          final AlignmentGeometry alignment,
-        )) {
-      SmoothFloatingMessage(message: message).show(
-        widget.context,
-        duration: SnackBarDuration.medium,
-        alignment: alignment,
-      );
+    if (widget.context.mounted) {
+      // ignore: use_build_context_synchronously
+      if (getFloatingMessage(AppLocalizations.of(widget.context))
+          case (
+            final String message,
+            final AlignmentGeometry alignment,
+          )) {
+        // ignore: use_build_context_synchronously
+        SmoothFloatingMessage(message: message).show(
+          widget.context,
+          duration: SnackBarDuration.medium,
+          alignment: alignment,
+        );
+      }
     }
   }
 

packages/smooth_app/lib/generic_lib/bottom_sheets/smooth_draggable_bottom_sheet.dart

@@ -7,10 +7,10 @@ class SmoothDraggableBottomSheet extends StatefulWidget {
     required this.headerBuilder,
     required this.headerHeight,
     required this.bodyBuilder,
+    required this.borderRadius,
     this.initHeightFraction = 0.5,
     this.maxHeightFraction = 1.0,
     this.animationController,
-    this.borderRadius,
     this.bottomSheetColor,
     this.draggableScrollableController,
   })  : assert(maxHeightFraction > 0.0 && maxHeightFraction <= 1.0),
@@ -23,7 +23,7 @@ class SmoothDraggableBottomSheet extends StatefulWidget {
   final WidgetBuilder bodyBuilder;
   final DraggableScrollableController? draggableScrollableController;
   final AnimationController? animationController;
-  final BorderRadius? borderRadius;
+  final BorderRadiusGeometry borderRadius;
   final Color? bottomSheetColor;
 
   @override

packages/smooth_app/lib/generic_lib/bottom_sheets/smooth_draggable_bottom_sheet_route.dart

@@ -7,9 +7,9 @@ Future<T?> showDraggableModalSheet<T>({
   required WidgetBuilder headerBuilder,
   required double headerHeight,
   required WidgetBuilder bodyBuilder,
+  required BorderRadiusGeometry borderRadius,
   double? initHeight,
   double? maxHeight,
-  BorderRadius? borderRadius,
   Color? bottomSheetColor,
   Color? barrierColor,
 }) {
@@ -37,8 +37,8 @@ class _FlexibleBottomSheetRoute<T> extends PopupRoute<T> {
     required this.headerBuilder,
     required this.headerHeight,
     required this.bodyBuilder,
+    required this.borderRadius,
     this.barrierLabel,
-    this.borderRadius,
     this.bottomSheetBackgroundColor,
     RouteSettings? settings,
   }) : super(settings: settings);
@@ -47,7 +47,7 @@ class _FlexibleBottomSheetRoute<T> extends PopupRoute<T> {
   final double headerHeight;
   final WidgetBuilder bodyBuilder;
   final double initHeight;
-  final BorderRadius? borderRadius;
+  final BorderRadiusGeometry borderRadius;
   final Color? bottomSheetBackgroundColor;
 
   @override

packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_group_card.dart

@@ -31,7 +31,7 @@ class KnowledgePanelGroupCard extends StatelessWidget {
                     themeData.textTheme.titleSmall!.apply(color: Colors.grey),
               ),
             ),
-          for (String panelId in groupElement.panelIds)
+          for (final String panelId in groupElement.panelIds)
             KnowledgePanelCard(
               panelId: panelId,
               product: product,

packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_table_card.dart

@@ -94,7 +94,7 @@ class _KnowledgePanelTableCardState extends State<KnowledgePanelTableCard> {
           _buildRowWidgets(_buildRowCells(), constraints);
       return Column(
         children: <Widget>[
-          for (List<Widget> row in rowsWidgets)
+          for (final List<Widget> row in rowsWidgets)
             Semantics(
               excludeSemantics: true,
               value: _buildSemanticsValue(row),

packages/smooth_app/lib/main.dart

@@ -255,10 +255,18 @@ class _SmoothAppState extends State<SmoothApp> {
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         debugShowCheckedModeBanner: !(kReleaseMode || _screenshots),
-        theme: SmoothTheme.getThemeData(Brightness.light, themeProvider,
-            colorProvider, textContrastProvider),
-        darkTheme: SmoothTheme.getThemeData(Brightness.dark, themeProvider,
-            colorProvider, textContrastProvider),
+        theme: SmoothTheme.getThemeData(
+          Brightness.light,
+          themeProvider,
+          colorProvider,
+          textContrastProvider,
+        ),
+        darkTheme: SmoothTheme.getThemeData(
+          Brightness.dark,
+          themeProvider,
+          colorProvider,
+          textContrastProvider,
+        ),
         themeMode: themeProvider.currentThemeMode,
         routerConfig: AppNavigator.of(context).router,
       ),
@@ -267,6 +275,7 @@ class _SmoothAppState extends State<SmoothApp> {
 
   Widget _buildError(AsyncSnapshot<void> snapshot) {
     return MaterialApp(
+      theme: ThemeData(useMaterial3: false),
       home: SmoothScaffold(
         body: Center(
           child: Text(

packages/smooth_app/lib/pages/onboarding/country_selector.dart

@@ -46,7 +46,7 @@ class _CountrySelectorState extends State<CountrySelector> {
 
     try {
       localizedCountries =
-          await IsoCountries.iso_countries_for_locale(languageCode);
+          await IsoCountries.isoCountriesForLocale(languageCode);
     } on MissingPluginException catch (_) {
       // Locales are not implemented on desktop and web
       // TODO(g123k): Add a complete list