diff --git a/library/src/main/java/com/kizitonwose/calendarview/CalendarView.kt b/library/src/main/java/com/kizitonwose/calendarview/CalendarView.kt index 24a1b5ed..cd98a8b8 100644 --- a/library/src/main/java/com/kizitonwose/calendarview/CalendarView.kt +++ b/library/src/main/java/com/kizitonwose/calendarview/CalendarView.kt @@ -232,6 +232,7 @@ open class CalendarView : RecyclerView { private fun init(attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) { if (isInEditMode) return + setHasFixedSize(true) val a = context.obtainStyledAttributes(attributeSet, R.styleable.CalendarView, defStyleAttr, defStyleRes) dayViewResource = a.getResourceId(R.styleable.CalendarView_cv_dayViewResource, dayViewResource) monthHeaderResource = a.getResourceId(R.styleable.CalendarView_cv_monthHeaderResource, monthHeaderResource) @@ -251,7 +252,7 @@ open class CalendarView : RecyclerView { } override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { - if (autoSize && isInEditMode.not()) { + if (autoSize && !isInEditMode) { val widthMode = MeasureSpec.getMode(widthMeasureSpec) val widthSize = MeasureSpec.getSize(widthMeasureSpec) val heightMode = MeasureSpec.getMode(heightMeasureSpec) @@ -284,7 +285,7 @@ open class CalendarView : RecyclerView { var dayWidth: Int = DAY_SIZE_SQUARE set(value) { field = value - if (sizedInternally.not()) { + if (!sizedInternally) { autoSize = value == DAY_SIZE_SQUARE invalidateViewHolders() } @@ -301,7 +302,7 @@ open class CalendarView : RecyclerView { var dayHeight: Int = DAY_SIZE_SQUARE set(value) { field = value - if (sizedInternally.not()) { + if (!sizedInternally) { autoSize = value == DAY_SIZE_SQUARE invalidateViewHolders() } diff --git a/library/src/main/java/com/kizitonwose/calendarview/ui/DayHolder.kt b/library/src/main/java/com/kizitonwose/calendarview/ui/DayHolder.kt index c8f50516..2e343172 100644 --- a/library/src/main/java/com/kizitonwose/calendarview/ui/DayHolder.kt +++ b/library/src/main/java/com/kizitonwose/calendarview/ui/DayHolder.kt @@ -45,7 +45,7 @@ internal class DayHolder(private val config: DayConfig) { fun bindDayView(currentDay: CalendarDay?) { this.day = currentDay - if (::viewContainer.isInitialized.not()) { + if (!::viewContainer.isInitialized) { viewContainer = config.viewBinder.create(dateView) } diff --git a/library/src/main/java/com/kizitonwose/calendarview/ui/WeekHolder.kt b/library/src/main/java/com/kizitonwose/calendarview/ui/WeekHolder.kt index 145b6d9b..4ab350c7 100644 --- a/library/src/main/java/com/kizitonwose/calendarview/ui/WeekHolder.kt +++ b/library/src/main/java/com/kizitonwose/calendarview/ui/WeekHolder.kt @@ -34,8 +34,4 @@ internal class WeekHolder(dayConfig: DayConfig) { holder.bindDayView(daysOfWeek.getOrNull(index)) } } - - fun reloadDay(day: CalendarDay) { - dayHolders.first { it.day == day }.reloadView() - } }