Merge branch 'main' into bottom-navigation-behavior

DroidKaigi · Sep 15, 2023 · f72a19f · f72a19f
2 parents d116fc3 + 387a662
commit f72a19f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 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,7 +81,10 @@ public enum class DroidKaigi2023Day(
         /**
          * @return appropriate initial day for now
          */
-        fun initialSelectedDay(): DroidKaigi2023Day {
+        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
             val reversedEntries = entries.sortedByDescending { it.day }
             var selectedDay = reversedEntries.last()
             for (entry in reversedEntries) {

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,8 +36,10 @@ 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
 
 const val TimetableTabTestTag = "TimetableTab"
+
 sealed interface TimetableSheetUiState {
     data object Empty : TimetableSheetUiState
     data class ListTimetable(
@@ -58,7 +60,7 @@ fun TimetableSheet(
     contentPadding: PaddingValues,
     modifier: Modifier = Modifier,
 ) {
-    var selectedDay by rememberSaveable { mutableStateOf(DroidKaigi2023Day.initialSelectedDay()) }
+    var selectedDay by rememberSaveable { mutableStateOf(DroidKaigi2023Day.initialSelectedDay(isTest())) }
     val corner by animateIntAsState(
         if (timetableScreenScrollState.isScreenLayoutCalculating || timetableScreenScrollState.isSheetExpandable) 40 else 0,
         label = "Timetable corner state",