Skip to content

Commit b1fb13e

Browse files
jakobkoerberjakobkoerber
authored
Student Life Tab with Student Clubs, Movies and News (#266)
1 parent 14dec55 commit b1fb13e

File tree

179 files changed

+1912
-982
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+1912
-982
lines changed

‎assets/images/placeholders/movie_placeholder.png

6.63 KB
Loading

‎assets/images/placeholders/news_placeholder.png

-5.24 KB
Loading

‎assets/images/placeholders/student_club_placeholder.png

9.39 KB
Loading

‎assets/translations/de.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,5 +221,9 @@
221221
"personNotFoundRecovery": "Überprüfe, ob du den Namen richtig eingegeben hast!",
222222
"invalidSearchRecovery": "Ein Suchbegriff mit weniger als 4 Zeichen darf keine Wildcards oder Sonderzeichen enthalten!",
223223
"tumOnlineDegraded": "TUMonline Services sind derzeit beeinträchtigt!",
224-
"tumOnlineMaintenance": "TUMonline Services werden derzeit gewartet!"
224+
"tumOnlineMaintenance": "TUMonline Services werden derzeit gewartet!",
225+
"campus": "Campus",
226+
"studies": "Studium",
227+
"suggested": "Interessante {}",
228+
"all": "Alle"
225229
}

‎assets/translations/en.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,5 +221,9 @@
221221
"personNotFoundRecovery": "Make sure you entered the name correctly!",
222222
"invalidSearchRecovery": "A search string with less than 4 characters must not contain wildcards or special characters!",
223223
"tumOnlineDegraded": "TUMonline Services are currently degraded!",
224-
"tumOnlineMaintenance": "TUMonline Services are currently under maintenance!"
224+
"tumOnlineMaintenance": "TUMonline Services are currently under maintenance!",
225+
"campus": "Campus",
226+
"studies": "Studies",
227+
"suggested": "Suggested {}",
228+
"all": "All"
225229
}

‎devtools_options.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
description: This file stores settings for Dart & Flutter DevTools.
2+
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
3+
extensions:

‎ios/Podfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ PODS:
99
- Firebase/RemoteConfig (11.0.0):
1010
- Firebase/CoreOnly
1111
- FirebaseRemoteConfig (~> 11.0.0)
12-
- firebase_core (3.4.1):
12+
- firebase_core (3.5.0):
1313
- Firebase/CoreOnly (= 11.0.0)
1414
- Flutter
15-
- firebase_crashlytics (4.1.1):
15+
- firebase_crashlytics (4.1.2):
1616
- Firebase/Crashlytics (= 11.0.0)
1717
- firebase_core
1818
- Flutter
19-
- firebase_remote_config (5.1.1):
19+
- firebase_remote_config (5.1.2):
2020
- Firebase/RemoteConfig (= 11.0.0)
2121
- firebase_core
2222
- Flutter
@@ -235,9 +235,9 @@ EXTERNAL SOURCES:
235235
SPEC CHECKSUMS:
236236
device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
237237
Firebase: 9f574c08c2396885b5e7e100ed4293d956218af9
238-
firebase_core: ba84e940cf5cbbc601095f86556560937419195c
239-
firebase_crashlytics: 4111f8198b78c99471c955af488cecd8224967e6
240-
firebase_remote_config: fd0d891a89fde724371e60300cf054a085664cba
238+
firebase_core: 2ec6b789859c7c24766344ec71fdf78639402d56
239+
firebase_crashlytics: 60630a0f91ee432275fa1660fd8593079761448a
240+
firebase_remote_config: e9540adfc076899bf326f934a9dc722dd7795310
241241
FirebaseABTesting: 2104d957ce33888a3d6f3bde298cdee376dde8f1
242242
FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383
243243
FirebaseCoreExtension: cda74ddfb001224bd8fd1d6e74698b4ed07803de

‎lib/base/classes/location.dart

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎lib/base/classes/location.g.dart

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎lib/base/enums/campus.dart

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:campus_flutter/base/classes/location.dart';
2-
import 'package:campus_flutter/departuresComponent/model/station.dart';
1+
import 'package:campus_flutter/homeComponent/model/station.dart';
2+
import 'package:google_maps_flutter/google_maps_flutter.dart';
33

44
enum Campus {
55
stammgelaende("Stammgelände"),
@@ -59,42 +59,42 @@ extension CampusExtension on Campus {
5959
}
6060
}
6161

62-
Location get location {
62+
LatLng get location {
6363
switch (this) {
6464
case Campus.stammgelaende:
65-
return Location(
66-
latitude: 48.14887567648079,
67-
longitude: 11.568029074814328,
65+
return const LatLng(
66+
48.14887567648079,
67+
11.568029074814328,
6868
);
6969
case Campus.olympiapark:
70-
return Location(
71-
latitude: 48.17957305879896,
72-
longitude: 11.546601863009668,
70+
return const LatLng(
71+
48.17957305879896,
72+
11.546601863009668,
7373
);
7474
case Campus.klinikumRechts:
75-
return Location(
76-
latitude: 48.13760759635786,
77-
longitude: 11.60083902677729,
75+
return const LatLng(
76+
48.13760759635786,
77+
11.60083902677729,
7878
);
7979
case Campus.grosshadern:
80-
return Location(
81-
latitude: 48.1116433849602,
82-
longitude: 11.47027262422505,
80+
return const LatLng(
81+
48.1116433849602,
82+
11.47027262422505,
8383
);
8484
case Campus.garching:
85-
return Location(
86-
latitude: 48.26513710129958,
87-
longitude: 11.671590834492283,
85+
return const LatLng(
86+
48.26513710129958,
87+
11.671590834492283,
8888
);
8989
case Campus.freising:
90-
return Location(
91-
latitude: 48.39549985559942,
92-
longitude: 11.727904526510946,
90+
return const LatLng(
91+
48.39549985559942,
92+
11.727904526510946,
9393
);
9494
}
9595
}
9696

97-
Map<Campus, Location> getAll() {
97+
Map<Campus, LatLng> getAll() {
9898
return Map.fromEntries(Campus.values.map((e) => MapEntry(e, e.location)));
9999
}
100100

@@ -104,54 +104,54 @@ extension CampusExtension on Campus {
104104
return Station(
105105
name: "Technische Universität",
106106
apiName: "91000095",
107-
location: Location(
108-
latitude: 48.148145129847244,
109-
longitude: 11.566048520744298,
107+
location: const LatLng(
108+
48.148145129847244,
109+
11.566048520744298,
110110
),
111111
);
112112
case Campus.olympiapark:
113113
return Station(
114114
name: "Olympiazentrum",
115115
apiName: "91000350",
116-
location: Location(
117-
latitude: 48.17946648767361,
118-
longitude: 11.555783595899824,
116+
location: const LatLng(
117+
48.17946648767361,
118+
11.555783595899824,
119119
),
120120
);
121121
case Campus.klinikumRechts:
122122
return Station(
123123
name: "Max-Weber-Platz",
124124
apiName: "91000580",
125-
location: Location(
126-
latitude: 48.13573243097588,
127-
longitude: 11.599014647301777,
125+
location: const LatLng(
126+
48.13573243097588,
127+
11.599014647301777,
128128
),
129129
);
130130
case Campus.grosshadern:
131131
return Station(
132132
name: "Klinikum Großhadern",
133133
apiName: "91001540",
134-
location: Location(
135-
latitude: 48.10889880944028,
136-
longitude: 11.47363212095666,
134+
location: const LatLng(
135+
48.10889880944028,
136+
11.47363212095666,
137137
),
138138
);
139139
case Campus.garching:
140140
return Station(
141141
name: "Forschungszentrum",
142142
apiName: "1000460",
143-
location: Location(
144-
latitude: 48.26519145730091,
145-
longitude: 11.671545161597082,
143+
location: const LatLng(
144+
48.26519145730091,
145+
11.671545161597082,
146146
),
147147
);
148148
case Campus.freising:
149149
return Station(
150150
name: "Freising, Weihenstephan",
151151
apiName: "1002911",
152-
location: Location(
153-
latitude: 48.39799498961109,
154-
longitude: 11.723989661968458,
152+
location: const LatLng(
153+
48.39799498961109,
154+
11.723989661968458,
155155
),
156156
);
157157
}
@@ -165,17 +165,17 @@ extension CampusExtension on Campus {
165165
Station(
166166
name: "Theresienstraße",
167167
apiName: "91000120",
168-
location: Location(
169-
latitude: 48.1512235719802,
170-
longitude: 11.564211669898931,
168+
location: const LatLng(
169+
48.1512235719802,
170+
11.564211669898931,
171171
),
172172
),
173173
Station(
174174
name: "Pinakotheken",
175175
apiName: "91000051",
176-
location: Location(
177-
latitude: 48.148780089472,
178-
longitude: 11.571870970398924,
176+
location: const LatLng(
177+
48.148780089472,
178+
11.571870970398924,
179179
),
180180
),
181181
];
@@ -187,9 +187,9 @@ extension CampusExtension on Campus {
187187
Station(
188188
name: "Friedensengel/Villa Stuck",
189189
apiName: "91000073",
190-
location: Location(
191-
latitude: 48.14074544433942,
192-
longitude: 11.600075277341709,
190+
location: const LatLng(
191+
48.14074544433942,
192+
11.600075277341709,
193193
),
194194
),
195195
];
@@ -199,17 +199,17 @@ extension CampusExtension on Campus {
199199
Station(
200200
name: "Klinikum Großhadern Ost",
201201
apiName: "91001472",
202-
location: Location(
203-
latitude: 48.11092668280441,
204-
longitude: 11.473909030506093,
202+
location: const LatLng(
203+
48.11092668280441,
204+
11.473909030506093,
205205
),
206206
),
207207
Station(
208208
name: "Klinikum Großhadern Nord",
209209
apiName: "91001474",
210-
location: Location(
211-
latitude: 48.11250562334001,
212-
longitude: 11.467122898318992,
210+
location: const LatLng(
211+
48.11250562334001,
212+
11.467122898318992,
213213
),
214214
),
215215
];
@@ -219,9 +219,9 @@ extension CampusExtension on Campus {
219219
Station(
220220
name: "Lichtenbergstraße",
221221
apiName: "1002070",
222-
location: Location(
223-
latitude: 48.26777168760462,
224-
longitude: 11.665502685140389,
222+
location: const LatLng(
223+
48.26777168760462,
224+
11.665502685140389,
225225
),
226226
),
227227
];
@@ -231,17 +231,17 @@ extension CampusExtension on Campus {
231231
Station(
232232
name: "Freising, Forstzentrum",
233233
apiName: "1009413",
234-
location: Location(
235-
latitude: 48.39924842116169,
236-
longitude: 11.716601891310122,
234+
location: const LatLng(
235+
48.39924842116169,
236+
11.716601891310122,
237237
),
238238
),
239239
Station(
240240
name: "Freising, Weihenstephaner Berg",
241241
apiName: "1002617",
242-
location: Location(
243-
latitude: 48.39581877364193,
244-
longitude: 11.725859432987532,
242+
location: const LatLng(
243+
48.39581877364193,
244+
11.725859432987532,
245245
),
246246
),
247247
];

0 commit comments

Comments
 (0)