fixed positioning of events and their lines.

AndroidDeveloperLB · AndroidDeveloperLB · commit 50585ff1eade · 2018-05-16T14:27:02.000+03:00
diff --git a/library/src/main/java/com/alamkanak/weekview/WeekView.kt b/library/src/main/java/com/alamkanak/weekview/WeekView.kt
@@ -175,7 +175,7 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
     /**
      *  the height of AllDay-events.
      */
-    var allDayEventHeight =  TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40f, resources.displayMetrics).toInt()
+    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.
@@ -516,7 +516,7 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
 
     private
     val eventsTop: Float
-        get() = mCurrentOrigin.y + mHeaderHeight + (weekDaysHeaderRowPadding * 2).toFloat() + spaceBelowAllDayEvents + mTimeTextHeight / 2 + spaceBetweenWeekDaysAndAllDayEvents.toFloat() - minHourOffset
+        get() = mCurrentOrigin.y + mHeaderHeight + (weekDaysHeaderRowPadding * 2).toFloat()  + mTimeTextHeight / 2 - minHourOffset
 
     private val leftDaysWithGaps: Int
         get() = (-Math.ceil((mCurrentOrigin.x / (mWidthPerDay + columnGap)).toDouble())).toInt()
@@ -1432,14 +1432,16 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
                         else -> canvas.drawRect(start, startY, startPixel + mWidthPerDay, height.toFloat(), futurePaint)
                     }
                 } else {
-                    canvas.drawRect(start, mHeaderHeight + (weekDaysHeaderRowPadding * 2).toFloat() + mTimeTextHeight / 2 + spaceBelowAllDayEvents, startPixel + mWidthPerDay, height.toFloat(), if (isToday) mTodayColumnBackgroundPaint else mDayBackgroundPaint)
+                    val cellBackgroundPaint = if (isToday) mTodayColumnBackgroundPaint else mDayBackgroundPaint
+                    if (cellBackgroundPaint.color != 0)
+                        canvas.drawRect(start, mHeaderHeight + (weekDaysHeaderRowPadding * 2).toFloat() + mTimeTextHeight / 2 + spaceBelowAllDayEvents, startPixel + mWidthPerDay, height.toFloat(), cellBackgroundPaint)
                 }
             }
 
             // Prepare the separator lines for hours.
             var i = 0
             for (hourNumber in mMinTime until mMaxTime) {
-                val top = mHeaderHeight + (weekDaysHeaderRowPadding * 2).toFloat() + mCurrentOrigin.y + (hourHeight * (hourNumber - mMinTime)).toFloat() + mTimeTextHeight / 2 + spaceBelowAllDayEvents
+                val top = mHeaderHeight + (weekDaysHeaderRowPadding * 2).toFloat() + mCurrentOrigin.y + (hourHeight * (hourNumber - mMinTime)).toFloat() + mTimeTextHeight / 2
                 if (top > mHeaderHeight + (weekDaysHeaderRowPadding * 2).toFloat() + mTimeTextHeight / 2 + spaceBelowAllDayEvents - hourSeparatorHeight && top < height && startPixel + mWidthPerDay - start > 0) {
                     hourLines[i * 4] = start
                     hourLines[i * 4 + 1] = top
@@ -1544,7 +1546,7 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
             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.drawText(allDaySideTitleText, mHeaderColumnWidth / 2, (top + bottom) / 2, allDaySideTitleTextPaint)
             canvas.restore()
         }
     }
diff --git a/library/src/main/java/com/alamkanak/weekview/WeekViewUtil.kt b/library/src/main/java/com/alamkanak/weekview/WeekViewUtil.kt
@@ -96,7 +96,7 @@ object WeekViewUtil {
     /**returns a date format of dayOfWeek+day&month, based on the current locale.
      * This is important, as the format is different in many countries. Especially the numeric part that can be different : "d/M", "M/d", "d-M", "M-d" ,...*/
     @JvmStatic
-    fun getWeekdayWithNumericDayAndMonthFormat(context: Context, shortDate: Boolean): SimpleDateFormat {
+    fun getWeekdayWithNumericDayAndMonthFormat(context: Context, shortDate: Boolean): java.text.DateFormat {
         val weekDayFormat = if (shortDate) "EEEEE" else "EEE"
         val defaultDateFormatPattern = "$weekDayFormat d/M"
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
diff --git a/sample/src/main/java/com/alamkanak/weekview/sample/BaseActivity.kt b/sample/src/main/java/com/alamkanak/weekview/sample/BaseActivity.kt
@@ -4,17 +4,18 @@ import android.content.ClipData
 import android.graphics.RectF
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
-import android.text.format.DateFormat
 import android.util.TypedValue
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.Toast
 import com.alamkanak.weekview.*
 import kotlinx.android.synthetic.main.activity_base.*
+import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*
 
+//import android.text.format.DateFormat
 /**
  * This is a base activity which contains week view and all the codes necessary to initialize the
  * week view.
@@ -23,9 +24,13 @@ import java.util.*
  */
 abstract class BaseActivity : AppCompatActivity(), WeekView.EventClickListener, MonthLoader.MonthChangeListener, WeekView.EventLongPressListener, WeekView.EmptyViewLongPressListener, WeekView.EmptyViewClickListener, WeekView.AddEventClickListener, WeekView.DropListener {
     private var mWeekViewType = TYPE_THREE_DAY_VIEW
+    private lateinit var shortDateFormat: DateFormat
+    private lateinit var timeFormat: DateFormat
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        shortDateFormat = WeekViewUtil.getWeekdayWithNumericDayAndMonthFormat(this, true)
+        timeFormat = android.text.format.DateFormat.getTimeFormat(this) ?: SimpleDateFormat("HH:mm", Locale.getDefault())
         setContentView(R.layout.activity_base)
 
         draggable_view.setOnLongClickListener(DragTapListener())
@@ -181,9 +186,6 @@ abstract class BaseActivity : AppCompatActivity(), WeekView.EventClickListener,
             set(Calendar.SECOND, 0)
             set(Calendar.MILLISECOND, 0)
         }
-        val timeFormat = DateFormat.getTimeFormat(this@BaseActivity)
-                ?: SimpleDateFormat("HH:mm", Locale.getDefault())
-        val shortDateFormat = WeekViewUtil.getWeekdayWithNumericDayAndMonthFormat(this@BaseActivity, true)
         val normalDateFormat = WeekViewUtil.getWeekdayWithNumericDayAndMonthFormat(this@BaseActivity, false)
         weekView.dateTimeInterpreter = object : DateTimeInterpreter {
             override fun interpretTime(hour: Int, minutes: Int): String {
@@ -198,8 +200,13 @@ abstract class BaseActivity : AppCompatActivity(), WeekView.EventClickListener,
         }
     }
 
-    protected fun getEventTitle(time: Calendar): String {
-        return String.format("Event of %02d:%02d %s/%d", time.get(Calendar.HOUR_OF_DAY), time.get(Calendar.MINUTE), time.get(Calendar.MONTH) + 1, time.get(Calendar.DAY_OF_MONTH))
+    protected fun getEventTitle(cal: Calendar, endCal: Calendar? = null): String {
+        val date = cal.time
+        if (endCal == null)
+            return "${shortDateFormat.format(date)} ${timeFormat.format(date)}"
+        else
+            return "${shortDateFormat.format(date)} ${timeFormat.format(date)}..${timeFormat.format(endCal.time)}"
+//        return String.format("%02d:%02d %s/%d", time.get(Calendar.HOUR_OF_DAY), time.get(Calendar.MINUTE), time.get(Calendar.MONTH) + 1, time.get(Calendar.DAY_OF_MONTH))
     }
 
     override fun onEventClick(event: WeekViewEvent, eventRect: RectF) {
diff --git a/sample/src/main/java/com/alamkanak/weekview/sample/BasicActivity.kt b/sample/src/main/java/com/alamkanak/weekview/sample/BasicActivity.kt
@@ -40,10 +40,22 @@ open class BasicActivity : BaseActivity() {
         var endTime = startTime.clone() as Calendar
         endTime.add(Calendar.HOUR, 1)
         endTime.set(Calendar.MONTH, newMonth - 1)
-        var event = WeekViewEvent("First", getEventTitle(startTime), startTime, endTime)
+        var event = WeekViewEvent("First", getEventTitle(startTime,endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_01)
         events.add(event)
 
+        startTime = Calendar.getInstance()
+        startTime.set(Calendar.MINUTE, 0)
+        startTime.set(Calendar.MONTH, newMonth - 1)
+        startTime.set(Calendar.YEAR, newYear)
+        endTime = startTime.clone() as Calendar
+        endTime.set(Calendar.HOUR_OF_DAY, startTime.get(Calendar.HOUR_OF_DAY) + 1)
+        endTime.set(Calendar.MINUTE, 0)
+        endTime.set(Calendar.MONTH, newMonth - 1)
+        event = WeekViewEvent("cur", "cur", startTime, endTime)
+        event.color = 0xffff0000.toInt()
+        events.add(event)
+
         startTime = Calendar.getInstance()
         startTime.set(Calendar.HOUR_OF_DAY, 3)
         startTime.set(Calendar.MINUTE, 30)
@@ -53,7 +65,7 @@ open class BasicActivity : BaseActivity() {
         endTime.set(Calendar.HOUR_OF_DAY, 4)
         endTime.set(Calendar.MINUTE, 30)
         endTime.set(Calendar.MONTH, newMonth - 1)
-        event = WeekViewEvent("Second", getEventTitle(startTime), startTime, endTime)
+        event = WeekViewEvent("Second", getEventTitle(startTime,endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_05)
         events.add(event)
 
@@ -65,7 +77,7 @@ open class BasicActivity : BaseActivity() {
         endTime = startTime.clone() as Calendar
         endTime.set(Calendar.HOUR_OF_DAY, 5)
         endTime.set(Calendar.MINUTE, 0)
-        event = WeekViewEvent(10, getEventTitle(startTime), startTime, endTime)
+        event = WeekViewEvent(10, getEventTitle(startTime,endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_03)
         events.add(event)
 
@@ -77,7 +89,7 @@ open class BasicActivity : BaseActivity() {
         endTime = startTime.clone() as Calendar
         endTime.add(Calendar.HOUR_OF_DAY, 2)
         endTime.set(Calendar.MONTH, newMonth - 1)
-        event = WeekViewEvent(2, getEventTitle(startTime), startTime, endTime)
+        event = WeekViewEvent(2, getEventTitle(startTime,endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_02)
         events.add(event)
 
@@ -90,7 +102,7 @@ open class BasicActivity : BaseActivity() {
         endTime = startTime.clone() as Calendar
         endTime.add(Calendar.HOUR_OF_DAY, 3)
         endTime.set(Calendar.MONTH, newMonth - 1)
-        event = WeekViewEvent(3, getEventTitle(startTime), startTime, endTime)
+        event = WeekViewEvent(3, getEventTitle(startTime,endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_03)
         events.add(event)
 
@@ -102,7 +114,7 @@ open class BasicActivity : BaseActivity() {
         startTime.set(Calendar.YEAR, newYear)
         endTime = startTime.clone() as Calendar
         endTime.add(Calendar.HOUR_OF_DAY, 3)
-        event = WeekViewEvent(4, getEventTitle(startTime), startTime, endTime)
+        event = WeekViewEvent(4, getEventTitle(startTime,endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_04)
         events.add(event)
 
@@ -114,7 +126,7 @@ open class BasicActivity : BaseActivity() {
         startTime.set(Calendar.YEAR, newYear)
         endTime = startTime.clone() as Calendar
         endTime.add(Calendar.HOUR_OF_DAY, 3)
-        event = WeekViewEvent(5, getEventTitle(startTime), startTime, endTime)
+        event = WeekViewEvent(5, getEventTitle(startTime,endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_01)
         events.add(event)
 
@@ -126,7 +138,7 @@ open class BasicActivity : BaseActivity() {
         startTime.set(Calendar.YEAR, newYear)
         endTime = startTime.clone() as Calendar
         endTime.add(Calendar.HOUR_OF_DAY, 3)
-        event = WeekViewEvent(5, getEventTitle(startTime), startTime, endTime)
+        event = WeekViewEvent(5, getEventTitle(startTime,endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_02)
         events.add(event)
 
@@ -138,7 +150,7 @@ open class BasicActivity : BaseActivity() {
         startTime.set(Calendar.YEAR, newYear)
         endTime = startTime.clone() as Calendar
         endTime.add(Calendar.HOUR_OF_DAY, 23)
-        event = WeekViewEvent(7, getEventTitle(startTime), null, startTime, endTime, true)
+        event = WeekViewEvent(7, getEventTitle(startTime,endTime), null, startTime, endTime, true)
         event.color = resources.getColor(R.color.event_color_04)
         events.add(event)
 
@@ -151,7 +163,7 @@ open class BasicActivity : BaseActivity() {
         endTime = startTime.clone() as Calendar
         endTime.set(Calendar.DAY_OF_MONTH, 10)
         endTime.set(Calendar.HOUR_OF_DAY, 23)
-        event = WeekViewEvent(8, getEventTitle(startTime), null, startTime, endTime, true)
+        event = WeekViewEvent(8, getEventTitle(startTime,endTime), null, startTime, endTime, true)
         event.color = resources.getColor(R.color.event_color_03)
         events.add(event)
 
@@ -166,7 +178,7 @@ open class BasicActivity : BaseActivity() {
         startTime.set(Calendar.YEAR, newYear)
         endTime = startTime.clone() as Calendar
         endTime.set(Calendar.DAY_OF_MONTH, 11)
-        event = WeekViewEvent(8, getEventTitle(startTime), null, startTime, endTime, true)
+        event = WeekViewEvent(8, getEventTitle(startTime,endTime), null, startTime, endTime, true)
         event.color = resources.getColor(R.color.event_color_01)
 
         startTime = Calendar.getInstance()
@@ -178,7 +190,7 @@ open class BasicActivity : BaseActivity() {
         endTime.set(Calendar.HOUR_OF_DAY, 19)
         endTime.set(Calendar.MINUTE, 30)
         endTime.set(Calendar.MONTH, newMonth - 1)
-        event = WeekViewEvent(22, getEventTitle(startTime), startTime, endTime)
+        event = WeekViewEvent(22, getEventTitle(startTime,endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_02)
         events.add(event)
 
