Skip to content

Commit bb35dec

Browse files
committed
Don't default to strike-through for events in sample app
1 parent feb8949 commit bb35dec

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import android.text.StaticLayout
99
import android.util.SparseArray
1010
import androidx.collection.ArrayMap
1111
import java.util.Calendar
12-
import kotlin.math.max
1312
import kotlin.math.roundToInt
1413

1514
internal class HeaderRenderer(
@@ -73,7 +72,7 @@ private class HeaderRowUpdater(
7372
) : Updater {
7473

7574
override fun update() {
76-
val missingDates = viewState.dateRange.filterNot { labelLayouts.contains(it.toEpochDays()) }
75+
val missingDates = viewState.dateRange.filterNot { labelLayouts.hasKey(it.toEpochDays()) }
7776
for (date in missingDates) {
7877
val key = date.toEpochDays()
7978
labelLayouts.put(key, calculateStaticLayoutForDate(date))
@@ -83,7 +82,7 @@ private class HeaderRowUpdater(
8382
updateHeaderHeight(dateLabels)
8483
}
8584

86-
private fun <E> SparseArray<E>.contains(key: Int): Boolean = indexOfKey(key) >= 0
85+
private fun <E> SparseArray<E>.hasKey(key: Int): Boolean = indexOfKey(key) >= 0
8786

8887
private fun updateHeaderHeight(
8988
dateLabels: List<StaticLayout>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,9 @@ class EventsDatabase(context: Context) {
213213
val title = buildEventTitle(startTime)
214214

215215
val spannableTitle = SpannableStringBuilder(title).apply {
216-
setSpan(StrikethroughSpan(), 0, title.length, SPAN_EXCLUSIVE_EXCLUSIVE)
216+
if (isCanceled) {
217+
setSpan(StrikethroughSpan(), 0, title.length, SPAN_EXCLUSIVE_EXCLUSIVE)
218+
}
217219
}
218220

219221
return Event(

sample/src/main/java/com/alamkanak/weekview/sample/data/model/Event.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@ data class Event(
3030
val style = WeekViewEvent.Style.Builder()
3131
.setTextColor(textColor)
3232
.setBackgroundColor(backgroundColor)
33-
.setTextStrikeThrough(isCanceled)
3433
.setBorderWidthResource(borderWidthResId)
3534
.setBorderColor(color)
3635
.build()
3736

3837
val styledTitle = SpannableStringBuilder(title).apply {
3938
setSpan(StyleSpan(Typeface.BOLD), 0, title.length, SPAN_EXCLUSIVE_EXCLUSIVE)
40-
setSpan(StrikethroughSpan(), 0, title.length, SPAN_EXCLUSIVE_EXCLUSIVE)
39+
if (isCanceled) {
40+
setSpan(StrikethroughSpan(), 0, title.length, SPAN_EXCLUSIVE_EXCLUSIVE)
41+
}
4142
}
4243

4344
return WeekViewEvent.Builder(this)

0 commit comments

Comments
 (0)