add clock parameter

DroidKaigi · Sep 16, 2023 · d8a9e0d · d8a9e0d
1 parent 3ed1da1
commit d8a9e0d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/...model/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/model/DroidKaigi2023Day.kt b/...model/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/model/DroidKaigi2023Day.kt
@@ -81,14 +81,11 @@ public enum class DroidKaigi2023Day(
         /**
          * @return appropriate initial day for now
          */
-        fun initialSelectedDay(isTest: Boolean = false): DroidKaigi2023Day {
-            // Timetable tab set initial tab with current date.
-            // To get the consistent test result, fix selected timetable tab to Day1 here.
-            if (isTest) return Day1
+        fun initialSelectedDay(clock: Clock): DroidKaigi2023Day {
             val reversedEntries = entries.sortedByDescending { it.day }
             var selectedDay = reversedEntries.last()
             for (entry in reversedEntries) {
-                if (Clock.System.now() <= entry.end) selectedDay = entry
+                if (clock.now() <= entry.end) selectedDay = entry
             }
             return selectedDay
         }

diff --git a/...ure/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/TimetableScreen.kt b/...ure/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/TimetableScreen.kt
@@ -52,6 +52,8 @@ import io.github.droidkaigi.confsched2023.sessions.section.TimetableSheet
 import io.github.droidkaigi.confsched2023.sessions.section.TimetableSheetUiState
 import io.github.droidkaigi.confsched2023.ui.SnackbarMessageEffect
 import kotlinx.collections.immutable.toPersistentMap
+import kotlinx.datetime.Clock
+import kotlinx.datetime.Instant
 import kotlin.math.roundToInt
 
 const val timetableScreenRoute = "timetable"
@@ -253,7 +255,7 @@ fun PreviewTimetableScreenDark() {
         TimetableScreen(
             uiState = TimetableScreenUiState(
                 contentUiState = TimetableSheetUiState.ListTimetable(
-                    mapOf(
+                    timetableListUiStates = mapOf(
                         DroidKaigi2023Day.Day1 to TimetableListUiState(
                             mapOf<String, List<TimetableItem>>().toPersistentMap(),
                             Timetable(),
@@ -263,6 +265,9 @@ fun PreviewTimetableScreenDark() {
                             Timetable(),
                         ),
                     ),
+                    clock = object : Clock {
+                        override fun now(): Instant = Instant.parse("2023-09-14T00:00:00Z")
+                    },
                 ),
                 timetableUiType = TimetableUiType.Grid,
                 onBookmarkIconClickStatus = false,

diff --git a/...ons/src/main/java/io/github/droidkaigi/confsched2023/sessions/TimetableScreenViewModel.kt b/...ons/src/main/java/io/github/droidkaigi/confsched2023/sessions/TimetableScreenViewModel.kt
@@ -52,7 +52,7 @@ class TimetableScreenViewModel @Inject constructor(
         timetableUiTypeStateFlow,
     ) { sessionTimetable, uiType ->
         if (sessionTimetable.timetableItems.isEmpty()) {
-            return@buildUiState TimetableSheetUiState.Empty
+            return@buildUiState TimetableSheetUiState.Empty()
         }
         if (uiType == TimetableUiType.List) {
             TimetableSheetUiState.ListTimetable(

diff --git a/...sions/src/main/java/io/github/droidkaigi/confsched2023/sessions/section/TimetableSheet.kt b/...sions/src/main/java/io/github/droidkaigi/confsched2023/sessions/section/TimetableSheet.kt
@@ -36,18 +36,26 @@ import io.github.droidkaigi.confsched2023.sessions.component.rememberTimetableTa
 import io.github.droidkaigi.confsched2023.sessions.section.TimetableSheetUiState.Empty
 import io.github.droidkaigi.confsched2023.sessions.section.TimetableSheetUiState.GridTimetable
 import io.github.droidkaigi.confsched2023.sessions.section.TimetableSheetUiState.ListTimetable
-import io.github.droidkaigi.confsched2023.ui.isTest
+import kotlinx.datetime.Clock
 
 const val TimetableTabTestTag = "TimetableTab"
 
 sealed interface TimetableSheetUiState {
-    data object Empty : TimetableSheetUiState
+
+    val clock: Clock
+
+    data class Empty(
+        override val clock: Clock = Clock.System,
+    ) : TimetableSheetUiState
+
     data class ListTimetable(
         val timetableListUiStates: Map<DroidKaigi2023Day, TimetableListUiState>,
+        override val clock: Clock = Clock.System,
     ) : TimetableSheetUiState
 
     data class GridTimetable(
         val timetableGridUiState: Map<DroidKaigi2023Day, TimetableGridUiState>,
+        override val clock: Clock = Clock.System,
     ) : TimetableSheetUiState
 }
 
@@ -60,7 +68,7 @@ fun TimetableSheet(
     contentPadding: PaddingValues,
     modifier: Modifier = Modifier,
 ) {
-    var selectedDay by rememberSaveable { mutableStateOf(DroidKaigi2023Day.initialSelectedDay(isTest())) }
+    var selectedDay by rememberSaveable { mutableStateOf(DroidKaigi2023Day.initialSelectedDay(uiState.clock)) }
     val corner by animateIntAsState(
         if (timetableScreenScrollState.isScreenLayoutCalculating || timetableScreenScrollState.isSheetExpandable) 40 else 0,
         label = "Timetable corner state",