Fix Calendar Decoding, Optimize Error Handling, Fix Movie Cards (#153)

TUM-Dev · Nov 1, 2023 · e577e6d · e577e6d
1 parent 0c8a609
commit e577e6d
Show file tree

Hide file tree

Showing 37 changed files with 146 additions and 45 deletions.
diff --git a/lib/base/enums/error_handling_view_type.dart b/lib/base/enums/error_handling_view_type.dart
@@ -0,0 +1,7 @@
+enum ErrorHandlingViewType {
+  fullScreen,
+  fullScreenNoImage,
+  textOnly,
+  descriptionOnly,
+  redDescriptionOnly
+}
diff --git a/lib/base/localization/l10n/app_de.arb b/lib/base/localization/l10n/app_de.arb
@@ -227,6 +227,7 @@
    "requestCancelled":"Anfrage abgebrochen",
    "pleaseReport":"Bitte melden Sie dies als Fehler \nper E-Mail oder auf GitHub",
    "connectionTimeout":"Zeitüberschreitung",
+   "decodingError":"Dekodierungsfehler",
    "unknownError":"Unbekannter Fehler",
    "monday":"Montag",
    "tuesday":"Dienstag",

diff --git a/lib/base/localization/l10n/app_en.arb b/lib/base/localization/l10n/app_en.arb
@@ -227,6 +227,7 @@
    "requestCancelled":"Request Cancelled",
    "pleaseReport":"Please report this is as a bug \nvia Email or on GitHub",
    "connectionTimeout":"Connection Timeout",
+   "decodingError":"Decoding Error",
    "unknownError":"Unknown Error",
    "monday":"Monday",
    "tuesday":"Tuesday",

diff --git a/lib/base/networking/protocols/main_api.dart b/lib/base/networking/protocols/main_api.dart
@@ -121,15 +121,19 @@ class MainApi {
           .data;
     } on U catch (e) {
       /// rethrow error if specified error U
-      e.toString();
+      log(e.toString());
       rethrow;
     } catch (_) {
       /// catch possible decoding error and return actual expected object
       try {
         return ApiResponse<T>.fromJson(jsonDecode(response.data.toString()),
             response.headers, createObject);
       } catch (e) {
-        log(e.toString());
+        if (e is Error) {
+          log(e.stackTrace.toString());
+        } else {
+          log(e.toString());
+        }
         rethrow;
       }
     }

diff --git a/lib/base/views/error_handling_view.dart b/lib/base/views/error_handling_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/extensions/custom_exception.dart';
 import 'package:campus_flutter/base/networking/apis/tumOnlineApi/tum_online_api_exception.dart';
 import 'package:campus_flutter/searchComponent/model/search_exception.dart';
@@ -71,6 +72,9 @@ class ErrorHandlingView extends StatelessWidget {
     } else if (error is CustomException) {
       final exception = error as CustomException;
       return _exceptionMessage(context, exception.message, null);
+    } else if (error is TypeError) {
+      return _exceptionMessage(context, context.localizations.decodingError,
+          context.localizations.pleaseReport);
     } else {
       return _exceptionMessage(context, context.localizations.unknownError,
           context.localizations.pleaseReport);
@@ -95,11 +99,15 @@ class ErrorHandlingView extends StatelessWidget {
           Expanded(
               flex: 0,
               child: Column(children: [
-                Text(errorMessage,
-                    style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                        color: titleColor ?? Theme.of(context).primaryColor),
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis),
+                _errorMessageText(
+                  errorMessage,
+                  context,
+                  style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                        color: titleColor ?? Theme.of(context).primaryColor,
+                      ),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                ),
                 if (fixMessage != null)
                   Text(fixMessage,
                       style: Theme.of(context)
@@ -121,8 +129,9 @@ class ErrorHandlingView extends StatelessWidget {
       case ErrorHandlingViewType.textOnly:
         return Center(
           child: Column(mainAxisAlignment: MainAxisAlignment.center, children: [
-            Text(
+            _errorMessageText(
               errorMessage,
+              context,
               style: Theme.of(context).textTheme.bodyLarge?.copyWith(
                   color: titleColor ?? Theme.of(context).primaryColor),
               textAlign: TextAlign.center,
@@ -135,19 +144,66 @@ class ErrorHandlingView extends StatelessWidget {
         );
       case ErrorHandlingViewType.descriptionOnly:
         return Center(
-            child: Text(errorMessage, style: TextStyle(color: bodyColor)));
+          child: _errorMessageText(
+            errorMessage,
+            context,
+            style: TextStyle(color: bodyColor),
+          ),
+        );
       case ErrorHandlingViewType.redDescriptionOnly:
         return Center(
-            child:
-                Text(errorMessage, style: const TextStyle(color: Colors.red)));
+          child: _errorMessageText(
+            errorMessage,
+            context,
+            style: const TextStyle(color: Colors.red),
+          ),
+        );
     }
   }
-}
 
-enum ErrorHandlingViewType {
-  fullScreen,
-  fullScreenNoImage,
-  textOnly,
-  descriptionOnly,
-  redDescriptionOnly
+  Widget _errorMessageText(String errorMessage, BuildContext context,
+      {TextStyle? style,
+      TextAlign? textAlign,
+      int? maxLines,
+      TextOverflow? overflow}) {
+    return GestureDetector(
+      onDoubleTap: () => showStackTrace(context),
+      child: Text(
+        errorMessage,
+        style: style,
+        textAlign: textAlign,
+        maxLines: maxLines,
+        overflow: overflow,
+      ),
+    );
+  }
+
+  showStackTrace(BuildContext context) {
+    if (error is Error) {
+      showDialog(
+          context: context,
+          builder: (context) {
+            final split = (error as Error).stackTrace.toString().split("\n");
+            return AlertDialog(
+              title: Text(
+                "Error Description",
+                style: Theme.of(context).textTheme.titleMedium,
+                textAlign: TextAlign.center,
+              ),
+              content: Text(
+                split.isNotEmpty
+                    ? split.first
+                    : (error as Error).stackTrace.toString(),
+                textAlign: TextAlign.center,
+              ),
+              actions: [
+                ElevatedButton(
+                    onPressed: () => Navigator.of(context).pop(),
+                    child: const Text("Okay"))
+              ],
+              actionsAlignment: MainAxisAlignment.center,
+            );
+          });
+    }
+  }
 }
diff --git a/lib/calendarComponent/model/calendar_event.dart b/lib/calendarComponent/model/calendar_event.dart
@@ -13,22 +13,21 @@ class CalendarEvent extends Searchable {
   @JsonKey(name: "nr")
   final String id;
   final String status;
-  final String url;
+  final String? url;
   final String title;
-  @JsonKey(name: "description")
-  final String descriptionText;
+  final String? description;
   @JsonKey(name: "dtstart")
   final DateTime startDate;
   @JsonKey(name: "dtend")
   final DateTime endDate;
-  final String location;
+  final String? location;
 
   Duration get duration {
     return endDate.difference(startDate);
   }
 
   String? get lvNr {
-    return url.split("LvNr=").last;
+    return url?.split("LvNr=").last;
   }
 
   String get timePeriod {
@@ -79,18 +78,18 @@ class CalendarEvent extends Searchable {
   @JsonKey(includeFromJson: false, includeToJson: false)
   List<ComparisonToken> get comparisonTokens => [
         ComparisonToken(value: title),
-        ComparisonToken(value: location),
+        if (location != null) ComparisonToken(value: location!),
       ];
 
   CalendarEvent(
       {required this.id,
       required this.status,
-      required this.url,
+      this.url,
       required this.title,
-      required this.descriptionText,
+      this.description,
       required this.startDate,
       required this.endDate,
-      required this.location});
+      this.location});
 
   factory CalendarEvent.fromJson(Map<String, dynamic> json) =>
       _$CalendarEventFromJson(json);

diff --git a/lib/calendarComponent/model/calendar_event.g.dart b/lib/calendarComponent/model/calendar_event.g.dart
diff --git a/lib/calendarComponent/views/appointment_view.dart b/lib/calendarComponent/views/appointment_view.dart
@@ -1,4 +1,5 @@
 import 'package:campus_flutter/calendarComponent/model/calendar_event.dart';
+import 'package:campus_flutter/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:syncfusion_flutter_calendar/calendar.dart';
 
@@ -30,7 +31,9 @@ class AppointmentView extends StatelessWidget {
                       .compareTo(const Duration(hours: 0, minutes: 45)) >
                   0)
                 _eventLocation(
-                    calendarEvent.location, calendarEvent.isCanceled, context),
+                    calendarEvent.location ?? context.localizations.unknown,
+                    calendarEvent.isCanceled,
+                    context),
               if (calendarEvent.endDate
                       .difference(calendarEvent.startDate)
                       .compareTo(const Duration(hours: 1, minutes: 30)) >=

diff --git a/lib/calendarComponent/views/calendars_view.dart b/lib/calendarComponent/views/calendars_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/helpers/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/helpers/last_updated_text.dart';
 import 'package:campus_flutter/base/views/error_handling_view.dart';
@@ -28,16 +29,10 @@ class _CalendarsViewState extends ConsumerState<CalendarsView>
   @override
   void initState() {
     ref.read(calendarViewModel).fetch(false);
+    _selectedCalendarTab = 1;
     super.initState();
   }
 
-  @override
-  void didChangeDependencies() {
-    _selectedCalendarTab =
-        MediaQuery.orientationOf(context) == Orientation.landscape ? 1 : 0;
-    super.didChangeDependencies();
-  }
-
   @override
   Widget build(BuildContext context) {
     super.build(context);

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

diff --git a/lib/calendarComponent/views/homeWidget/calendar_widget_view.dart b/lib/calendarComponent/views/homeWidget/calendar_widget_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/helpers/card_with_padding.dart';
 import 'package:campus_flutter/base/helpers/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/views/error_handling_view.dart';

diff --git a/lib/departuresComponent/views/departures_details_view.dart b/lib/departuresComponent/views/departures_details_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/helpers/card_with_padding.dart';
 import 'package:campus_flutter/base/helpers/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/helpers/directions_launcher.dart';

diff --git a/lib/departuresComponent/views/homeWidget/departures_widget_view.dart b/lib/departuresComponent/views/homeWidget/departures_widget_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/helpers/card_with_padding.dart';
 import 'package:campus_flutter/base/helpers/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/views/error_handling_view.dart';

diff --git a/lib/gradeComponent/views/grades_view.dart b/lib/gradeComponent/views/grades_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/helpers/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/helpers/last_updated_text.dart';
 import 'package:campus_flutter/base/helpers/padded_divider.dart';

diff --git a/lib/homeComponent/widgetComponent/views/widget_screen.dart b/lib/homeComponent/widgetComponent/views/widget_screen.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/enums/home_widget.dart';
 import 'package:campus_flutter/base/helpers/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/views/error_handling_view.dart';

diff --git a/lib/lectureComponent/views/lecture_details_view.dart b/lib/lectureComponent/views/lecture_details_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/helpers/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/helpers/last_updated_text.dart';
 import 'package:campus_flutter/base/views/error_handling_view.dart';

diff --git a/lib/lectureComponent/views/lecture_meeting_info_view.dart b/lib/lectureComponent/views/lecture_meeting_info_view.dart
@@ -21,7 +21,8 @@ class LectureMeetingInfoView extends ConsumerWidget {
             information: ref.read(viewModel).event!.timeDatePeriod(context),
             iconData: Icons.hourglass_top),
         BasicLectureInfoRowView(
-          information: ref.read(viewModel).event!.location,
+          information: ref.read(viewModel).event!.location ??
+              context.localizations.unknown,
           iconData: Icons.location_on,
           trailingWidget: IconButton(
               onPressed: () => Navigator.push(

diff --git a/lib/lectureComponent/views/lectures_view.dart b/lib/lectureComponent/views/lectures_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/helpers/last_updated_text.dart';
 import 'package:campus_flutter/base/helpers/padded_divider.dart';
 import 'package:campus_flutter/base/helpers/delayed_loading_indicator.dart';

diff --git a/lib/loginComponent/views/confirm_view.dart b/lib/loginComponent/views/confirm_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'dart:io';
 
 import 'package:campus_flutter/base/helpers/icon_text.dart';

diff --git a/lib/loginComponent/views/login_view.dart b/lib/loginComponent/views/login_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/views/error_handling_view.dart';
 import 'package:campus_flutter/providers_get_it.dart';
 import 'package:flutter/foundation.dart';

diff --git a/lib/movieComponent/views/homeWidget/movie_card_view.dart b/lib/movieComponent/views/homeWidget/movie_card_view.dart
@@ -30,7 +30,7 @@ class MovieCardView extends ConsumerWidget {
                               top: Radius.circular(10)),
                           child: CachedNetworkImage(
                             imageUrl: movie.coverUrl.toString(),
-                            fit: BoxFit.fitWidth,
+                            fit: BoxFit.fill,
                             fadeOutDuration: Duration.zero,
                             fadeInDuration: Duration.zero,
                             placeholder: (context, string) => Image.asset(

diff --git a/lib/movieComponent/views/homeWidget/movies_widget_view.dart b/lib/movieComponent/views/homeWidget/movies_widget_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/helpers/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/helpers/horizontal_slider.dart';
 import 'package:campus_flutter/base/networking/apis/tumdev/campus_backend.pbgrpc.dart';

diff --git a/lib/navigaTumComponent/views/navigatum_room_view.dart b/lib/navigaTumComponent/views/navigatum_room_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/helpers/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/views/error_handling_view.dart';
 import 'package:campus_flutter/navigaTumComponent/model/navigatum_navigation_details.dart';

diff --git a/lib/newsComponent/views/homeWidget/news_widget_view.dart b/lib/newsComponent/views/homeWidget/news_widget_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/helpers/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/helpers/horizontal_slider.dart';
 import 'package:campus_flutter/base/views/error_handling_view.dart';

diff --git a/lib/personDetailedComponent/views/person_details_view.dart b/lib/personDetailedComponent/views/person_details_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/extensions/base_64_decode_image_data.dart';
 import 'package:campus_flutter/base/helpers/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/helpers/url_launcher.dart';

diff --git a/lib/placesComponent/services/mealplan_service.dart b/lib/placesComponent/services/mealplan_service.dart
@@ -1,5 +1,3 @@
-import 'dart:developer';
-
 import 'package:campus_flutter/base/extensions/date_time_week_number.dart';
 import 'package:campus_flutter/base/networking/apis/eatApi/eat_api.dart';
 import 'package:campus_flutter/base/networking/apis/eatApi/eat_api_service.dart';

diff --git a/lib/placesComponent/views/cafeterias/cafeteria_view.dart b/lib/placesComponent/views/cafeterias/cafeteria_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/helpers/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/helpers/info_row.dart';
 import 'package:campus_flutter/base/helpers/padded_divider.dart';

diff --git a/lib/placesComponent/views/cafeterias/cafeterias_view.dart b/lib/placesComponent/views/cafeterias/cafeterias_view.dart
@@ -1,3 +1,4 @@
+import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/helpers/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/helpers/padded_divider.dart';
 import 'package:campus_flutter/base/views/error_handling_view.dart';