From f06b7864abaf71c22abcab279cbe587b687aa389 Mon Sep 17 00:00:00 2001 From: Naveen Date: Sun, 16 Jul 2023 03:07:28 +0530 Subject: [PATCH] Reuse `getFirstDayOfWeek()` in WeekFragment --- .../calendar/pro/extensions/Context.kt | 6 +++++- .../calendar/pro/fragments/WeekFragmentsHolder.kt | 15 ++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt index 9b1321279..e4ecdfafd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt @@ -758,6 +758,10 @@ fun Context.editEvent(event: ListEvent) { } fun Context.getFirstDayOfWeek(date: DateTime): String { + return getFirstDayOfWeekDt(date).toString() +} + +fun Context.getFirstDayOfWeekDt(date: DateTime): DateTime { var startOfWeek = date.withTimeAtStartOfDay() if (!config.startWeekWithCurrentDay) { startOfWeek = if (config.isSundayFirst) { @@ -771,7 +775,7 @@ fun Context.getFirstDayOfWeek(date: DateTime): String { startOfWeek.withDayOfWeek(DateTimeConstants.MONDAY) } } - return startOfWeek.toString() + return startOfWeek } fun Context.isTaskCompleted(event: Event): Boolean { 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 4204e360a..a06c89546 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 @@ -189,22 +189,11 @@ class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener { } private fun dateSelected(dateTime: DateTime, datePicker: DatePicker) { - val isSundayFirst = requireContext().config.isSundayFirst val month = datePicker.month + 1 val year = datePicker.year val day = datePicker.dayOfMonth - var newDateTime = dateTime.withDate(year, month, day) - - if (isSundayFirst) { - newDateTime = newDateTime.plusDays(1) - } - - var selectedWeek = newDateTime.withDayOfWeek(1).withTimeAtStartOfDay().minusDays(if (isSundayFirst) 1 else 0) - if (newDateTime.minusDays(7).seconds() > selectedWeek.seconds()) { - selectedWeek = selectedWeek.plusDays(7) - } - - currentWeekTS = selectedWeek.seconds() + val newDateTime = dateTime.withDate(year, month, day) + currentWeekTS = requireContext().getFirstDayOfWeekDt(newDateTime).seconds() setupFragment() }