Merge pull request #1041 from DroidKaigi/takahirom/add-day-to-timeslo…

…t/2024-09-11 Add day to TimeSlot
DroidKaigi · Sep 11, 2024 · fc8059e · fc8059e
2 parents 4862d8a + 05e3e27
commit fc8059e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts
@@ -25,8 +25,8 @@ android {
         buildConfig = true
     }
     defaultConfig {
-        versionCode = 9
-        versionName = "1.5.0"
+        versionCode = 10
+        versionName = "1.5.1"
     }
     signingConfigs {
         create("dev") {

diff --git a/...vorites/src/commonMain/kotlin/io/github/droidkaigi/confsched/favorites/FavoritesScreen.kt b/...vorites/src/commonMain/kotlin/io/github/droidkaigi/confsched/favorites/FavoritesScreen.kt
@@ -204,6 +204,7 @@ fun FavoritesScreenPreview() {
                         currentDayFilter = persistentListOf(DroidKaigi2024Day.ConferenceDay1),
                         timetableItemMap = persistentMapOf(
                             TimeSlot(
+                                day = DroidKaigi2024Day.ConferenceDay1,
                                 startTimeString = "10:00",
                                 endTimeString = "11:00",
                             ) to listOf(

diff --git a/...rc/commonMain/kotlin/io/github/droidkaigi/confsched/favorites/FavoritesScreenPresenter.kt b/...rc/commonMain/kotlin/io/github/droidkaigi/confsched/favorites/FavoritesScreenPresenter.kt
@@ -107,7 +107,7 @@ private fun favoritesSheet(
                 ),
             )
             .timetableItems.groupBy {
-                TimeSlot(it.startsTimeString, it.endsTimeString)
+                TimeSlot(it.day, it.startsTimeString, it.endsTimeString)
             }.mapValues { entry ->
                 entry.value.sortedWith(
                     compareBy({ it.day?.name.orEmpty() }, { it.startsTimeString }),

diff --git a/...es/src/commonMain/kotlin/io/github/droidkaigi/confsched/favorites/section/FavoriteList.kt b/...es/src/commonMain/kotlin/io/github/droidkaigi/confsched/favorites/section/FavoriteList.kt
@@ -39,6 +39,7 @@ import io.github.droidkaigi.confsched.droidkaigiui.component.TimetableItemTag
 import io.github.droidkaigi.confsched.droidkaigiui.component.TimetableTime
 import io.github.droidkaigi.confsched.droidkaigiui.icon
 import io.github.droidkaigi.confsched.favorites.section.FavoritesSheetUiState.FavoriteListUiState.TimeSlot
+import io.github.droidkaigi.confsched.model.DroidKaigi2024Day
 import io.github.droidkaigi.confsched.model.TimetableItem
 import io.github.droidkaigi.confsched.model.TimetableItem.Session
 import io.github.droidkaigi.confsched.model.fake
@@ -162,6 +163,7 @@ fun FavoriteListPreview() {
             FavoriteList(
                 timetableItemMap = persistentMapOf(
                     TimeSlot(
+                        day = DroidKaigi2024Day.ConferenceDay1,
                         startTimeString = "10:00",
                         endTimeString = "11:00",
                     ) to listOf(

diff --git a/...s/src/commonMain/kotlin/io/github/droidkaigi/confsched/favorites/section/FavoriteSheet.kt b/...s/src/commonMain/kotlin/io/github/droidkaigi/confsched/favorites/section/FavoriteSheet.kt
@@ -67,10 +67,11 @@ sealed interface FavoritesSheetUiState {
         val timetableItemMap: PersistentMap<TimeSlot, List<TimetableItem>>,
     ) : FavoritesSheetUiState {
         data class TimeSlot(
+            val day: DroidKaigi2024Day?,
             val startTimeString: String,
             val endTimeString: String,
         ) {
-            val key: String get() = "$startTimeString-$endTimeString"
+            val key: String get() = "${day?.ordinal}-$startTimeString-$endTimeString"
         }
     }
 
@@ -187,6 +188,7 @@ fun FavoriteSheetPreview() {
                     currentDayFilter = persistentListOf(ConferenceDay1, ConferenceDay2),
                     timetableItemMap = persistentMapOf(
                         TimeSlot(
+                            day = DroidKaigi2024Day.ConferenceDay1,
                             startTimeString = "10:00",
                             endTimeString = "11:00",
                         ) to listOf(