fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-01-30 18:34:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

simplify daily repeatable event fetching for better performance

Browse Source
This commit is contained in:
tibbi 2018-05-06 10:31:07 +02:00
parent 857854632b
commit c44abf2957
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/kotlin/com/simplemobiletools/calendar/models/Event.kt
View File

@ -3,6 +3,7 @@ package com.simplemobiletools.calendar.models
import com.simplemobiletools.calendar.extensions.seconds
import com.simplemobiletools.calendar.helpers.*
import com.simplemobiletools.calendar.helpers.Formatter
import com.simplemobiletools.commons.helpers.DAY_SECONDS
import org.joda.time.DateTime
import java.io.Serializable
import java.util.*
@ -20,12 +21,14 @@ data class Event(var id: Int = 0, var startTS: Int = 0, var endTS: Int = 0, var
}
fun addIntervalTime(original: Event) {
val currStart = Formatter.getDateTimeFromTS(startTS)
val newStart: DateTime
newStart = when (repeatInterval) {
DAY -> currStart.plusDays(1)
when (repeatInterval) {
DAY -> {
startTS += DAY_SECONDS
endTS += DAY_SECONDS
}
else -> {
when {
val currStart = Formatter.getDateTimeFromTS(startTS)
val newStart = when {
repeatInterval % YEAR == 0 -> currStart.plusYears(repeatInterval / YEAR)
repeatInterval % MONTH == 0 -> when (repeatRule) {
REPEAT_MONTH_SAME_DAY -> addMonthsWithSameDay(currStart, original)
@ -39,13 +42,13 @@ data class Event(var id: Int = 0, var startTS: Int = 0, var endTS: Int = 0, var
}
else -> currStart.plusSeconds(repeatInterval)
}
}
}
val newStartTS = newStart.seconds()
val newEndTS = newStartTS + (endTS - startTS)
startTS = newStartTS
endTS = newEndTS
}
}
}
// if an event should happen on 31st with Same Day monthly repetition, dont show it at all at months with 30 or less days
private fun addMonthsWithSameDay(currStart: DateTime, original: Event): DateTime {