Merge pull request #1240 from aqua-ix/fix-off-by-one-hour

Fix the issue of TimetableGrid is off by one hour
DroidKaigi · Sep 16, 2023 · 968cb40 · 968cb40
2 parents 3ed1da1 + fa51f28
commit 968cb40
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/...ssions/src/main/java/io/github/droidkaigi/confsched2023/sessions/section/TimetableGrid.kt b/...ssions/src/main/java/io/github/droidkaigi/confsched2023/sessions/section/TimetableGrid.kt
@@ -351,7 +351,16 @@ private data class TimetableItemLayout(
     val minutePx: Float,
     val dayToStartTime: Map<DroidKaigi2023Day, Instant>,
 ) {
-    val dayStart = dayToStartTime[timetableItem.day] ?: dayStartTime
+    val dayStart = run {
+        val tz = TimeZone.of("Asia/Tokyo")
+        val startTime = dayToStartTime[timetableItem.day] ?: dayStartTime
+        val localDate = startTime.toLocalDateTime(tz).date
+        val dayStartLocalTime = LocalDateTime(
+            date = localDate,
+            time = LocalTime(10, 0),
+        )
+        dayStartLocalTime.toInstant(tz)
+    }
     private val displayEndsAt = timetableItem.endsAt.minus(1, DateTimeUnit.MINUTE)
     val height =
         ((displayEndsAt - timetableItem.startsAt).inWholeMinutes * minutePx).roundToInt()