Student Life Tab with Student Clubs, Movies and News

assets/translations/de.json

@@ -221,5 +221,9 @@
   "personNotFoundRecovery": "Überprüfe, ob du den Namen richtig eingegeben hast!",
   "invalidSearchRecovery": "Ein Suchbegriff mit weniger als 4 Zeichen darf keine Wildcards oder Sonderzeichen enthalten!",
   "tumOnlineDegraded": "TUMonline Services sind derzeit beeinträchtigt!",
-  "tumOnlineMaintenance": "TUMonline Services werden derzeit gewartet!"
+  "tumOnlineMaintenance": "TUMonline Services werden derzeit gewartet!",
+  "campus": "Campus",
+  "studies": "Studium",
+  "suggested": "Interessante {}",
+  "all": "Alle"
 }

assets/translations/en.json

@@ -221,5 +221,9 @@
   "personNotFoundRecovery": "Make sure you entered the name correctly!",
   "invalidSearchRecovery": "A search string with less than 4 characters must not contain wildcards or special characters!",
   "tumOnlineDegraded": "TUMonline Services are currently degraded!",
-  "tumOnlineMaintenance": "TUMonline Services are currently under maintenance!"
+  "tumOnlineMaintenance": "TUMonline Services are currently under maintenance!",
+  "campus": "Campus",
+  "studies": "Studies",
+  "suggested": "Suggested {}",
+  "all": "All"
 }

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

ios/Podfile.lock

@@ -9,14 +9,14 @@ PODS:
   - Firebase/RemoteConfig (11.0.0):
     - Firebase/CoreOnly
     - FirebaseRemoteConfig (~> 11.0.0)
-  - firebase_core (3.4.1):
+  - firebase_core (3.5.0):
     - Firebase/CoreOnly (= 11.0.0)
     - Flutter
-  - firebase_crashlytics (4.1.1):
+  - firebase_crashlytics (4.1.2):
     - Firebase/Crashlytics (= 11.0.0)
     - firebase_core
     - Flutter
-  - firebase_remote_config (5.1.1):
+  - firebase_remote_config (5.1.2):
     - Firebase/RemoteConfig (= 11.0.0)
     - firebase_core
     - Flutter
@@ -235,9 +235,9 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
   Firebase: 9f574c08c2396885b5e7e100ed4293d956218af9
-  firebase_core: ba84e940cf5cbbc601095f86556560937419195c
-  firebase_crashlytics: 4111f8198b78c99471c955af488cecd8224967e6
-  firebase_remote_config: fd0d891a89fde724371e60300cf054a085664cba
+  firebase_core: 2ec6b789859c7c24766344ec71fdf78639402d56
+  firebase_crashlytics: 60630a0f91ee432275fa1660fd8593079761448a
+  firebase_remote_config: e9540adfc076899bf326f934a9dc722dd7795310
   FirebaseABTesting: 2104d957ce33888a3d6f3bde298cdee376dde8f1
   FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383
   FirebaseCoreExtension: cda74ddfb001224bd8fd1d6e74698b4ed07803de

lib/base/enums/campus.dart

@@ -1,5 +1,5 @@
-import 'package:campus_flutter/base/classes/location.dart';
-import 'package:campus_flutter/departuresComponent/model/station.dart';
+import 'package:campus_flutter/homeComponent/model/station.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
 
 enum Campus {
   stammgelaende("Stammgelände"),
@@ -59,42 +59,42 @@ extension CampusExtension on Campus {
     }
   }
 
-  Location get location {
+  LatLng get location {
     switch (this) {
       case Campus.stammgelaende:
-        return Location(
-          latitude: 48.14887567648079,
-          longitude: 11.568029074814328,
+        return const LatLng(
+          48.14887567648079,
+          11.568029074814328,
         );
       case Campus.olympiapark:
-        return Location(
-          latitude: 48.17957305879896,
-          longitude: 11.546601863009668,
+        return const LatLng(
+          48.17957305879896,
+          11.546601863009668,
         );
       case Campus.klinikumRechts:
-        return Location(
-          latitude: 48.13760759635786,
-          longitude: 11.60083902677729,
+        return const LatLng(
+          48.13760759635786,
+          11.60083902677729,
         );
       case Campus.grosshadern:
-        return Location(
-          latitude: 48.1116433849602,
-          longitude: 11.47027262422505,
+        return const LatLng(
+          48.1116433849602,
+          11.47027262422505,
         );
       case Campus.garching:
-        return Location(
-          latitude: 48.26513710129958,
-          longitude: 11.671590834492283,
+        return const LatLng(
+          48.26513710129958,
+          11.671590834492283,
         );
       case Campus.freising:
-        return Location(
-          latitude: 48.39549985559942,
-          longitude: 11.727904526510946,
+        return const LatLng(
+          48.39549985559942,
+          11.727904526510946,
         );
     }
   }
 
-  Map<Campus, Location> getAll() {
+  Map<Campus, LatLng> getAll() {
     return Map.fromEntries(Campus.values.map((e) => MapEntry(e, e.location)));
   }
 
@@ -104,54 +104,54 @@ extension CampusExtension on Campus {
         return Station(
           name: "Technische Universität",
           apiName: "91000095",
-          location: Location(
-            latitude: 48.148145129847244,
-            longitude: 11.566048520744298,
+          location: const LatLng(
+            48.148145129847244,
+            11.566048520744298,
           ),
         );
       case Campus.olympiapark:
         return Station(
           name: "Olympiazentrum",
           apiName: "91000350",
-          location: Location(
-            latitude: 48.17946648767361,
-            longitude: 11.555783595899824,
+          location: const LatLng(
+            48.17946648767361,
+            11.555783595899824,
           ),
         );
       case Campus.klinikumRechts:
         return Station(
           name: "Max-Weber-Platz",
           apiName: "91000580",
-          location: Location(
-            latitude: 48.13573243097588,
-            longitude: 11.599014647301777,
+          location: const LatLng(
+            48.13573243097588,
+            11.599014647301777,
           ),
         );
       case Campus.grosshadern:
         return Station(
           name: "Klinikum Großhadern",
           apiName: "91001540",
-          location: Location(
-            latitude: 48.10889880944028,
-            longitude: 11.47363212095666,
+          location: const LatLng(
+            48.10889880944028,
+            11.47363212095666,
           ),
         );
       case Campus.garching:
         return Station(
           name: "Forschungszentrum",
           apiName: "1000460",
-          location: Location(
-            latitude: 48.26519145730091,
-            longitude: 11.671545161597082,
+          location: const LatLng(
+            48.26519145730091,
+            11.671545161597082,
           ),
         );
       case Campus.freising:
         return Station(
           name: "Freising, Weihenstephan",
           apiName: "1002911",
-          location: Location(
-            latitude: 48.39799498961109,
-            longitude: 11.723989661968458,
+          location: const LatLng(
+            48.39799498961109,
+            11.723989661968458,
           ),
         );
     }
@@ -165,17 +165,17 @@ extension CampusExtension on Campus {
           Station(
             name: "Theresienstraße",
             apiName: "91000120",
-            location: Location(
-              latitude: 48.1512235719802,
-              longitude: 11.564211669898931,
+            location: const LatLng(
+              48.1512235719802,
+              11.564211669898931,
             ),
           ),
           Station(
             name: "Pinakotheken",
             apiName: "91000051",
-            location: Location(
-              latitude: 48.148780089472,
-              longitude: 11.571870970398924,
+            location: const LatLng(
+              48.148780089472,
+              11.571870970398924,
             ),
           ),
         ];
@@ -187,9 +187,9 @@ extension CampusExtension on Campus {
           Station(
             name: "Friedensengel/Villa Stuck",
             apiName: "91000073",
-            location: Location(
-              latitude: 48.14074544433942,
-              longitude: 11.600075277341709,
+            location: const LatLng(
+              48.14074544433942,
+              11.600075277341709,
             ),
           ),
         ];
@@ -199,17 +199,17 @@ extension CampusExtension on Campus {
           Station(
             name: "Klinikum Großhadern Ost",
             apiName: "91001472",
-            location: Location(
-              latitude: 48.11092668280441,
-              longitude: 11.473909030506093,
+            location: const LatLng(
+              48.11092668280441,
+              11.473909030506093,
             ),
           ),
           Station(
             name: "Klinikum Großhadern Nord",
             apiName: "91001474",
-            location: Location(
-              latitude: 48.11250562334001,
-              longitude: 11.467122898318992,
+            location: const LatLng(
+              48.11250562334001,
+              11.467122898318992,
             ),
           ),
         ];
@@ -219,9 +219,9 @@ extension CampusExtension on Campus {
           Station(
             name: "Lichtenbergstraße",
             apiName: "1002070",
-            location: Location(
-              latitude: 48.26777168760462,
-              longitude: 11.665502685140389,
+            location: const LatLng(
+              48.26777168760462,
+              11.665502685140389,
             ),
           ),
         ];
@@ -231,17 +231,17 @@ extension CampusExtension on Campus {
           Station(
             name: "Freising, Forstzentrum",
             apiName: "1009413",
-            location: Location(
-              latitude: 48.39924842116169,
-              longitude: 11.716601891310122,
+            location: const LatLng(
+              48.39924842116169,
+              11.716601891310122,
             ),
           ),
           Station(
             name: "Freising, Weihenstephaner Berg",
             apiName: "1002617",
-            location: Location(
-              latitude: 48.39581877364193,
-              longitude: 11.725859432987532,
+            location: const LatLng(
+              48.39581877364193,
+              11.725859432987532,
             ),
           ),
         ];

lib/base/enums/device.dart

@@ -0,0 +1,5 @@
+enum Device {
+  phone,
+  portraitTablet,
+  landscapeTablet;
+}

lib/base/enums/home_widget.dart

@@ -13,10 +13,15 @@ class HomeScreenWidget {
     return "${WidgetType.values.indexOf(widgetType)};${enabled.toString()}";
   }
 
-  factory HomeScreenWidget.fromString(String data) {
+  static HomeScreenWidget? fromString(String data) {
     final dataPoints = data.split(";");
-    final widgetType = WidgetType.values[int.parse(dataPoints[0])];
-    final enabled = dataPoints[1] == "true" ? true : false;
-    return HomeScreenWidget(widgetType: widgetType, enabled: enabled);
+    final index = int.parse(dataPoints[0]);
+    if (index < WidgetType.values.length) {
+      final widgetType = WidgetType.values[int.parse(dataPoints[0])];
+      final enabled = dataPoints[1] == "true" ? true : false;
+      return HomeScreenWidget(widgetType: widgetType, enabled: enabled);
+    } else {
+      return null;
+    }
   }
 }

lib/base/enums/search_category.dart

@@ -11,7 +11,8 @@ enum SearchCategory {
   personalLectures,
   grade,
   movie,
-  news;
+  news,
+  studentClub;
 }
 
 extension SearchCategoryExtension on SearchCategory {
@@ -44,6 +45,8 @@ extension SearchCategoryExtension on SearchCategory {
         return context.tr("persons");
       case SearchCategory.rooms:
         return context.tr("rooms");
+      case SearchCategory.studentClub:
+        return "Student Clubs";
       default:
         return context.tr("unknown");
     }
@@ -56,6 +59,7 @@ extension SearchCategoryExtension on SearchCategory {
       SearchCategory.cafeterias,
       SearchCategory.movie,
       SearchCategory.news,
+      SearchCategory.studentClub,
     ];
   }
 }