@@ -361,12 +361,10 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
361361 }
362362 }
363363
364- val startDayIndex = days[event.originalStartDayIndex]
365- val endDayIndex = days[min(event.startDayIndex + event.daysCnt - 1 , 41 )]
366364 bgRectF.set(bgLeft, bgTop, bgRight, bgBottom)
367- canvas.drawRoundRect(bgRectF, BG_CORNER_RADIUS , BG_CORNER_RADIUS , getEventBackgroundColor(event, startDayIndex, endDayIndex ))
365+ canvas.drawRoundRect(bgRectF, BG_CORNER_RADIUS , BG_CORNER_RADIUS , getEventBackgroundColor(event))
368366
369- val specificEventTitlePaint = getEventTitlePaint(event, startDayIndex, endDayIndex )
367+ val specificEventTitlePaint = getEventTitlePaint(event)
370368 var taskIconWidth = 0
371369 if (event.isTask) {
372370 val taskIcon = resources.getColoredDrawableWithColor(R .drawable.ic_task_vector, specificEventTitlePaint.color).mutate()
@@ -408,12 +406,11 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
408406 return curPaint
409407 }
410408
411- private fun getEventBackgroundColor (event : MonthViewEvent , startDay : DayMonthly , endDay : DayMonthly ): Paint {
409+ private fun getEventBackgroundColor (event : MonthViewEvent ): Paint {
412410 var paintColor = event.color
413411
414412 val adjustAlpha = when {
415413 event.isTask -> dimCompletedTasks && event.isTaskCompleted
416- ! startDay.isThisMonth && ! endDay.isThisMonth -> true
417414 else -> dimPastEvents && event.isPastEvent && ! isPrintVersion
418415 }
419416
@@ -424,11 +421,10 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
424421 return getColoredPaint(paintColor)
425422 }
426423
427- private fun getEventTitlePaint (event : MonthViewEvent , startDay : DayMonthly , endDay : DayMonthly ): Paint {
424+ private fun getEventTitlePaint (event : MonthViewEvent ): Paint {
428425 var paintColor = event.color.getContrastColor()
429426 val adjustAlpha = when {
430427 event.isTask -> dimCompletedTasks && event.isTaskCompleted
431- ! startDay.isThisMonth && ! endDay.isThisMonth -> true
432428 else -> dimPastEvents && event.isPastEvent && ! isPrintVersion
433429 }
434430
0 commit comments