- fixed issue of not being able to add an all-day event with same start-time and end-time, because if the end time is the same, it should still be considered ok.

- removed deprecated long id, because it's too common for calendar services to use String instead

Author: AndroidDeveloperLB

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

@@ -516,7 +516,7 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
 
     private
     val eventsTop: Float
-        get() = mCurrentOrigin.y + mHeaderHeight + (weekDaysHeaderRowPadding * 2).toFloat()  + mTimeTextHeight / 2 - minHourOffset
+        get() = mCurrentOrigin.y + mHeaderHeight + (weekDaysHeaderRowPadding * 2).toFloat() + mTimeTextHeight / 2 - minHourOffset
 
     private val leftDaysWithGaps: Int
         get() = (-Math.ceil((mCurrentOrigin.x / (mWidthPerDay + columnGap)).toDouble())).toInt()
@@ -1885,7 +1885,7 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
      * @param event The event to cache.
      */
     private fun cacheEvent(event: WeekViewEvent) {
-        if (event.startTime!! >= event.endTime)
+        if (!event.isAllDay && event.startTime!! >= event.endTime)
             return
         val splitedEvents = event.splitWeekViewEvents()
         for (splitedEvent in splitedEvents) {

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

@@ -67,26 +67,6 @@ class WeekViewEvent {
         this.name = name
     }
 
-    /**
-     * Initializes the event for week view.
-     *
-     * @param id          The id of the event.
-     * @param name        Name of the event.
-     * @param startYear   Year when the event starts.
-     * @param startMonth  Month when the event starts.
-     * @param startDay    Day when the event starts.
-     * @param startHour   Hour (in 24-hour format) when the event starts.
-     * @param startMinute Minute when the event starts.
-     * @param endYear     Year when the event ends.
-     * @param endMonth    Month when the event ends.
-     * @param endDay      Day when the event ends.
-     * @param endHour     Hour (in 24-hour format) when the event ends.
-     * @param endMinute   Minute when the event ends.
-     */
-    @Deprecated("")
-    constructor(id: Long, name: String, startYear: Int, startMonth: Int, startDay: Int, startHour: Int, startMinute: Int, endYear: Int, endMonth: Int, endDay: Int, endHour: Int, endMinute: Int) : this(id.toString(), name, startYear, startMonth, startDay, startHour, startMinute, endYear, endMonth, endDay, endHour, endMinute) {
-    }
-
     /**
      * Initializes the event for week view.
      *
@@ -108,21 +88,6 @@ class WeekViewEvent {
         this.shader = shader
     }
 
-    /**
-     * Initializes the event for week view.
-     *
-     * @param id        The id of the event.
-     * @param name      Name of the event.
-     * @param location  The location of the event.
-     * @param startTime The time when the event starts.
-     * @param endTime   The time when the event ends.
-     * @param allDay    Is the event an all day event.
-     * @param shader    the Shader of the event rectangle
-     */
-    @Deprecated("")
-    @JvmOverloads constructor(id: Long, name: String, location: String?, startTime: Calendar, endTime: Calendar, allDay: Boolean = false, shader: Shader? = null) : this(id.toString(), name, location, startTime, endTime, allDay, shader) {
-    }
-
     /**
      * Initializes the event for week view.
      *
@@ -133,18 +98,6 @@ class WeekViewEvent {
      */
     constructor(id: String, name: String, startTime: Calendar, endTime: Calendar) : this(id, name, null, startTime, endTime) {}
 
-    /**
-     * Initializes the event for week view.
-     *
-     * @param id        The id of the event.
-     * @param name      Name of the event.
-     * @param startTime The time when the event starts.
-     * @param endTime   The time when the event ends.
-     */
-    @Deprecated("")
-    constructor(id: Long, name: String, startTime: Calendar, endTime: Calendar) : this(id, name, null, startTime, endTime) {
-    }
-
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other == null || javaClass != other.javaClass) return false

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

@@ -14,6 +14,9 @@ import java.util.*
  * Website: http://alamkanak.github.io
  */
 open class BasicActivity : BaseActivity() {
+    var uniqueId: Long = 0
+    fun getUniqueId(): String = uniqueId++.toString()
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -40,7 +43,7 @@ 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,endTime), startTime, endTime)
+        var event = WeekViewEvent("First", getEventTitle(startTime, endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_01)
         events.add(event)
 
@@ -65,7 +68,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,endTime), startTime, endTime)
+        event = WeekViewEvent("Second", getEventTitle(startTime, endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_05)
         events.add(event)
 
@@ -77,7 +80,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,endTime), startTime, endTime)
+        event = WeekViewEvent(getUniqueId(), getEventTitle(startTime, endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_03)
         events.add(event)
 
@@ -89,7 +92,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,endTime), startTime, endTime)
+        event = WeekViewEvent(getUniqueId(), getEventTitle(startTime, endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_02)
         events.add(event)
 
@@ -102,7 +105,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,endTime), startTime, endTime)
+        event = WeekViewEvent(getUniqueId(), getEventTitle(startTime, endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_03)
         events.add(event)
 
@@ -114,7 +117,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,endTime), startTime, endTime)
+        event = WeekViewEvent(getUniqueId(), getEventTitle(startTime, endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_04)
         events.add(event)
 
@@ -126,7 +129,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,endTime), startTime, endTime)
+        event = WeekViewEvent(getUniqueId(), getEventTitle(startTime, endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_01)
         events.add(event)
 
@@ -138,7 +141,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,endTime), startTime, endTime)
+        event = WeekViewEvent(getUniqueId(), getEventTitle(startTime, endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_02)
         events.add(event)
 
@@ -150,7 +153,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,endTime), null, startTime, endTime, true)
+        event = WeekViewEvent(getUniqueId(), getEventTitle(startTime, endTime), null, startTime, endTime, true)
         event.color = resources.getColor(R.color.event_color_04)
         events.add(event)
 
@@ -163,7 +166,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,endTime), null, startTime, endTime, true)
+        event = WeekViewEvent(getUniqueId(), getEventTitle(startTime, endTime), null, startTime, endTime, true)
         event.color = resources.getColor(R.color.event_color_03)
         events.add(event)
 
@@ -178,7 +181,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,endTime), null, startTime, endTime, true)
+        event = WeekViewEvent(getUniqueId(), getEventTitle(startTime, endTime), null, startTime, endTime, true)
         event.color = resources.getColor(R.color.event_color_01)
 
         startTime = Calendar.getInstance()
@@ -190,10 +193,11 @@ 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,endTime), startTime, endTime)
+        event = WeekViewEvent(getUniqueId(), getEventTitle(startTime, endTime), startTime, endTime)
         event.color = resources.getColor(R.color.event_color_02)
         events.add(event)
 
         return events
     }
+
 }