🐛 :: timeTable focusing

team-xquare · Jun 30, 2023 · 1119da1 · 1119da1
1 parent ac321cf
commit 1119da1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/app/src/main/java/com/xquare/xquare_android/feature/schedule/ScheduleScreen.kt b/app/src/main/java/com/xquare/xquare_android/feature/schedule/ScheduleScreen.kt
@@ -163,14 +163,17 @@ private fun Timetable(
     dayOfWeek: Int,
     timetableEntity: TimetableEntity?,
 ) {
+    var dayOfWeek = dayOfWeek
+    var date = dayOfWeek
     if (timetableEntity == null) return
     if (timetableEntity.week_timetable.isEmpty()) return
     val pagerState = rememberPagerState()
     LaunchedEffect(Unit) {
         val lastIndex = timetableEntity.week_timetable.lastIndex
         //val coerce = dayOfWeek.coerceIn(0, lastIndex)
-        val initPage = getTimeTablePage(dayOfWeek = dayOfWeek, lastIndex = lastIndex)
-
+        if (dayOfWeek > 4) dayOfWeek = 4
+        if (timetableEntity.week_timetable[dayOfWeek-1].week_day != dayOfWeek) date -= (5-timetableEntity.week_timetable.size)
+        val initPage = getTimeTablePage(dayOfWeek = date, lastIndex = lastIndex)
         pagerState.scrollToPage(initPage)
     }
     Scaffold(