Fix issue where goToHour() would work incorrectly when minHour was set

Author: thellmund

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

@@ -1114,24 +1114,34 @@ class WeekView<T : Any> @JvmOverloads constructor(
     /**
      * Scrolls to a specific hour.
      *
-     * @param hour The hour to scroll to in 24-hour format. Supported values are 0-24.
+     * @param hour The hour to scroll to, in 24-hour format. Supported values are 0-24.
+     *
+     * @throws IllegalArgumentException Throws exception if the provided hour is smaller than
+     *                                   [minHour] or larger than [maxHour].
      */
     override fun goToHour(hour: Int) {
         if (viewState.areDimensionsInvalid) {
             viewState.scrollToHour = hour
             return
         }
 
-        val modifiedHour = min(hour, configWrapper.hoursPerDay)
-        var verticalOffset = configWrapper.hourHeight * modifiedHour
+        if (hour !in configWrapper.timeRange) {
+            throw IllegalArgumentException(
+                "The provided hour ($hour) is outside of the set time range " +
+                    "(${configWrapper.minHour} – ${configWrapper.maxHour})"
+            )
+        }
 
-        val dayHeight = configWrapper.totalDayHeight
-        val viewHeight = height.toDouble()
+        val hourHeight = configWrapper.hourHeight
+        val desiredOffset = hourHeight * (hour - configWrapper.minHour)
 
-        val desiredOffset = dayHeight - viewHeight
-        verticalOffset = min(desiredOffset.toFloat(), verticalOffset)
+        // We make sure that WeekView doesn't "over-scroll" by limiting the offset to the total day
+        // height minus the height of WeekView, which would result in scrolling all the way to the
+        // bottom.
+        val maxOffset = configWrapper.totalDayHeight - height
+        val finalOffset = min(maxOffset, desiredOffset)
 
-        configWrapper.currentOrigin.y = -verticalOffset
+        configWrapper.currentOrigin.y = finalOffset * (-1)
         invalidate()
     }
 

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

@@ -10,8 +10,6 @@ import java.util.Calendar
 import kotlin.math.max
 import kotlin.math.min
 
-private const val DAYS_PER_WEEK = 7
-
 internal class WeekViewConfigWrapper(
     private val view: WeekView<*>,
     private val config: WeekViewConfig
@@ -254,6 +252,9 @@ internal class WeekViewConfigWrapper(
             config.maxHour = value
         }
 
+    val timeRange: IntRange
+        get() = minHour..maxHour
+
     var xScrollingSpeed: Float
         get() = config.xScrollingSpeed
         set(value) {

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

@@ -198,8 +198,6 @@ data class WeekViewEvent<T> internal constructor(
         private var data: T? = null
     ) {
 
-        // private val event = WeekViewEvent(data = data)
-
         private var id: Long? = null
         private var title: TextResource? = null
         private var location: TextResource? = null