Various Minor Bugfixes (#300)

TUM-Dev · Nov 30, 2024 · 4e6cbe2 · 4e6cbe2
1 parent ad5d21c
commit 4e6cbe2
Show file tree

Hide file tree

Showing 15 changed files with 78 additions and 67 deletions.
diff --git a/lib/calendarComponent/model/calendar_data_source.dart b/lib/calendarComponent/model/calendar_data_source.dart
@@ -34,7 +34,8 @@ class MeetingDataSource extends CalendarDataSource {
   @override
   String getSubject(int index) {
     final calendarEvent = cast<CalendarEvent>(appointments![index])!;
-    return "${calendarEvent.title}\n${calendarEvent.location ?? ""}";
+    final location = calendarEvent.locations.firstOrNull ?? "";
+    return "${calendarEvent.title}\n$location";
   }
 
   @override

diff --git a/lib/calendarComponent/model/calendar_event.dart b/lib/calendarComponent/model/calendar_event.dart
@@ -1,4 +1,5 @@
 import 'package:campus_flutter/base/theme/constants.dart';
+import 'package:campus_flutter/base/util/read_list_value.dart';
 import 'package:campus_flutter/searchComponent/model/comparison_token.dart';
 import 'package:campus_flutter/searchComponent/protocols/searchable.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -19,7 +20,8 @@ class CalendarEvent extends Searchable {
   final DateTime startDate;
   @JsonKey(name: "dtend")
   final DateTime endDate;
-  final String? location;
+  @JsonKey(readValue: readListValue)
+  final List<String> locations;
 
   int? color;
   bool? isVisible;
@@ -84,7 +86,8 @@ class CalendarEvent extends Searchable {
   @JsonKey(includeFromJson: false, includeToJson: false)
   List<ComparisonToken> get comparisonTokens => [
         if (title != null) ComparisonToken(value: title!),
-        if (location != null) ComparisonToken(value: location!),
+        if (locations.isNotEmpty)
+          for (var location in locations) ComparisonToken(value: location),
       ];
 
   CalendarEvent({
@@ -95,7 +98,7 @@ class CalendarEvent extends Searchable {
     this.description,
     required this.startDate,
     required this.endDate,
-    this.location,
+    required this.locations,
     this.color,
   });
 

diff --git a/lib/calendarComponent/model/calendar_event.g.dart b/lib/calendarComponent/model/calendar_event.g.dart
diff --git a/lib/calendarComponent/viewModels/calendar_addition_viewmodel.dart b/lib/calendarComponent/viewModels/calendar_addition_viewmodel.dart
@@ -143,6 +143,7 @@ class CalendarAdditionViewModel {
               title: titleController.text,
               startDate: from.value,
               endDate: to.value,
+              locations: [],
             ),
           );
     }

diff --git a/lib/calendarComponent/views/event_creation_view.dart b/lib/calendarComponent/views/event_creation_view.dart
@@ -106,8 +106,8 @@ class EventCreationView extends ConsumerWidget {
                       .read(calendarAdditionViewModel(calendarEvent))
                       .saveEvent()
                       .then((value) {
-                    ref.invalidate(calendarAdditionViewModel);
                     if (context.mounted) {
+                      ref.invalidate(calendarAdditionViewModel);
                       context.canPop() ? context.pop() : context.go(calendar);
                     }
                   })

diff --git a/lib/calendarComponent/views/homeWidget/calendar_widget_event_view.dart b/lib/calendarComponent/views/homeWidget/calendar_widget_event_view.dart
@@ -77,7 +77,8 @@ class CalendarHomeWidgetEventView extends ConsumerWidget {
                     style: Theme.of(context).textTheme.labelSmall,
                   ),
                   Text(
-                    calendarEvent.location ?? context.tr("unknown"),
+                    calendarEvent.locations.firstOrNull ??
+                        context.tr("unknown"),
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
                     style: Theme.of(context).textTheme.labelSmall,

diff --git a/lib/homeComponent/view/contactCard/contact_card_view.dart b/lib/homeComponent/view/contactCard/contact_card_view.dart
@@ -113,7 +113,7 @@ class _ContactCardViewState extends ConsumerState<ContactCardView> {
   }
 
   ImageProvider<Object> imageData(AsyncSnapshot<List<StudentCard>?> snapshot) {
-    if (snapshot.hasData) {
+    if (snapshot.hasData && snapshot.data!.isNotEmpty) {
       return Image.memory(
         base64DecodeImageData(snapshot.data!.first.image),
       ).image;

diff --git a/lib/personComponent/views/person_details_view.dart b/lib/personComponent/views/person_details_view.dart
@@ -194,10 +194,7 @@ class _PersonDetailsViewState extends ConsumerState<PersonDetailsView> {
               ),
               onTap: () => context.push(
                 roomSearch,
-                extra: (
-                  personDetails.rooms.first.id,
-                  null,
-                ),
+                extra: personDetails.rooms.first.id,
               ),
             ),
             ListTile(

diff --git a/lib/placesComponent/views/homeWidget/cafeteria_widget_view.dart b/lib/placesComponent/views/homeWidget/cafeteria_widget_view.dart
@@ -56,19 +56,22 @@ class _CafeteriaWidgetViewState extends ConsumerState<CafeteriaWidgetView> {
                   Icons.filter_list,
                   color: context.primaryColor,
                 ),
-                onTap: () => showModalBottomSheet(
-                  builder: (context) => PreferenceSelectionView<Cafeteria>(
-                    data: ref
-                        .read(cafeteriasViewModel)
-                        .getCafeteriaEntries(context),
-                    entry: context.tr("cafeteria"),
-                  ),
-                  context: context,
-                  useRootNavigator: true,
-                  isScrollControlled: true,
-                  useSafeArea: true,
-                  showDragHandle: true,
-                ),
+                onTap: () => context.mounted
+                    ? showModalBottomSheet(
+                        builder: (context) =>
+                            PreferenceSelectionView<Cafeteria>(
+                          data: ref
+                              .read(cafeteriasViewModel)
+                              .getCafeteriaEntries(context),
+                          entry: context.tr("cafeteria"),
+                        ),
+                        context: context,
+                        useRootNavigator: true,
+                        isScrollControlled: true,
+                        useSafeArea: true,
+                        showDragHandle: true,
+                      )
+                    : null,
               ),
             ],
           ),

diff --git a/lib/searchComponent/views/resultViews/calendar_search_result_view.dart b/lib/searchComponent/views/resultViews/calendar_search_result_view.dart
@@ -37,7 +37,8 @@ class CalendarSearchResultView extends ConsumerWidget {
             ),
             IconText(
               iconData: Icons.location_pin,
-              label: calendarEvent.location ?? context.tr("unknown"),
+              label:
+                  calendarEvent.locations.firstOrNull ?? context.tr("unknown"),
               style: Theme.of(context).textTheme.bodySmall?.copyWith(
                     color: Theme.of(context).colorScheme.secondary,
                   ),

diff --git a/lib/settingsComponent/views/settings_view.dart b/lib/settingsComponent/views/settings_view.dart
@@ -81,7 +81,9 @@ class SettingsView extends ConsumerWidget {
 
   Widget _resetPreferencesButton(BuildContext context, WidgetRef ref) {
     return ListTile(
-      onTap: () => ref.read(onboardingViewModel).resetPreferences(ref),
+      onTap: () => context.mounted
+          ? ref.read(onboardingViewModel).resetPreferences(ref)
+          : null,
       dense: true,
       title: Text(
         context.tr("resetPreferences"),

diff --git a/lib/studiesComponent/view/lectureDetail/basic_lecture_info_view.dart b/lib/studiesComponent/view/lectureDetail/basic_lecture_info_view.dart
@@ -54,7 +54,7 @@ class BasicLectureInfoView extends ConsumerWidget {
               ),
             ),
           ),
-        if (lecture?.speaker == null)
+        if (lecture?.speaker == null && lectureDetails.speaker != null)
           BasicLectureInfoRowView(
             information: Speaker.getSpeakerName(lectureDetails.speaker!),
             iconData: Icons.person,

diff --git a/lib/studiesComponent/view/lectureDetail/lecture_meeting_info_view.dart b/lib/studiesComponent/view/lectureDetail/lecture_meeting_info_view.dart
@@ -24,13 +24,13 @@ class LectureMeetingInfoView extends ConsumerWidget {
           iconData: Icons.hourglass_top,
         ),
         BasicLectureInfoRowView(
-          information:
-              ref.read(viewModel).event!.location ?? context.tr("unknown"),
+          information: ref.read(viewModel).event!.locations.firstOrNull ??
+              context.tr("unknown"),
           iconData: Icons.location_on,
           trailingWidget: IconButton(
             onPressed: () => context.push(
               roomSearch,
-              extra: ref.read(viewModel).event!.location,
+              extra: ref.read(viewModel).event!.locations.firstOrNull,
             ),
             icon: Icon(
               Icons.search,