MarianumMobile/Client
MarianumMobile/Client
5
1
Fork 0
Code Issues 33 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Changed color indication of elements without teacher

Browse Source
This commit is contained in:
Elias Müller 2023-07-01 13:53:56 +02:00
parent 2c22147468
commit 77707ce720
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/view/pages/timetable/timetable.dart
View File

@ -129,10 +129,7 @@ class _TimetableState extends State<Timetable> {
timeRegionBuilder: (BuildContext context, TimeRegionDetails timeRegionDetails) => TimeRegionComponent(details: timeRegionDetails),
appointmentBuilder: (BuildContext context, CalendarAppointmentDetails details) => AppointmentComponent(
details: details,
crossedOut: (
(details.appointments.first.id as GetTimetableResponseObject).code == "cancelled"
|| (details.appointments.first.id as GetTimetableResponseObject).te.first.id == 0
)
crossedOut: _isCrossedOut(details)
),
headerHeight: 0,
@ -211,7 +208,7 @@ class _TimetableState extends State<Timetable> {
"\n"
"${element.te.first.longname}",
notes: element.activityType,
color: _getEventColor(element.code, startTime, endTime),
color: _getEventColor(element, startTime, endTime),
);
} catch(e) {
return Appointment(
@ -236,15 +233,29 @@ class _TimetableState extends State<Timetable> {
return DateTime.parse('$date ${timeString.substring(0, 2)}:${timeString.substring(2, 4)}');
}
Color _getEventColor(String? code, DateTime startTime, DateTime endTime) {
Color _getEventColor(GetTimetableResponseObject webuntisElement, DateTime startTime, DateTime endTime) {
// Make element darker, when it already took place
int opacity = endTime.isBefore(DateTime.now()) ? 100 : 255;
if(code == "cancelled") return const Color(0xff000000).withAlpha(opacity);
if(code == "irregular") return const Color(0xff8F19B3).withAlpha(opacity);
// Cancelled
if(webuntisElement.code == "cancelled") return const Color(0xff000000).withAlpha(opacity);
// Any changes or no teacher at this element
if(webuntisElement.code == "irregular" || webuntisElement.te.first.id == 0) return const Color(0xff8F19B3).withAlpha(opacity);
// Event was in the past
if(endTime.isBefore(DateTime.now())) return Theme.of(context).primaryColor.withAlpha(opacity);
// Event takes currently place
if(endTime.isAfter(DateTime.now()) && startTime.isBefore(DateTime.now())) return Theme.of(context).primaryColor.withRed(100);
// Fallback
return Theme.of(context).primaryColor;
}
bool _isCrossedOut(CalendarAppointmentDetails calendarEntry) {
GetTimetableResponseObject webuntisElement = (calendarEntry.appointments.first.id as GetTimetableResponseObject);
return webuntisElement.code == "cancelled";
}
}

2
pubspec.yaml
View File

@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 0.0.1+8
version: 0.0.1+9
environment:
sdk: '>3.0.0'