From 3ffb88330cb5b77e90b66c37911fcb147c3d6a37 Mon Sep 17 00:00:00 2001 From: Doozy Date: Sat, 2 Jul 2022 00:04:45 +0300 Subject: [PATCH] refactor attempt 2 --- .../calendar/pro/adapters/DayEventsAdapter.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 6519dcaa8..4e0ef4bb9 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 @@ -93,10 +93,12 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList, r if (event.startTS != event.endTS && !event.getIsAllDay()) { 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 startDayString = if (startDayCode != dayCode) "(${Formatter.getDayTitle(activity, startDayCode,false)})" else "" val endTimeString = Formatter.getTimeFromTS(context, event.endTS) - val endDayString = if (endDayCode != dayCode) "(${Formatter.getDayTitle(activity, endDayCode,false)})" else "" + val startDayString = if (startDayCode != dayCode) "($startDate)" else "" + val endDayString = if (endDayCode != dayCode) "($endDate)" else "" event_item_time.text = "$startTimeString$startDayString - $endTimeString$endDayString" }