Fix issue where click listeners didn't work after zooming

Author: thellmund

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

@@ -45,9 +45,10 @@ internal class SingleEventsUpdater<T : Any>(
     }
 
     private val RectF.isValidSingleEventRect: Boolean
-        get() = (left < right &&
-            left < view.width &&
-            top < view.height &&
-            right > config.timeColumnWidth &&
-            bottom > config.headerHeight)
+        get() {
+            val hasCorrectWidth = left < right && left < view.width
+            val hasCorrectHeight = top < view.height
+            val isNotHiddenByChrome = right > config.timeColumnWidth && bottom > config.headerHeight
+            return hasCorrectWidth && hasCorrectHeight && isNotHiddenByChrome
+        }
 }

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

@@ -28,8 +28,7 @@ class WeekView<T : Any> @JvmOverloads constructor(
     }
 
     private val gestureListener = object : WeekViewGestureHandler.Listener {
-        override fun onScaled() = invalidate()
-        override fun onScrolled() = ViewCompat.postInvalidateOnAnimation(this@WeekView)
+        override fun requireInvalidation() = ViewCompat.postInvalidateOnAnimation(this@WeekView)
     }
 
     private val cache = WeekViewCache<T>()

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

@@ -56,7 +56,7 @@ internal class WeekViewGestureHandler<T : Any>(
         object : ScaleGestureDetector.OnScaleGestureListener {
             override fun onScaleEnd(detector: ScaleGestureDetector) {
                 isZooming = false
-                chipCache.clearSingleEventsCache()
+                listener.requireInvalidation()
             }
 
             override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
@@ -68,7 +68,7 @@ internal class WeekViewGestureHandler<T : Any>(
             override fun onScale(detector: ScaleGestureDetector): Boolean {
                 val hourHeight = config.hourHeight
                 config.newHourHeight = hourHeight * detector.scaleFactor
-                listener.onScaled()
+                listener.requireInvalidation()
                 return true
             }
         })
@@ -138,11 +138,11 @@ internal class WeekViewGestureHandler<T : Any>(
                 config.currentOrigin.x -= distanceX * config.xScrollingSpeed
                 config.currentOrigin.x = min(config.currentOrigin.x, config.maxX)
                 config.currentOrigin.x = max(config.currentOrigin.x, config.minX)
-                listener.onScrolled()
+                listener.requireInvalidation()
             }
             currentScrollDirection.isVertical -> {
                 config.currentOrigin.y -= distanceY
-                listener.onScrolled()
+                listener.requireInvalidation()
             }
             else -> Unit
         }
@@ -178,7 +178,7 @@ internal class WeekViewGestureHandler<T : Any>(
             else -> Unit
         }
 
-        listener.onScrolled()
+        listener.requireInvalidation()
         return true
     }
 
@@ -331,7 +331,7 @@ internal class WeekViewGestureHandler<T : Any>(
             val duration = (daysScrolled * config.scrollDuration).toInt()
 
             scroller.startScroll(startX, startY, distanceX, distanceY, duration)
-            listener.onScrolled()
+            listener.requireInvalidation()
         }
 
         // Reset scrolling and fling direction.
@@ -378,7 +378,7 @@ internal class WeekViewGestureHandler<T : Any>(
             } else if (scroller.computeScrollOffset()) {
                 config.currentOrigin.y = scroller.currY.toFloat()
                 config.currentOrigin.x = scroller.currX.toFloat()
-                listener.onScrolled()
+                listener.requireInvalidation()
             }
         }
     }
@@ -397,7 +397,6 @@ internal class WeekViewGestureHandler<T : Any>(
         get() = ViewConfiguration.get(context).scaledTouchSlop
 
     internal interface Listener {
-        fun onScaled()
-        fun onScrolled()
+        fun requireInvalidation()
     }
 }