Code Cleanup

TUM-Dev · Sep 9, 2024 · 28dc420 · 28dc420
1 parent 21689cd
commit 28dc420
Show file tree

Hide file tree

Showing 65 changed files with 278 additions and 323 deletions.
diff --git a/lib/base/classes/location.dart b/lib/base/classes/location.dart
diff --git a/lib/base/classes/location.g.dart b/lib/base/classes/location.g.dart
diff --git a/lib/base/enums/campus.dart b/lib/base/enums/campus.dart
@@ -1,5 +1,5 @@
-import 'package:campus_flutter/base/classes/location.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,
             ),
           ),
         ];

diff --git a/lib/base/errorHandling/campus_exception_router.dart b/lib/base/errorHandling/campus_exception_router.dart
diff --git a/lib/base/errorHandling/error_handling_router.dart b/lib/base/errorHandling/error_handling_router.dart
@@ -1,13 +1,11 @@
 import 'package:campus_flutter/base/enums/credentials.dart';
 import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
-import 'package:campus_flutter/base/errorHandling/campus_exception_router.dart';
 import 'package:campus_flutter/base/errorHandling/default_error_router.dart';
 import 'package:campus_flutter/base/errorHandling/dio_exception_router.dart';
 import 'package:campus_flutter/base/errorHandling/grpc_error_router.dart';
 import 'package:campus_flutter/base/errorHandling/search_exception_router.dart';
 import 'package:campus_flutter/base/errorHandling/tum_online_api_exception_router.dart';
 import 'package:campus_flutter/base/errorHandling/type_error_router.dart';
-import 'package:campus_flutter/base/extensions/campus_exception.dart';
 import 'package:campus_flutter/base/networking/apis/tumOnlineApi/tum_online_api_exception.dart';
 import 'package:campus_flutter/onboardingComponent/viewModels/onboarding_viewmodel.dart';
 import 'package:campus_flutter/searchComponent/model/search_exception.dart';
@@ -89,19 +87,6 @@ class ErrorHandlingRouter extends ConsumerWidget {
           titleColor: titleColor,
           bodyColor: bodyColor,
         );
-      case CampusException campusException:
-        recordFlutterError(
-          FlutterErrorDetails(
-            exception: campusException,
-          ),
-        );
-        return CampusExceptionRouter(
-          campusException: campusException,
-          errorHandlingViewType: errorHandlingViewType,
-          retry: retry,
-          titleColor: titleColor,
-          bodyColor: bodyColor,
-        );
       case TypeError typeError:
         recordFlutterError(
           FlutterErrorDetails(

diff --git a/lib/base/extensions/campus_exception.dart b/lib/base/extensions/campus_exception.dart
diff --git a/lib/base/routing/router.dart b/lib/base/routing/router.dart
@@ -19,7 +19,7 @@ import 'package:campus_flutter/onboardingComponent/views/login_view.dart';
 import 'package:campus_flutter/main.dart';
 import 'package:campus_flutter/navigation.dart';
 import 'package:campus_flutter/onboardingComponent/views/permission_check_view.dart';
-import 'package:campus_flutter/personDetailedComponent/views/person_details_view.dart';
+import 'package:campus_flutter/personComponent/views/person_details_view.dart';
 import 'package:campus_flutter/placesComponent/model/cafeterias/cafeteria.dart';
 import 'package:campus_flutter/placesComponent/model/studyRooms/study_room_group.dart';
 import 'package:campus_flutter/placesComponent/views/cafeterias/cafeteria_view.dart';

diff --git a/lib/base/views/color_picker_view.dart → lib/base/util/color_picker_view.dart b/lib/base/views/color_picker_view.dart → lib/base/util/color_picker_view.dart