fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some formatting update at events

This commit is contained in:
tibbi 2017-09-10 15:50:17 +02:00
parent 77ae86f6ab
commit 1d7ba8ee0a
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,21 +24,18 @@ data class Event(var id: Int = 0, var startTS: Int = 0, var endTS: Int = 0, var
newStart = when (repeatInterval) {
DAY -> currStart.plusDays(1)
else -> {
if (repeatInterval % YEAR == 0) {
currStart.plusYears(repeatInterval / YEAR)
} else if (repeatInterval % MONTH == 0) {
if (repeatRule == REPEAT_MONTH_SAME_DAY) {
addMonthsWithSameDay(currStart, original)
} else if (repeatRule == REPEAT_MONTH_EVERY_XTH_DAY) {
addXthDayInterval(currStart, original)
} else {
currStart.plusMonths(repeatInterval / MONTH).dayOfMonth().withMaximumValue()
when {
repeatInterval % YEAR == 0 -> currStart.plusYears(repeatInterval / YEAR)
repeatInterval % MONTH == 0 -> when (repeatRule) {
REPEAT_MONTH_SAME_DAY -> addMonthsWithSameDay(currStart, original)
REPEAT_MONTH_EVERY_XTH_DAY -> addXthDayInterval(currStart, original)
else -> currStart.plusMonths(repeatInterval / MONTH).dayOfMonth().withMaximumValue()
}
} else if (repeatInterval % WEEK == 0) {
// step through weekly repetition by days too, as events can trigger multiple times a week
currStart.plusDays(1)
} else {
currStart.plusSeconds(repeatInterval)
repeatInterval % WEEK == 0 -> {
// step through weekly repetition by days too, as events can trigger multiple times a week
currStart.plusDays(1)
}
else -> currStart.plusSeconds(repeatInterval)
}
}
}