Allow SpannableString for event titles and locations (alamkanak#152)

* Introduce ResolvedWeekViewEvent to only resolve resources once

* Move text conversion methods into extension methods

* Allow SpannableStrings in event titles and locations

* Fix incorrect drawing of event chip borders, titles, and locations

Author: thellmund

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

@@ -1,26 +1,19 @@
 package com.alamkanak.weekview
 
 import android.graphics.RectF
-import android.graphics.Typeface
 import android.text.SpannableStringBuilder
 import android.text.StaticLayout
-import android.text.TextPaint
-import android.text.TextUtils
-import android.text.TextUtils.TruncateAt.END
-import android.text.style.StyleSpan
-import com.alamkanak.weekview.WeekViewEvent.TextResource
 import kotlin.math.roundToInt
 
 internal class AllDayEventsUpdater<T : Any>(
     private val view: WeekView<T>,
     private val config: WeekViewConfigWrapper,
     private val cache: WeekViewCache<T>,
-    private val chipsCache: EventChipsCache<T>,
-    private val emojiTextProcessor: EmojiTextProcessor = EmojiTextProcessor()
+    private val chipsCache: EventChipsCache<T>
 ) : Updater {
 
-    private val context = view.context
-    private val rectCalculator = EventChipRectCalculator<T>(config)
+    private val boundsCalculator = EventChipBoundsCalculator<T>(config)
+    private val spannableStringBuilder = SpannableStringBuilder()
 
     private var previousHorizontalOrigin: Float? = null
     private var dummyTextLayout: StaticLayout? = null
@@ -61,13 +54,13 @@ internal class AllDayEventsUpdater<T : Any>(
         eventChip: EventChip<T>,
         startPixel: Float
     ) {
-        val chipRect = rectCalculator.calculateAllDayEvent(eventChip, startPixel)
+        val chipRect = boundsCalculator.calculateAllDayEvent(eventChip, startPixel)
         eventChip.bounds = if (chipRect.isValidEventBounds) chipRect else null
 
         if (chipRect.isValidEventBounds) {
             val textLayout = calculateChipTextLayout(eventChip)
-            textLayout?.let { layout ->
-                cache.allDayEventLayouts[eventChip] = layout
+            if (textLayout != null) {
+                cache.allDayEventLayouts[eventChip] = textLayout
             }
         }
     }
@@ -96,31 +89,25 @@ internal class AllDayEventsUpdater<T : Any>(
             return dummyTextLayout
         }
 
-        val title = when (val resource = event.titleResource) {
-            is TextResource.Id -> context.getString(resource.resId)
-            is TextResource.Value -> resource.text
-            null -> ""
-        }
-
-        val modifiedTitle = emojiTextProcessor.process(title)
-        val text = SpannableStringBuilder(modifiedTitle)
-        text.setSpan(StyleSpan(Typeface.BOLD))
+        spannableStringBuilder.clear()
+        val title = event.title.emojify()
+        spannableStringBuilder.append(title)
 
-        val location = when (val resource = event.locationResource) {
-            is TextResource.Id -> context.getString(resource.resId)
-            is TextResource.Value -> resource.text
-            null -> null
-        }
+        // val title = event.title.emojify()
+        // val text = SpannableStringBuilder(title)
+        // text.setSpan(StyleSpan(Typeface.BOLD))
 
+        val location = event.location?.emojify()
         if (location != null) {
-            val modifiedLocation = emojiTextProcessor.process(location)
-            text.append(' ').append(modifiedLocation)
+            spannableStringBuilder.append(' ')
+            spannableStringBuilder.append(location)
         }
 
+        val text = spannableStringBuilder.build()
         val availableWidth = width.toInt()
 
-        val textPaint = event.getTextPaint(context, config)
-        val textLayout = TextLayoutBuilder.build(text, textPaint, availableWidth)
+        val textPaint = config.getTextPaint(event)
+        val textLayout = text.toTextLayout(textPaint, availableWidth)
         val lineHeight = textLayout.height / textLayout.lineCount
 
         // For an all day event, we display just one line
@@ -134,11 +121,11 @@ 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: WeekViewEvent<T>
+        event: ResolvedWeekViewEvent<T>
     ): StaticLayout {
         if (dummyTextLayout == null) {
-            val textPaint = event.getTextPaint(context, config)
-            dummyTextLayout = TextLayoutBuilder.build("", textPaint, width = 0)
+            val textPaint = config.getTextPaint(event)
+            dummyTextLayout = "".toTextLayout(textPaint, width = 0)
         }
         return checkNotNull(dummyTextLayout)
     }
@@ -148,7 +135,7 @@ internal class AllDayEventsUpdater<T : Any>(
         availableWidth: Int,
         existingTextLayout: StaticLayout
     ): StaticLayout {
-        val textPaint = event.getTextPaint(context, config)
+        val textPaint = config.getTextPaint(event)
         val bounds = checkNotNull(bounds)
         val width = bounds.width().roundToInt() - (config.eventPaddingHorizontal * 2)
 
@@ -160,7 +147,7 @@ internal class AllDayEventsUpdater<T : Any>(
             return existingTextLayout
         }
 
-        return TextLayoutBuilder.build(ellipsized, textPaint, width)
+        return ellipsized.toTextLayout(textPaint, width)
     }
 
     private val RectF.isValidEventBounds: Boolean
@@ -169,18 +156,4 @@ internal class AllDayEventsUpdater<T : Any>(
             top < view.height &&
             right > config.timeColumnWidth &&
             bottom > 0)
-
-    private operator fun RectF.component1() = left
-
-    private operator fun RectF.component2() = top
-
-    private operator fun RectF.component3() = right
-
-    private operator fun RectF.component4() = bottom
-
-    private fun CharSequence.ellipsized(
-        textPaint: TextPaint,
-        availableArea: Int,
-        truncateAt: TextUtils.TruncateAt = END
-    ): CharSequence = TextUtils.ellipsize(this, textPaint, availableArea.toFloat(), truncateAt)
 }

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

@@ -1,6 +1,7 @@
 package com.alamkanak.weekview
 
 import android.graphics.Canvas
+import android.graphics.RectF
 
 fun Canvas.withTranslation(x: Float, y: Float, block: Canvas.() -> Unit) {
     save()
@@ -21,3 +22,9 @@ fun Canvas.drawInRect(
     block()
     restore()
 }
+
+fun RectF.insetBy(inset: Float): RectF {
+    return RectF(this).apply {
+        inset(inset, inset)
+    }
+}

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

@@ -3,29 +3,29 @@ package com.alamkanak.weekview
 import android.graphics.RectF
 
 /**
- * This class encapsulates a [WeekViewEvent] and its visual representation, a [RectF]
+ * This class encapsulates a [ResolvedWeekViewEvent] and its visual representation, a [RectF]
  * which is eventually drawn to the screen.
  *
  * There may be more than one [EventChip] for any even (think multi-day events). In that case,
- * multiple [EventChip]s will be used for a single [WeekViewEvent].
+ * multiple [EventChip]s will be used for a single [ResolvedWeekViewEvent].
  *
- * The original [WeekViewEvent] is accessible via [originalEvent]. The [WeekViewEvent] that
- * corresponds to the drawn rectangle is accessible via [event].
+ * The original [ResolvedWeekViewEvent] is accessible via [originalEvent]. The
+ * [ResolvedWeekViewEvent] that corresponds to the drawn rectangle is accessible via [event].
  */
 internal data class EventChip<T>(
     /**
-     * The [WeekViewEvent] corresponding to the drawn rectangle. It might differ from
+     * The [ResolvedWeekViewEvent] corresponding to the drawn rectangle. It might differ from
      * [originalEvent], which may be a multi-day event.
      */
-    val event: WeekViewEvent<T>,
+    val event: ResolvedWeekViewEvent<T>,
     /**
-     * The original [WeekViewEvent], which may be a multi-day event.
+     * The original [ResolvedWeekViewEvent], which may be a multi-day event.
      */
-    val originalEvent: WeekViewEvent<T>
+    val originalEvent: ResolvedWeekViewEvent<T>
 ) {
 
     /**
-     * The rectangle in which the [WeekViewEvent] will be drawn.
+     * The rectangle in which the [ResolvedWeekViewEvent] will be drawn.
      */
     var bounds: RectF? = null
 

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

@@ -2,7 +2,7 @@ package com.alamkanak.weekview
 
 import android.graphics.RectF
 
-internal class EventChipRectCalculator<T>(
+internal class EventChipBoundsCalculator<T>(
     private val config: WeekViewConfigWrapper
 ) {