From 30044d6b21f621bcefd101edf1b8b122213c1e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Tue, 3 Mar 2020 18:06:55 +0100 Subject: [PATCH] [Timetable] Ignore last lessons if cancelled and jump to the next day. --- .../edziennik/ui/modules/home/cards/HomeTimetableCard.kt | 1 + .../edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt index 5a33f136..c33a52b4 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt @@ -156,6 +156,7 @@ class HomeTimetableCard( || (it.displayDate == today && it.displayEndTime != null && it.displayEndTime!! >= now)) + && !it.isCancelled }) && checkedDays < 7) { timetableDate.stepForward(0, 0, 1) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt index 17ea9633..c086cf53 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt @@ -219,6 +219,7 @@ class WidgetTimetableProvider : AppWidgetProvider() { || (it.displayDate == today && it.displayEndTime != null && it.displayEndTime!! >= now)) + && !it.isCancelled }) && checkedDays < 7) { timetableDate.stepForward(0, 0, 1)