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

Reuse getFirstDayOfWeek() in WeekFragment

Browse Source
This commit is contained in:
Naveen 2023-07-16 03:07:28 +05:30
parent 2ee226d06b
commit f06b7864ab
No known key found for this signature in database
GPG Key ID: 0E155DAD31671DA3
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -758,6 +758,10 @@ fun Context.editEvent(event: ListEvent) {
} }
fun Context.getFirstDayOfWeek(date: DateTime): String { fun Context.getFirstDayOfWeek(date: DateTime): String {
return getFirstDayOfWeekDt(date).toString()
}
fun Context.getFirstDayOfWeekDt(date: DateTime): DateTime {
var startOfWeek = date.withTimeAtStartOfDay() var startOfWeek = date.withTimeAtStartOfDay()
if (!config.startWeekWithCurrentDay) { if (!config.startWeekWithCurrentDay) {
startOfWeek = if (config.isSundayFirst) { startOfWeek = if (config.isSundayFirst) {
@ -771,7 +775,7 @@ fun Context.getFirstDayOfWeek(date: DateTime): String {
startOfWeek.withDayOfWeek(DateTimeConstants.MONDAY) startOfWeek.withDayOfWeek(DateTimeConstants.MONDAY)
} }
} }
return startOfWeek.toString() return startOfWeek
} }
fun Context.isTaskCompleted(event: Event): Boolean { fun Context.isTaskCompleted(event: Event): Boolean {

15
app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragmentsHolder.kt
View File

@ -189,22 +189,11 @@ class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener {
} }
private fun dateSelected(dateTime: DateTime, datePicker: DatePicker) { private fun dateSelected(dateTime: DateTime, datePicker: DatePicker) {
val isSundayFirst = requireContext().config.isSundayFirst
val month = datePicker.month + 1 val month = datePicker.month + 1
val year = datePicker.year val year = datePicker.year
val day = datePicker.dayOfMonth val day = datePicker.dayOfMonth
var newDateTime = dateTime.withDate(year, month, day) val newDateTime = dateTime.withDate(year, month, day)
currentWeekTS = requireContext().getFirstDayOfWeekDt(newDateTime).seconds()
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()
setupFragment() setupFragment()
} }