Merge pull request #281 from SwEnt-Group13/fix/home-sort-event

Fix/home sort event
SwEnt-Group13 · Dec 9, 2024 · 4bd1423 · 4bd1423
2 parents ac309d0 + 485321e
commit 4bd1423
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/app/src/main/java/com/android/unio/ui/home/Home.kt b/app/src/main/java/com/android/unio/ui/home/Home.kt
@@ -179,10 +179,18 @@ fun HomeContent(
         Text(context.getString(R.string.explore_search_no_results))
       }
     } else {
-      EventList(navigationAction, searchResults, userViewModel, eventViewModel)
+      EventList(
+          navigationAction,
+          searchResults.sortedWith(compareBy({ it.startDate }, { it.uid })),
+          userViewModel,
+          eventViewModel)
     }
   } else if (events.isNotEmpty()) {
-    EventList(navigationAction, events, userViewModel, eventViewModel)
+    EventList(
+        navigationAction,
+        events.sortedWith(compareBy({ it.startDate }, { it.uid })),
+        userViewModel,
+        eventViewModel)
   } else {
     Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
       Text(

diff --git a/app/src/main/java/com/android/unio/ui/saved/Saved.kt b/app/src/main/java/com/android/unio/ui/saved/Saved.kt
@@ -60,7 +60,11 @@ fun SavedScreen(
   }
 
   val allEvents by eventViewModel.events.collectAsState()
-  val savedEvents by derivedStateOf { allEvents.filter { user!!.savedEvents.contains(it.uid) } }
+  val savedEvents by derivedStateOf {
+    allEvents
+        .filter { user!!.savedEvents.contains(it.uid) }
+        .sortedWith(compareBy({ it.startDate }, { it.uid }))
+  }
 
   val context = LocalContext.current