Improve how borders are drawn for multi-day events

Author: thellmund

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

@@ -1,6 +1,7 @@
 package com.alamkanak.weekview
 
 import android.graphics.Canvas
+import android.graphics.Paint
 import android.graphics.RectF
 
 fun Canvas.withTranslation(x: Float, y: Float, block: Canvas.() -> Unit) {
@@ -10,6 +11,15 @@ fun Canvas.withTranslation(x: Float, y: Float, block: Canvas.() -> Unit) {
     restore()
 }
 
+fun Canvas.drawVerticalLine(
+    horizontalOffset: Float,
+    startY: Float,
+    endY: Float,
+    paint: Paint
+) {
+    drawLine(horizontalOffset, startY, horizontalOffset, endY, paint)
+}
+
 fun Canvas.drawInBounds(
     left: Float,
     top: Float,

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

@@ -33,7 +33,6 @@ internal class EventChipDrawer(
 
         if (event.style.borderWidth != null) {
             updateBorderPaint(event, borderPaint)
-
             val borderBounds = bounds.insetBy(event.style.borderWidth / 2f)
             canvas.drawRoundRect(borderBounds, cornerRadius, cornerRadius, borderPaint)
         }
@@ -72,40 +71,72 @@ internal class EventChipDrawer(
         }
 
         if (event.style.borderWidth != null) {
-            drawBorderStroke(eventChip, canvas)
+            drawMultiDayBorderStroke(eventChip, cornerRadius, canvas)
         }
     }
 
-    private fun drawBorderStroke(
+    private fun drawMultiDayBorderStroke(
         eventChip: EventChip,
+        cornerRadius: Float,
         canvas: Canvas
     ) {
         val event = eventChip.event
         val originalEvent = eventChip.originalEvent
         val rect = checkNotNull(eventChip.bounds)
 
         val borderWidth = event.style.borderWidth ?: 0
-        val innerWidth = rect.width() - borderWidth * 2
+        val borderStart = rect.left + borderWidth / 2
+        val borderEnd = rect.right - borderWidth / 2
+
+        // val innerWidth = rect.width() - borderWidth * 2
 
-        val borderStartX = rect.left + borderWidth
-        val borderEndX = borderStartX + innerWidth
+//        val borderStartX = rect.left + borderWidth
+//        val borderEndX = borderStartX + innerWidth
 
         updateBorderPaint(event, backgroundPaint)
 
         if (event.startsOnEarlierDay(originalEvent)) {
             // Remove top rounded corners by drawing a rectangle
-            val borderStartY = rect.top
-            val borderEndY = borderStartY + borderWidth
-            val newRect = RectF(borderStartX, borderStartY, borderEndX, borderEndY)
-            canvas.drawRect(newRect, backgroundPaint)
+//            val borderStartY = rect.top
+//            val borderEndY = borderStartY + borderWidth
+//            val newRect = RectF(borderStartX, borderStartY, borderEndX, borderEndY)
+//            canvas.drawRect(newRect, backgroundPaint)
+
+            canvas.drawVerticalLine(
+                horizontalOffset = borderStart,
+                startY = rect.top,
+                endY = rect.top + cornerRadius,
+                paint = backgroundPaint
+            )
+
+            canvas.drawVerticalLine(
+                horizontalOffset = borderEnd,
+                startY = rect.top,
+                endY = rect.top + cornerRadius,
+                paint = backgroundPaint
+            )
         }
 
         if (event.endsOnLaterDay(originalEvent)) {
             // Remove bottom rounded corners by drawing a rectangle
-            val borderEndY = rect.bottom
-            val borderStartY = borderEndY - borderWidth
-            val newRect = RectF(borderStartX, borderStartY, borderEndX, borderEndY)
-            canvas.drawRect(newRect, backgroundPaint)
+//            val borderEndY = rect.bottom
+//            val borderStartY = borderEndY - borderWidth
+//            val newRect = RectF(borderStartX, borderStartY, borderEndX, borderEndY)
+//            canvas.drawRect(newRect, backgroundPaint)
+
+            canvas.drawVerticalLine(
+                horizontalOffset = borderStart,
+                startY = rect.bottom - cornerRadius,
+                endY = rect.bottom,
+                paint = backgroundPaint
+            )
+
+            canvas.drawVerticalLine(
+                horizontalOffset = borderEnd,
+                startY = rect.bottom - cornerRadius,
+                endY = rect.bottom,
+                paint = backgroundPaint
+            )
         }
     }
 

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

@@ -1418,6 +1418,7 @@ class WeekView @JvmOverloads constructor(
          *
          * @param events The [WeekViewDisplayable] elements that are to be displayed in [WeekView]
          */
+        @PublicApi
         fun submit(events: List<WeekViewDisplayable<T>>) {
             val viewState = weekView?.viewState ?: return
             eventsDiffer.submit(events, viewState, onFinished = this::updateObserver)
@@ -1449,6 +1450,7 @@ class WeekView @JvmOverloads constructor(
          *
          * @param events The [WeekViewDisplayable] elements that are to be displayed in [WeekView]
          */
+        @PublicApi
         fun submit(events: List<WeekViewDisplayable<T>>) {
             val viewState = weekView?.viewState ?: return
             eventsDiffer.submit(events, viewState, onFinished = this::updateObserver)
@@ -1465,12 +1467,14 @@ class WeekView @JvmOverloads constructor(
          * @param startDate A [Calendar] of the first date of the month that needs to be fetched
          * @param endDate A [Calendar] of the last date of the month that needs to be fetched
          */
+        @PublicApi
         open fun onLoadMore(startDate: Calendar, endDate: Calendar) = Unit
 
         /**
          * Refreshes the [WeekViewDisplayable] elements presented by this adapter. All cached
          * elements will be removed and a call to [onLoadMore] will be triggered.
          */
+        @PublicApi
         fun refresh() {
             eventsCache.clear()
             weekView?.invalidate()

sample/src/main/java/com/alamkanak/weekview/sample/BasicActivity.kt

@@ -48,8 +48,6 @@ class BasicActivity : AppCompatActivity() {
 
         toolbar.setupWithWeekView(weekView)
 
-        WeekView.SimpleAdapter<Int>()
-
         val adapter = BasicActivityWeekViewAdapter(loadMoreHandler = viewModel::fetchEvents)
         weekView.adapter = adapter
 

sample/src/main/java/com/alamkanak/weekview/sample/data/EventsDatabase.kt

@@ -62,7 +62,6 @@ class EventsDatabase(context: Context) {
             hour = 20,
             minute = 0,
             duration = 5 * 60,
-            isCanceled = true,
             color = color4
         )