Use SimpleAdapter and PagingAdapter for submitting new events (alamkanak#162)

* Introduce SimpleAdapter and PagingAdapter

This means WeekView must no longer be generic.

* Update JodaTime, JSR310 and ThreeTenABP date extensions

Author: thellmund

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

@@ -5,13 +5,13 @@ import android.text.SpannableStringBuilder
 import android.text.StaticLayout
 import kotlin.math.roundToInt
 
-internal class AllDayEventsUpdater<T : Any>(
+internal class AllDayEventsUpdater(
     private val viewState: ViewState,
-    private val cache: WeekViewCache<T>,
-    private val chipsCache: EventChipsCache<T>
+    private val cache: WeekViewCache,
+    private val chipsCache: EventChipsCache
 ) : Updater {
 
-    private val boundsCalculator = EventChipBoundsCalculator<T>(viewState)
+    private val boundsCalculator = EventChipBoundsCalculator(viewState)
     private val spannableStringBuilder = SpannableStringBuilder()
 
     private var previousHorizontalOrigin: Float? = null
@@ -25,7 +25,7 @@ internal class AllDayEventsUpdater<T : Any>(
     }
 
     override fun update() {
-        cache.clearAllDayEventLayouts()
+        cache.allDayEventLayouts.clear()
 
         val datesWithStartPixels = viewState.dateRangeWithStartPixels
         for ((date, startPixel) in datesWithStartPixels) {
@@ -50,7 +50,7 @@ internal class AllDayEventsUpdater<T : Any>(
     }
 
     private fun calculateTextLayout(
-        eventChip: EventChip<T>,
+        eventChip: EventChip,
         startPixel: Float
     ) {
         val chipRect = boundsCalculator.calculateAllDayEvent(eventChip, startPixel)
@@ -64,9 +64,7 @@ internal class AllDayEventsUpdater<T : Any>(
         }
     }
 
-    private fun calculateChipTextLayout(
-        eventChip: EventChip<T>
-    ): StaticLayout? {
+    private fun calculateChipTextLayout(eventChip: EventChip): StaticLayout? {
         val event = eventChip.event
         val bounds = checkNotNull(eventChip.bounds)
 
@@ -120,7 +118,7 @@ internal class AllDayEventsUpdater<T : Any>(
      * Creates a dummy text layout that is only used to determine the height of all-day events.
      */
     private fun createDummyTextLayout(
-        event: ResolvedWeekViewEvent<T>
+        event: ResolvedWeekViewEvent<*>
     ): StaticLayout {
         if (dummyTextLayout == null) {
             val textPaint = viewState.getTextPaint(event)
@@ -129,7 +127,7 @@ internal class AllDayEventsUpdater<T : Any>(
         return checkNotNull(dummyTextLayout)
     }
 
-    private fun EventChip<T>.ellipsizeText(
+    private fun EventChip.ellipsizeText(
         text: CharSequence,
         availableWidth: Int,
         existingTextLayout: StaticLayout

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

@@ -3,9 +3,9 @@ package com.alamkanak.weekview
 import android.graphics.Canvas
 import java.util.Calendar
 
-internal class DayLabelsDrawer<T>(
+internal class DayLabelsDrawer(
     private val viewState: ViewState,
-    private val cache: WeekViewCache<T>
+    private val cache: WeekViewCache
 ) : Drawer {
 
     override fun draw(canvas: Canvas) {

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

@@ -12,18 +12,24 @@ import android.graphics.RectF
  * The original [ResolvedWeekViewEvent] is accessible via [originalEvent]. The
  * [ResolvedWeekViewEvent] that corresponds to the drawn rectangle is accessible via [event].
  */
-internal data class EventChip<T>(
+internal data class EventChip(
     /**
      * The [ResolvedWeekViewEvent] corresponding to the drawn rectangle. It might differ from
      * [originalEvent], which may be a multi-day event.
      */
-    val event: ResolvedWeekViewEvent<T>,
+    val event: ResolvedWeekViewEvent<*>,
     /**
      * The original [ResolvedWeekViewEvent], which may be a multi-day event.
      */
-    val originalEvent: ResolvedWeekViewEvent<T>
+    val originalEvent: ResolvedWeekViewEvent<*>
 ) {
 
+    /**
+     * The ID of the [ResolvedWeekViewEvent] that this [EventChip] represents.
+     */
+    val eventId: Long
+        get() = originalEvent.id
+
     /**
      * The rectangle in which the [ResolvedWeekViewEvent] will be drawn.
      */

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

@@ -2,12 +2,12 @@ package com.alamkanak.weekview
 
 import android.graphics.RectF
 
-internal class EventChipBoundsCalculator<T>(
+internal class EventChipBoundsCalculator(
     private val viewState: ViewState
 ) {
 
     fun calculateSingleEvent(
-        eventChip: EventChip<T>,
+        eventChip: EventChip,
         startPixel: Float
     ): RectF {
         val widthPerDay = viewState.widthPerDay
@@ -47,7 +47,7 @@ internal class EventChipBoundsCalculator<T>(
     }
 
     fun calculateAllDayEvent(
-        eventChip: EventChip<T>,
+        eventChip: EventChip,
         startPixel: Float
     ): RectF {
         val top = viewState.headerTextHeight + viewState.headerRowPadding * 1.5f

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

@@ -8,18 +8,18 @@ import android.text.SpannableStringBuilder
 import android.text.StaticLayout
 import android.text.style.StyleSpan
 
-internal class EventChipDrawer<T>(
+internal class EventChipDrawer(
     private val viewState: ViewState
 ) {
 
-    private val textFitter = TextFitter<T>(viewState)
+    private val textFitter = TextFitter(viewState)
     private val textLayoutCache = mutableMapOf<Long, StaticLayout>()
 
     private val backgroundPaint = Paint()
     private val borderPaint = Paint()
 
     internal fun draw(
-        eventChip: EventChip<T>,
+        eventChip: EventChip,
         canvas: Canvas,
         textLayout: StaticLayout? = null
     ) {
@@ -51,7 +51,7 @@ internal class EventChipDrawer<T>(
     }
 
     private fun drawCornersForMultiDayEvents(
-        eventChip: EventChip<T>,
+        eventChip: EventChip,
         cornerRadius: Float,
         canvas: Canvas
     ) {
@@ -77,7 +77,7 @@ internal class EventChipDrawer<T>(
     }
 
     private fun drawStroke(
-        eventChip: EventChip<T>,
+        eventChip: EventChip,
         canvas: Canvas
     ) {
         val event = eventChip.event
@@ -110,7 +110,7 @@ internal class EventChipDrawer<T>(
     }
 
     private fun drawEventTitle(
-        eventChip: EventChip<T>,
+        eventChip: EventChip,
         textLayout: StaticLayout,
         canvas: Canvas
     ) {
@@ -127,7 +127,7 @@ internal class EventChipDrawer<T>(
     }
 
     private fun calculateTextHeightAndDrawTitle(
-        eventChip: EventChip<T>,
+        eventChip: EventChip,
         canvas: Canvas
     ) {
         val event = eventChip.event
@@ -183,7 +183,7 @@ internal class EventChipDrawer<T>(
     }
 
     private fun updateBackgroundPaint(
-        event: ResolvedWeekViewEvent<T>,
+        event: ResolvedWeekViewEvent<*>,
         paint: Paint
     ) {
         paint.color = event.style.backgroundColor ?: viewState.defaultEventColor
@@ -193,7 +193,7 @@ internal class EventChipDrawer<T>(
     }
 
     private fun updateBorderPaint(
-        event: ResolvedWeekViewEvent<T>,
+        event: ResolvedWeekViewEvent<*>,
         paint: Paint
     ) {
         paint.color = event.style.borderColor ?: viewState.defaultEventColor

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

@@ -3,18 +3,18 @@ package com.alamkanak.weekview
 import java.util.Calendar
 import java.util.concurrent.ConcurrentHashMap
 
-internal class EventChipsCache<T> {
+internal class EventChipsCache {
 
-    val allEventChips: List<EventChip<T>>
+    val allEventChips: List<EventChip>
         get() = normalEventChipsByDate.values.flatten() + allDayEventChipsByDate.values.flatten()
 
-    private val normalEventChipsByDate = ConcurrentHashMap<Long, MutableList<EventChip<T>>>()
-    private val allDayEventChipsByDate = ConcurrentHashMap<Long, MutableList<EventChip<T>>>()
+    private val normalEventChipsByDate = ConcurrentHashMap<Long, MutableList<EventChip>>()
+    private val allDayEventChipsByDate = ConcurrentHashMap<Long, MutableList<EventChip>>()
 
     fun allEventChipsInDateRange(
         dateRange: List<Calendar>
-    ): List<EventChip<T>> {
-        val results = mutableListOf<EventChip<T>>()
+    ): List<EventChip> {
+        val results = mutableListOf<EventChip>()
         for (date in dateRange) {
             results += allDayEventChipsByDate[date.atStartOfDay.timeInMillis].orEmpty()
             results += normalEventChipsByDate[date.atStartOfDay.timeInMillis].orEmpty()
@@ -24,23 +24,23 @@ internal class EventChipsCache<T> {
 
     fun normalEventChipsByDate(
         date: Calendar
-    ): List<EventChip<T>> = normalEventChipsByDate[date.atStartOfDay.timeInMillis].orEmpty()
+    ): List<EventChip> = normalEventChipsByDate[date.atStartOfDay.timeInMillis].orEmpty()
 
     fun allDayEventChipsByDate(
         date: Calendar
-    ): List<EventChip<T>> = allDayEventChipsByDate[date.atStartOfDay.timeInMillis].orEmpty()
+    ): List<EventChip> = allDayEventChipsByDate[date.atStartOfDay.timeInMillis].orEmpty()
 
     fun allDayEventChipsInDateRange(
         dateRange: List<Calendar>
-    ): List<EventChip<T>> {
-        val results = mutableListOf<EventChip<T>>()
+    ): List<EventChip> {
+        val results = mutableListOf<EventChip>()
         for (date in dateRange) {
             results += allDayEventChipsByDate[date.atStartOfDay.timeInMillis].orEmpty()
         }
         return results
     }
 
-    private fun put(newChips: List<EventChip<T>>) {
+    private fun put(newChips: List<EventChip>) {
         for (eventChip in newChips) {
             val key = eventChip.event.startTime.atStartOfDay.timeInMillis
             if (eventChip.event.isAllDay) {
@@ -51,20 +51,20 @@ internal class EventChipsCache<T> {
         }
     }
 
-    operator fun plusAssign(newChips: List<EventChip<T>>) = put(newChips)
+    operator fun plusAssign(newChips: List<EventChip>) = put(newChips)
 
     fun clearSingleEventsCache() {
-        allEventChips.filter { it.originalEvent.isNotAllDay }.forEach(EventChip<T>::clearCache)
+        allEventChips.filter { it.originalEvent.isNotAllDay }.forEach(EventChip::clearCache)
     }
 
     fun clear() {
         allDayEventChipsByDate.clear()
         normalEventChipsByDate.clear()
     }
 
-    private fun <T> ConcurrentHashMap<Long, MutableList<EventChip<T>>>.addOrReplace(
+    private fun ConcurrentHashMap<Long, MutableList<EventChip>>.addOrReplace(
         key: Long,
-        eventChip: EventChip<T>
+        eventChip: EventChip
     ) {
         val results = getOrElse(key) { mutableListOf() }
         val indexOfExisting = results.indexOfFirst { it.event.id == eventChip.event.id }