Skip to content

Commit d80f2de

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

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/OnBoardingPage.kt

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ import androidx.compose.ui.Alignment
2828
import androidx.compose.ui.Modifier
2929
import androidx.compose.ui.layout.ContentScale
3030
import androidx.compose.ui.res.painterResource
31-
import androidx.compose.ui.tooling.preview.Preview
3231
import androidx.compose.ui.unit.dp
3332
import io.element.android.libraries.designsystem.R
34-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
35-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
33+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
34+
import io.element.android.libraries.designsystem.preview.ElementPreview
3635
import io.element.android.libraries.designsystem.theme.components.Text
3736
import io.element.android.libraries.theme.ElementTheme
3837

@@ -52,10 +51,6 @@ fun OnBoardingPage(
5251
footer: @Composable () -> Unit = {},
5352
content: @Composable () -> Unit = {},
5453
) {
55-
// Note: having a night variant of R.drawable.onboarding_bg in the folder `drawable-night` is working
56-
// at runtime, but is not in Android Studio Preview. So I prefer to handle this manually.
57-
val isLight = ElementTheme.colors.isLight
58-
val bgDrawableRes = if (isLight) R.drawable.onboarding_bg_light else R.drawable.onboarding_bg_dark
5954
Box(
6055
modifier = modifier
6156
.fillMaxSize()
@@ -64,7 +59,7 @@ fun OnBoardingPage(
6459
Image(
6560
modifier = Modifier
6661
.fillMaxSize(),
67-
painter = painterResource(id = bgDrawableRes),
62+
painter = painterResource(id = R.drawable.onboarding_bg),
6863
contentScale = ContentScale.Crop,
6964
contentDescription = null,
7065
)
@@ -92,18 +87,9 @@ fun OnBoardingPage(
9287
}
9388
}
9489

95-
@Preview
90+
@DayNightPreviews
9691
@Composable
97-
internal fun OnBoardingPageLightPreview() =
98-
ElementPreviewLight { ContentToPreview() }
99-
100-
@Preview
101-
@Composable
102-
internal fun OnBoardingPageDarkPreview() =
103-
ElementPreviewDark { ContentToPreview() }
104-
105-
@Composable
106-
private fun ContentToPreview() {
92+
internal fun OnBoardingPagePreview() = ElementPreview {
10793
OnBoardingPage(
10894
content = {
10995
Box(

libraries/designsystem/src/main/res/drawable/onboarding_bg_dark.png renamed to libraries/designsystem/src/main/res/drawable-night/onboarding_bg.png

File renamed without changes.

libraries/designsystem/src/main/res/drawable/onboarding_bg_light.png renamed to libraries/designsystem/src/main/res/drawable/onboarding_bg.png

File renamed without changes.

0 commit comments

Comments
 (0)