Skip to content

Commit 3e69985

Browse files
Marco RomanoElementBot
andauthored
Use @DayNightPreviews for static map (#832)
* Use @DayNightPreviews for static map To properly screenshot the dark pin. * Update screenshots --------- Co-authored-by: ElementBot <[email protected]>
1 parent 4d8c929 commit 3e69985

File tree

11 files changed

+19
-39
lines changed

11 files changed

+19
-39
lines changed

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

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import androidx.compose.ui.Modifier
2929
import androidx.compose.ui.graphics.Color
3030
import androidx.compose.ui.layout.ContentScale
3131
import androidx.compose.ui.platform.LocalContext
32-
import androidx.compose.ui.tooling.preview.Preview
3332
import androidx.compose.ui.unit.IntOffset
3433
import androidx.compose.ui.unit.dp
3534
import coil.compose.AsyncImagePainter
@@ -38,8 +37,8 @@ import coil.request.ImageRequest
3837
import io.element.android.features.location.api.internal.AttributionPlacement
3938
import io.element.android.features.location.api.internal.StaticMapPlaceholder
4039
import io.element.android.features.location.api.internal.buildStaticMapsApiUrl
41-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
42-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
40+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
41+
import io.element.android.libraries.designsystem.preview.ElementPreview
4342
import io.element.android.libraries.designsystem.text.toDp
4443
import io.element.android.libraries.designsystem.theme.components.Icon
4544
import io.element.android.libraries.theme.ElementTheme
@@ -127,18 +126,9 @@ fun StaticMapView(
127126
}
128127
}
129128

130-
@Preview
129+
@DayNightPreviews
131130
@Composable
132-
fun StaticMapViewLightPreview() =
133-
ElementPreviewLight { ContentToPreview() }
134-
135-
@Preview
136-
@Composable
137-
fun StaticMapViewDarkPreview() =
138-
ElementPreviewDark { ContentToPreview() }
139-
140-
@Composable
141-
private fun ContentToPreview() {
131+
fun StaticMapViewPreview() = ElementPreview {
142132
StaticMapView(
143133
lat = 0.0,
144134
lon = 0.0,

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

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ import androidx.compose.ui.Modifier
2929
import androidx.compose.ui.layout.ContentScale
3030
import androidx.compose.ui.res.painterResource
3131
import androidx.compose.ui.res.stringResource
32-
import androidx.compose.ui.tooling.preview.Preview
3332
import androidx.compose.ui.tooling.preview.PreviewParameter
3433
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
3534
import androidx.compose.ui.unit.dp
3635
import io.element.android.features.location.api.R
37-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
38-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
36+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
37+
import io.element.android.libraries.designsystem.preview.ElementPreview
3938
import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
4039
import io.element.android.libraries.designsystem.theme.components.Icon
4140
import io.element.android.libraries.designsystem.theme.components.Text
@@ -83,22 +82,13 @@ internal fun StaticMapPlaceholder(
8382
}
8483
}
8584

86-
@Preview
85+
@DayNightPreviews
8786
@Composable
88-
fun StaticMapPlaceholderLightPreview(
87+
fun StaticMapPlaceholderPreview(
8988
@PreviewParameter(BooleanParameterProvider::class) values: Boolean
90-
) = ElementPreviewLight { ContentToPreview(values) }
91-
92-
@Preview
93-
@Composable
94-
fun StaticMapPlaceholderDarkPreview(
95-
@PreviewParameter(BooleanParameterProvider::class) values: Boolean
96-
) = ElementPreviewDark { ContentToPreview(values) }
97-
98-
@Composable
99-
private fun ContentToPreview(showProgress: Boolean) {
89+
) = ElementPreview {
10090
StaticMapPlaceholder(
101-
showProgress = showProgress,
91+
showProgress = values,
10292
contentDescription = null,
10393
modifier = Modifier.size(400.dp),
10494
onLoadMapClick = {},

tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.location.api.internal_null_DefaultGroup_StaticMapPlaceholderDarkPreview_0_null_0,NEXUS_5,1.0,en].png

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.location.api.internal_null_DefaultGroup_StaticMapPlaceholderDarkPreview_0_null_1,NEXUS_5,1.0,en].png

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.location.api.internal_null_DefaultGroup_StaticMapPlaceholderLightPreview_0_null_0,NEXUS_5,1.0,en].png renamed to tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.location.api.internal_null_DefaultGroup_StaticMapPlaceholderPreview-D-1_2_null_0,NEXUS_5,1.0,en].png

File renamed without changes.

tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.location.api.internal_null_DefaultGroup_StaticMapPlaceholderLightPreview_0_null_1,NEXUS_5,1.0,en].png renamed to tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.location.api.internal_null_DefaultGroup_StaticMapPlaceholderPreview-D-1_2_null_1,NEXUS_5,1.0,en].png

File renamed without changes.

tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.location.api_null_DefaultGroup_StaticMapViewDarkPreview_0_null,NEXUS_5,1.0,en].png

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.location.api_null_DefaultGroup_StaticMapViewLightPreview_0_null,NEXUS_5,1.0,en].png renamed to tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.location.api_null_DefaultGroup_StaticMapViewPreview-D-0_1_null,NEXUS_5,1.0,en].png

File renamed without changes.

0 commit comments

Comments
 (0)