Allow Hiding of Calendar Events (#282)

Author: jakobkoerber

android/app/src/main/kotlin/de/tum/in/tumcampus/widgets/calendar/CalendarWidgetService.kt

@@ -9,6 +9,7 @@ import de.tum.`in`.tumcampus.R
 import de.tum.`in`.tumcampus.util.Const
 import es.antonborri.home_widget.HomeWidgetPlugin
 import kotlinx.serialization.json.Json
+import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.time.format.TextStyle
 import java.util.*
@@ -34,6 +35,10 @@ class CalendarWidgetService : RemoteViewsService() {
                 calendarEvents = Json.decodeFromString<Array<WidgetCalendarItem>>(data).asList()
             }
 
+            calendarEvents.filter { widgetCalendarItem ->
+                widgetCalendarItem.endDate.isAfter(LocalDateTime.now())
+            }
+
             // Set isFirstOnDay flags
             if (calendarEvents.isNotEmpty()) {
                 calendarEvents[0].isFirstOnDay = true

assets/translations/de.json

@@ -196,6 +196,7 @@
   "openIn": "In {} öffnen",
   "unknownDirection": "Unbekannte Richtung",
   "showWeekends": "Wochenenden anzeigen",
+  "showHiddenCalendarEntries": "Versteckte Kalendareintrage anzeigen",
   "color": "Farbe",
   "resetLogin": "Zurücksetzen & Anmelden",
   "resetPreferences": "Einstellungen zurücksetzen",
@@ -225,5 +226,6 @@
   "campus": "Campus",
   "studies": "Studium",
   "suggested": "Interessante {}",
-  "all": "Alle"
+  "all": "Alle",
+  "visibility": "Sichtbarkeit"
 }

assets/translations/en.json

@@ -196,6 +196,7 @@
   "openIn": "Open in {}",
   "unknownDirection": "Unknown Direction",
   "showWeekends": "Show Weekends",
+  "showHiddenCalendarEntries": "Show Hidden Calendar Entries",
   "color": "Color",
   "resetLogin": "Reset & Login",
   "resetPreferences": "Reset Preferences",
@@ -225,5 +226,6 @@
   "campus": "Campus",
   "studies": "Studies",
   "suggested": "Suggested {}",
-  "all": "All"
+  "all": "All",
+  "visibility": "Visibility"
 }

devtools_options.yaml

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

ios/CalendarWidget/CalendarWidget.swift

@@ -34,7 +34,8 @@ struct Provider: TimelineProvider {
                 let dateFormatter = DateFormatter()
                 dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSS"
                 decoder.dateDecodingStrategy = .formatted(dateFormatter)
-                let entries = try decoder.decode([CalendarEntry].self, from: data)
+                var entries = try decoder.decode([CalendarEntry].self, from: data)
+                entries = entries.filter({ $0.endDate > Date() })
                 let entry = CalendarWidgetEntry(date: dateFormatter.date(from: calendarSaved ?? "") ?? Date(), entries: entries, size: context.family)
                 completion(entry)
             } catch {

ios/Podfile.lock

@@ -119,7 +119,7 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqflite (0.0.3):
+  - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
   - "sqlite3 (3.46.1+1)":
@@ -163,7 +163,7 @@ DEPENDENCIES:
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - quick_actions_ios (from `.symlinks/plugins/quick_actions_ios/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
+  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
   - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
@@ -223,8 +223,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/quick_actions_ios/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  sqflite:
-    :path: ".symlinks/plugins/sqflite/darwin"
+  sqflite_darwin:
+    :path: ".symlinks/plugins/sqflite_darwin/darwin"
   sqlite3_flutter_libs:
     :path: ".symlinks/plugins/sqlite3_flutter_libs/ios"
   url_launcher_ios:
@@ -267,7 +267,7 @@ SPEC CHECKSUMS:
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
   quick_actions_ios: 56f3cbaa71e94f212838d1f9fe354bd0734779bf
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
+  sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13
   sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb
   sqlite3_flutter_libs: c00457ebd31e59fa6bb830380ddba24d44fbcd3b
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe

lib/base/enums/user_preference.dart

@@ -7,7 +7,8 @@ enum UserPreference {
   calendarColors(String),
   browser(bool),
   failedGrades(bool),
-  weekends(bool);
+  weekends(bool),
+  hiddenCalendarEntries(bool);
 
   final Type type;
 

lib/calendarComponent/model/calendar_data_source.dart

@@ -1,13 +1,24 @@
 import 'package:campus_flutter/base/extensions/cast.dart';
 import 'package:campus_flutter/calendarComponent/model/calendar_event.dart';
+import 'package:campus_flutter/settingsComponent/views/settings_view.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:syncfusion_flutter_calendar/calendar.dart';
 
 class MeetingDataSource extends CalendarDataSource {
   final BuildContext context;
+  final WidgetRef ref;
 
-  MeetingDataSource(List<CalendarEvent> source, this.context) {
-    appointments = source;
+  MeetingDataSource(List<CalendarEvent> source, this.context, this.ref) {
+    if (!ref.read(showHiddenCalendarEntries)) {
+      appointments = source
+          .where(
+            (element) => element.isVisible ?? true,
+          )
+          .toList();
+    } else {
+      appointments = source;
+    }
   }
 
   @override

lib/calendarComponent/model/calendar_event.dart

@@ -22,6 +22,7 @@ class CalendarEvent extends Searchable {
   final String? location;
 
   int? color;
+  bool? isVisible;
 
   Duration get duration {
     return endDate.difference(startDate);

lib/calendarComponent/model/calendar_preferences.dart

@@ -0,0 +1,19 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'calendar_preferences.g.dart';
+
+@JsonSerializable()
+class CalendarPreferences {
+  final Map<String, int> colorPreferences;
+  final Map<String, bool> visibilityPreferences;
+
+  CalendarPreferences(
+    this.colorPreferences,
+    this.visibilityPreferences,
+  );
+
+  factory CalendarPreferences.fromJson(Map<String, dynamic> json) =>
+      _$CalendarPreferencesFromJson(json);
+
+  Map<String, dynamic> toJson() => _$CalendarPreferencesToJson(this);
+}