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

support 29th Feb. yearly recurring events

This commit is contained in:
Kazuhiro Ito 2021-03-22 18:17:00 +09:00
parent f3f1ea4874
commit 1463785167
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Parser.kt
View File

@ -1,4 +1,4 @@
package com.simplemobiletools.calendar.pro.helpers
package com.simplemobiletools.calendar.pro.helpers
import com.simplemobiletools.calendar.pro.extensions.isXMonthlyRepetition
import com.simplemobiletools.calendar.pro.extensions.isXWeeklyRepetition

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

@ -54,7 +54,7 @@ data class Event(
repeatInterval % YEAR == 0 -> when (repeatRule) {
REPEAT_ORDER_WEEKDAY -> addXthDayInterval(oldStart, original, false)
REPEAT_ORDER_WEEKDAY_USE_LAST -> addXthDayInterval(oldStart, original, true)
else -> oldStart.plusYears(repeatInterval / YEAR)
else -> addYearsWithSameDay(oldStart)
}
repeatInterval % MONTH == 0 -> when (repeatRule) {
REPEAT_SAME_DAY -> addMonthsWithSameDay(oldStart, original)
@ -77,6 +77,20 @@ data class Event(
endTS = newEndTS
}
// if an event should happen on 29th Feb. with Same Day yearly repetition, show it only on leap years
private fun addYearsWithSameDay(currStart: DateTime): DateTime {
var newDateTime = currStart.plusYears(repeatInterval / YEAR)
// Date may slide within the same month
if (newDateTime.dayOfMonth != currStart.dayOfMonth) {
while (newDateTime.dayOfMonth().maximumValue < currStart.dayOfMonth) {
newDateTime = newDateTime.plusYears(repeatInterval / YEAR)
}
newDateTime = newDateTime.withDayOfMonth(currStart.dayOfMonth)
}
return newDateTime
}
// 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 {
var newDateTime = currStart.plusMonths(repeatInterval / MONTH)