Skip to content

Commit d6e811e

Browse files
committed
No need to use trick for night resource when using DayNightPreviews annotation.
1 parent d80f2de commit d6e811e

File tree

5 files changed

+8
-22
lines changed

5 files changed

+8
-22
lines changed

features/location/api/src/main/kotlin/io/element/android/features/location/api/StaticMapView.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ fun StaticMapView(
119119
showProgress = painter.state is AsyncImagePainter.State.Loading,
120120
contentDescription = contentDescription,
121121
modifier = Modifier.size(width = maxWidth, height = maxHeight),
122-
darkMode = darkMode,
123122
onLoadMapClick = { retryHash++ }
124123
)
125124
}

features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/StaticMapPlaceholder.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,20 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
3838
import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
3939
import io.element.android.libraries.designsystem.theme.components.Icon
4040
import io.element.android.libraries.designsystem.theme.components.Text
41-
import io.element.android.libraries.theme.ElementTheme
4241
import io.element.android.libraries.ui.strings.CommonStrings
4342

4443
@Composable
4544
internal fun StaticMapPlaceholder(
4645
showProgress: Boolean,
4746
contentDescription: String?,
4847
modifier: Modifier = Modifier,
49-
darkMode: Boolean = !ElementTheme.isLightTheme,
5048
onLoadMapClick: () -> Unit,
5149
) {
5250
Box(
5351
contentAlignment = Alignment.Center,
5452
) {
5553
Image(
56-
painter = painterResource(
57-
id = if (darkMode) R.drawable.blurred_map_dark
58-
else R.drawable.blurred_map_light
59-
),
54+
painter = painterResource(id = R.drawable.blurred_map),
6055
contentDescription = contentDescription,
6156
modifier = modifier,
6257
contentScale = ContentScale.FillBounds,

features/location/api/src/main/res/drawable/blurred_map_dark.png renamed to features/location/api/src/main/res/drawable-night/blurred_map.png

File renamed without changes.

features/location/api/src/main/res/drawable/blurred_map_light.png renamed to features/location/api/src/main/res/drawable/blurred_map.png

File renamed without changes.

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLocationView.kt

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@ import androidx.compose.foundation.layout.heightIn
2222
import androidx.compose.foundation.layout.padding
2323
import androidx.compose.runtime.Composable
2424
import androidx.compose.ui.Modifier
25-
import androidx.compose.ui.tooling.preview.Preview
2625
import androidx.compose.ui.tooling.preview.PreviewParameter
2726
import androidx.compose.ui.unit.dp
2827
import io.element.android.features.location.api.StaticMapView
2928
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
3029
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContentProvider
31-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
32-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
30+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
31+
import io.element.android.libraries.designsystem.preview.ElementPreview
3332
import io.element.android.libraries.designsystem.theme.components.Text
3433

3534
@Composable
@@ -57,17 +56,10 @@ fun TimelineItemLocationView(
5756
}
5857
}
5958

60-
@Preview
59+
@DayNightPreviews
6160
@Composable
62-
internal fun TimelineItemLocationViewLightPreview(@PreviewParameter(TimelineItemLocationContentProvider::class) content: TimelineItemLocationContent) =
63-
ElementPreviewLight { ContentToPreview(content) }
64-
65-
@Preview
66-
@Composable
67-
internal fun TimelineItemLocationViewDarkPreview(@PreviewParameter(TimelineItemLocationContentProvider::class) content: TimelineItemLocationContent) =
68-
ElementPreviewDark { ContentToPreview(content) }
61+
internal fun TimelineItemLocationViewPreview(@PreviewParameter(TimelineItemLocationContentProvider::class) content: TimelineItemLocationContent) =
62+
ElementPreview {
63+
TimelineItemLocationView(content)
64+
}
6965

70-
@Composable
71-
private fun ContentToPreview(content: TimelineItemLocationContent) {
72-
TimelineItemLocationView(content)
73-
}

0 commit comments

Comments
 (0)