fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2138 from Aga-C/fix-long-events 

Fixed displaying long events in weekly view (#2135)
This commit is contained in:
Tibor Kaputa 2023-07-14 14:27:39 +02:00 committed by GitHub
parent c5e9c6f1cb 549665e302
commit e24b226344
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt
View File

@ -552,8 +552,14 @@ class WeekFragment : Fragment(), WeeklyCalendar {
do { do {
val dayOfWeek = dayColumns.indexOfFirst { it.tag == currentDayCode } val dayOfWeek = dayColumns.indexOfFirst { it.tag == currentDayCode }
if (dayOfWeek == -1 || dayOfWeek >= config.weeklyViewDays) { if (dayOfWeek == -1 || dayOfWeek >= config.weeklyViewDays) {
if (startDayCode != endDayCode) {
currentDateTime = currentDateTime.plusDays(1)
currentDayCode = Formatter.getDayCodeFromDateTime(currentDateTime)
continue
} else {
continue@dayevents continue@dayevents
} }
}
val dayColumn = dayColumns[dayOfWeek] val dayColumn = dayColumns[dayOfWeek]
(inflater.inflate(R.layout.week_event_marker, null, false) as ConstraintLayout).apply { (inflater.inflate(R.layout.week_event_marker, null, false) as ConstraintLayout).apply {