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

Merge pull request #1836 from Honk2/show_duration-issue1798 

fix issue #1798 display of start/end for multi day events
This commit is contained in:
Tibor Kaputa 2022-10-25 10:55:28 +02:00 committed by GitHub
parent 856b476acb b1b1d440ef
commit d0cd362c08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/DayEventsAdapter.kt
View File

@ -88,16 +88,21 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList<Event>, r
event_item_title.text = event.title
event_item_title.checkViewStrikeThrough(event.isTaskCompleted())
event_item_time.text = if (event.getIsAllDay()) allDayString else Formatter.getTimeFromTS(context, event.startTS)
if (event.startTS != event.endTS && !event.getIsAllDay()) {
if (event.startTS != event.endTS) {
val startDayCode = Formatter.getDayCodeFromTS(event.startTS)
val endDayCode = Formatter.getDayCodeFromTS(event.endTS)
val startDate = Formatter.getDayTitle(activity, startDayCode, false)
val endDate = Formatter.getDayTitle(activity, endDayCode, false)
val startTimeString = event_item_time.text
val endTimeString = Formatter.getTimeFromTS(context, event.endTS)
val startDayString = if (startDayCode != dayCode) " ($startDate)" else ""
val endDayString = if (endDayCode != dayCode) " ($endDate)" else ""
event_item_time.text = "$startTimeString$startDayString - $endTimeString$endDayString"
if (!event.getIsAllDay()) {
val endTimeString = Formatter.getTimeFromTS(context, event.endTS)
val endDayString = if (endDayCode != dayCode) " ($endDate)" else ""
event_item_time.text = "${event_item_time.text}$startDayString - $endTimeString$endDayString"
}
else {
val endDayString = if (endDayCode != dayCode) " - ($endDate)" else ""
event_item_time.text = "${event_item_time.text}$startDayString$endDayString"
}
}
event_item_description.text = if (replaceDescriptionWithLocation) event.location else event.description.replace("\n", " ")