Fix issue where day backgrounds weren't applied correctly (#234)

Author: thellmund

core/src/main/java/com/alamkanak/weekview/CalendarRenderer.kt

@@ -120,28 +120,28 @@ private class DayBackgroundDrawer(
     /**
      * Draws a day's background color in the corresponding bounds.
      *
-     * @param day The [Calendar] indicating the date
+     * @param date The [Calendar] indicating the date
      * @param startPixel The x-coordinate on which to start drawing the background
      * @param canvas The [Canvas] on which to draw the background
      */
     private fun drawDayBackground(
-        day: Calendar,
+        date: Calendar,
         startPixel: Float,
         canvas: Canvas
     ) {
         val actualStartPixel = max(startPixel, viewState.calendarGridBounds.left)
         val height = viewState.viewHeight.toFloat()
 
         // If not specified, this will use the normal day background.
-        val pastPaint = viewState.getPastBackgroundPaint(isWeekend = day.isWeekend)
-        val futurePaint = viewState.getFutureBackgroundPaint(isWeekend = day.isWeekend)
+        val pastPaint = viewState.getPastBackgroundPaint(date = date)
+        val futurePaint = viewState.getFutureBackgroundPaint(date = date)
 
         val startY = viewState.headerHeight + viewState.currentOrigin.y
         val endX = startPixel + viewState.dayWidth
 
         when {
-            day.isToday -> drawPastAndFutureRect(actualStartPixel, startY, endX, pastPaint, futurePaint, height, canvas)
-            day.isBeforeToday -> canvas.drawRect(actualStartPixel, startY, endX, height, pastPaint)
+            date.isToday -> drawPastAndFutureRect(actualStartPixel, startY, endX, pastPaint, futurePaint, height, canvas)
+            date.isBeforeToday -> canvas.drawRect(actualStartPixel, startY, endX, height, pastPaint)
             else -> canvas.drawRect(actualStartPixel, startY, endX, height, futurePaint)
         }
     }

core/src/main/java/com/alamkanak/weekview/ViewState.kt

@@ -154,15 +154,15 @@ internal class ViewState {
         style = Paint.Style.STROKE
     }
 
-    val todayBackgroundPaint = Paint()
+    var todayBackgroundPaint: Paint? = null
 
-    val futureBackgroundPaint = Paint()
+    var futureBackgroundPaint: Paint? = null
 
-    val pastBackgroundPaint = Paint()
+    var pastBackgroundPaint: Paint? = null
 
-    val futureWeekendBackgroundPaint = Paint()
+    var futureWeekendBackgroundPaint: Paint? = null
 
-    val pastWeekendBackgroundPaint = Paint()
+    var pastWeekendBackgroundPaint: Paint? = null
 
     val timeColumnSeparatorPaint = Paint()
 
@@ -393,12 +393,22 @@ internal class ViewState {
         currentOrigin.y = min(currentOrigin.y, 0f)
     }
 
-    fun getPastBackgroundPaint(isWeekend: Boolean): Paint {
-        return if (isWeekend) pastWeekendBackgroundPaint else pastBackgroundPaint
+    fun getPastBackgroundPaint(date: Calendar): Paint {
+        val paint = when {
+            date.isToday -> todayBackgroundPaint
+            date.isWeekend -> pastWeekendBackgroundPaint
+            else -> pastBackgroundPaint
+        }
+        return paint ?: dayBackgroundPaint
     }
 
-    fun getFutureBackgroundPaint(isWeekend: Boolean): Paint {
-        return if (isWeekend) futureWeekendBackgroundPaint else futureBackgroundPaint
+    fun getFutureBackgroundPaint(date: Calendar): Paint {
+        val paint = when {
+            date.isToday -> todayBackgroundPaint
+            date.isWeekend -> futureWeekendBackgroundPaint
+            else -> futureBackgroundPaint
+        }
+        return paint ?: dayBackgroundPaint
     }
 
     private fun updateHourHeight(viewHeight: Int) {

core/src/main/java/com/alamkanak/weekview/ViewStateFactory.kt

@@ -3,6 +3,7 @@ package com.alamkanak.weekview
 import android.content.Context
 import android.content.res.TypedArray
 import android.graphics.Color
+import android.graphics.Paint
 import android.graphics.Typeface
 import android.os.Build
 import android.util.AttributeSet
@@ -83,25 +84,12 @@ internal object ViewStateFactory {
             color = a.getColor(R.styleable.WeekView_dayBackgroundColor, context.windowBackground)
         }
 
-        viewState.todayBackgroundPaint.apply {
-            color = a.getColor(R.styleable.WeekView_todayBackgroundColor, viewState.dayBackgroundPaint.color)
-        }
-
-        viewState.pastBackgroundPaint.apply {
-            color = a.getColor(R.styleable.WeekView_pastBackgroundColor, viewState.dayBackgroundPaint.color)
-        }
-
-        viewState.futureBackgroundPaint.apply {
-            color = a.getColor(R.styleable.WeekView_futureBackgroundColor, viewState.dayBackgroundPaint.color)
-        }
-
-        viewState.pastWeekendBackgroundPaint.apply {
-            color = a.getColor(R.styleable.WeekView_pastWeekendBackgroundColor, viewState.pastBackgroundPaint.color)
-        }
+        viewState.todayBackgroundPaint = a.paintFromColor(colorIndex = R.styleable.WeekView_todayBackgroundColor)
+        viewState.pastBackgroundPaint = a.paintFromColor(colorIndex = R.styleable.WeekView_pastBackgroundColor)
+        viewState.futureBackgroundPaint = a.paintFromColor(colorIndex = R.styleable.WeekView_futureBackgroundColor)
 
-        viewState.futureWeekendBackgroundPaint.apply {
-            color = a.getColor(R.styleable.WeekView_futureWeekendBackgroundColor, viewState.futureBackgroundPaint.color)
-        }
+        viewState.pastWeekendBackgroundPaint = a.paintFromColor(colorIndex = R.styleable.WeekView_pastWeekendBackgroundColor)
+        viewState.futureWeekendBackgroundPaint = a.paintFromColor(colorIndex = R.styleable.WeekView_futureWeekendBackgroundColor)
 
         viewState.timeColumnSeparatorPaint.apply {
             color = a.getColor(R.styleable.WeekView_timeColumnSeparatorColor, context.lineColor)
@@ -229,6 +217,14 @@ internal object ViewStateFactory {
     }
 }
 
+private fun TypedArray.paintFromColor(colorIndex: Int): Paint? {
+    return if (hasValue(colorIndex)) getColor(colorIndex, 0).toPaint() else null
+}
+
+internal fun Int.toPaint(): Paint {
+    return Paint().apply { color = this@toPaint }
+}
+
 private const val SANS = 1
 private const val SERIF = 2
 private const val MONOSPACE = 3

core/src/main/java/com/alamkanak/weekview/WeekView.kt

@@ -753,61 +753,62 @@ class WeekView @JvmOverloads constructor(
         }
 
     /**
-     * Returns the background color of the current date.
+     * Returns the background color of the current date. If not explicitly set, WeekView will use
+     * [dayBackgroundColor].
      */
     @PublicApi
     var todayBackgroundColor: Int
-        get() = viewState.todayBackgroundPaint.color
+        get() = viewState.todayBackgroundPaint?.color ?: dayBackgroundColor
         set(value) {
-            viewState.todayBackgroundPaint.color = value
+            viewState.todayBackgroundPaint = value.toPaint()
             invalidate()
         }
 
     /**
-     * Returns the background color for past dates. If not explicitly set, WeekView will used
+     * Returns the background color for past dates. If not explicitly set, WeekView will use
      * [dayBackgroundColor].
      */
     @PublicApi
     var pastBackgroundColor: Int
-        get() = viewState.pastBackgroundPaint.color
+        get() = viewState.pastBackgroundPaint?.color ?: dayBackgroundColor
         set(value) {
-            viewState.pastBackgroundPaint.color = value
+            viewState.pastBackgroundPaint = value.toPaint()
             invalidate()
         }
 
     /**
-     * Returns the background color for past weekend dates. If not explicitly set, WeekView will
-     * used [pastBackgroundColor].
+     * Returns the background color for past weekend dates. If not explicitly set, WeekView will use
+     * [dayBackgroundColor].
      */
     @PublicApi
     var pastWeekendBackgroundColor: Int
-        get() = viewState.pastWeekendBackgroundPaint.color
+        get() = viewState.pastWeekendBackgroundPaint?.color ?: dayBackgroundColor
         set(value) {
-            viewState.pastWeekendBackgroundPaint.color = value
+            viewState.pastWeekendBackgroundPaint = value.toPaint()
             invalidate()
         }
 
     /**
-     * Returns the background color for future dates. If not explicitly set, WeekView will used
+     * Returns the background color for future dates. If not explicitly set, WeekView will use
      * [dayBackgroundColor].
      */
     @PublicApi
     var futureBackgroundColor: Int
-        get() = viewState.futureBackgroundPaint.color
+        get() = viewState.futureBackgroundPaint?.color ?: dayBackgroundColor
         set(value) {
-            viewState.futureBackgroundPaint.color = value
+            viewState.futureBackgroundPaint = value.toPaint()
             invalidate()
         }
 
     /**
      * Returns the background color for future weekend dates. If not explicitly set, WeekView will
-     * used [futureBackgroundColor].
+     * use [dayBackgroundColor].
      */
     @PublicApi
     var futureWeekendBackgroundColor: Int
-        get() = viewState.futureWeekendBackgroundPaint.color
+        get() = viewState.futureWeekendBackgroundPaint?.color ?: dayBackgroundColor
         set(value) {
-            viewState.futureWeekendBackgroundPaint.color = value
+            viewState.futureWeekendBackgroundPaint = value.toPaint()
             invalidate()
         }