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

Mitigate disappearing room numbers in timetable (#265)

Browse Source
This commit is contained in:
Mikołaj Pich
2019-03-07 13:08:11 +01:00
committed by Rafał Borcz
parent dcab8df4b9
commit 1b7db4bfbb
8 changed files with 149 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
View File

@ -33,7 +33,14 @@ class TimetableRepository @Inject constructor(
.toSingle(emptyList())
.doOnSuccess { oldTimetable ->
local.deleteTimetable(oldTimetable - newTimetable)
local.saveTimetable(newTimetable - oldTimetable)
local.saveTimetable((newTimetable - oldTimetable).map { item ->
item.apply {
if (room.isEmpty()) {
oldTimetable.singleOrNull { it.start == this.start && it.room.isNotEmpty() }
?.let { return@map copy(room = it.room) }
}
}
})
}
}.flatMap {
local.getTimetable(semester, dates.first, dates.second)

3
app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
View File

@ -1,5 +1,6 @@
package io.github.wulkanowy.utils
import org.threeten.bp.DateTimeUtils
import org.threeten.bp.DayOfWeek.FRIDAY
import org.threeten.bp.DayOfWeek.MONDAY
import org.threeten.bp.DayOfWeek.SATURDAY
@ -36,6 +37,8 @@ fun LocalDate.toFormattedString(format: String = DATE_PATTERN): String = this.fo
fun LocalDateTime.toFormattedString(format: String = DATE_PATTERN): String = this.format(ofPattern(format))
fun LocalDateTime.toDate(): Date = DateTimeUtils.toDate(atZone(ZoneId.systemDefault()).toInstant())
/**
* https://github.com/ThreeTen/threetenbp/issues/55
*/