Fix issue where header height wasn't updated correctly

Author: thellmund

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

@@ -2,7 +2,6 @@ package com.alamkanak.weekview
 
 import android.graphics.Canvas
 import android.graphics.Paint
-import android.graphics.Rect
 import android.graphics.RectF
 import java.util.Calendar
 import kotlin.math.max
@@ -21,8 +20,7 @@ internal class CalendarRenderer(
         DayBackgroundDrawer(viewState),
         BackgroundGridDrawer(viewState),
         SingleEventsDrawer(viewState, eventChipsCache),
-        NowLineDrawer(viewState),
-        HeaderRowDrawer(viewState)
+        NowLineDrawer(viewState)
     )
 
     override fun render(canvas: Canvas) {
@@ -305,73 +303,3 @@ private class NowLineDrawer(
         drawCircle(actualStartPixel, lineStartY, adjustedRadius, viewState.nowDotPaint)
     }
 }
-
-private class HeaderRowDrawer(
-    private val viewState: ViewState
-) : Drawer {
-
-    override fun draw(canvas: Canvas) {
-        val width = viewState.viewWidth.toFloat()
-
-        val backgroundPaint = if (viewState.showHeaderRowBottomShadow) {
-            viewState.headerBackgroundPaint.withShadow(
-                radius = viewState.headerRowBottomShadowRadius,
-                color = viewState.headerRowBottomShadowColor
-            )
-        } else viewState.headerBackgroundPaint
-
-        canvas.drawRect(0f, 0f, width, viewState.headerHeight, backgroundPaint)
-
-        if (viewState.showWeekNumber) {
-            canvas.drawWeekNumber(viewState)
-        }
-
-        if (viewState.showHeaderRowBottomLine) {
-            val y = viewState.headerHeight - viewState.headerRowBottomLineWidth
-            canvas.drawLine(0f, y, width, y, viewState.headerRowBottomLinePaint)
-        }
-    }
-
-    private fun Canvas.drawWeekNumber(state: ViewState) {
-        val weekNumber = state.dateRange.first().weekOfYear.toString()
-
-        val bounds = state.weekNumberBounds
-        val textPaint = state.weekNumberTextPaint
-
-        val textHeight = textPaint.textHeight
-        val textOffset = (textHeight / 2f).roundToInt() - textPaint.descent().roundToInt()
-
-        val width = textPaint.getTextBounds("52").width() * 2.5f
-        val height = textHeight * 1.5f
-
-        val backgroundRect = RectF(
-            bounds.centerX() - width / 2f,
-            bounds.centerY() - height / 2f,
-            bounds.centerX() + width / 2f,
-            bounds.centerY() + height / 2f
-        )
-
-        drawRect(bounds, state.headerBackgroundPaint)
-
-        val backgroundPaint = state.weekNumberBackgroundPaint
-        val radius = state.weekNumberBackgroundCornerRadius.toFloat()
-        drawRoundRect(backgroundRect, radius, radius, backgroundPaint)
-
-        drawText(weekNumber, bounds.centerX(), bounds.centerY() + textOffset, textPaint)
-    }
-}
-
-private val Paint.textHeight: Int
-    get() = (descent() - ascent()).roundToInt()
-
-private fun Paint.getTextBounds(text: String): Rect {
-    val rect = Rect()
-    getTextBounds(text, 0, text.length, rect)
-    return rect
-}
-
-private fun Paint.withShadow(radius: Int, color: Int): Paint {
-    return Paint(this).apply {
-        setShadowLayer(radius.toFloat(), 0f, 0f, color)
-    }
-}

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

@@ -1,6 +1,8 @@
 package com.alamkanak.weekview
 
 import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Rect
 import android.graphics.RectF
 import android.text.SpannableStringBuilder
 import android.text.StaticLayout
@@ -23,22 +25,26 @@ internal class HeaderRenderer(
         labelLayouts = dateLabelLayouts
     )
 
-    private val dateLabelDrawer = DayLabelsDrawer(
-        viewState = viewState,
-        dateLabelLayouts = dateLabelLayouts
-    )
-
     private val eventsUpdater = AllDayEventsUpdater(
         viewState = viewState,
         eventsLabelLayouts = allDayEventLabels,
         eventChipsCache = eventChipsCache
     )
 
+    private val dateLabelDrawer = DayLabelsDrawer(
+        viewState = viewState,
+        dateLabelLayouts = dateLabelLayouts
+    )
+
     private val eventsDrawer = AllDayEventsDrawer(
         viewState = viewState,
         allDayEventLayouts = allDayEventLabels
     )
 
+    private val headerRowDrawer = HeaderRowDrawer(
+        viewState = viewState
+    )
+
     override fun onSizeChanged(width: Int, height: Int) {
         allDayEventLabels.clear()
         dateLabelLayouts.clear()
@@ -53,10 +59,11 @@ internal class HeaderRenderer(
         if (eventsUpdater.isRequired()) {
             eventsUpdater.update()
         }
-        eventsDrawer.draw(canvas)
-
         headerRowUpdater.update()
+
+        headerRowDrawer.draw(canvas)
         dateLabelDrawer.draw(canvas)
+        eventsDrawer.draw(canvas)
     }
 }
 
@@ -290,3 +297,73 @@ internal class AllDayEventsDrawer(
         }
     }
 }
+
+private class HeaderRowDrawer(
+    private val viewState: ViewState
+) : Drawer {
+
+    override fun draw(canvas: Canvas) {
+        val width = viewState.viewWidth.toFloat()
+
+        val backgroundPaint = if (viewState.showHeaderRowBottomShadow) {
+            viewState.headerBackgroundPaint.withShadow(
+                radius = viewState.headerRowBottomShadowRadius,
+                color = viewState.headerRowBottomShadowColor
+            )
+        } else viewState.headerBackgroundPaint
+
+        canvas.drawRect(0f, 0f, width, viewState.headerHeight, backgroundPaint)
+
+        if (viewState.showWeekNumber) {
+            canvas.drawWeekNumber(viewState)
+        }
+
+        if (viewState.showHeaderRowBottomLine) {
+            val y = viewState.headerHeight - viewState.headerRowBottomLineWidth
+            canvas.drawLine(0f, y, width, y, viewState.headerRowBottomLinePaint)
+        }
+    }
+
+    private fun Canvas.drawWeekNumber(state: ViewState) {
+        val weekNumber = state.dateRange.first().weekOfYear.toString()
+
+        val bounds = state.weekNumberBounds
+        val textPaint = state.weekNumberTextPaint
+
+        val textHeight = textPaint.textHeight
+        val textOffset = (textHeight / 2f).roundToInt() - textPaint.descent().roundToInt()
+
+        val width = textPaint.getTextBounds("52").width() * 2.5f
+        val height = textHeight * 1.5f
+
+        val backgroundRect = RectF(
+            bounds.centerX() - width / 2f,
+            bounds.centerY() - height / 2f,
+            bounds.centerX() + width / 2f,
+            bounds.centerY() + height / 2f
+        )
+
+        drawRect(bounds, state.headerBackgroundPaint)
+
+        val backgroundPaint = state.weekNumberBackgroundPaint
+        val radius = state.weekNumberBackgroundCornerRadius.toFloat()
+        drawRoundRect(backgroundRect, radius, radius, backgroundPaint)
+
+        drawText(weekNumber, bounds.centerX(), bounds.centerY() + textOffset, textPaint)
+    }
+}
+
+private val Paint.textHeight: Int
+    get() = (descent() - ascent()).roundToInt()
+
+private fun Paint.getTextBounds(text: String): Rect {
+    val rect = Rect()
+    getTextBounds(text, 0, text.length, rect)
+    return rect
+}
+
+private fun Paint.withShadow(radius: Int, color: Int): Paint {
+    return Paint(this).apply {
+        setShadowLayer(radius.toFloat(), 0f, 0f, color)
+    }
+}

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

@@ -1,6 +1,5 @@
 package com.alamkanak.weekview
 
-import android.animation.Animator
 import android.animation.ValueAnimator as AndroidValueAnimator
 import android.view.animation.DecelerateInterpolator
 
@@ -15,8 +14,7 @@ internal class ValueAnimator {
         fromValue: Float,
         toValue: Float,
         duration: Long = 300,
-        onUpdate: (Float) -> Unit,
-        onEnd: () -> Unit = {}
+        onUpdate: (Float) -> Unit
     ) {
         valueAnimator?.cancel()
 
@@ -29,8 +27,6 @@ internal class ValueAnimator {
                 onUpdate(value)
             }
 
-            addEndListener { onEnd() }
-
             start()
         }
     }
@@ -39,15 +35,3 @@ internal class ValueAnimator {
         valueAnimator?.cancel()
     }
 }
-
-private fun AndroidValueAnimator.addEndListener(listener: (AndroidValueAnimator) -> Unit) {
-    addListener(object : Animator.AnimatorListener {
-        override fun onAnimationStart(animator: Animator) {
-            listener(animator as AndroidValueAnimator)
-        }
-
-        override fun onAnimationEnd(animator: Animator) = Unit
-        override fun onAnimationCancel(animator: Animator) = Unit
-        override fun onAnimationRepeat(animator: Animator) = Unit
-    })
-}

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

@@ -18,7 +18,7 @@ import kotlin.math.min
 typealias DateFormatter = (Calendar) -> String
 typealias TimeFormatter = (Int) -> String
 
-data class ViewState(
+internal data class ViewState(
     // View
     var viewWidth: Int = 0,
     var viewHeight: Int = 0,
@@ -805,11 +805,6 @@ private fun TypedArray.getInt(index: Int): Int? {
     return if (hasValue(index)) getInteger(index, 0) else null
 }
 
-private fun Float.limit(
-    minValue: Float,
-    maxValue: Float
-): Float = min(max(this, minValue), maxValue)
-
 private object Defaults {
     const val BACKGROUND_COLOR = Color.WHITE
     val PAST_BACKGROUND_COLOR = Color.rgb(227, 227, 227)

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

@@ -44,6 +44,8 @@ class WeekView @JvmOverloads constructor(
         eventChipsCache = eventChipsCache
     )
 
+    private val scroller = ValueAnimator()
+
     private val renderers: List<Renderer> = listOf(
         TimeColumnRenderer(viewState),
         CalendarRenderer(viewState, eventChipsCache),
@@ -1110,9 +1112,24 @@ class WeekView @JvmOverloads constructor(
             return
         }
 
-        val diff = adjustedDate.daysFromToday
-        viewState.currentOrigin.x = diff.toFloat() * (-1f) * viewState.totalDayWidth
-        invalidate()
+        val destinationOffset = viewState.getXOriginForDate(date)
+        val adjustedDestinationOffset = destinationOffset.limit(
+            minValue = viewState.minX,
+            maxValue = viewState.maxX
+        )
+
+        scroller.animate(
+            fromValue = viewState.currentOrigin.x,
+            toValue = adjustedDestinationOffset,
+            onUpdate = {
+                viewState.currentOrigin.x = it
+                invalidate()
+            }
+        )
+
+//        val diff = adjustedDate.daysFromToday
+//        viewState.currentOrigin.x = diff.toFloat() * (-1f) * viewState.totalDayWidth
+//        invalidate()
     }
 
     /**
@@ -1144,10 +1161,16 @@ class WeekView @JvmOverloads constructor(
         // height minus the height of WeekView, which would result in scrolling all the way to the
         // bottom.
         val maxOffset = viewState.totalDayHeight - height
-        val finalOffset = min(maxOffset, desiredOffset)
-
-        viewState.currentOrigin.y = finalOffset * (-1)
-        invalidate()
+        val finalOffset = min(maxOffset, desiredOffset) * (-1)
+
+        scroller.animate(
+            fromValue = viewState.currentOrigin.y,
+            toValue = finalOffset,
+            onUpdate = {
+                viewState.currentOrigin.y = it
+                invalidate()
+            }
+        )
     }
 
     /**

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

@@ -247,6 +247,6 @@ internal class WeekViewGestureHandler(
 
     private val Context.scaledTouchSlop: Int
         get() = ViewConfiguration.get(this).scaledTouchSlop
-
-    private fun Float.limit(minValue: Float, maxValue: Float): Float = min(max(this, minValue), maxValue)
 }
+
+internal fun Float.limit(minValue: Float, maxValue: Float): Float = min(max(this, minValue), maxValue)