From 8e4388c749ff5c800537224e43340fe24adfb35b Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 19 Nov 2016 17:07:32 +0100
Subject: [PATCH] make sure the events in day view are sorted by start time

---
 .../com/simplemobiletools/calendar/fragments/DayFragment.kt   | 4 +++-
 .../simplemobiletools/calendar/fragments/EventListFragment.kt | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt
index 55a33fbad..da89e64dc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt
@@ -25,6 +25,7 @@ import com.simplemobiletools.calendar.models.Event
 import kotlinx.android.synthetic.main.day_fragment.view.*
 import kotlinx.android.synthetic.main.top_navigation.view.*
 import java.util.*
+import kotlin.comparisons.compareBy
 
 class DayFragment : Fragment(), DBHelper.EventsListener, AdapterView.OnItemClickListener, AbsListView.MultiChoiceModeListener, DBHelper.GetEventsListener {
 
@@ -232,8 +233,9 @@ class DayFragment : Fragment(), DBHelper.EventsListener, AdapterView.OnItemClick
     }
 
     override fun gotEvents(events: MutableList<Event>) {
+        val sorted = ArrayList<Event>(events.sortedWith(compareBy({ it.startTS }, { it.endTS }, { it.title }, { it.description })))
         activity?.runOnUiThread {
-            updateEvents(events)
+            updateEvents(sorted)
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt
index 3c35e7d6f..8e4d7b97b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt
@@ -63,7 +63,7 @@ class EventListFragment : Fragment(), DBHelper.GetEventsListener, AdapterView.On
     override fun gotEvents(events: MutableList<Event>) {
         val filtered = getEventsToShow(events)
         mListItems = ArrayList<ListItem>(filtered.size)
-        val sorted = filtered.sortedWith(compareBy({ it.startTS }, { it.endTS }))
+        val sorted = filtered.sortedWith(compareBy({ it.startTS }, { it.endTS }, { it.title }, { it.description }))
         var prevCode = ""
         sorted.forEach {
             val code = Formatter.getDayCodeFromTS(it.startTS)