Fix conflicts

DroidKaigi · Jul 19, 2024 · 23abc8b · 23abc8b
1 parent 4a3bdd8
commit 23abc8b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/...esting/src/main/java/io/github/droidkaigi/confsched/testing/DroidKaigiKmpPreviewTester.kt b/...esting/src/main/java/io/github/droidkaigi/confsched/testing/DroidKaigiKmpPreviewTester.kt
@@ -13,8 +13,9 @@ class DroidKaigiKmpPreviewTester : ComposePreviewTester<JvmAnnotationScanner.Des
             .getPreviews()
             .filter { preview ->
                 System.getProperties()
-                Class.forName(preview.declaringClass).declaredMethods.first { it.name == preview.methodName }.kotlinFunction?.visibility == kotlin.reflect.KVisibility.PUBLIC
-
+                Class.forName(preview.declaringClass).declaredMethods.first {
+                    it.name == preview.methodName
+                }.kotlinFunction?.visibility == kotlin.reflect.KVisibility.PUBLIC
             }
     }
 

diff --git a/...ommonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeBottomNavigation.kt b/...ommonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeBottomNavigation.kt
@@ -51,9 +51,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import dev.chrisbanes.haze.HazeState
 import dev.chrisbanes.haze.hazeChild
-import io.github.droidkaigi.confsched.designsystem.preview.Preview
 import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
 import io.github.droidkaigi.confsched.main.MainScreenTab
+import org.jetbrains.compose.ui.tooling.preview.Preview
 
 @Composable
 fun GlassLikeBottomNavigation(

diff --git a/.../commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridItem.kt b/.../commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridItem.kt
@@ -35,8 +35,6 @@ import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import io.github.droidkaigi.confsched.designsystem.preview.MultiLanguagePreviews
-import io.github.droidkaigi.confsched.designsystem.preview.MultiThemePreviews
 import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
 import io.github.droidkaigi.confsched.designsystem.theme.hallColors
 import io.github.droidkaigi.confsched.designsystem.theme.md_theme_light_outline
@@ -65,6 +63,7 @@ import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.minus
 import kotlinx.datetime.toInstant
+import org.jetbrains.compose.ui.tooling.preview.Preview
 import org.jetbrains.compose.ui.tooling.preview.PreviewParameter
 import kotlin.math.ceil
 import kotlin.math.roundToInt
@@ -399,7 +398,7 @@ object TimetableGridItemSizes {
     val minTitleLineHeight = 12.sp
 }
 
-@MultiLanguagePreviews
+@Preview
 @Composable
 fun PreviewTimetableGridItem() {
     KaigiTheme {
@@ -414,7 +413,7 @@ fun PreviewTimetableGridItem() {
     }
 }
 
-@MultiLanguagePreviews
+@Preview
 @Composable
 fun PreviewTimetableGridLongTitleItem() {
     val fake = Session.fake()
@@ -443,7 +442,7 @@ fun PreviewTimetableGridLongTitleItem() {
     }
 }
 
-@MultiThemePreviews
+@Preview
 @Composable
 fun PreviewTimetableGridMultiSpeakersItem() {
     KaigiTheme {
@@ -457,7 +456,7 @@ fun PreviewTimetableGridMultiSpeakersItem() {
     }
 }
 
-@MultiThemePreviews
+@Preview
 @Composable
 internal fun PreviewTimetableGridItem(
     @PreviewParameter(PreviewTimeTableItemRoomProvider::class) timetableItem: TimetableItem,
@@ -473,7 +472,7 @@ internal fun PreviewTimetableGridItem(
     }
 }
 
-@MultiThemePreviews
+@Preview
 @Composable
 fun PreviewTimetableGridItemWelcomeTalk() {
     KaigiTheme {

diff --git a/...ns/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/section/TimetableGrid.kt b/...ns/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/section/TimetableGrid.kt
@@ -60,8 +60,6 @@ import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import io.github.droidkaigi.confsched.designsystem.preview.MultiLanguagePreviews
-import io.github.droidkaigi.confsched.designsystem.preview.MultiThemePreviews
 import io.github.droidkaigi.confsched.model.DroidKaigi2023Day
 import io.github.droidkaigi.confsched.model.Timetable
 import io.github.droidkaigi.confsched.model.TimetableItem
@@ -85,6 +83,7 @@ import kotlinx.datetime.TimeZone
 import kotlinx.datetime.minus
 import kotlinx.datetime.toInstant
 import kotlinx.datetime.toLocalDateTime
+import org.jetbrains.compose.ui.tooling.preview.Preview
 import kotlin.math.roundToInt
 
 data class TimetableGridUiState(val timetable: Timetable)
@@ -333,8 +332,7 @@ fun TimetableGrid(
     }
 }
 
-@MultiThemePreviews
-@MultiLanguagePreviews
+@Preview
 @Composable
 fun TimetablePreview() {
     TimetableGrid(