From dcf60a27ec1909221986cef0de1f85c119174908 Mon Sep 17 00:00:00 2001
From: Michael Markl <marklmichael98@gmail.com>
Date: Sat, 4 Mar 2023 14:33:33 +0100
Subject: [PATCH 1/5] Upgrade frontend

---
 .circleci/config.yml                          |   2 +-
 .github/hooks/pre-commit                      |   2 +-
 .idea/runConfigurations/Format_frontend.xml   |   2 +-
 frontend/.fvm/fvm_config.json                 |   2 +-
 frontend/analysis_options.yaml                |   2 +-
 frontend/lib/about/about_page.dart            |  10 +-
 frontend/lib/about/content_tile.dart          |   2 +-
 frontend/lib/about/license_page.dart          |   2 +-
 frontend/lib/about/texts.dart                 |   4 +-
 frontend/lib/home/home_page.dart              |   4 +-
 .../animated_progressbar.dart                 |   4 +-
 .../verification_code_view.dart               |   6 +-
 frontend/lib/identification/info_dialog.dart  |   2 +-
 frontend/lib/identification/no_card_view.dart |   2 +-
 .../qr_code_scanner/qr_code_scanner.dart      | 130 +--
 .../dialogs/verification_info_dialog.dart     |   2 +-
 .../verification_qr_scanner_page.dart         |  22 +-
 frontend/lib/intro_slides/intro_screen.dart   | 134 ++-
 frontend/lib/map/location_button.dart         |   2 +-
 .../preview/accepting_store_preview_card.dart |   4 +-
 frontend/lib/search/filter_bar_button.dart    |   2 +-
 frontend/lib/search/location_button.dart      |   2 +-
 .../accepting_store_summary.dart              |   6 +-
 .../store_widgets/detail/detail_app_bar.dart  |   4 +-
 .../store_widgets/detail/detail_content.dart  |   2 +-
 frontend/lib/themes.dart                      |  28 +-
 frontend/lib/widgets/app_bars.dart            |   4 +-
 frontend/pubs/df_build_config/pubspec.yaml    |   2 +-
 frontend/pubs/df_protobuf/pubspec.yaml        |   2 +-
 frontend/pubspec.lock                         | 867 ++++++++++--------
 frontend/pubspec.yaml                         |  43 +-
 31 files changed, 709 insertions(+), 593 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 43ca9c38d..e4acc483b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -164,7 +164,7 @@ jobs:
           command: fvm flutter pub get
       - run:
           name: Check Formatting
-          command: fvm flutter format -l 120 -o none --set-exit-if-changed .
+          command: fvm dart format -l 120 -o none --set-exit-if-changed .
       - run:
           name: Build Runner
           command: |
diff --git a/.github/hooks/pre-commit b/.github/hooks/pre-commit
index 32d604ef3..67da91a69 100755
--- a/.github/hooks/pre-commit
+++ b/.github/hooks/pre-commit
@@ -14,7 +14,7 @@ if [ ! -x "$(command -v fvm)" ]; then
 fi
 
 # Prettify all selected files
-echo "$FILES" | xargs fvm flutter format -l 120
+echo "$FILES" | xargs fvm dart format -l 120
 
 # Add back the modified/prettified files to staging
 echo "$FILES" | xargs git add
diff --git a/.idea/runConfigurations/Format_frontend.xml b/.idea/runConfigurations/Format_frontend.xml
index edf0b2fcf..4ea012225 100644
--- a/.idea/runConfigurations/Format_frontend.xml
+++ b/.idea/runConfigurations/Format_frontend.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Format frontend" type="ShConfigurationType" folderName="Frontend">
-    <option name="SCRIPT_TEXT" value="fvm flutter format -l 120 ." />
+    <option name="SCRIPT_TEXT" value="fvm dart format -l 120 ." />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
diff --git a/frontend/.fvm/fvm_config.json b/frontend/.fvm/fvm_config.json
index e44645b53..6e3d57e67 100644
--- a/frontend/.fvm/fvm_config.json
+++ b/frontend/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.3.0",
+  "flutterSdkVersion": "3.7.6",
   "flavors": {}
 }
\ No newline at end of file
diff --git a/frontend/analysis_options.yaml b/frontend/analysis_options.yaml
index 47071d0ee..06a045757 100644
--- a/frontend/analysis_options.yaml
+++ b/frontend/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:lint/analysis_options.yaml
+include: package:lints/recommended.yaml
 
 analyzer:
   strong-mode:
diff --git a/frontend/lib/about/about_page.dart b/frontend/lib/about/about_page.dart
index 6dc1ad654..bac17854a 100644
--- a/frontend/lib/about/about_page.dart
+++ b/frontend/lib/about/about_page.dart
@@ -39,10 +39,10 @@ class AboutPage extends StatelessWidget {
               ),
             ),
             Center(
-              child: Text(packageInfo.appName, style: Theme.of(context).textTheme.headline5),
+              child: Text(packageInfo.appName, style: Theme.of(context).textTheme.headlineSmall),
             ),
             Center(
-              child: Text(packageInfo.version, style: Theme.of(context).textTheme.bodyText2),
+              child: Text(packageInfo.version, style: Theme.of(context).textTheme.bodyMedium),
             ),
             const SizedBox(height: 20),
             const Divider(
@@ -55,17 +55,17 @@ class AboutPage extends StatelessWidget {
                 child: Column(
                   children: [
                     Center(
-                      child: Text("Herausgeber", style: Theme.of(context).textTheme.subtitle2),
+                      child: Text("Herausgeber", style: Theme.of(context).textTheme.titleSmall),
                     ),
                     Padding(
                       padding: const EdgeInsets.only(left: 10, right: 10, top: 16, bottom: 16),
-                      child: Text(buildConfig.publisherAddress, style: Theme.of(context).textTheme.bodyText1),
+                      child: Text(buildConfig.publisherAddress, style: Theme.of(context).textTheme.bodyLarge),
                     ),
                     Text(
                       "Mehr Informationen",
                       style: Theme.of(context)
                           .textTheme
-                          .bodyText2
+                          .bodyMedium
                           ?.merge(TextStyle(color: Theme.of(context).colorScheme.secondary)),
                     ),
                   ],
diff --git a/frontend/lib/about/content_tile.dart b/frontend/lib/about/content_tile.dart
index b8dd47cda..97cd704bd 100644
--- a/frontend/lib/about/content_tile.dart
+++ b/frontend/lib/about/content_tile.dart
@@ -34,7 +34,7 @@ class ContentPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     return DecoratedBox(
-      decoration: BoxDecoration(color: theme.backgroundColor),
+      decoration: BoxDecoration(color: theme.colorScheme.background),
       child: CustomScrollView(
         slivers: <Widget>[
           CustomSliverAppBar(title: title),
diff --git a/frontend/lib/about/license_page.dart b/frontend/lib/about/license_page.dart
index 07518edd2..24239e349 100644
--- a/frontend/lib/about/license_page.dart
+++ b/frontend/lib/about/license_page.dart
@@ -100,7 +100,7 @@ class SingleLicensePage extends StatelessWidget {
               (BuildContext context, int index) {
                 final paragraph = paragraphs.toList()[index];
 
-                return Text("\t" * paragraph.indent * 2 + paragraph.text, style: Theme.of(context).textTheme.bodyText1);
+                return Text("\t" * paragraph.indent * 2 + paragraph.text, style: Theme.of(context).textTheme.bodyLarge);
               },
               childCount: paragraphs.length,
             ),
diff --git a/frontend/lib/about/texts.dart b/frontend/lib/about/texts.dart
index 40795439e..93599ef3b 100644
--- a/frontend/lib/about/texts.dart
+++ b/frontend/lib/about/texts.dart
@@ -15,8 +15,8 @@ List<Widget> toWidgets(ThemeData theme, List<Paragraph> paragraphs) {
         final title = e.title;
         final content = e.content;
         return [
-          if (title != null) Text(title, style: theme.textTheme.headline6),
-          if (content != null) Text(content, style: theme.textTheme.bodyText1)
+          if (title != null) Text(title, style: theme.textTheme.titleLarge),
+          if (content != null) Text(content, style: theme.textTheme.bodyLarge)
         ];
       })
       .expand((i) => i)
diff --git a/frontend/lib/home/home_page.dart b/frontend/lib/home/home_page.dart
index 0505f0533..b6a1805ab 100644
--- a/frontend/lib/home/home_page.dart
+++ b/frontend/lib/home/home_page.dart
@@ -15,10 +15,10 @@ class HomePage extends StatefulWidget {
   const HomePage({super.key});
 
   @override
-  _HomePageState createState() => _HomePageState();
+  HomePageState createState() => HomePageState();
 }
 
-class _HomePageState extends State<HomePage> {
+class HomePageState extends State<HomePage> {
   int _currentTabIndex = 0;
   late List<AppFlow> appFlows;
 
diff --git a/frontend/lib/identification/card_detail_view/animated_progressbar.dart b/frontend/lib/identification/card_detail_view/animated_progressbar.dart
index 5f287bf87..f14b05d2b 100644
--- a/frontend/lib/identification/card_detail_view/animated_progressbar.dart
+++ b/frontend/lib/identification/card_detail_view/animated_progressbar.dart
@@ -8,10 +8,10 @@ class AnimatedProgressbar extends StatefulWidget {
   const AnimatedProgressbar({super.key, required this.initialProgress});
 
   @override
-  _AnimatedProgressbarState createState() => _AnimatedProgressbarState();
+  AnimatedProgressbarState createState() => AnimatedProgressbarState();
 }
 
-class _AnimatedProgressbarState extends State<AnimatedProgressbar> with SingleTickerProviderStateMixin {
+class AnimatedProgressbarState extends State<AnimatedProgressbar> with SingleTickerProviderStateMixin {
   late AnimationController controller;
   late Animation<double> animation;
 
diff --git a/frontend/lib/identification/card_detail_view/verification_code_view.dart b/frontend/lib/identification/card_detail_view/verification_code_view.dart
index 491bdcf55..234cc5dcd 100644
--- a/frontend/lib/identification/card_detail_view/verification_code_view.dart
+++ b/frontend/lib/identification/card_detail_view/verification_code_view.dart
@@ -17,10 +17,10 @@ class VerificationCodeView extends StatefulWidget {
   VerificationCodeView({super.key, required this.userCode}) : _otpGenerator = OTPGenerator(userCode.totpSecret);
 
   @override
-  _VerificationCodeViewState createState() => _VerificationCodeViewState();
+  VerificationCodeViewState createState() => VerificationCodeViewState();
 }
 
-class _VerificationCodeViewState extends State<VerificationCodeView> {
+class VerificationCodeViewState extends State<VerificationCodeView> {
   OTPCode? _otpCode;
 
   @override
@@ -69,7 +69,7 @@ class _VerificationCodeViewState extends State<VerificationCodeView> {
                       child: qr.QrImage.withQr(
                         qr: qrCode,
                         version: qr.QrVersions.auto,
-                        foregroundColor: Theme.of(context).textTheme.bodyText2?.color,
+                        foregroundColor: Theme.of(context).textTheme.bodyMedium?.color,
                         gapless: false,
                       ),
                     ),
diff --git a/frontend/lib/identification/info_dialog.dart b/frontend/lib/identification/info_dialog.dart
index fe17c3d3a..2a5e533d2 100644
--- a/frontend/lib/identification/info_dialog.dart
+++ b/frontend/lib/identification/info_dialog.dart
@@ -20,7 +20,7 @@ class InfoDialog extends StatelessWidget {
     return AlertDialog(
       title: ListTile(
         leading: Icon(icon, color: iconColor ?? theme.colorScheme.primaryContainer, size: 30),
-        title: Text(title, style: theme.textTheme.headline5),
+        title: Text(title, style: theme.textTheme.headlineSmall),
       ),
       content: child,
       actions: [TextButton(onPressed: () => Navigator.of(context).pop(), child: const Text("OK"))],
diff --git a/frontend/lib/identification/no_card_view.dart b/frontend/lib/identification/no_card_view.dart
index 84109e90c..056f26b7c 100644
--- a/frontend/lib/identification/no_card_view.dart
+++ b/frontend/lib/identification/no_card_view.dart
@@ -91,7 +91,7 @@ class _TapableCardWithArea extends StatelessWidget {
                   Expanded(
                     child: Text(
                       title,
-                      style: Theme.of(context).textTheme.headline6,
+                      style: Theme.of(context).textTheme.titleLarge,
                       textAlign: TextAlign.left,
                     ),
                   ),
diff --git a/frontend/lib/identification/qr_code_scanner/qr_code_scanner.dart b/frontend/lib/identification/qr_code_scanner/qr_code_scanner.dart
index 76816687b..dfd893137 100644
--- a/frontend/lib/identification/qr_code_scanner/qr_code_scanner.dart
+++ b/frontend/lib/identification/qr_code_scanner/qr_code_scanner.dart
@@ -1,14 +1,11 @@
 import 'dart:math';
 import 'dart:typed_data';
 
-import 'package:collection/collection.dart';
 import 'package:ehrenamtskarte/identification/qr_code_scanner/qr_code_scanner_controls.dart';
 import 'package:ehrenamtskarte/identification/qr_code_scanner/qr_overlay_shape.dart';
 import 'package:flutter/material.dart';
 import 'package:mobile_scanner/mobile_scanner.dart';
 
-const scanDelayAfterErrorMs = 500;
-
 typedef OnCodeScannedCallback = Future<void> Function(Uint8List code);
 
 class QrCodeScanner extends StatefulWidget {
@@ -23,60 +20,77 @@ class QrCodeScanner extends StatefulWidget {
 class _QRViewState extends State<QrCodeScanner> {
   final MobileScannerController _controller = MobileScannerController(
     torchEnabled: false,
+    detectionSpeed: DetectionSpeed.normal,
     formats: [BarcodeFormat.qrCode],
+    returnImage: false,
   );
   final GlobalKey qrKey = GlobalKey(debugLabel: 'QR');
-  Uint8List? lastScanned;
+
+  // Determines whether a code is currently processed by the onCodeScanned callback
+  // During this time, we do not re-trigger the callback.
+  bool processingCode = false;
+
+  bool showWaiting = false;
 
   @override
   Widget build(BuildContext context) {
     final controller = _controller;
-    return Column(
-      children: <Widget>[
-        Expanded(
-          flex: 4,
-          child: Stack(
-            fit: StackFit.expand,
-            children: [
-              MobileScanner(
-                key: qrKey,
-                onDetect: (barcode, args) => _onCodeScanned(barcode),
-                allowDuplicates:
-                    true, // We need allowDuplicates until https://github.com/juliansteenbakker/mobile_scanner/pull/304 is available. It will be available with mobile_scanner 3.0.0
-                controller: controller,
-              ),
-              Padding(
-                padding: EdgeInsets.zero,
-                child: DecoratedBox(
-                  decoration: ShapeDecoration(
-                    shape: QrScannerOverlayShape(
-                      borderRadius: 10,
-                      borderColor: Theme.of(context).colorScheme.secondary,
-                      borderLength: 30,
-                      borderWidth: 10,
-                      cutOutSize: _calculateScanArea(context),
+    return Stack(
+      children: [
+        Column(
+          children: <Widget>[
+            Expanded(
+              flex: 4,
+              child: Stack(
+                fit: StackFit.expand,
+                children: [
+                  MobileScanner(
+                    key: qrKey,
+                    placeholderBuilder: (context, _) => Align(
+                      alignment: Alignment.center,
+                      child: Icon(Icons.camera_alt_outlined, size: 128, color: Colors.grey),
                     ),
+                    onDetect: (barcodes) => _onCodeScanned(barcodes),
+                    controller: controller,
                   ),
+                  DecoratedBox(
+                    decoration: ShapeDecoration(
+                      shape: QrScannerOverlayShape(
+                        borderRadius: 10,
+                        borderColor: Theme.of(context).colorScheme.secondary,
+                        borderLength: 30,
+                        borderWidth: 10,
+                        cutOutSize: _calculateScanArea(context),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            Expanded(
+              flex: 1,
+              child: FittedBox(
+                fit: BoxFit.contain,
+                child: Column(
+                  children: [
+                    Container(
+                      margin: const EdgeInsets.all(8),
+                      child: const Text('Halten Sie die Kamera auf den QR Code.'),
+                    ),
+                    QrCodeScannerControls(controller: controller)
+                  ],
                 ),
               ),
-            ],
-          ),
+            )
+          ],
         ),
-        Expanded(
-          flex: 1,
-          child: FittedBox(
-            fit: BoxFit.contain,
-            child: Column(
-              children: [
-                Container(
-                  margin: const EdgeInsets.all(8),
-                  child: const Text('Halten Sie die Kamera auf den QR Code.'),
-                ),
-                QrCodeScannerControls(controller: controller)
-              ],
-            ),
-          ),
-        )
+        if (showWaiting)
+          Center(
+              child: Card(
+                  child: Padding(
+            padding: const EdgeInsets.all(32),
+            child: CircularProgressIndicator(),
+          ))),
       ],
     );
   }
@@ -95,16 +109,26 @@ class _QRViewState extends State<QrCodeScanner> {
     return scanArea;
   }
 
-  Future<void> _onCodeScanned(Barcode scanData) async {
-    final code = scanData.rawBytes;
+  Future<void> _onCodeScanned(BarcodeCapture capture) async {
+    if (capture.barcodes.length != 1) return;
+    final barcode = capture.barcodes[0];
+    final code = barcode.rawBytes;
+    if (code == null) return;
 
-    if (code == null || const ListEquality().equals(lastScanned, code)) {
-      return;
+    if (processingCode) return;
+    setState(() {
+      processingCode = true;
+      showWaiting = true;
+    });
+    try {
+      await widget.onCodeScanned(code);
+    } finally {
+      setState(() {
+        showWaiting = false;
+      });
+      await Future.delayed(Duration(milliseconds: 500));
+      processingCode = false;
     }
-
-    lastScanned = code;
-
-    await widget.onCodeScanned(code);
   }
 
   @override
diff --git a/frontend/lib/identification/verification_workflow/dialogs/verification_info_dialog.dart b/frontend/lib/identification/verification_workflow/dialogs/verification_info_dialog.dart
index c8faefe51..1e415c154 100644
--- a/frontend/lib/identification/verification_workflow/dialogs/verification_info_dialog.dart
+++ b/frontend/lib/identification/verification_workflow/dialogs/verification_info_dialog.dart
@@ -80,7 +80,7 @@ class _EnumeratedListItem extends StatelessWidget {
             child: Text(
               "${index + 1}",
               style: TextStyle(
-                color: Theme.of(context).backgroundColor,
+                color: Theme.of(context).colorScheme.background,
                 fontWeight: FontWeight.bold,
               ),
             ),
diff --git a/frontend/lib/identification/verification_workflow/verification_qr_scanner_page.dart b/frontend/lib/identification/verification_workflow/verification_qr_scanner_page.dart
index ca474ef39..3c9de9a98 100644
--- a/frontend/lib/identification/verification_workflow/verification_qr_scanner_page.dart
+++ b/frontend/lib/identification/verification_workflow/verification_qr_scanner_page.dart
@@ -70,8 +70,6 @@ class VerificationQrScannerPage extends StatelessWidget {
   }
 
   Future<void> _handleQrCode(BuildContext context, Uint8List rawQrContent) async {
-    _openWaitingDialog(context);
-
     try {
       final qrcode = rawQrContent.parseQRCodeContent();
 
@@ -122,7 +120,7 @@ class VerificationQrScannerPage extends StatelessWidget {
       );
     } finally {
       // close current "Karte verifizieren" view
-      Navigator.of(context).pop();
+      await Navigator.of(context).maybePop();
     }
   }
 
@@ -130,8 +128,6 @@ class VerificationQrScannerPage extends StatelessWidget {
     if (exception != null) {
       debugPrint("Verification failed: $exception");
     }
-    _closeWaitingDialog(context);
-
     await NegativeVerificationResultDialog.show(context, message);
   }
 
@@ -139,30 +135,14 @@ class VerificationQrScannerPage extends StatelessWidget {
     if (exception != null) {
       debugPrint("Connection failed: $exception");
     }
-    _closeWaitingDialog(context);
-
     await ConnectionFailedDialog.show(context, message);
   }
 
   Future<void> _onSuccess(BuildContext context, CardInfo cardInfo, bool isStaticVerificationCode) async {
-    _closeWaitingDialog(context);
     await PositiveVerificationResultDialog.show(
       context: context,
       cardInfo: cardInfo,
       isStaticVerificationCode: isStaticVerificationCode,
     );
   }
-
-  void _openWaitingDialog(BuildContext context) {
-    showDialog(
-      barrierDismissible: false,
-      context: context,
-      builder: (context) =>
-          AlertDialog(title: Column(mainAxisSize: MainAxisSize.min, children: const [CircularProgressIndicator()])),
-    );
-  }
-
-  void _closeWaitingDialog(BuildContext context) {
-    Navigator.of(context, rootNavigator: true).pop();
-  }
 }
diff --git a/frontend/lib/intro_slides/intro_screen.dart b/frontend/lib/intro_slides/intro_screen.dart
index e710fcd63..673a06917 100644
--- a/frontend/lib/intro_slides/intro_screen.dart
+++ b/frontend/lib/intro_slides/intro_screen.dart
@@ -16,72 +16,6 @@ class IntroScreen extends StatefulWidget {
 }
 
 class IntroScreenState extends State<IntroScreen> {
-  List<Slide> slides = [];
-
-  void _setSlides() {
-    final theme = Theme.of(context);
-    slides.clear();
-    slides.add(
-      Slide(
-        title: buildConfig.introSlide1.title,
-        description: buildConfig.introSlide1.description,
-        pathImage: buildConfig.introSlide1.imagePath,
-        backgroundColor: theme.brightness == Brightness.light ? const Color(0xffECECEC) : theme.backgroundColor,
-        maxLineTitle: 3,
-        styleTitle: theme.textTheme.headline5,
-        styleDescription: theme.textTheme.bodyText1?.apply(fontSizeFactor: 1.2),
-      ),
-    );
-    slides.add(
-      Slide(
-        title: buildConfig.introSlide2.title,
-        description: buildConfig.introSlide2.description,
-        pathImage: buildConfig.introSlide2.imagePath,
-        backgroundColor: theme.brightness == Brightness.light ? const Color(0xffECECEC) : theme.backgroundColor,
-        maxLineTitle: 3,
-        styleTitle: theme.textTheme.headline5,
-        styleDescription: theme.textTheme.bodyText1?.apply(fontSizeFactor: 1.2),
-      ),
-    );
-    slides.add(
-      Slide(
-        title: buildConfig.introSlide3.title,
-        description: buildConfig.introSlide3.description,
-        pathImage: buildConfig.introSlide3.imagePath,
-        backgroundColor: theme.brightness == Brightness.light ? const Color(0xffECECEC) : theme.backgroundColor,
-        maxLineTitle: 3,
-        styleTitle: theme.textTheme.headline5,
-        styleDescription: theme.textTheme.bodyText1?.apply(fontSizeFactor: 1.2),
-      ),
-    );
-    slides.add(
-      Slide(
-        title: buildConfig.introSlide4.title,
-        backgroundColor: theme.brightness == Brightness.light ? const Color(0xffECECEC) : theme.backgroundColor,
-        maxLineTitle: 3,
-        styleTitle: theme.textTheme.headline5,
-        pathImage: buildConfig.introSlide4.imagePath,
-        widgetDescription: Center(
-          child: Column(
-            children: [
-              Text(
-                buildConfig.introSlide4.description,
-                style: theme.textTheme.bodyText1?.apply(fontSizeFactor: 1.2),
-                textAlign: TextAlign.center,
-                maxLines: 100,
-                overflow: TextOverflow.ellipsis,
-              ),
-              const Padding(
-                padding: EdgeInsets.all(15),
-                child: LocationRequestButton(),
-              )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
   void onDonePress() {
     final onFinishedCallback = widget.onFinishedCallback;
     if (onFinishedCallback != null) {
@@ -92,17 +26,75 @@ class IntroScreenState extends State<IntroScreen> {
 
   @override
   Widget build(BuildContext context) {
-    _setSlides();
+    final theme = Theme.of(context);
     return IntroSlider(
-      slides: slides,
       onDonePress: onDonePress,
       renderDoneBtn: const Text("Fertig"),
       renderNextBtn: const Text("Weiter"),
       renderPrevBtn: const Text("Zurück"),
       doneButtonStyle: Theme.of(context).textButtonTheme.style,
-      showSkipBtn: false,
-      colorDot: Theme.of(context).brightness == Brightness.light ? Colors.black54 : Colors.white38,
-      colorActiveDot: Theme.of(context).brightness == Brightness.light ? Colors.black : Colors.white,
+      indicatorConfig: IndicatorConfig(
+        colorActiveIndicator: theme.colorScheme.primary,
+        colorIndicator: Colors.grey,
+      ),
+      isShowSkipBtn: false,
+      listContentConfig: [
+        ContentConfig(
+          title: buildConfig.introSlide1.title,
+          description: buildConfig.introSlide1.description,
+          pathImage: buildConfig.introSlide1.imagePath,
+          backgroundColor:
+              theme.brightness == Brightness.light ? const Color(0xffECECEC) : theme.colorScheme.background,
+          maxLineTitle: 3,
+          styleTitle: theme.textTheme.headlineSmall,
+          styleDescription: theme.textTheme.bodyLarge?.apply(fontSizeFactor: 1.2),
+        ),
+        ContentConfig(
+          title: buildConfig.introSlide2.title,
+          description: buildConfig.introSlide2.description,
+          pathImage: buildConfig.introSlide2.imagePath,
+          backgroundColor:
+              theme.brightness == Brightness.light ? const Color(0xffECECEC) : theme.colorScheme.background,
+          maxLineTitle: 3,
+          styleTitle: theme.textTheme.headlineSmall,
+          styleDescription: theme.textTheme.bodyLarge?.apply(fontSizeFactor: 1.2),
+        ),
+        ContentConfig(
+          title: buildConfig.introSlide3.title,
+          description: buildConfig.introSlide3.description,
+          pathImage: buildConfig.introSlide3.imagePath,
+          backgroundColor:
+              theme.brightness == Brightness.light ? const Color(0xffECECEC) : theme.colorScheme.background,
+          maxLineTitle: 3,
+          styleTitle: theme.textTheme.headlineSmall,
+          styleDescription: theme.textTheme.bodyLarge?.apply(fontSizeFactor: 1.2),
+        ),
+        ContentConfig(
+          title: buildConfig.introSlide4.title,
+          backgroundColor:
+              theme.brightness == Brightness.light ? const Color(0xffECECEC) : theme.colorScheme.background,
+          maxLineTitle: 3,
+          styleTitle: theme.textTheme.headlineSmall,
+          pathImage: buildConfig.introSlide4.imagePath,
+          widgetDescription: Center(
+            child: Column(
+              children: [
+                Text(
+                  buildConfig.introSlide4.description,
+                  style: theme.textTheme.bodyLarge?.apply(fontSizeFactor: 1.2),
+                  textAlign: TextAlign.center,
+                  maxLines: 100,
+                  overflow: TextOverflow.ellipsis,
+                ),
+                const Padding(
+                  padding: EdgeInsets.all(15),
+                  child: LocationRequestButton(),
+                )
+              ],
+            ),
+          ),
+        ),
+      ],
     );
   }
 }
diff --git a/frontend/lib/map/location_button.dart b/frontend/lib/map/location_button.dart
index e70413906..622390fda 100644
--- a/frontend/lib/map/location_button.dart
+++ b/frontend/lib/map/location_button.dart
@@ -33,7 +33,7 @@ class _LocationButtonState extends State<LocationButton> {
       child: FloatingActionButton(
         heroTag: "fab_map_view",
         elevation: 1,
-        backgroundColor: theme.backgroundColor,
+        backgroundColor: theme.colorScheme.surfaceVariant,
         onPressed: _status == LocationPermissionStatus.requestFinished ? () => _determinePosition(settings) : null,
         child: AnimatedSwitcher(
           duration: const Duration(milliseconds: 200),
diff --git a/frontend/lib/map/preview/accepting_store_preview_card.dart b/frontend/lib/map/preview/accepting_store_preview_card.dart
index a09a9d971..660ca3c23 100644
--- a/frontend/lib/map/preview/accepting_store_preview_card.dart
+++ b/frontend/lib/map/preview/accepting_store_preview_card.dart
@@ -32,11 +32,13 @@ class AcceptingStorePreviewCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final currentAcceptingStore = acceptingStore;
-    return Container(
+    return Padding(
       padding: EdgeInsets.symmetric(horizontal: fabPadding.toDouble()),
       child: Card(
         clipBehavior: Clip.hardEdge,
         margin: EdgeInsets.zero,
+        color: Theme.of(context).colorScheme.surfaceVariant,
+        surfaceTintColor: Colors.transparent,
         child: AnimatedSwitcher(
           duration: const Duration(milliseconds: 200),
           child: isLoading
diff --git a/frontend/lib/search/filter_bar_button.dart b/frontend/lib/search/filter_bar_button.dart
index f98bca249..c0286e9a5 100644
--- a/frontend/lib/search/filter_bar_button.dart
+++ b/frontend/lib/search/filter_bar_button.dart
@@ -85,7 +85,7 @@ class _FilterBarButtonState extends State<FilterBarButton> with SingleTickerProv
     return AnimatedBuilder(
       animation: colorTween,
       builder: (context, child) {
-        final color = Color.lerp(theme.backgroundColor, selectedColor, colorTween.value);
+        final color = Color.lerp(theme.colorScheme.background, selectedColor, colorTween.value);
         return ConstrainedBox(
           constraints: BoxConstraints.tightFor(width: width, height: 70),
           child: Card(
diff --git a/frontend/lib/search/location_button.dart b/frontend/lib/search/location_button.dart
index 741b0e85a..a9e50de6d 100644
--- a/frontend/lib/search/location_button.dart
+++ b/frontend/lib/search/location_button.dart
@@ -40,7 +40,7 @@ class _LocationButtonState extends State<LocationButton> {
         padding: const EdgeInsets.all(10),
         child: FloatingActionButton.extended(
           heroTag: "fab_search_view",
-          backgroundColor: Theme.of(context).backgroundColor,
+          backgroundColor: Theme.of(context).colorScheme.surfaceVariant,
           elevation: 1,
           onPressed:
               _locationStatus == LocationRequestStatus.requesting ? null : () => _determinePosition(true, settings),
diff --git a/frontend/lib/store_widgets/accepting_store_summary.dart b/frontend/lib/store_widgets/accepting_store_summary.dart
index d3369b03b..4f9c7ff29 100644
--- a/frontend/lib/store_widgets/accepting_store_summary.dart
+++ b/frontend/lib/store_widgets/accepting_store_summary.dart
@@ -155,14 +155,14 @@ class StoreTextOverview extends StatelessWidget {
             store.name ?? "Akzeptanzstelle",
             maxLines: 1,
             overflow: TextOverflow.ellipsis,
-            style: Theme.of(context).textTheme.bodyText1,
+            style: Theme.of(context).textTheme.bodyLarge,
           ),
           const SizedBox(height: 4),
           Text(
             store.description ?? "Keine Beschreibung verfügbar",
             maxLines: 1,
             overflow: TextOverflow.ellipsis,
-            style: Theme.of(context).textTheme.bodyText2,
+            style: Theme.of(context).textTheme.bodyMedium,
           ),
           if (showTownName && location != null) Text(location, maxLines: 1, overflow: TextOverflow.ellipsis)
         ],
@@ -189,7 +189,7 @@ class DistanceText extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Center(
-      child: Text(_formatDistance(distance), maxLines: 1, style: Theme.of(context).textTheme.bodyText2),
+      child: Text(_formatDistance(distance), maxLines: 1, style: Theme.of(context).textTheme.bodyMedium),
     );
   }
 }
diff --git a/frontend/lib/store_widgets/detail/detail_app_bar.dart b/frontend/lib/store_widgets/detail/detail_app_bar.dart
index cc0e5e675..396e04c89 100644
--- a/frontend/lib/store_widgets/detail/detail_app_bar.dart
+++ b/frontend/lib/store_widgets/detail/detail_app_bar.dart
@@ -60,13 +60,13 @@ class DetailAppBarBottom extends StatelessWidget {
         children: [
           Text(
             categoryName ?? "",
-            style: Theme.of(context).textTheme.bodyText2?.apply(color: textColorGrey),
+            style: Theme.of(context).textTheme.bodyMedium?.apply(color: textColorGrey),
             maxLines: 1,
             overflow: TextOverflow.ellipsis,
           ),
           Text(
             title ?? "",
-            style: Theme.of(context).textTheme.headline6?.apply(color: textColor),
+            style: Theme.of(context).textTheme.titleLarge?.apply(color: textColor),
             maxLines: 2,
             overflow: TextOverflow.ellipsis,
           )
diff --git a/frontend/lib/store_widgets/detail/detail_content.dart b/frontend/lib/store_widgets/detail/detail_content.dart
index 3cbaff77d..0ab03537f 100644
--- a/frontend/lib/store_widgets/detail/detail_content.dart
+++ b/frontend/lib/store_widgets/detail/detail_content.dart
@@ -50,7 +50,7 @@ class DetailContent extends StatelessWidget {
             if (storeDescription != null) ...[
               Text(
                 storeDescription,
-                style: Theme.of(context).textTheme.bodyText1,
+                style: Theme.of(context).textTheme.bodyLarge,
               ),
               Divider(thickness: 0.7, height: 48, color: Theme.of(context).primaryColorLight),
             ],
diff --git a/frontend/lib/themes.dart b/frontend/lib/themes.dart
index 822b25f70..3a1081c18 100644
--- a/frontend/lib/themes.dart
+++ b/frontend/lib/themes.dart
@@ -11,14 +11,14 @@ ThemeData get lightTheme {
       primary: primaryColor,
       secondary: primaryColor,
       background: Colors.white,
-      surfaceVariant: const Color(0xffededed),
+      surfaceVariant: const Color(0xffefefef),
     ),
     textTheme: defaultTypography.copyWith(
-      headline4: defaultTypography.headline4?.apply(color: Colors.black87),
-      headline5: defaultTypography.headline4?.apply(color: Colors.black87),
-      headline6: const TextStyle(fontSize: 20.0, fontWeight: FontWeight.bold),
-      bodyText1: const TextStyle(fontSize: 15.0, fontWeight: FontWeight.normal),
-      bodyText2: const TextStyle(fontSize: 15.0, color: Color(0xFF505050)),
+      headlineMedium: defaultTypography.headlineMedium?.apply(color: Colors.black87),
+      headlineSmall: defaultTypography.headlineMedium?.apply(color: Colors.black87),
+      titleLarge: const TextStyle(fontSize: 20.0, fontWeight: FontWeight.bold),
+      bodyLarge: const TextStyle(fontSize: 15.0, fontWeight: FontWeight.normal),
+      bodyMedium: const TextStyle(fontSize: 15.0, color: Color(0xFF505050)),
     ),
     useMaterial3: true,
   );
@@ -27,6 +27,9 @@ ThemeData get lightTheme {
       selectionHandleColor: Colors.white,
       selectionColor: Color(0xFF505050),
     ),
+    dividerTheme: DividerThemeData(
+      color: Color(0xffeeeeee),
+    ),
     appBarTheme: AppBarTheme(
       systemOverlayStyle: SystemUiOverlayStyle.light,
       backgroundColor: lightTheme.colorScheme.primary,
@@ -53,11 +56,11 @@ ThemeData get darkTheme {
       surfaceVariant: const Color(0xff262626),
     ),
     textTheme: defaultTypography.copyWith(
-      headline4: defaultTypography.headline4?.apply(color: Colors.white),
-      headline5: defaultTypography.headline4?.apply(color: Colors.white),
-      headline6: const TextStyle(fontSize: 20.0, fontWeight: FontWeight.bold),
-      bodyText1: const TextStyle(fontSize: 15.0, fontWeight: FontWeight.normal),
-      bodyText2: const TextStyle(fontSize: 15.0, color: Color(0xFFC6C4C4)),
+      headlineMedium: defaultTypography.headlineMedium?.apply(color: Colors.white),
+      headlineSmall: defaultTypography.headlineMedium?.apply(color: Colors.white),
+      titleLarge: const TextStyle(fontSize: 20.0, fontWeight: FontWeight.bold),
+      bodyLarge: const TextStyle(fontSize: 15.0, fontWeight: FontWeight.normal),
+      bodyMedium: const TextStyle(fontSize: 15.0, color: Color(0xFFC6C4C4)),
     ),
     useMaterial3: true,
   );
@@ -66,6 +69,9 @@ ThemeData get darkTheme {
       selectionHandleColor: Colors.white,
       selectionColor: Color(0xFF505050),
     ),
+    dividerTheme: DividerThemeData(
+      color: Color(0xFF505050),
+    ),
     appBarTheme: AppBarTheme(systemOverlayStyle: SystemUiOverlayStyle.light, color: theme.colorScheme.primary),
     outlinedButtonTheme: OutlinedButtonThemeData(
       style: ButtonStyle(side: MaterialStatePropertyAll(BorderSide(color: primaryColor, width: 1))),
diff --git a/frontend/lib/widgets/app_bars.dart b/frontend/lib/widgets/app_bars.dart
index 0fe2b7733..503c7995d 100644
--- a/frontend/lib/widgets/app_bars.dart
+++ b/frontend/lib/widgets/app_bars.dart
@@ -75,10 +75,10 @@ class SearchSliverAppBar extends StatefulWidget {
   SearchSliverAppBar({super.key, required this.onChanged});
 
   @override
-  _SearchSliverAppBarState createState() => _SearchSliverAppBarState();
+  SearchSliverAppBarState createState() => SearchSliverAppBarState();
 }
 
-class _SearchSliverAppBarState extends State<SearchSliverAppBar> {
+class SearchSliverAppBarState extends State<SearchSliverAppBar> {
   final TextEditingController textEditingController = TextEditingController();
   final FocusNode focusNode = FocusNode();
 
diff --git a/frontend/pubs/df_build_config/pubspec.yaml b/frontend/pubs/df_build_config/pubspec.yaml
index 42e0a1922..5cc4788fa 100644
--- a/frontend/pubs/df_build_config/pubspec.yaml
+++ b/frontend/pubs/df_build_config/pubspec.yaml
@@ -9,4 +9,4 @@ dependencies:
   build: ^2.0.0
   test: '>=1.0.0'
   logging: ^1.0.2
-  lint: ^1.7.2
+  lint: ^2.0.1
diff --git a/frontend/pubs/df_protobuf/pubspec.yaml b/frontend/pubs/df_protobuf/pubspec.yaml
index 8ddec22ac..175dce978 100644
--- a/frontend/pubs/df_protobuf/pubspec.yaml
+++ b/frontend/pubs/df_protobuf/pubspec.yaml
@@ -9,4 +9,4 @@ dependencies:
   path: ^1.8.2
   build: ^2.0.0
   test: '>=1.0.0'
-  lint: ^1.7.2
+  lint: ^2.0.1
diff --git a/frontend/pubspec.lock b/frontend/pubspec.lock
index 777c5dd64..f06b33c15 100644
--- a/frontend/pubspec.lock
+++ b/frontend/pubspec.lock
@@ -5,231 +5,232 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      url: "https://pub.dartlang.org"
+      sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8"
+      url: "https://pub.dev"
     source: hosted
     version: "47.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      url: "https://pub.dartlang.org"
+      sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80"
+      url: "https://pub.dev"
     source: hosted
     version: "4.7.0"
   archive:
     dependency: transitive
     description:
       name: archive
-      url: "https://pub.dartlang.org"
+      sha256: d6347d54a2d8028e0437e3c099f66fdb8ae02c4720c1e7534c9f24c10351f85d
+      url: "https://pub.dev"
     source: hosted
     version: "3.3.6"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.dartlang.org"
+      sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.0"
   artemis:
     dependency: "direct dev"
     description:
       name: artemis
-      url: "https://pub.dartlang.org"
+      sha256: "78aa34a18cd4cea00f0f83649bdaa2fe2d9c42dc0d5bdf667562f61be703f8c8"
+      url: "https://pub.dev"
     source: hosted
-    version: "7.9.0-beta"
+    version: "7.11.0-beta.1"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      url: "https://pub.dev"
     source: hosted
-    version: "2.9.0"
+    version: "2.10.0"
   base32:
     dependency: "direct main"
     description:
       name: base32
-      url: "https://pub.dartlang.org"
+      sha256: ddad4ebfedf93d4500818ed8e61443b734ffe7cf8a45c668c9b34ef6adde02e2
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.3"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   build:
     dependency: transitive
     description:
       name: build
-      url: "https://pub.dartlang.org"
+      sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      url: "https://pub.dartlang.org"
+      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      url: "https://pub.dartlang.org"
+      sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.1"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
-      url: "https://pub.dartlang.org"
+      sha256: "687cf90a3951affac1bd5f9ecb5e3e90b60487f3d9cdc359bb310f8876bb02a6"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.9"
+    version: "2.0.10"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      url: "https://pub.dartlang.org"
+      sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727
+      url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.3"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      url: "https://pub.dartlang.org"
+      sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292"
+      url: "https://pub.dev"
     source: hosted
-    version: "7.2.3"
+    version: "7.2.7"
   built_collection:
     dependency: transitive
     description:
       name: built_collection
-      url: "https://pub.dartlang.org"
+      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
+      url: "https://pub.dev"
     source: hosted
     version: "5.1.1"
   built_value:
     dependency: transitive
     description:
       name: built_value
-      url: "https://pub.dartlang.org"
+      sha256: "31b7c748fd4b9adf8d25d72a4c4a59ef119f12876cf414f94f8af5131d5fa2b0"
+      url: "https://pub.dev"
     source: hosted
-    version: "8.4.1"
+    version: "8.4.4"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      url: "https://pub.dartlang.org"
+      sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
   code_builder:
     dependency: transitive
     description:
       name: code_builder
-      url: "https://pub.dartlang.org"
+      sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.2.0"
+    version: "4.4.0"
   collection:
     dependency: "direct main"
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
   connectivity_plus:
     dependency: transitive
     description:
       name: connectivity_plus
-      url: "https://pub.dartlang.org"
+      sha256: "8875e8ed511a49f030e313656154e4bbbcef18d68dfd32eb853fac10bce48e96"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.3.6+1"
-  connectivity_plus_linux:
-    dependency: transitive
-    description:
-      name: connectivity_plus_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
-  connectivity_plus_macos:
-    dependency: transitive
-    description:
-      name: connectivity_plus_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.4"
+    version: "3.0.3"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
       name: connectivity_plus_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
-  connectivity_plus_web:
-    dependency: transitive
-    description:
-      name: connectivity_plus_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.3"
-  connectivity_plus_windows:
-    dependency: transitive
-    description:
-      name: connectivity_plus_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.2"
+    version: "1.2.4"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.dartlang.org"
+      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.1.1"
   coverage:
     dependency: transitive
     description:
       name: coverage
-      url: "https://pub.dartlang.org"
+      sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "1.6.3"
   crypto:
     dependency: "direct main"
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
+      url: "https://pub.dev"
     source: hosted
     version: "3.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.5"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      url: "https://pub.dartlang.org"
+      sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.2.4"
   dbus:
     dependency: transitive
     description:
       name: dbus
-      url: "https://pub.dartlang.org"
+      sha256: "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263"
+      url: "https://pub.dev"
     source: hosted
     version: "0.7.8"
   df_build_config:
@@ -246,48 +247,46 @@ packages:
       relative: true
     source: path
     version: "0.0.1"
-  effective_dart:
-    dependency: "direct dev"
-    description:
-      name: effective_dart
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.2"
   equatable:
     dependency: "direct main"
     description:
       name: equatable
-      url: "https://pub.dartlang.org"
+      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.5"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.dartlang.org"
+      sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.dartlang.org"
+      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      url: "https://pub.dev"
     source: hosted
     version: "6.1.4"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      url: "https://pub.dartlang.org"
+      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -297,9 +296,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_hooks
-      url: "https://pub.dartlang.org"
+      sha256: "6a126f703b89499818d73305e4ce1e3de33b4ae1c5512e3b8eab4b986f46774c"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.18.5+1"
+    version: "0.18.6"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -309,51 +309,58 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_secure_storage
-      url: "https://pub.dartlang.org"
+      sha256: "98352186ee7ad3639ccc77ad7924b773ff6883076ab952437d20f18a61f0a7c5"
+      url: "https://pub.dev"
     source: hosted
-    version: "6.0.0"
+    version: "8.0.0"
   flutter_secure_storage_linux:
     dependency: transitive
     description:
       name: flutter_secure_storage_linux
-      url: "https://pub.dartlang.org"
+      sha256: "0912ae29a572230ad52d8a4697e5518d7f0f429052fd51df7e5a7952c7efe2a3"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.3"
   flutter_secure_storage_macos:
     dependency: transitive
     description:
       name: flutter_secure_storage_macos
-      url: "https://pub.dartlang.org"
+      sha256: "083add01847fc1c80a07a08e1ed6927e9acd9618a35e330239d4422cd2a58c50"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "3.0.0"
   flutter_secure_storage_platform_interface:
     dependency: transitive
     description:
       name: flutter_secure_storage_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: b3773190e385a3c8a382007893d678ae95462b3c2279e987b55d140d3b0cb81b
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
   flutter_secure_storage_web:
     dependency: transitive
     description:
       name: flutter_secure_storage_web
-      url: "https://pub.dartlang.org"
+      sha256: "42938e70d4b872e856e678c423cc0e9065d7d294f45bc41fc1981a4eb4beaffe"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.1"
   flutter_secure_storage_windows:
     dependency: transitive
     description:
       name: flutter_secure_storage_windows
-      url: "https://pub.dartlang.org"
+      sha256: fc2910ec9b28d60598216c29ea763b3a96c401f0ce1d13cdf69ccb0e5c93c3ee
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "2.0.0"
   flutter_svg:
     dependency: "direct main"
     description:
       name: flutter_svg
-      url: "https://pub.dartlang.org"
+      sha256: "97c5b291b4fd34ae4f55d6a4c05841d4d0ed94952e033c5a6529e1b47b4d2a29"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.4"
+    version: "2.0.2"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -368,239 +375,280 @@ packages:
     dependency: transitive
     description:
       name: frontend_server_client
-      url: "https://pub.dartlang.org"
+      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "3.2.0"
   geolocator:
     dependency: "direct main"
     description:
       name: geolocator
-      url: "https://pub.dartlang.org"
+      sha256: "5c23f3613f50586c0bbb2b8f970240ae66b3bd992088cf60dd5ee2e6f7dde3a8"
+      url: "https://pub.dev"
     source: hosted
-    version: "9.0.1"
+    version: "9.0.2"
   geolocator_android:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: geolocator_android
-      url: "https://pub.dartlang.org"
+      sha256: fe90565c3a8789dc3b433d8f95cdb18343f9bde298a419d978337ba1ae1037d3
+      url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "4.1.4"
   geolocator_apple:
     dependency: transitive
     description:
       name: geolocator_apple
-      url: "https://pub.dartlang.org"
+      sha256: "22b60ca3b8c0f58e6a9688ff855ee39ab813ca3f0c0609a48d282f6631266f2e"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.5"
   geolocator_platform_interface:
     dependency: transitive
     description:
       name: geolocator_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: af4d69231452f9620718588f41acc4cb58312368716bfff2e92e770b46ce6386
+      url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "4.0.7"
   geolocator_web:
     dependency: transitive
     description:
       name: geolocator_web
-      url: "https://pub.dartlang.org"
+      sha256: f68a122da48fcfff68bbc9846bb0b74ef651afe84a1b1f6ec20939de4d6860e1
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.6"
   geolocator_windows:
     dependency: transitive
     description:
       name: geolocator_windows
-      url: "https://pub.dartlang.org"
+      sha256: f5911c88e23f48b598dd506c7c19eff0e001645bdc03bb6fecb9f4549208354d
+      url: "https://pub.dev"
     source: hosted
     version: "0.1.1"
   glob:
     dependency: transitive
     description:
       name: glob
-      url: "https://pub.dartlang.org"
+      sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   gql:
     dependency: "direct dev"
     description:
       name: gql
-      url: "https://pub.dartlang.org"
+      sha256: "5cf96b136f36524515588af477ae819d785a7f346c6a6a8e203a40099b43b0ba"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.13.2-alpha+1659715356091"
+    version: "0.14.1-alpha+1677441264268"
   gql_code_builder:
     dependency: transitive
     description:
       name: gql_code_builder
-      url: "https://pub.dartlang.org"
+      sha256: "27fd7dee009cea2bc982cacc461f66cc03e08ebf71cf8b0c78028cf280107ce7"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.5.2-alpha+1659715356193"
+    version: "0.6.0"
   gql_dedupe_link:
     dependency: transitive
     description:
       name: gql_dedupe_link
-      url: "https://pub.dartlang.org"
+      sha256: "024aa836258fdc67a25ae4547c3bafbea10c4948f925c6d6d6fd77c8e8dcbfb1"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.3-alpha+1659715356233"
+    version: "2.0.3"
   gql_error_link:
     dependency: transitive
     description:
       name: gql_error_link
-      url: "https://pub.dartlang.org"
+      sha256: a80b1f5f858798bc3ede38910e4c262d99755bffccb55d146c364bfeb8fa8350
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.2"
+    version: "0.2.3"
   gql_exec:
     dependency: transitive
     description:
       name: gql_exec
-      url: "https://pub.dartlang.org"
+      sha256: "983b702593eba382a5c518d30678b86798bf20fbf1b03affb8b10a418439160e"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.1-alpha+1659715356108"
+    version: "0.4.1"
   gql_http_link:
     dependency: transitive
     description:
       name: gql_http_link
-      url: "https://pub.dartlang.org"
+      sha256: "101232d7fd5a3524974c05d26bb3c247a3d35c5b4a8806a361accf841a8e942e"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.3-alpha+1659715356170"
+    version: "0.4.4+1"
   gql_link:
     dependency: transitive
     description:
       name: gql_link
-      url: "https://pub.dartlang.org"
+      sha256: "50c36e7462530361859e6a34bb84885b3091a1906846494295c5ea947019d854"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.3-alpha+1659715356132"
+    version: "0.5.1-alpha+1660256327632"
   gql_transform_link:
     dependency: transitive
     description:
       name: gql_transform_link
-      url: "https://pub.dartlang.org"
+      sha256: b532c777b5d1d7147d4ae5cc27fcd57bfcddb47a09e102c7b4a2e98fcc162737
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.2"
+    version: "0.2.3-alpha+1660256327655"
   graphql:
     dependency: transitive
     description:
       name: graphql
-      url: "https://pub.dartlang.org"
+      sha256: b061201579040e9548cec2bae17bbdea0ab30666cb4e7ba48b9675f14d982199
+      url: "https://pub.dev"
     source: hosted
-    version: "5.1.1"
+    version: "5.1.3"
   graphql_flutter:
     dependency: "direct main"
     description:
       name: graphql_flutter
-      url: "https://pub.dartlang.org"
+      sha256: "06059ac9e8417c71582f05e28a59b1416d43959d34a6a0d9565341e3a362e117"
+      url: "https://pub.dev"
     source: hosted
-    version: "5.1.0"
+    version: "5.1.2"
   graphs:
     dependency: transitive
     description:
       name: graphs
-      url: "https://pub.dartlang.org"
+      sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   hive:
     dependency: transitive
     description:
       name: hive
-      url: "https://pub.dartlang.org"
+      sha256: "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.3"
   http:
     dependency: "direct main"
     description:
       name: http
-      url: "https://pub.dartlang.org"
+      sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
+      url: "https://pub.dev"
     source: hosted
     version: "0.13.5"
   http_multi_server:
     dependency: transitive
     description:
       name: http_multi_server
-      url: "https://pub.dartlang.org"
+      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+      url: "https://pub.dev"
     source: hosted
     version: "3.2.1"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.dartlang.org"
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   image:
     dependency: transitive
     description:
       name: image
-      url: "https://pub.dartlang.org"
+      sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6"
+      url: "https://pub.dev"
     source: hosted
     version: "3.3.0"
   infinite_scroll_pagination:
     dependency: "direct main"
     description:
       name: infinite_scroll_pagination
-      url: "https://pub.dartlang.org"
+      sha256: "9517328f4e373f08f57dbb11c5aac5b05554142024d6b60c903f3b73476d52db"
+      url: "https://pub.dev"
     source: hosted
     version: "3.2.0"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      url: "https://pub.dartlang.org"
+      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      url: "https://pub.dev"
     source: hosted
     version: "0.17.0"
   intro_slider:
     dependency: "direct main"
     description:
       name: intro_slider
-      url: "https://pub.dartlang.org"
+      sha256: c6b3e830b01859446ea008a32d753d302d19805fdf1f775fb857a1e3590aead9
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.10"
+    version: "4.2.0"
   io:
     dependency: transitive
     description:
       name: io
-      url: "https://pub.dartlang.org"
+      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.dartlang.org"
+      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.6.4"
+    version: "0.6.5"
   json_annotation:
     dependency: "direct dev"
     description:
       name: json_annotation
-      url: "https://pub.dartlang.org"
+      sha256: "3520fa844009431b5d4491a5a778603520cdc399ab3406332dcc50f93547258c"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.6.0"
+    version: "4.7.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
-      url: "https://pub.dartlang.org"
+      sha256: f3c2c18a7889580f71926f30c1937727c8c7d4f3a435f8f5e8b0ddd25253ef5d
+      url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.5.4"
   lint:
     dependency: "direct dev"
     description:
       name: lint
-      url: "https://pub.dartlang.org"
+      sha256: "3e9343b1cededcfb1e8b40d0dbd3592b7a1c6c0121545663a991433390c2bc97"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "2.0.1"
+  lints:
+    dependency: "direct dev"
+    description:
+      name: lints
+      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   logging:
     dependency: transitive
     description:
       name: logging
-      url: "https://pub.dartlang.org"
+      sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.1"
   maplibre_gl:
     dependency: "direct main"
     description:
       path: "."
-      ref: c723434d635068157311eb47c26df3e0554ff894
-      resolved-ref: c723434d635068157311eb47c26df3e0554ff894
+      ref: f35709343e03439746857a9fbbd23dbb9bbafafc
+      resolved-ref: f35709343e03439746857a9fbbd23dbb9bbafafc
       url: "https://github.com/m0nac0/flutter-maplibre-gl.git"
     source: git
     version: "0.16.0"
@@ -618,7 +666,7 @@ packages:
     description:
       path: maplibre_gl_platform_interface
       ref: main
-      resolved-ref: c723434d635068157311eb47c26df3e0554ff894
+      resolved-ref: f35709343e03439746857a9fbbd23dbb9bbafafc
       url: "https://github.com/m0nac0/flutter-maplibre-gl.git"
     source: git
     version: "0.16.0"
@@ -627,7 +675,7 @@ packages:
     description:
       path: maplibre_gl_web
       ref: main
-      resolved-ref: "7e6b575001b5d9ab5a976cd8753501db415502e2"
+      resolved-ref: f35709343e03439746857a9fbbd23dbb9bbafafc
       url: "https://github.com/m0nac0/flutter-maplibre-gl.git"
     source: git
     version: "0.16.0"
@@ -635,422 +683,419 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.12"
+    version: "0.12.13"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      url: "https://pub.dev"
     source: hosted
-    version: "0.1.5"
+    version: "0.2.0"
   meta:
     dependency: "direct main"
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      url: "https://pub.dev"
     source: hosted
     version: "1.8.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      url: "https://pub.dartlang.org"
+      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.4"
   mobile_scanner:
     dependency: "direct main"
     description:
-      name: mobile_scanner
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
+      path: "."
+      ref: "3a4f39ccebb99673f63b95560e5abc1710ba4096"
+      resolved-ref: "3a4f39ccebb99673f63b95560e5abc1710ba4096"
+      url: "https://github.com/michael-markl/mobile_scanner.git"
+    source: git
+    version: "3.0.0"
   nested:
     dependency: transitive
     description:
       name: nested
-      url: "https://pub.dartlang.org"
+      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   nm:
     dependency: transitive
     description:
       name: nm
-      url: "https://pub.dartlang.org"
+      sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254"
+      url: "https://pub.dev"
     source: hosted
     version: "0.5.0"
   node_preamble:
     dependency: transitive
     description:
       name: node_preamble
-      url: "https://pub.dartlang.org"
+      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   normalize:
     dependency: transitive
     description:
       name: normalize
-      url: "https://pub.dartlang.org"
+      sha256: baf8caf2d8b745af5737cca6c24f7fe3cf3158897fdbcde9a909b9c8d3e2e5af
+      url: "https://pub.dev"
     source: hosted
-    version: "0.6.0+1"
+    version: "0.7.2"
   otp:
     dependency: "direct main"
     description:
       name: otp
-      url: "https://pub.dartlang.org"
+      sha256: "337fddb07d10df56dc57f3f8a3e1a7e7abe7463cd85e4efc567c4d2bc94d4ed6"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.3"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      url: "https://pub.dartlang.org"
+      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
   package_info_plus:
     dependency: "direct main"
     description:
       name: package_info_plus
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.4.3+1"
-  package_info_plus_linux:
-    dependency: transitive
-    description:
-      name: package_info_plus_linux
-      url: "https://pub.dartlang.org"
+      sha256: "8df5ab0a481d7dc20c0e63809e90a588e496d276ba53358afc4c4443d0a00697"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
-  package_info_plus_macos:
-    dependency: transitive
-    description:
-      name: package_info_plus_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.0"
+    version: "3.0.3"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.2"
-  package_info_plus_web:
-    dependency: transitive
-    description:
-      name: package_info_plus_web
-      url: "https://pub.dartlang.org"
+      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
-  package_info_plus_windows:
-    dependency: transitive
-    description:
-      name: package_info_plus_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      url: "https://pub.dev"
     source: hosted
     version: "1.8.2"
-  path_drawing:
-    dependency: transitive
-    description:
-      name: path_drawing
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.1"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
-      url: "https://pub.dartlang.org"
+      sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
-      url: "https://pub.dartlang.org"
+      sha256: "04890b994ee89bfa80bf3080bfec40d5a92c5c7a785ebb02c13084a099d2b6f9"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.11"
+    version: "2.0.13"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      url: "https://pub.dartlang.org"
+      sha256: "7623b7d4be0f0f7d9a8b5ee6879fc13e4522d4c875ab86801dee4af32b54b83e"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.20"
-  path_provider_ios:
+    version: "2.0.23"
+  path_provider_foundation:
     dependency: transitive
     description:
-      name: path_provider_ios
-      url: "https://pub.dartlang.org"
+      name: path_provider_foundation
+      sha256: eec003594f19fe2456ea965ae36b3fc967bc5005f508890aafe31fa75e41d972
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.11"
+    version: "2.1.2"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.7"
-  path_provider_macos:
-    dependency: transitive
-    description:
-      name: path_provider_macos
-      url: "https://pub.dartlang.org"
+      sha256: "525ad5e07622d19447ad740b1ed5070031f7a5437f44355ae915ff56e986429a"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.6"
+    version: "2.1.9"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.6"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      url: "https://pub.dartlang.org"
+      sha256: "642ddf65fde5404f83267e8459ddb4556316d3ee6d511ed193357e25caa3632d"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   permission_handler:
     dependency: "direct main"
     description:
       name: permission_handler
-      url: "https://pub.dartlang.org"
+      sha256: "33c6a1253d1f95fd06fa74b65b7ba907ae9811f9d5c1d3150e51417d04b8d6a8"
+      url: "https://pub.dev"
     source: hosted
     version: "10.2.0"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      url: "https://pub.dartlang.org"
+      sha256: "8028362b40c4a45298f1cbfccd227c8dd6caf0e27088a69f2ba2ab15464159e2"
+      url: "https://pub.dev"
     source: hosted
     version: "10.2.0"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
-      url: "https://pub.dartlang.org"
+      sha256: "9c370ef6a18b1c4b2f7f35944d644a56aa23576f23abee654cf73968de93f163"
+      url: "https://pub.dev"
     source: hosted
     version: "9.0.7"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "68abbc472002b5e6dfce47fe9898c6b7d8328d58b5d2524f75e277c07a97eb84"
+      url: "https://pub.dev"
     source: hosted
     version: "3.9.0"
   permission_handler_windows:
     dependency: transitive
     description:
       name: permission_handler_windows
-      url: "https://pub.dartlang.org"
+      sha256: f67cab14b4328574938ecea2db3475dad7af7ead6afab6338772c5f88963e38b
+      url: "https://pub.dev"
     source: hosted
     version: "0.1.2"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      url: "https://pub.dartlang.org"
+      sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4"
+      url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "5.1.0"
   pigment:
     dependency: transitive
     description:
       name: pigment
-      url: "https://pub.dartlang.org"
+      sha256: b8c56059e21ecb9379a304c78a4f20e399d41e54384a7f64de21103b4b5c38dd
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.dartlang.org"
+      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   pointycastle:
     dependency: transitive
     description:
       name: pointycastle
-      url: "https://pub.dartlang.org"
+      sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346
+      url: "https://pub.dev"
     source: hosted
     version: "3.6.2"
   pool:
     dependency: transitive
     description:
       name: pool
-      url: "https://pub.dartlang.org"
+      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
   process:
     dependency: transitive
     description:
       name: process
-      url: "https://pub.dartlang.org"
+      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
+      url: "https://pub.dev"
     source: hosted
     version: "4.2.4"
   protobuf:
     dependency: "direct main"
     description:
       name: protobuf
-      url: "https://pub.dartlang.org"
+      sha256: "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
   provider:
     dependency: "direct main"
     description:
       name: provider
-      url: "https://pub.dartlang.org"
+      sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f
+      url: "https://pub.dev"
     source: hosted
-    version: "6.0.3"
+    version: "6.0.5"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      url: "https://pub.dartlang.org"
+      sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.3"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      url: "https://pub.dartlang.org"
+      sha256: "75f6614d6dde2dc68948dffbaa4fe5dae32cd700eb9fb763fe11dfb45a3c4d0a"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
   qr:
     dependency: transitive
     description:
       name: qr
-      url: "https://pub.dartlang.org"
+      sha256: "5c4208b4dc0d55c3184d10d83ee0ded6212dc2b5e2ba17c5a0c0aab279128d21"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
   qr_flutter:
     dependency: "direct main"
     description:
       name: qr_flutter
-      url: "https://pub.dartlang.org"
+      sha256: c5c121c54cb6dd837b9b9d57eb7bc7ec6df4aee741032060c8833a678c80b87e
+      url: "https://pub.dev"
     source: hosted
     version: "4.0.0"
-  quiver:
-    dependency: transitive
-    description:
-      name: quiver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.1.0"
   recase:
     dependency: transitive
     description:
       name: recase
-      url: "https://pub.dartlang.org"
+      sha256: e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213
+      url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.1.0"
   rxdart:
     dependency: transitive
     description:
       name: rxdart
-      url: "https://pub.dartlang.org"
+      sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.27.5"
+    version: "0.27.7"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      url: "https://pub.dartlang.org"
+      sha256: ee6257848f822b8481691f20c3e6d2bfee2e9eccb2a3d249907fcfb198c55b41
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.15"
+    version: "2.0.18"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      url: "https://pub.dartlang.org"
+      sha256: a51a4f9375097f94df1c6e0a49c0374440d31ab026b59d58a7e7660675879db4
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.12"
-  shared_preferences_ios:
+    version: "2.0.16"
+  shared_preferences_foundation:
     dependency: transitive
     description:
-      name: shared_preferences_ios
-      url: "https://pub.dartlang.org"
+      name: shared_preferences_foundation
+      sha256: "6b84fdf06b32bb336f972d373cd38b63734f3461ba56ac2ba01b56d052796259"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.4"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.1"
-  shared_preferences_macos:
-    dependency: transitive
-    description:
-      name: shared_preferences_macos
-      url: "https://pub.dartlang.org"
+      sha256: d7fb71e6e20cd3dfffcc823a28da3539b392e53ed5fc5c2b90b55fdaa8a7e8fa
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.1.4"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "824bfd02713e37603b2bdade0842e47d56e7db32b1dcdd1cae533fb88e2913fc"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      url: "https://pub.dartlang.org"
+      sha256: "6737b757e49ba93de2a233df229d0b6a87728cea1684da828cbc718b65dcf9d7"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.5"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      url: "https://pub.dartlang.org"
+      sha256: bd014168e8484837c39ef21065b78f305810ceabc1d4f90be6e3b392ce81b46d
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.4"
   shelf:
     dependency: transitive
     description:
       name: shelf
-      url: "https://pub.dartlang.org"
+      sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   shelf_packages_handler:
     dependency: transitive
     description:
       name: shelf_packages_handler
-      url: "https://pub.dartlang.org"
+      sha256: aef74dc9195746a384843102142ab65b6a4735bb3beea791e63527b88cc83306
+      url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
   shelf_static:
     dependency: transitive
     description:
       name: shelf_static
-      url: "https://pub.dartlang.org"
+      sha256: e792b76b96a36d4a41b819da593aff4bdd413576b3ba6150df5d8d9996d2e74c
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      url: "https://pub.dartlang.org"
+      sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -1060,254 +1105,314 @@ packages:
     dependency: transitive
     description:
       name: sliver_tools
-      url: "https://pub.dartlang.org"
+      sha256: bfa69411ebb203cc1a115b1e8bc7935b893eb381fdcf8d453b40c0d4e1db3247
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.8"
+    version: "0.2.9"
   source_gen:
     dependency: transitive
     description:
       name: source_gen
-      url: "https://pub.dartlang.org"
+      sha256: "2d79738b6bbf38a43920e2b8d189e9a3ce6cc201f4b8fc76be5e4fe377b1c38d"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.2.6"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      url: "https://pub.dartlang.org"
+      sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   source_map_stack_trace:
     dependency: transitive
     description:
       name: source_map_stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   source_maps:
     dependency: transitive
     description:
       name: source_maps
-      url: "https://pub.dartlang.org"
+      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.10.10"
+    version: "0.10.12"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
-      url: "https://pub.dartlang.org"
+      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
   test:
     dependency: "direct dev"
     description:
       name: test
-      url: "https://pub.dartlang.org"
+      sha256: a5fcd2d25eeadbb6589e80198a47d6a464ba3e2049da473943b8af9797900c2d
+      url: "https://pub.dev"
     source: hosted
-    version: "1.21.4"
+    version: "1.22.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.12"
+    version: "0.4.16"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      url: "https://pub.dartlang.org"
+      sha256: "0ef9755ec6d746951ba0aabe62f874b707690b5ede0fecc818b138fcc9b14888"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.16"
+    version: "0.4.20"
   timing:
     dependency: transitive
     description:
       name: timing
-      url: "https://pub.dartlang.org"
+      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
   tinycolor2:
     dependency: "direct main"
     description:
       name: tinycolor2
-      url: "https://pub.dartlang.org"
+      sha256: "81850c32ac8d4dcff37299bf3e52bcad4f4db6bc73d4b06727c9922de3766390"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "3.0.1"
   tuple:
     dependency: "direct main"
     description:
       name: tuple
-      url: "https://pub.dartlang.org"
+      sha256: "0ea99cd2f9352b2586583ab2ce6489d1f95a5f6de6fb9492faaf97ae2060f0aa"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
   url_launcher:
     dependency: "direct main"
     description:
       name: url_launcher
-      url: "https://pub.dartlang.org"
+      sha256: "75f2846facd11168d007529d6cd8fcb2b750186bea046af9711f10b907e1587e"
+      url: "https://pub.dev"
     source: hosted
-    version: "6.1.6"
+    version: "6.1.10"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      url: "https://pub.dartlang.org"
+      sha256: "1f4d9ebe86f333c15d318f81dcdc08b01d45da44af74552608455ebdc08d9732"
+      url: "https://pub.dev"
     source: hosted
-    version: "6.0.17"
+    version: "6.0.24"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      url: "https://pub.dartlang.org"
+      sha256: c9cd648d2f7ab56968e049d4e9116f96a85517f1dd806b96a86ea1018a3a82e5
+      url: "https://pub.dev"
     source: hosted
-    version: "6.0.17"
+    version: "6.1.1"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      url: "https://pub.dartlang.org"
+      sha256: e29039160ab3730e42f3d811dc2a6d5f2864b90a70fb765ea60144b03307f682
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.3"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      url: "https://pub.dartlang.org"
+      sha256: "2dddb3291a57b074dade66b5e07e64401dd2487caefd4e9e2f467138d8c7eb06"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.3"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "6c9ca697a5ae218ce56cece69d46128169a58aa8653c1b01d26fcd4aad8c4370"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      url: "https://pub.dartlang.org"
+      sha256: "574cfbe2390666003c3a1d129bdc4574aaa6728f0c00a4829a81c316de69dd9b"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.13"
+    version: "2.0.15"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
-      url: "https://pub.dartlang.org"
+      sha256: "97c9067950a0d09cbd93e2e3f0383d1403989362b97102fbf446473a48079a4b"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.4"
   uuid:
     dependency: transitive
     description:
       name: uuid
-      url: "https://pub.dartlang.org"
+      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.7"
+  vector_graphics:
+    dependency: transitive
+    description:
+      name: vector_graphics
+      sha256: "254348b40251c995cf8301ac715486c8cfa0a93b7fdc4dbd495a30f04db1fb44"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  vector_graphics_codec:
+    dependency: transitive
+    description:
+      name: vector_graphics_codec
+      sha256: "143c290b762646c696c63be5d976bde7379ea892cb6868ddc5a17cbc56e71411"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  vector_graphics_compiler:
+    dependency: transitive
+    description:
+      name: vector_graphics_compiler
+      sha256: "3190cc26d9ebda686bafb9721bb6a74c6d358700f4fc978a0f2cba6912daff86"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.6"
+    version: "1.1.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   vm_service:
     dependency: transitive
     description:
       name: vm_service
-      url: "https://pub.dartlang.org"
+      sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7
+      url: "https://pub.dev"
     source: hosted
-    version: "9.3.0"
+    version: "9.4.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      url: "https://pub.dartlang.org"
+      sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      url: "https://pub.dartlang.org"
+      sha256: "3a969ddcc204a3e34e863d204b29c0752716f78b6f9cc8235083208d268a4ccd"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
   webkit_inspection_protocol:
     dependency: transitive
     description:
       name: webkit_inspection_protocol
-      url: "https://pub.dartlang.org"
+      sha256: "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.dartlang.org"
+      sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46
+      url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
+    version: "3.1.3"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      url: "https://pub.dartlang.org"
+      sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.0+2"
+    version: "1.0.0"
   xml:
     dependency: transitive
     description:
       name: xml
-      url: "https://pub.dartlang.org"
+      sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5"
+      url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "6.2.2"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      url: "https://pub.dartlang.org"
+      sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.18.0 <3.0.0"
-  flutter: ">=3.3.0"
+  dart: ">=2.19.0 <3.0.0"
+  flutter: ">=3.7.6"
diff --git a/frontend/pubspec.yaml b/frontend/pubspec.yaml
index ae383194f..216fb0fd0 100644
--- a/frontend/pubspec.yaml
+++ b/frontend/pubspec.yaml
@@ -19,7 +19,7 @@ version: 3.0.5+106
 
 environment:
   sdk: '>=2.18.0 <3.0.0'
-  flutter: 3.3.0
+  flutter: 3.7.6
 
 dependencies:
   flutter:
@@ -30,37 +30,43 @@ dependencies:
   maplibre_gl:
     git:
       url: https://github.com/m0nac0/flutter-maplibre-gl.git
-      ref: c723434d635068157311eb47c26df3e0554ff894
+      ref: f35709343e03439746857a9fbbd23dbb9bbafafc
   provider: ^6.0.3
-  graphql_flutter: ^5.1.0
+  graphql_flutter: ^5.1.2
   url_launcher: ^6.1.6
-  flutter_svg: ^1.1.4
+  flutter_svg: ^2.0.2
   permission_handler: ^10.2.0
-  package_info_plus: ^1.4.3+1 # for about dialog
-  mobile_scanner: ^2.1.0
-  flutter_secure_storage: ^6.0.0
+  package_info_plus: ^3.0.3 # for about dialog
+  mobile_scanner:
+    # Can be reverted to ^3.0.1 once https://github.com/juliansteenbakker/mobile_scanner/pull/529 is deployed
+    git:
+      url: https://github.com/michael-markl/mobile_scanner.git
+      ref: 3a4f39ccebb99673f63b95560e5abc1710ba4096
+  flutter_secure_storage: ^8.0.0
   infinite_scroll_pagination: ^3.2.0
-  geolocator: ^9.0.1
+  geolocator: ^9.0.2
+  # The following is necessary until we can use Google Play Location Services v21 (which does not work with maplibre yet)
+  geolocator_android: <4.1.6
   protobuf: ^2.1.0
   base32: ^2.1.3
   qr_flutter: ^4.0.0
-  otp: ^3.1.1
+  otp: ^3.1.3
   crypto: ^3.0.2
-  intro_slider: ^3.0.10
-  shared_preferences: ^2.0.15
-  tinycolor2: ^2.1.0
+  intro_slider: ^4.2.0
+  shared_preferences: ^2.0.18
+  tinycolor2: ^3.0.1
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.5
-  collection: ^1.16.0
+  collection: ^1.17.0
   meta: ^1.8.0
   http: ^0.13.5
   equatable: ^2.0.5
-  tuple: ^2.0.0
+  tuple: ^2.0.1
 
 dev_dependencies:
-  build_runner: ^2.2.0
+  build_runner: ^2.3.3
   df_protobuf:
     path: ./pubs/df_protobuf
   df_build_config:
@@ -68,14 +74,15 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   json_serializable: ^6.3.1
-  effective_dart: ^1.3.2
+  lints: ^2.0.1
   test: '>=1.0.0'
 
   # graphQL type generation
   artemis: '>=6.0.0' # only if you're using ArtemisClient!
-  json_annotation: ^4.6.0
+  json_annotation: ^4.7.0
   gql: '>=0.12.3 <1.0.0'
-  lint: ^1.7.2
+  lint: ^2.0.1
+
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

From 0ec217e6cc26b93a2e2e169160805e5b88653e3b Mon Sep 17 00:00:00 2001
From: Michael Markl <marklmichael98@gmail.com>
Date: Sat, 4 Mar 2023 15:09:37 +0100
Subject: [PATCH 2/5] Use fix for iOS

---
 frontend/pubspec.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/pubspec.yaml b/frontend/pubspec.yaml
index 216fb0fd0..d315d5d3d 100644
--- a/frontend/pubspec.yaml
+++ b/frontend/pubspec.yaml
@@ -38,10 +38,10 @@ dependencies:
   permission_handler: ^10.2.0
   package_info_plus: ^3.0.3 # for about dialog
   mobile_scanner:
-    # Can be reverted to ^3.0.1 once https://github.com/juliansteenbakker/mobile_scanner/pull/529 is deployed
+    # Can be reverted to ^3.0.1 once https://github.com/juliansteenbakker/mobile_scanner/pull/529 and 527 are deployed
     git:
       url: https://github.com/michael-markl/mobile_scanner.git
-      ref: 3a4f39ccebb99673f63b95560e5abc1710ba4096
+      ref: 4bdbbc3d5613bc3055611a1cc06ba0eb88a2e485
   flutter_secure_storage: ^8.0.0
   infinite_scroll_pagination: ^3.2.0
   geolocator: ^9.0.2

From df730af36d4e3e2e7836182f6e3f0344bcbe51aa Mon Sep 17 00:00:00 2001
From: Michael Markl <marklmichael98@gmail.com>
Date: Sat, 4 Mar 2023 15:33:11 +0100
Subject: [PATCH 3/5] Make intro screen stateless

---
 frontend/lib/intro_slides/intro_screen.dart | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/frontend/lib/intro_slides/intro_screen.dart b/frontend/lib/intro_slides/intro_screen.dart
index 673a06917..144491fee 100644
--- a/frontend/lib/intro_slides/intro_screen.dart
+++ b/frontend/lib/intro_slides/intro_screen.dart
@@ -6,21 +6,13 @@ import 'package:intro_slider/intro_slider.dart';
 
 typedef OnFinishedCallback = void Function();
 
-class IntroScreen extends StatefulWidget {
+class IntroScreen extends StatelessWidget {
   final OnFinishedCallback? onFinishedCallback;
 
   const IntroScreen({super.key, this.onFinishedCallback});
 
-  @override
-  IntroScreenState createState() => IntroScreenState();
-}
-
-class IntroScreenState extends State<IntroScreen> {
-  void onDonePress() {
-    final onFinishedCallback = widget.onFinishedCallback;
-    if (onFinishedCallback != null) {
-      onFinishedCallback();
-    }
+  void onDonePress(BuildContext context) {
+    onFinishedCallback?.call();
     Navigator.of(context).pushReplacementNamed(homeRouteName);
   }
 
@@ -28,7 +20,7 @@ class IntroScreenState extends State<IntroScreen> {
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     return IntroSlider(
-      onDonePress: onDonePress,
+      onDonePress: () => onDonePress(context),
       renderDoneBtn: const Text("Fertig"),
       renderNextBtn: const Text("Weiter"),
       renderPrevBtn: const Text("Zurück"),

From 63d696dc1a64ace01aeed76505e3858dafcbf4b9 Mon Sep 17 00:00:00 2001
From: Sarah Sporck <sarah.sporck@tuerantuer.org>
Date: Mon, 6 Mar 2023 09:42:02 +0100
Subject: [PATCH 4/5] install pods

---
 frontend/ios/Podfile.lock | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/frontend/ios/Podfile.lock b/frontend/ios/Podfile.lock
index 87e62d941..198619851 100644
--- a/frontend/ios/Podfile.lock
+++ b/frontend/ios/Podfile.lock
@@ -3,7 +3,7 @@ PODS:
     - Flutter
     - ReachabilitySwift
   - Flutter (1.0.0)
-  - flutter_secure_storage (3.3.1):
+  - flutter_secure_storage (6.0.0):
     - Flutter
   - geolocator_apple (1.2.0):
     - Flutter
@@ -64,7 +64,7 @@ PODS:
     - MLImage (= 1.0.0-beta3)
     - MLKitCommon (~> 8.0)
     - Protobuf (~> 3.12)
-  - mobile_scanner (0.0.1):
+  - mobile_scanner (3.0.0):
     - Flutter
     - GoogleMLKit/BarcodeScanning (~> 3.2.0)
   - nanopb (2.30909.0):
@@ -74,15 +74,17 @@ PODS:
   - nanopb/encode (2.30909.0)
   - package_info_plus (0.4.5):
     - Flutter
-  - path_provider_ios (0.0.1):
+  - path_provider_foundation (0.0.1):
     - Flutter
+    - FlutterMacOS
   - permission_handler_apple (9.0.4):
     - Flutter
   - PromisesObjC (2.1.1)
   - Protobuf (3.21.12)
   - ReachabilitySwift (5.0.0)
-  - shared_preferences_ios (0.0.1):
+  - shared_preferences_foundation (0.0.1):
     - Flutter
+    - FlutterMacOS
   - url_launcher_ios (0.0.1):
     - Flutter
 
@@ -96,9 +98,9 @@ DEPENDENCIES:
   - MapLibreAnnotationExtension
   - mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
-  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
-  - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
 SPEC REPOS:
@@ -136,19 +138,19 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/mobile_scanner/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
-  path_provider_ios:
-    :path: ".symlinks/plugins/path_provider_ios/ios"
+  path_provider_foundation:
+    :path: ".symlinks/plugins/path_provider_foundation/ios"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
-  shared_preferences_ios:
-    :path: ".symlinks/plugins/shared_preferences_ios/ios"
+  shared_preferences_foundation:
+    :path: ".symlinks/plugins/shared_preferences_foundation/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
   connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
+  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
   GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f
   GoogleMLKit: 0017a6a8372e1a182139b9def4d89be5d87ca5a7
@@ -163,16 +165,16 @@ SPEC CHECKSUMS:
   MLKitBarcodeScanning: d92fe1911001ec36870162c5a0eb206f612b7169
   MLKitCommon: f6da6c5659618c070b50a80db01248ebe2964175
   MLKitVision: 96c96571190b7f63eddf4a12068ce8a8689e0d2c
-  mobile_scanner: 0cf06f3d5224576aa24ade02a6f73d8b2551c7bf
+  mobile_scanner: 004f7ad2fe4e2b5a3e6ed0bc4b83ca9c5b5dd975
   nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
+  path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
   permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
   PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
   Protobuf: 120350fc38646e2dedc26f49ecba778184ea1de2
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
-  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
+  shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
+  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
 
 PODFILE CHECKSUM: 9e624ef9ea1950d5ac2524cf89093b7a29070f86
 

From 4bc86346e1daa08dd477d4a93ede96eeb7d222e7 Mon Sep 17 00:00:00 2001
From: Michael Markl <marklmichael98@gmail.com>
Date: Tue, 7 Mar 2023 17:27:42 +0100
Subject: [PATCH 5/5] Update pubspec.lock

---
 frontend/pubspec.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/pubspec.lock b/frontend/pubspec.lock
index f06b33c15..7c8821cda 100644
--- a/frontend/pubspec.lock
+++ b/frontend/pubspec.lock
@@ -715,8 +715,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "3a4f39ccebb99673f63b95560e5abc1710ba4096"
-      resolved-ref: "3a4f39ccebb99673f63b95560e5abc1710ba4096"
+      ref: "4bdbbc3d5613bc3055611a1cc06ba0eb88a2e485"
+      resolved-ref: "4bdbbc3d5613bc3055611a1cc06ba0eb88a2e485"
       url: "https://github.com/michael-markl/mobile_scanner.git"
     source: git
     version: "3.0.0"