-added a way to put text on the left of the all-day events.

-Minor bugs fixes
-Minor optimizations to make drawing and scrolling smoother

Author: AndroidDeveloperLB

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

@@ -77,23 +77,16 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
             mCurrentOrigin.x = 0f
             invalidate()
         }
-    private val mTimeTextPaint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
-    private var mTimeTextWidth: Float = 0f
-    private var mTimeTextHeight: Float = 0f
+    private val mTimeTextPaint = TextPaint(Paint.ANTI_ALIAS_FLAG)
     private val mHeaderWeekDayTitleTextPaint = TextPaint(Paint.ANTI_ALIAS_FLAG)
-    private var mHeaderWeekDayTitleTextHeight: Float = 0f
-    private var mHeaderHeight: Float = 0f
     private val mHeaderWeekDaySubtitleTextPaint = TextPaint(Paint.ANTI_ALIAS_FLAG)
-    private var mHeaderWeekDaySubtitleTextHeight: Float = 0f
     private val mHeaderWeekDayTitleTodayTextPaint = TextPaint(Paint.ANTI_ALIAS_FLAG)
     private val mHeaderWeekDaySubtitleTodayTextPaint = TextPaint(Paint.ANTI_ALIAS_FLAG)
-    private var mGestureDetector: GestureDetectorCompat? = null
-    private var mScroller: OverScroller? = null
-    private val mCurrentOrigin = PointF(0f, 0f)
-    private var mCurrentScrollDirection = Direction.NONE
+    private val mEventTextPaint = TextPaint(Paint.ANTI_ALIAS_FLAG or Paint.LINEAR_TEXT_FLAG)
+    private val sideTitleTextPaint = TextPaint(Paint.ANTI_ALIAS_FLAG)
+    private val allDaySideTitleTextPaint = TextPaint(Paint.ANTI_ALIAS_FLAG)
     private val mEmptyEventPaint = Paint()
     private val mHeaderBackgroundPaint: Paint = Paint()
-    private var mWidthPerDay: Float = 0f
     private val mDayBackgroundPaint: Paint = Paint()
     private val mHourSeparatorPaint = Paint()
     private val mTodayColumnBackgroundPaint: Paint = Paint()
@@ -104,11 +97,20 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
     private val mNowLinePaint = Paint()
     private val mEventBackgroundPaint = Paint()
     private val mNewEventBackgroundPaint = Paint()
+    private var containsAllDayEvent: Boolean = false
+    private var mTimeTextWidth: Float = 0f
+    private var mTimeTextHeight: Float = 0f
+    private var mHeaderWeekDayTitleTextHeight: Float = 0f
+    private var mHeaderHeight: Float = 0f
+    private var mHeaderWeekDaySubtitleTextHeight: Float = 0f
+    private var mGestureDetector: GestureDetectorCompat? = null
+    private var mScroller: OverScroller? = null
+    private val mCurrentOrigin = PointF(0f, 0f)
+    private var mCurrentScrollDirection = Direction.NONE
+    private var mWidthPerDay: Float = 0f
     private var mHeaderColumnWidth: Float = 0f
     private var mEventRects: MutableList<EventRect>? = null
     private var mEvents: MutableList<WeekViewEvent>? = null
-    private val mEventTextPaint = TextPaint(Paint.ANTI_ALIAS_FLAG or Paint.LINEAR_TEXT_FLAG)
-    private val mHeaderColumnBackgroundPaint: Paint = Paint()
     private var mFetchedPeriod = -1 // the middle period the calendar has fetched.
     private var mRefreshEvents = false
     private var mCurrentFlingDirection = Direction.NONE
@@ -139,8 +141,6 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
     private var mDistanceMin: Float = 0f
     private var mOffsetValueToSecureScreen = 9
     private var mStartOriginForScroll = 0f
-
-    // Attributes and their default values.
     private var mNewHourHeight = -1
     var minHourHeight = 0
     //no minimum specified (will be dynamic, based on screen)
@@ -152,7 +152,6 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
     var newEventLengthInMinutes = 60
     var newEventTimeResolutionInMinutes = 15
     var isShowFirstDayOfWeekFirst = false
-
     private var mIsFirstDraw = true
     private var mAreDimensionsInvalid = true
     /**
@@ -176,7 +175,7 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
     /**
      *  the height of AllDay-events.
      */
-    var allDayEventHeight = 100
+    var allDayEventHeight =  TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40f, resources.displayMetrics).toInt()
     /**
      * If you set this to false the `zoomFocusPoint` won't take effect any more while zooming.
      * The zoom will always be focused at the center of your gesture.
@@ -193,6 +192,13 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
                 init()
             }
         }
+    var allDaySideTitleText: String? = null
+        set(value) {
+            if (value == field)
+                return
+            field = value
+            invalidate()
+        }
 
     private var mMinTime = 0
     private var mMaxTime = 24
@@ -245,8 +251,6 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
             field = value
             invalidate()
         }
-    private val sideTitleTextPaint = Paint(Paint.ANTI_ALIAS_FLAG)
-
 
     private val mGestureListener = object : GestureDetector.SimpleOnGestureListener() {
         override fun onDown(e: MotionEvent): Boolean {
@@ -633,7 +637,7 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
                 return
             field = value
             mTimeTextPaint.textSize = value
-            sideTitleTextPaint.textSize = value
+            allDaySideTitleTextPaint.textSize = value
             invalidate()
         }
 
@@ -678,9 +682,21 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
             mHeaderWeekDaySubtitleTextPaint.color = value
             mTimeTextPaint.color = value
             sideTitleTextPaint.color = value
+            allDaySideTitleTextPaint.color = value
+            invalidate()
+        }
+
+    @ColorInt
+    var allDaySideTitleTextColor = headerColumnTextColor
+        set(value) {
+            if (field == value)
+                return
+            field = value
+            allDaySideTitleTextPaint.color = value
             invalidate()
         }
 
+
     @ColorInt
     var headerRowBackgroundColor: Int = Color.WHITE
         set(value) {
@@ -768,16 +784,6 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
             invalidate()
         }
 
-    @ColorInt
-    var headerColumnBackgroundColor: Int = Color.WHITE
-        set(value) {
-            if (field == value)
-                return
-            field = value
-            mHeaderColumnBackgroundPaint.color = value
-            invalidate()
-        }
-
     @ColorInt
     var defaultEventColor: Int = 0
         set(value) {
@@ -1030,7 +1036,6 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
             newEventLengthInMinutes = a.getInt(R.styleable.WeekView_newEventLengthInMinutes, newEventLengthInMinutes)
             newEventTimeResolutionInMinutes = a.getInt(R.styleable.WeekView_newEventTimeResolutionInMinutes, newEventTimeResolutionInMinutes)
             eventPadding = a.getDimensionPixelSize(R.styleable.WeekView_eventPadding, eventPadding)
-            headerColumnBackgroundColor = a.getColor(R.styleable.WeekView_headerColumnBackground, headerColumnBackgroundColor)
             dayNameLength = a.getInteger(R.styleable.WeekView_dayNameLength, dayNameLength)
             overlappingEventGap = a.getDimensionPixelSize(R.styleable.WeekView_overlappingEventGap, overlappingEventGap)
             spaceBetweenWeekDaysAndAllDayEvents = a.getDimensionPixelSize(R.styleable.WeekView_spaceBetweenWeekDaysAndAllDayEvents, spaceBetweenWeekDaysAndAllDayEvents)
@@ -1063,6 +1068,7 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
         mHeaderWeekDayTitleTextPaint.textAlign = Paint.Align.CENTER
         mHeaderWeekDaySubtitleTextPaint.textAlign = Paint.Align.CENTER
         sideTitleTextPaint.textAlign = Paint.Align.CENTER
+        allDaySideTitleTextPaint.textAlign = Paint.Align.CENTER
         mTimeTextPaint.textAlign = Paint.Align.RIGHT
         mEventTextPaint.style = Paint.Style.FILL
         mHourSeparatorPaint.style = Paint.Style.STROKE
@@ -1095,10 +1101,14 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
         initTextTimeWidth()
 
         //handle sideTitleTextPaint
-        sideTitleTextPaint.textSize = textSize
         sideTitleTextPaint.color = headerColumnTextColor
         sideTitleTextPaint.typeface = typeface
 
+        //handle allDaySideTitleTextPaint
+        allDaySideTitleTextPaint.textSize = textSize
+        allDaySideTitleTextPaint.color = allDaySideTitleTextColor
+        allDaySideTitleTextPaint.typeface = typeface
+
         // Measure settings for header row.
         //TODO measure the text that will actually be used, based on the locale and dates. Important because various characters might look different.
         val sampleText = "ABCDEFGHIKLMNOPQRSTUVWXYZabcdefghiklmnopqrstuvwxyz0123456789"
@@ -1151,9 +1161,6 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
         // Prepare empty event background color.
         mNewEventBackgroundPaint.color = Color.rgb(60, 147, 217)
 
-        // Prepare header column background color.
-        mHeaderColumnBackgroundPaint.color = headerColumnBackgroundColor
-
         // Prepare event text size and color.
         mEventTextPaint.color = eventTextColor
         mEventTextPaint.textSize = eventTextSize
@@ -1229,20 +1236,20 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
 
     private fun calculateHeaderHeight() {
         //Make sure the header is the right size (depends on AllDay events)
-        var containsAllDayEvent = false
+        containsAllDayEvent = false
         if (mEventRects != null && mEventRects!!.size > 0) {
+            val day = firstVisibleDay!!.clone() as Calendar
             for (dayNumber in 0 until realNumberOfVisibleDays) {
-                val day = firstVisibleDay!!.clone() as Calendar
-                day.add(Calendar.DATE, dayNumber)
                 for (i in mEventRects!!.indices) {
-                    if (isSameDay(mEventRects!![i].event.startTime!!, day) && mEventRects!![i].event.isAllDay) {
+                    val event = mEventRects!![i].event
+                    if (isSameDay(event.startTime!!, day) && event.isAllDay) {
                         containsAllDayEvent = true
                         break
                     }
                 }
-                if (containsAllDayEvent) {
+                if (containsAllDayEvent)
                     break
-                }
+                day.add(Calendar.DATE, 1)
             }
         }
         mHeaderHeight = if (containsAllDayEvent) {
@@ -1255,9 +1262,6 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
     }
 
     private fun drawTimeColumnAndAxes(canvas: Canvas) {
-        // Draw the background color for the header column.
-        canvas.drawRect(0f, mHeaderHeight + weekDaysHeaderRowPadding * 2, mHeaderColumnWidth, height.toFloat(), mHeaderColumnBackgroundPaint)
-        canvas.restore()
         canvas.save()
         // Clip to paint in left column only.
         canvas.clipRect(0.0f, mHeaderHeight + weekDaysHeaderRowPadding * 2, mHeaderColumnWidth, height.toFloat())
@@ -1490,6 +1494,7 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
         canvas.save()
         canvas.clipRect(mHeaderColumnWidth, 0f, width.toFloat(), mHeaderHeight + weekDaysHeaderRowPadding * 2)
 
+
         // Draw the header background.
         if (enableDrawHeaderBackgroundOnlyOnWeekDays)
             canvas.drawRect(0f, 0f, width.toFloat(), headerTitleAndSubtitleTextHeight + weekDaysHeaderRowPadding * 2, mHeaderBackgroundPaint)
@@ -1524,11 +1529,24 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
                     canvas.drawText(subtitleText, startPixel + mWidthPerDay / 2, headerTitleAndSubtitleTextHeight + weekDaysHeaderRowPadding,
                             if (isToday) mHeaderWeekDaySubtitleTodayTextPaint else mHeaderWeekDaySubtitleTextPaint)
                 }
-                drawAllDayEvents(day, startPixel, canvas)
+                if (containsAllDayEvent)
+                    drawAllDayEvents(day, startPixel, canvas)
                 startPixel += mWidthPerDay + columnGap
                 day.add(Calendar.DAY_OF_YEAR, 1)
             }
         }
+        canvas.restore()
+        //draw text on the left of the all-day events
+        if (containsAllDayEvent && !TextUtils.isEmpty(allDaySideTitleText)) {
+            canvas.save()
+            val headerTitleAndSubtitleTextHeight = mHeaderWeekDayTitleTextHeight + (if (isSubtitleHeaderEnabled) mHeaderWeekDaySubtitleTextHeight + spaceBetweenHeaderWeekDayTitleAndSubtitle else 0.0f)
+            val weekDaysHeight = headerTitleAndSubtitleTextHeight + weekDaysHeaderRowPadding * 2
+            val top = weekDaysHeight + spaceBetweenWeekDaysAndAllDayEvents + mTimeTextHeight / 2
+            val bottom = top + allDayEventHeight
+            canvas.clipRect(0f, 0f, top, bottom)
+            canvas.drawText(allDaySideTitleText, mHeaderColumnWidth / 2, (top+bottom)/2, allDaySideTitleTextPaint)
+            canvas.restore()
+        }
     }
 
     /**
@@ -1647,7 +1665,7 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
      * @param canvas         The canvas to draw upon.
      */
     private fun drawAllDayEvents(date: Calendar, startFromPixel: Float, canvas: Canvas) {
-        if (mEventRects != null && mEventRects!!.size > 0) {
+        if (mEventRects != null && mEventRects!!.isNotEmpty()) {
             val headerTitleAndSubtitleTextHeight = mHeaderWeekDayTitleTextHeight + (if (isSubtitleHeaderEnabled) mHeaderWeekDaySubtitleTextHeight + spaceBetweenHeaderWeekDayTitleAndSubtitle else 0.0f)
 
             for (i in mEventRects!!.indices) {

library/src/main/res/values/attrs.xml

@@ -25,7 +25,6 @@
         </attr>
         <attr name="futureBackgroundColor" format="color"/>
         <attr name="futureWeekendBackgroundColor" format="color"/>
-        <attr name="headerColumnBackground" format="color"/>
         <attr name="headerColumnPadding" format="dimension"/>
         <attr name="headerColumnTextColor" format="color"/>
         <attr name="headerRowBackgroundColor" format="color"/>

sample/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
 
         <activity
             android:name=".WholeViewSnappingActivity" android:label="@string/title_activity_whole_view_snap"
-            android:screenOrientation="userLandscape" android:theme="@style/AppTheme.FullScreen"/>
+            android:screenOrientation="reverseLandscape" android:theme="@style/AppTheme.FullScreen"/>
     </application>
 
 </manifest>

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

@@ -24,7 +24,7 @@ class MainActivity : AppCompatActivity() {
         buttonWholeViewSnap.setOnClickListener {
             startActivity(Intent(this@MainActivity, WholeViewSnappingActivity::class.java))
         }
-        startActivity(Intent(this@MainActivity, WholeViewSnappingActivity::class.java))
-        finish()
+//        startActivity(Intent(this@MainActivity, WholeViewSnappingActivity::class.java))
+//        finish()
     }
 }

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

@@ -1,5 +1,6 @@
 package com.alamkanak.weekview.sample
 
+import android.graphics.RectF
 import android.os.Bundle
 import android.text.format.DateFormat
 import android.util.TypedValue
@@ -9,6 +10,7 @@ import android.view.View
 import com.alamkanak.weekview.DateTimeInterpreter
 import com.alamkanak.weekview.WeekDaySubtitleInterpreter
 import com.alamkanak.weekview.WeekView
+import com.alamkanak.weekview.WeekViewEvent
 import kotlinx.android.synthetic.main.activity_base.*
 import java.text.SimpleDateFormat
 import java.util.*
@@ -18,7 +20,6 @@ import java.util.*
  */
 class WholeViewSnappingActivity : BasicActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-//        window.setBackgroundDrawable(ColorDrawable(0))
         super.onCreate(savedInstanceState)
 
         weekView.isShowNowLine = true
@@ -29,6 +30,7 @@ class WholeViewSnappingActivity : BasicActivity() {
         weekView.hourSeparatorHeight = weekView.columnGap
         weekView.isScrollNumberOfVisibleDays = true
         weekView.dropListener = null
+        weekView.allDaySideTitleText = getString(R.string.all_day)
         setDayViewType(TYPE_WEEK_VIEW)
         val cal = Calendar.getInstance()
         val currentHour = cal.get(Calendar.HOUR_OF_DAY) + cal.get(Calendar.MINUTE) / 60.0
@@ -47,6 +49,10 @@ class WholeViewSnappingActivity : BasicActivity() {
 
             override fun interpretDate(date: Calendar): String = dateFormatTitle.format(date.time)
         }
+        weekView.eventClickListener = object : WeekView.EventClickListener {
+            override fun onEventClick(event: WeekViewEvent, eventRect: RectF) {
+            }
+        }
     }
 
     override fun setupDateTimeInterpreter(shortDate: Boolean) {

sample/src/main/res/layout/activity_base.xml

@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".BaseActivity"
-    android:background="#fff">
+    tools:context=".BaseActivity">
 
     <com.alamkanak.weekview.WeekView
         android:id="@+id/weekView"
@@ -19,7 +18,6 @@
         app:headerRowBackgroundColor="@color/toolbar"
         app:dayBackgroundColor="#05000000"
         app:todayColumnBackgroundColor="#1848adff"
-        app:headerColumnBackground="#ffffffff"
         app:todayHeaderTextColor="@color/accent"
         app:newEventTimeResolutionInMinutes="15"
         app:timeColumnResolution="60"

sample/src/main/res/values/strings.xml

@@ -10,4 +10,5 @@
     <string name="async_error">Could not download events from the internet</string>
     <string name="drag_me">Drag Me</string>
     <string name="title_activity_whole_view_snap">Whole view snap</string>
+    <string name="all_day">All day</string>
 </resources>