Merge branch 'main' into feature/migrate_from_kapt_to_ksp

fumiya-kume · Sep 16, 2023 · 0cd710d · 0cd710d
2 parents 2ae8f3f + b98cd67
commit 0cd710d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.run/generateComposeCompilerMetricsReports.run.xml b/.run/generateComposeCompilerMetricsReports.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="generateMetricsReport" type="GradleRunConfiguration" factoryName="Gradle">
+    <configuration default="false" name="generateComposeMetricsReport" type="GradleRunConfiguration" factoryName="Gradle">
         <ExternalSystemSettings>
             <option name="executionName" />
             <option name="externalProjectPath" value="$PROJECT_DIR$" />

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()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ accompanist = "0.30.1"
 junit = "4.13.2"
 androidxTestExt = "1.1.5"
 androidxTestEspresso = "3.5.1"
-dagger = "2.47"
+dagger = "2.48"
 koin = "3.4.3"
 ktlint = "0.49.1"
 kotlinxSerialization = "1.6.0"