Upgrade Flutter to 3.19.6 and package upgrades (especially Mapbox 2.0…

….0) (#582)

* Apply flutter upgrade to latest stable 3.22.1 and therefore apply color migration

* Change flutter version in readme

* Upgrade packages

* Downgrade to flutter 3.19.6 due to an open bug with uniquekey

* Add keystore to gitignore

* Ios files

* Adjust gitignore

* fix gitignore

* Adjust ci flutter version

* Fix scroll view is not resetting and bottom sheets are visible

* Fix Readme

.github/workflows/beta.yaml

@@ -14,7 +14,7 @@ jobs:
   test:
     runs-on: self-hosted
     # When upgrading: also upgrade dev.yaml, release.yaml, and test.yaml
-    container: ghcr.io/cirruslabs/flutter:3.16.9
+    container: ghcr.io/cirruslabs/flutter:3.19.6
     steps:
       - uses: actions/checkout@v2
       - name: Run unit tests
@@ -26,7 +26,7 @@ jobs:
     runs-on: self-hosted
     needs: test
     # When upgrading: also upgrade dev.yaml, release.yaml, and test.yaml
-    container: ghcr.io/cirruslabs/flutter:3.16.9
+    container: ghcr.io/cirruslabs/flutter:3.19.6
     steps:
       - uses: actions/checkout@v2
       - name: Prepare secret files

.github/workflows/dev.yaml

@@ -13,7 +13,7 @@ jobs:
   test:
     runs-on: self-hosted
     # When upgrading: also upgrade dev.yaml, release.yaml, and test.yaml
-    container: ghcr.io/cirruslabs/flutter:3.16.9
+    container: ghcr.io/cirruslabs/flutter:3.19.6
     steps:
       - uses: actions/checkout@v2
       - name: Run unit tests
@@ -25,7 +25,7 @@ jobs:
     runs-on: self-hosted
     needs: test
     # When upgrading: also upgrade dev.yaml, release.yaml, and test.yaml
-    container: ghcr.io/cirruslabs/flutter:3.16.9
+    container: ghcr.io/cirruslabs/flutter:3.19.6
     steps:
       - uses: actions/checkout@v2
       - name: Prepare secret files

.github/workflows/release.yaml

@@ -14,7 +14,7 @@ jobs:
   test:
     runs-on: self-hosted
     # When upgrading: also upgrade dev.yaml, release.yaml, and test.yaml
-    container: ghcr.io/cirruslabs/flutter:3.16.9
+    container: ghcr.io/cirruslabs/flutter:3.19.6
     steps:
       - uses: actions/checkout@v2
       - name: Run unit tests

.github/workflows/test.yaml

@@ -14,7 +14,7 @@ jobs:
   test:
     runs-on: self-hosted
     # When upgrading: also upgrade dev.yaml, release.yaml, and test.yaml
-    container: ghcr.io/cirruslabs/flutter:3.16.9
+    container: ghcr.io/cirruslabs/flutter:3.19.6
     steps:
       - uses: actions/checkout@v2
       - name: Run unit tests and check for styling errors

README.md

@@ -1,6 +1,6 @@
 # PrioBike-HH Flutter App
 
-**Required Flutter Version: `3.16.9`**
+**Required Flutter Version: `3.19.6`**
 
 For getting started with development you need to set up your development environment according to
 the [guide](https://docs.flutter.dev/get-started/install).

android/.gitignore

@@ -10,3 +10,5 @@ GeneratedPluginRegistrant.java
 .settings/org.eclipse.buildship.core.prefs
 
 gradle.properties
+
+/fastlane/keystore.jks

ios/Podfile.lock

@@ -8,30 +8,30 @@ PODS:
     - Flutter
   - file_picker (0.0.1):
     - Flutter
-  - Firebase/CoreOnly (10.22.0):
-    - FirebaseCore (= 10.22.0)
-  - Firebase/Messaging (10.22.0):
+  - Firebase/CoreOnly (10.25.0):
+    - FirebaseCore (= 10.25.0)
+  - Firebase/Messaging (10.25.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 10.22.0)
-  - firebase_core (2.27.0):
-    - Firebase/CoreOnly (= 10.22.0)
+    - FirebaseMessaging (~> 10.25.0)
+  - firebase_core (2.32.0):
+    - Firebase/CoreOnly (= 10.25.0)
     - Flutter
-  - firebase_messaging (14.7.19):
-    - Firebase/Messaging (= 10.22.0)
+  - firebase_messaging (14.9.4):
+    - Firebase/Messaging (= 10.25.0)
     - firebase_core
     - Flutter
-  - FirebaseCore (10.22.0):
+  - FirebaseCore (10.25.0):
     - FirebaseCoreInternal (~> 10.0)
     - GoogleUtilities/Environment (~> 7.12)
     - GoogleUtilities/Logger (~> 7.12)
-  - FirebaseCoreInternal (10.23.0):
+  - FirebaseCoreInternal (10.27.0):
     - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseInstallations (10.23.0):
+  - FirebaseInstallations (10.27.0):
     - FirebaseCore (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/UserDefaults (~> 7.8)
     - PromisesObjC (~> 2.1)
-  - FirebaseMessaging (10.22.0):
+  - FirebaseMessaging (10.25.0):
     - FirebaseCore (~> 10.0)
     - FirebaseInstallations (~> 10.0)
     - GoogleDataTransport (~> 9.3)
@@ -58,42 +58,43 @@ PODS:
     - GoogleUtilities/Environment (~> 7.7)
     - nanopb (< 2.30911.0, >= 2.30908.0)
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/AppDelegateSwizzler (7.13.0):
+  - GoogleUtilities/AppDelegateSwizzler (7.13.3):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Environment (7.13.0):
+  - GoogleUtilities/Environment (7.13.3):
     - GoogleUtilities/Privacy
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.13.0):
+  - GoogleUtilities/Logger (7.13.3):
     - GoogleUtilities/Environment
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Network (7.13.0):
+  - GoogleUtilities/Network (7.13.3):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Privacy
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.13.0)":
+  - "GoogleUtilities/NSData+zlib (7.13.3)":
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Privacy (7.13.0)
-  - GoogleUtilities/Reachability (7.13.0):
+  - GoogleUtilities/Privacy (7.13.3)
+  - GoogleUtilities/Reachability (7.13.3):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
-  - GoogleUtilities/UserDefaults (7.13.0):
+  - GoogleUtilities/UserDefaults (7.13.3):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
   - in_app_review (0.2.0):
     - Flutter
-  - mapbox_maps_flutter (1.0.0):
+  - mapbox_maps_flutter (2.0.0):
     - Flutter
-    - MapboxMaps (~> 11.2.0)
-  - MapboxCommon (24.2.0)
-  - MapboxCoreMaps (11.2.0):
-    - MapboxCommon (~> 24.2)
-  - MapboxMaps (11.2.0):
-    - MapboxCommon (= 24.2.0)
-    - MapboxCoreMaps (= 11.2.0)
+    - MapboxMaps (~> 11.4.0)
+    - Turf (= 2.8.0)
+  - MapboxCommon (24.4.0)
+  - MapboxCoreMaps (11.4.0):
+    - MapboxCommon (~> 24.4)
+  - MapboxMaps (11.4.0):
+    - MapboxCommon (= 24.4.0)
+    - MapboxCoreMaps (= 11.4.0)
     - Turf (= 2.8.0)
   - MTBBarcodeScanner (5.0.11)
   - nanopb (2.30910.0):
@@ -117,7 +118,7 @@ PODS:
     - FlutterMacOS
   - system_info_plus (0.0.1):
     - Flutter
-  - Toast (4.1.0)
+  - Toast (4.1.1)
   - Turf (2.8.0)
   - url_launcher_ios (0.0.1):
     - Flutter
@@ -216,44 +217,44 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
-  battery_plus: 3b68b6e7710fe49c022999753d22760e6dbbc471
+  battery_plus: 1ff2e16ba75af2a78387f65476057a390b47885e
   connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
-  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
+  device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
   file_picker: c79185e70b9b45728cde2a8d8da454e0cb43f287
-  Firebase: 797fd7297b7e1be954432743a0b3f90038e45a71
-  firebase_core: 100945864b4aedce3cfef0c62ab864858bf013cf
-  firebase_messaging: e65050bf9b187511d80ea3a4de7cf5573d2c7543
-  FirebaseCore: 0326ec9b05fbed8f8716cddbf0e36894a13837f7
-  FirebaseCoreInternal: 6a292e6f0bece1243a737e81556e56e5e19282e3
-  FirebaseInstallations: 42d6ead4605d6eafb3b6683674e80e18eb6f2c35
-  FirebaseMessaging: 9f71037fd9db3376a4caa54e5a3949d1027b4b6e
+  Firebase: 0312a2352584f782ea56f66d91606891d4607f06
+  firebase_core: a626d00494efa398e7c54f25f1454a64c8abf197
+  firebase_messaging: 06391e8f35dc65a00c56580266285263d2861f10
+  FirebaseCore: 7ec4d0484817f12c3373955bc87762d96842d483
+  FirebaseCoreInternal: 4b297a2d56063dbea2c1d0d04222d44a8d058862
+  FirebaseInstallations: 766dabca09fd94aef922538aaf144cc4a6fb6869
+  FirebaseMessaging: 88950ba9485052891ebe26f6c43a52bb62248952
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_blue_plus: 4837da7d00cf5d441fdd6635b3a57f936778ea96
   flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
-  flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
+  flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
   flutter_tts: 0f492aab6accf87059b72354fcb4ba934304771d
-  fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
+  fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
   geolocator_apple: 6cbaf322953988e009e5ecb481f07efece75c450
   GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
-  GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152
+  GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
   in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d
-  mapbox_maps_flutter: 7954cf84b3973ec17d49b483f31baad6abde6c48
-  MapboxCommon: f40f1e8c8f3ee8e2bee3b15437812ab114722420
-  MapboxCoreMaps: 4294d3178201702a95f2ae316bc4ad419f5fa16a
-  MapboxMaps: 413cb886e75b6703c0a3084ce84c29cd681d916f
+  mapbox_maps_flutter: 6b7ea767ed02514e0b796d5a2e48ba83b71bac01
+  MapboxCommon: 6acbd8ff41d66abf498e1558b0739f25c562945a
+  MapboxCoreMaps: f306bb1b10ebe995a2247b40e99322ab7f9b8071
+  MapboxMaps: 82044383ae19ec124ff444ec4b5d3ce82cb36ba5
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   nanopb: 438bc412db1928dac798aa6fd75726007be04262
-  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
-  share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
-  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
+  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   system_info_plus: 5393c8da281d899950d751713575fbf91c7709aa
-  Toast: ec33c32b8688982cecc6348adeae667c1b9938da
+  Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
   Turf: aa2ede4298009639d10db36aba1a7ebaad072a5e
-  url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
-  wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
 
 PODFILE CHECKSUM: 2e8fe0a6a5d0b318a89a087f5015eefc11a84376
 

ios/Runner.xcodeproj/project.pbxproj

@@ -154,6 +154,7 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				14046DC9C519174C11C7025B /* [CP] Embed Pods Frameworks */,
+				295963E71F1D1D02E02677C7 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -170,7 +171,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -230,6 +231,23 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		295963E71F1D1D02E02677C7 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;

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

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

ios/ci_scripts/ci_post_clone.sh

@@ -16,7 +16,7 @@ echo "$NETRC_BASE64" | base64 --decode > $HOME/.netrc
 chmod 600 $HOME/.netrc
 
 # Install Flutter using git.
-git clone https://github.com/flutter/flutter.git --depth 1 -b 3.16.9 $HOME/flutter
+git clone https://github.com/flutter/flutter.git --depth 1 -b 3.19.6 $HOME/flutter
 export PATH="$PATH:$HOME/flutter/bin"
 
 # Install Flutter artifacts for iOS (--ios), or macOS (--macos) platforms.

lib/common/layout/buttons.dart

@@ -112,7 +112,7 @@ class SmallIconButtonSecondary extends StatelessWidget {
       child: RawMaterialButton(
         elevation: 0,
         // Hide ugly material shadows.
-        fillColor: fill ?? Theme.of(context).colorScheme.background,
+        fillColor: fill ?? Theme.of(context).colorScheme.surface,
         splashColor: splash ?? Theme.of(context).colorScheme.onSecondary,
         onPressed: onPressed,
         shape: withBorder
@@ -290,7 +290,7 @@ class BigButtonPrimary extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final usedFillColor = fillColor ?? Theme.of(context).colorScheme.surface;
+    final usedFillColor = fillColor ?? Theme.of(context).colorScheme.primary;
     final usedFillColorHSL = HSLColor.fromColor(usedFillColor);
     final fillSaturation = usedFillColorHSL.saturation;
     final disabledColor =
@@ -623,7 +623,7 @@ class IconTextButtonPrimary extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return RawMaterialButton(
-      fillColor: fillColor ?? Theme.of(context).colorScheme.surface,
+      fillColor: fillColor ?? Theme.of(context).colorScheme.primary,
       splashColor: splashColor ?? Theme.of(context).colorScheme.surfaceTint,
       constraints: boxConstraints,
       // Hide ugly material shadows.