fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

improve weekly and custom repetitions too

Browse Source
This commit is contained in:
tibbi
2018-05-06 10:44:21 +02:00
parent c44abf2957
commit bc7b1f0a3d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,10 +37,16 @@ data class Event(var id: Int = 0, var startTS: Int = 0, var endTS: Int = 0, var
else -> currStart.plusMonths(repeatInterval / MONTH).dayOfMonth().withMaximumValue() else -> currStart.plusMonths(repeatInterval / MONTH).dayOfMonth().withMaximumValue()
} }
repeatInterval % WEEK == 0 -> { repeatInterval % WEEK == 0 -> {
// step through weekly repetition by days too, as events can trigger multiple times a week // step through weekly repetition by days, as events can trigger multiple times a week
currStart.plusDays(1) startTS += DAY_SECONDS
endTS += DAY_SECONDS
return
}
else -> {
startTS += repeatInterval
endTS += repeatInterval
return
} }
else -> currStart.plusSeconds(repeatInterval)
} }
val newStartTS = newStart.seconds() val newStartTS = newStart.seconds()
val newEndTS = newStartTS + (endTS - startTS) val newEndTS = newStartTS + (endTS - startTS)