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

small cleanup at MonthView

Browse Source
This commit is contained in:
tibbi 2018-03-26 14:09:21 +02:00
parent f62be2ac40
commit 40ac88dc83
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/calendar/views/MonthView.kt
View File

@ -169,6 +169,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
val bgLeft = xPos + smallPadding val bgLeft = xPos + smallPadding
val bgTop = backgroundY + smallPadding - eventTitleHeight val bgTop = backgroundY + smallPadding - eventTitleHeight
var bgRight = xPos - smallPadding + dayWidth * event.daysCnt var bgRight = xPos - smallPadding + dayWidth * event.daysCnt
val bgBottom = backgroundY + smallPadding * 2
if (bgRight > canvas.width.toFloat()) { if (bgRight > canvas.width.toFloat()) {
bgRight = canvas.width.toFloat() - smallPadding bgRight = canvas.width.toFloat() - smallPadding
val newStartDayIndex = (event.startDayIndex / 7 + 1) * 7 val newStartDayIndex = (event.startDayIndex / 7 + 1) * 7
@ -176,11 +177,12 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
drawEvent(newEvent, canvas) drawEvent(newEvent, canvas)
} }
val bgBottom = backgroundY + smallPadding * 2 val startDayIndex = days[event.originalStartDayIndex]
val endDayIndex = days[event.startDayIndex + event.daysCnt - 1]
bgRectF.set(bgLeft, bgTop, bgRight, bgBottom) bgRectF.set(bgLeft, bgTop, bgRight, bgBottom)
canvas.drawRoundRect(bgRectF, BG_CORNER_RADIUS, BG_CORNER_RADIUS, getEventBackgroundColor(event, days[event.originalStartDayIndex], days[event.startDayIndex + event.daysCnt - 1])) canvas.drawRoundRect(bgRectF, BG_CORNER_RADIUS, BG_CORNER_RADIUS, getEventBackgroundColor(event, startDayIndex, endDayIndex))
drawEventTitle(event.title, canvas, xPos, yPos + verticalOffset, bgRight - bgLeft, event.color, days[event.originalStartDayIndex], days[event.startDayIndex + event.daysCnt - 1]) drawEventTitle(event.title, canvas, xPos, yPos + verticalOffset, bgRight - bgLeft, event.color, startDayIndex, endDayIndex)
dayVerticalOffsets.put(event.startDayIndex, verticalOffset + eventTitleHeight + smallPadding * 2) dayVerticalOffsets.put(event.startDayIndex, verticalOffset + eventTitleHeight + smallPadding * 2)
for (i in 0 until event.daysCnt) { for (i in 0 until event.daysCnt) {