Merge remote-tracking branch 'origin/main' into migrate-to-3.38

Author: jakobkoerber

.github/workflows/deploy_beta.yml

@@ -20,16 +20,16 @@ jobs:
       - name: Install Bundle
         run: cd ./${{ matrix.platform }} && bundle install
 
-      - name: Setup Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-
       - if: matrix.platform == 'android'
         uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
-          java-version: '17'
+          java-version: '21'
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
 
       - name: Install Flutter Packages
         run: |

.github/workflows/lint_test_build.yml

@@ -37,7 +37,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
-          java-version: '17'
+          java-version: '21'
 
       - name: Build iOS
         run: flutter build ipa --no-codesign

.gitignore

@@ -50,3 +50,6 @@ ios/Runner.app.dSYM.zip
 ios/Runner.ipa
 ios/fastlane/report.xml
 ios/fastlane/README.md
+
+#Android Studio Miscellaneous
+bugreport-*.zip

android/app/build.gradle.kts

@@ -13,16 +13,16 @@ plugins {
 android {
     namespace = "de.tum.in.tumcampus"
     compileSdk = 36
-    ndkVersion = "27.0.12077973"
+    ndkVersion = "28.1.13356709"
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     kotlin {
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_1_8)
+            jvmTarget.set(JvmTarget.JVM_21)
         }
     }
 

assets/images/map/locate.webp

@@ -74,18 +74,9 @@ PODS:
   - geolocator_apple (1.2.0):
     - Flutter
     - FlutterMacOS
-  - Google-Maps-iOS-Utils (6.1.0):
-    - GoogleMaps (~> 9.0)
-  - google_maps_flutter_ios (0.0.1):
-    - Flutter
-    - Google-Maps-iOS-Utils (< 7.0, >= 5.0)
-    - GoogleMaps (< 11.0, >= 8.4)
   - GoogleDataTransport (10.1.0):
     - nanopb (~> 3.30910.0)
     - PromisesObjC (~> 2.4)
-  - GoogleMaps (9.4.0):
-    - GoogleMaps/Maps (= 9.4.0)
-  - GoogleMaps/Maps (9.4.0)
   - GoogleUtilities/Environment (8.1.0):
     - GoogleUtilities/Privacy
   - GoogleUtilities/Logger (8.1.0):
@@ -101,6 +92,10 @@ PODS:
     - Flutter
   - map_launcher (0.0.1):
     - Flutter
+  - MapLibre (6.19.1)
+  - maplibre_gl (0.25.0):
+    - Flutter
+    - MapLibre (= 6.19.1)
   - nanopb (3.30910.0):
     - nanopb/decode (= 3.30910.0)
     - nanopb/encode (= 3.30910.0)
@@ -165,9 +160,9 @@ DEPENDENCIES:
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - flutter_secure_storage_darwin (from `.symlinks/plugins/flutter_secure_storage_darwin/darwin`)
   - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
-  - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
   - home_widget (from `.symlinks/plugins/home_widget/ios`)
   - map_launcher (from `.symlinks/plugins/map_launcher/ios`)
+  - maplibre_gl (from `.symlinks/plugins/maplibre_gl/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
@@ -191,10 +186,9 @@ SPEC REPOS:
     - FirebaseRemoteConfigInterop
     - FirebaseSessions
     - FirebaseSharedSwift
-    - Google-Maps-iOS-Utils
     - GoogleDataTransport
-    - GoogleMaps
     - GoogleUtilities
+    - MapLibre
     - nanopb
     - PromisesObjC
     - PromisesSwift
@@ -219,12 +213,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_secure_storage_darwin/darwin"
   geolocator_apple:
     :path: ".symlinks/plugins/geolocator_apple/darwin"
-  google_maps_flutter_ios:
-    :path: ".symlinks/plugins/google_maps_flutter_ios/ios"
   home_widget:
     :path: ".symlinks/plugins/home_widget/ios"
   map_launcher:
     :path: ".symlinks/plugins/map_launcher/ios"
+  maplibre_gl:
+    :path: ".symlinks/plugins/maplibre_gl/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
@@ -265,13 +259,12 @@ SPEC CHECKSUMS:
   flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
   flutter_secure_storage_darwin: acdb3f316ed05a3e68f856e0353b133eec373a23
   geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
-  Google-Maps-iOS-Utils: 0a484b05ed21d88c9f9ebbacb007956edd508a96
-  google_maps_flutter_ios: 3213e1e5f5588b6134935cb8fc59acb4e6d88377
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
-  GoogleMaps: 0608099d4870cac8754bdba9b6953db543432438
   GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
-  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
+  home_widget: 54b4f6b36ed8d64cfee594a476225c35c3e45091
   map_launcher: 8051ad5783913cafce93f2414c6858f2904fd8df
+  MapLibre: 7f24faba45439f80ccb0f83393c29fa32cb81952
+  maplibre_gl: a2114567cbd1065866614fbd34dfb75ab782aaa2
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880

assets/images/map/pin_blue.webp

@@ -1,14 +1,12 @@
 import UIKit
-import Flutter
-import GoogleMaps
+import Flutter  
 
 @main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-    GMSServices.provideAPIKey("AIzaSyAxUbnUMsXWVzeptXiLuNDMGpGEVFHLT4Y")
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }

assets/images/map/pin_red.webp

@@ -1,13 +1,14 @@
 import 'package:campus_flutter/homeComponent/model/station.dart';
-import 'package:google_maps_flutter/google_maps_flutter.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 enum Campus {
   stammgelaende("Stammgelände"),
   olympiapark("Campus Olympiapark"),
   klinikumRechts("Klinikum rechts der Isar"),
   grosshadern("Klinikum Großhadern"),
   garching("Garching Forschungszentrum"),
-  freising("Campus Freising");
+  freising("Campus Freising"),
+  ottobrunn("Campus Ottobrunn");
 
   final String name;
 
@@ -22,6 +23,7 @@ extension CampusExtension on Campus {
       Campus.olympiapark,
       Campus.klinikumRechts,
       Campus.freising,
+      Campus.ottobrunn,
     ];
   }
 
@@ -39,6 +41,8 @@ extension CampusExtension on Campus {
         return "Garching Forschungszentrum";
       case Campus.freising:
         return "Weihenstephan";
+      case Campus.ottobrunn:
+        return "Taufkirchen / Ottobrunn (Luftfahrt, Raumfahrt und Geodäsie)";
     }
   }
 
@@ -73,6 +77,8 @@ extension CampusExtension on Campus {
         return const LatLng(48.26513710129958, 11.671590834492283);
       case Campus.freising:
         return const LatLng(48.39549985559942, 11.727904526510946);
+      case Campus.ottobrunn:
+        return const LatLng(48.05465656040613, 11.653499097414645);
     }
   }
 
@@ -118,6 +124,12 @@ extension CampusExtension on Campus {
           apiName: "1002911",
           location: const LatLng(48.39799498961109, 11.723989661968458),
         );
+      case Campus.ottobrunn:
+        return Station(
+          name: "Taufkirchen, Lilienthalstr.",
+          apiName: "1002389",
+          location: const LatLng(48.05155653835728, 11.655056447685036),
+        );
     }
   }
 
@@ -185,6 +197,8 @@ extension CampusExtension on Campus {
             location: const LatLng(48.39581877364193, 11.725859432987532),
           ),
         ];
+      case Campus.ottobrunn:
+        return [defaultStation];
     }
   }
 }