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

minor code style update and optimizing imports

Browse Source
This commit is contained in:
Tibor Kaputa
2021-08-12 22:01:29 +02:00
committed by GitHub
parent 3398d582e4
commit 3a0ee3794c
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/EventsHelper.kt
View File

@ -9,9 +9,6 @@ import com.simplemobiletools.calendar.pro.models.Event
import com.simplemobiletools.calendar.pro.models.EventType import com.simplemobiletools.calendar.pro.models.EventType
import com.simplemobiletools.commons.helpers.CHOPPED_LIST_DEFAULT_SIZE import com.simplemobiletools.commons.helpers.CHOPPED_LIST_DEFAULT_SIZE
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import java.util.Date
import org.joda.time.DateTime
import org.joda.time.LocalDateTime
class EventsHelper(val context: Context) { class EventsHelper(val context: Context) {
private val config = context.config private val config = context.config
@ -302,14 +299,15 @@ class EventsHelper(val context: Context) {
events.forEach { events.forEach {
it.updateIsPastEvent() it.updateIsPastEvent()
val originalEvent = eventsDB.getEventWithId(it.id!!) val originalEvent = eventsDB.getEventWithId(it.id!!)
if(originalEvent != null && if (originalEvent != null &&
(birthDayEventId != -1L && it.eventType == birthDayEventId) or (birthDayEventId != -1L && it.eventType == birthDayEventId) or
(anniversaryEventId != -1L && it.eventType == anniversaryEventId)){ (anniversaryEventId != -1L && it.eventType == anniversaryEventId)
) {
val eventStartDate = Formatter.getDateFromTS(it.startTS) val eventStartDate = Formatter.getDateFromTS(it.startTS)
val originalEventStartDate = Formatter.getDateFromTS(originalEvent.startTS) val originalEventStartDate = Formatter.getDateFromTS(originalEvent.startTS)
if(it.hasMissingYear().not()){ if (it.hasMissingYear().not()) {
val years = (eventStartDate.year - originalEventStartDate.year).coerceAtLeast(0) val years = (eventStartDate.year - originalEventStartDate.year).coerceAtLeast(0)
if(years > 0){ if (years > 0) {
it.title = "${it.title} ($years)" it.title = "${it.title} ($years)"
} }
} }