@@ -85,6 +85,7 @@ class MaterialKalendar
8585 @ShowingDateModes private var showingDateFlagModes = SHOWING_MODE_DEFAULT
8686 private var allowClickDaysOutsideCurrentMonth: Boolean = true
8787 private var allowDynamicWeeksHeightResize: Boolean = false
88+ private var weekLabelsArray: Array <CharSequence >? = null
8889 private var shouldShowWeekDays: Boolean = true
8990
9091 init {
@@ -118,10 +119,7 @@ class MaterialKalendar
118119
119120 shouldShowWeekDays = a.getBoolean(R .styleable.MaterialKalendar_mk_showWeekDayLabels , true )
120121
121- val weekLabelsArray: Array <CharSequence >? = a.getTextArray(R .styleable.MaterialKalendar_mk_weekDayLabels )
122- weekLabelsArray?.let {
123- setWeekDayFormatter(ArrayKalendarWeekDayDateFormatter (weekLabelsArray))
124- }
122+ weekLabelsArray = a.getTextArray(R .styleable.MaterialKalendar_mk_weekDayLabels )
125123
126124 showingDateFlagModes = a.getInteger(R .styleable.MaterialKalendar_mk_showingModes ,
127125 SHOWING_MODE_DEFAULT )
@@ -143,7 +141,11 @@ class MaterialKalendar
143141
144142 adapter = KalendarMonthPagerAdapter (this @MaterialKalendar).apply {
145143 setShowingDatesMode(showingDateFlagModes)
144+ weekLabelsArray?.let {
145+ setWeekDayFormatter(ArrayKalendarWeekDayDateFormatter (it))
146+ } ? : setWeekDayFormatter(KalendarWeekDayDateFormatter ())
146147 }
148+
147149 pager = KalendarPager (context).apply {
148150 addOnPageChangeListener(pageChangeListener)
149151 pageMargin = 16 .dpToPx()
@@ -302,8 +304,8 @@ class MaterialKalendar
302304 adapter.setShowingDatesMode(flagsMode)
303305 }
304306
305- fun setWeekDayFormatter (formatter : DateFormatter <DayOfWeek >? ) {
306- adapter.setWeekDayFormatter(formatter ? : KalendarWeekDayDateFormatter () )
307+ fun setWeekDayFormatter (formatter : DateFormatter <DayOfWeek >) {
308+ adapter.setWeekDayFormatter(formatter)
307309 }
308310
309311 fun setAllowClickDaysOutsideCurrentMonth (enable : Boolean ) {
0 commit comments