feat: change time table map key type to Pair

DroidKaigi · Aug 11, 2024 · 5128d30 · 5128d30
1 parent 1e3464c
commit 5128d30
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/TimetableScreen.kt b/...sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/TimetableScreen.kt
@@ -206,11 +206,11 @@ fun PreviewTimetableScreenDark() {
                     contentUiState = TimetableSheetUiState.ListTimetable(
                         mapOf(
                             DroidKaigi2024Day.Workday to TimetableListUiState(
-                                mapOf<String, List<TimetableItem>>().toPersistentMap(),
+                                mapOf<Pair<String, String>, List<TimetableItem>>().toPersistentMap(),
                                 Timetable(),
                             ),
                             DroidKaigi2024Day.ConferenceDay1 to TimetableListUiState(
-                                mapOf<String, List<TimetableItem>>().toPersistentMap(),
+                                mapOf<Pair<String, String>, List<TimetableItem>>().toPersistentMap(),
                                 Timetable(),
                             ),
                         ),

diff --git a/...src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/TimetableScreenPresenter.kt b/...src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/TimetableScreenPresenter.kt
@@ -85,7 +85,7 @@ fun timetableSheet(
                         days = listOf(day),
                     ),
                 ).timetableItems.groupBy {
-                    it.startsTimeString + it.endsTimeString
+                    it.startsTimeString to it.endsTimeString
                 }.mapValues { entries ->
                     entries.value.sortedWith(
                         compareBy({ it.day?.name.orEmpty() }, { it.startsTimeString }),