Skip to content

Commit f2a4226

Browse files
sample bug fix (reported here: Quivr#92 )
fixed issue of inconsistency of short vs long text. Now will show short text whenever you switch to week view.
1 parent 1bc68ab commit f2a4226

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

library/src/main/java/com/alamkanak/weekview/WeekView.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -615,10 +615,10 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
615615
if (field == value)
616616
return
617617
field = value
618-
mTodayHeaderTextPaint.textSize = field.toFloat()
619-
mHeaderTextPaint.textSize = field.toFloat()
620-
mTimeTextPaint.textSize = field.toFloat()
621-
sideTitleTextPaint.textSize = field.toFloat()
618+
mTodayHeaderTextPaint.textSize = value.toFloat()
619+
mHeaderTextPaint.textSize = value.toFloat()
620+
mTimeTextPaint.textSize = value.toFloat()
621+
sideTitleTextPaint.textSize = value.toFloat()
622622
invalidate()
623623
}
624624

@@ -1027,6 +1027,7 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
10271027
mHeaderTextPaint.color = headerColumnTextColor
10281028
mHeaderTextPaint.textAlign = Paint.Align.CENTER
10291029
mHeaderTextPaint.textSize = textSize.toFloat()
1030+
// WeekViewUtil.getWeekdayWithNumericDayAndMonthFormat(context,)
10301031
mHeaderTextPaint.getTextBounds(exampleTime, 0, exampleTime.length, rect)
10311032
mHeaderTextHeight = rect.height().toFloat()
10321033
mHeaderTextPaint.typeface = typeface

sample/src/main/java/com/alamkanak/weekview/sample/BaseActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ abstract class BaseActivity : AppCompatActivity(), WeekView.EventClickListener,
108108

109109
override fun onOptionsItemSelected(item: MenuItem): Boolean {
110110
val id = item.itemId
111-
setupDateTimeInterpreter(id == R.id.action_week_view)
112111
when (id) {
113112
R.id.action_today -> {
114113
weekView.goToToday()
@@ -140,6 +139,8 @@ abstract class BaseActivity : AppCompatActivity(), WeekView.EventClickListener,
140139
}
141140

142141
fun setDayViewType(dayViewType: Int) {
142+
setupDateTimeInterpreter(dayViewType==TYPE_WEEK_VIEW)
143+
143144
when (dayViewType) {
144145
TYPE_DAY_VIEW -> {
145146
mWeekViewType = TYPE_DAY_VIEW

0 commit comments

Comments
 (0)