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.
hermansje · May 15, 2018 · 27d2c2f · 27d2c2f
1 parent 727eab1
commit 27d2c2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/library/src/main/java/com/alamkanak/weekview/WeekView.kt b/library/src/main/java/com/alamkanak/weekview/WeekView.kt
@@ -615,10 +615,10 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
             if (field == value)
                 return
             field = value
-            mTodayHeaderTextPaint.textSize = field.toFloat()
-            mHeaderTextPaint.textSize = field.toFloat()
-            mTimeTextPaint.textSize = field.toFloat()
-            sideTitleTextPaint.textSize = field.toFloat()
+            mTodayHeaderTextPaint.textSize = value.toFloat()
+            mHeaderTextPaint.textSize = value.toFloat()
+            mTimeTextPaint.textSize = value.toFloat()
+            sideTitleTextPaint.textSize = value.toFloat()
             invalidate()
         }
 
@@ -1027,6 +1027,7 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
         mHeaderTextPaint.color = headerColumnTextColor
         mHeaderTextPaint.textAlign = Paint.Align.CENTER
         mHeaderTextPaint.textSize = textSize.toFloat()
+//        WeekViewUtil.getWeekdayWithNumericDayAndMonthFormat(context,)
         mHeaderTextPaint.getTextBounds(exampleTime, 0, exampleTime.length, rect)
         mHeaderTextHeight = rect.height().toFloat()
         mHeaderTextPaint.typeface = typeface

diff --git a/sample/src/main/java/com/alamkanak/weekview/sample/BaseActivity.kt b/sample/src/main/java/com/alamkanak/weekview/sample/BaseActivity.kt
@@ -108,7 +108,6 @@ abstract class BaseActivity : AppCompatActivity(), WeekView.EventClickListener,
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         val id = item.itemId
-        setupDateTimeInterpreter(id == R.id.action_week_view)
         when (id) {
             R.id.action_today -> {
                 weekView.goToToday()
@@ -140,6 +139,8 @@ abstract class BaseActivity : AppCompatActivity(), WeekView.EventClickListener,
     }
 
     fun setDayViewType(dayViewType: Int) {
+        setupDateTimeInterpreter(dayViewType==TYPE_WEEK_VIEW)
+
         when (dayViewType) {
             TYPE_DAY_VIEW -> {
                 mWeekViewType = TYPE_DAY_VIEW