Upgrade flutter to 3.10.2 (#991)

digitalfabrik · May 30, 2023 · e4e5468 · e4e5468
1 parent a4b5db5
commit e4e5468
Show file tree

Hide file tree

Showing 6 changed files with 208 additions and 197 deletions.
diff --git a/frontend/.fvm/fvm_config.json b/frontend/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.7.6",
+  "flutterSdkVersion": "3.10.2",
   "flavors": {}
 }
diff --git a/frontend/analysis_options.yaml b/frontend/analysis_options.yaml
@@ -1,8 +1,6 @@
 include: package:lints/recommended.yaml
 
 analyzer:
-  strong-mode:
-    implicit-casts: false
   exclude:
     - build/**
     - lib/graphql/graphql_api*.dart
@@ -152,6 +150,8 @@ analyzer:
     use_test_throws_matchers: error
     valid_regexps: error
     void_checks: error
+  language:
+    strict-casts: true
 
 linter:
   rules:

diff --git a/frontend/android/build.gradle b/frontend/android/build.gradle
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/frontend/lib/identification/card_detail_view/verification_code_view.dart b/frontend/lib/identification/card_detail_view/verification_code_view.dart
@@ -13,7 +13,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:provider/provider.dart';
-import 'package:qr_flutter/qr_flutter.dart' as qr show QrImage, QrCode, QrVersions, QrErrorCorrectLevel;
+import 'package:qr_flutter/qr_flutter.dart' as qr;
 
 class VerificationCodeView extends StatefulWidget {
   final DynamicUserCode userCode;
@@ -67,7 +67,6 @@ class VerificationCodeViewState extends State<VerificationCodeView> {
               data: createDynamicVerificationQrCodeData(userCode, otpCode.code),
               errorCorrectLevel: qr.QrErrorCorrectLevel.L,
             );
-            qrCode.make();
 
             return isCardVerificationExpired
                 ? TextButton.icon(
@@ -86,11 +85,15 @@ class VerificationCodeViewState extends State<VerificationCodeView> {
                         children: [
                           Padding(
                             padding: EdgeInsets.all(padding),
-                            child: qr.QrImage.withQr(
+                            child: qr.QrImageView.withQr(
                               qr: qrCode,
                               version: qr.QrVersions.auto,
-                              foregroundColor: Theme.of(context).textTheme.bodyMedium?.color,
                               gapless: false,
+                              dataModuleStyle: qr.QrDataModuleStyle(
+                                  dataModuleShape: qr.QrDataModuleShape.square,
+                                  color: Theme.of(context).textTheme.bodyMedium?.color),
+                              eyeStyle: qr.QrEyeStyle(
+                                  eyeShape: qr.QrEyeShape.square, color: Theme.of(context).textTheme.bodyMedium?.color),
                             ),
                           ),
                           Positioned.fill(