From 969f860d63a3de6937f2238e16c92d6d38cfb573 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 7 Aug 2019 16:33:54 +0200 Subject: [PATCH] if the current week is shown, use Today as the default date at weekly view --- .../calendar/pro/fragments/WeekFragmentsHolder.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragmentsHolder.kt index 257785003..d626af001 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragmentsHolder.kt @@ -181,7 +181,14 @@ class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener { setupWeeklyActionbarTitle(currentWeekTS) } - override fun getNewEventDayCode() = Formatter.getDayCodeFromTS(currentWeekTS) + override fun getNewEventDayCode(): String { + val currentTS = System.currentTimeMillis() / 1000 + return if (currentTS > currentWeekTS && currentTS < currentWeekTS + WEEK_SECONDS) { + Formatter.getTodayCode() + } else { + Formatter.getDayCodeFromTS(currentWeekTS) + } + } override fun scrollTo(y: Int) { weekHolder!!.week_view_hours_scrollview.scrollY = y