fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-16 20:00:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2077 from WessellUrdata/sunday-fix

Browse Source 
Fixing getDatesWeekDateTime (closes Issue #1894)
This commit is contained in:
Tibor Kaputa 2023-06-29 12:45:42 +02:00 committed by GitHub
commit 5f856d7164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
View File

@ -766,19 +766,20 @@ fun Context.editEvent(event: ListEvent) {
} }
fun Context.getDatesWeekDateTime(date: DateTime): String { fun Context.getDatesWeekDateTime(date: DateTime): String {
return if (!config.startWeekWithCurrentDay) { var startOfWeek = date.withZoneRetainFields(DateTimeZone.UTC).withTimeAtStartOfDay()
val currentOffsetHours = TimeZone.getDefault().rawOffset / 1000 / 60 / 60 if (!config.startWeekWithCurrentDay) {
startOfWeek = if (config.isSundayFirst) {
// not great, not terrible // a workaround for Joda-time's Monday-as-first-day-of-the-week
val useHours = if (currentOffsetHours >= 10) 8 else 12 if (startOfWeek.dayOfWeek == 7) {
var thisweek = date.withZone(DateTimeZone.UTC).withDayOfWeek(1).withHourOfDay(useHours).minusDays(if (config.isSundayFirst) 1 else 0) startOfWeek
if (date.minusDays(7).seconds() > thisweek.seconds()) { } else {
thisweek = thisweek.plusDays(7) startOfWeek.minusWeeks(1).withDayOfWeek(7)
}
} else {
startOfWeek.withDayOfWeek(1)
} }
thisweek.toString()
} else {
date.withZone(DateTimeZone.UTC).toString()
} }
return startOfWeek.toString()
} }
fun Context.isTaskCompleted(event: Event): Boolean { fun Context.isTaskCompleted(event: Event): Boolean {