From 0a2eb0784469afd19c837af49a1e7d5e45001567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sat, 18 Jun 2022 12:11:46 +0200
Subject: [PATCH] Fix date in attendance and timetable when day is changing
 (#1893)

---
 .../modules/attendance/AttendancePresenter.kt  | 18 +++++++++++-------
 .../ui/modules/timetable/TimetablePresenter.kt | 18 +++++++++++-------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index 7fcbd002..26bfaf19 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@@ -91,15 +91,19 @@ class AttendancePresenter @Inject constructor(
 
     fun onViewReselected() {
         Timber.i("Attendance view is reselected")
-        view?.also { view ->
+        view?.let { view ->
             if (view.currentStackSize == 1) {
-                baseDate.also {
-                    if (currentDate != it) {
-                        reloadView(it)
-                        loadData()
-                    } else if (!view.isViewEmpty) view.resetView()
+                baseDate = now().previousOrSameSchoolDay
+
+                if (currentDate != baseDate) {
+                    reloadView(baseDate)
+                    loadData()
+                } else if (!view.isViewEmpty) {
+                    view.resetView()
                 }
-            } else view.popView()
+            } else {
+                view.popView()
+            }
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index dc6c8921..d0687408 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -87,15 +87,19 @@ class TimetablePresenter @Inject constructor(
 
     fun onViewReselected() {
         Timber.i("Timetable view is reselected")
-        view?.also { view ->
+        view?.let { view ->
             if (view.currentStackSize == 1) {
-                baseDate.also {
-                    if (currentDate != it) {
-                        reloadView(it)
-                        loadData()
-                    } else if (!view.isViewEmpty) view.resetView()
+                baseDate = now().nextOrSameSchoolDay
+
+                if (currentDate != baseDate) {
+                    reloadView(baseDate)
+                    loadData()
+                } else if (!view.isViewEmpty) {
+                    view.resetView()
                 }
-            } else view.popView()
+            } else {
+                view.popView()
+            }
         }
     }