sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Fix date in attendance and timetable when day is changing (#1893)

Browse Source
This commit is contained in:
Rafał Borcz 2022-06-18 12:11:46 +02:00 committed by GitHub
parent bfab265ccf
commit 0a2eb07844
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
View File

@ -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()
}
}
}

18
app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
View File

@ -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()
}
}
}