From b1b1d440efc822706cc619c2dcd5ee0c5353c90d Mon Sep 17 00:00:00 2001 From: Honk2 Date: Sun, 11 Sep 2022 18:39:43 +0200 Subject: [PATCH] fix display of start/end for multi day events --- .../calendar/pro/adapters/DayEventsAdapter.kt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/DayEventsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/DayEventsAdapter.kt index 447aac5e5..9e2a126d9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/DayEventsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/DayEventsAdapter.kt @@ -88,16 +88,21 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList, 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", " ")