From 1b5295f8e8445af63a2f934e953da0f6346015cf Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 18 Jul 2023 12:28:42 +0200 Subject: [PATCH] Use DayNightPreviews for correct rendering in AndroidStudio. --- .../messages/impl/timeline/TimelineView.kt | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt index 0404edf7db..d7820e707b 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt @@ -51,7 +51,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalInspectionMode import androidx.compose.ui.res.pluralStringResource -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import io.element.android.features.messages.impl.R @@ -64,8 +63,8 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContentProvider import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateContent -import io.element.android.libraries.designsystem.preview.ElementPreviewDark -import io.element.android.libraries.designsystem.preview.ElementPreviewLight +import io.element.android.libraries.designsystem.preview.DayNightPreviews +import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.theme.components.FloatingActionButton import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.matrix.api.core.EventId @@ -308,20 +307,11 @@ private fun JumpToBottomButton( } } -@Preview +@DayNightPreviews @Composable -fun TimelineViewLightPreview( +fun TimelineViewPreview( @PreviewParameter(TimelineItemEventContentProvider::class) content: TimelineItemEventContent -) = ElementPreviewLight { ContentToPreview(content) } - -@Preview -@Composable -fun TimelineViewDarkPreview( - @PreviewParameter(TimelineItemEventContentProvider::class) content: TimelineItemEventContent -) = ElementPreviewDark { ContentToPreview(content) } - -@Composable -private fun ContentToPreview(content: TimelineItemEventContent) { +) = ElementPreview { val timelineItems = aTimelineItemList(content) TimelineView( state = aTimelineState(timelineItems),