Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.samples.apps.nowinandroid.core.designsystem.component

import android.content.res.Configuration
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
Expand All @@ -31,7 +30,7 @@ import androidx.compose.ui.draw.drawWithCache
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.google.samples.apps.nowinandroid.core.designsystem.theme.GradientColors
Expand Down Expand Up @@ -139,55 +138,47 @@ fun NiaGradientBackground(
}
}

/**
* Multipreview annotation that represents light and dark themes. Add this annotation to a
* composable to render the both themes.
*/
@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO, name = "Light theme")
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, name = "Dark theme")
annotation class ThemePreviews

@ThemePreviews
@PreviewLightDark
@Composable
fun BackgroundDefault() {
NiaTheme(disableDynamicTheming = true) {
NiaBackground(Modifier.size(100.dp), content = {})
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun BackgroundDynamic() {
NiaTheme(disableDynamicTheming = false) {
NiaBackground(Modifier.size(100.dp), content = {})
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun BackgroundAndroid() {
NiaTheme(androidTheme = true) {
NiaBackground(Modifier.size(100.dp), content = {})
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun GradientBackgroundDefault() {
NiaTheme(disableDynamicTheming = true) {
NiaGradientBackground(Modifier.size(100.dp), content = {})
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun GradientBackgroundDynamic() {
NiaTheme(disableDynamicTheming = false) {
NiaGradientBackground(Modifier.size(100.dp), content = {})
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun GradientBackgroundAndroid() {
NiaTheme(androidTheme = true) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.unit.dp
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
Expand Down Expand Up @@ -265,7 +266,7 @@ private fun NiaButtonContent(
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun NiaButtonPreview() {
NiaTheme {
Expand All @@ -275,7 +276,7 @@ fun NiaButtonPreview() {
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun NiaOutlinedButtonPreview() {
NiaTheme {
Expand All @@ -285,7 +286,7 @@ fun NiaOutlinedButtonPreview() {
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun NiaButtonLeadingIconPreview() {
NiaTheme {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.unit.dp
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
Expand Down Expand Up @@ -106,7 +107,7 @@ fun NiaFilterChip(
)
}

@ThemePreviews
@PreviewLightDark
@Composable
fun ChipPreview() {
NiaTheme {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.tooling.preview.PreviewLightDark
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme

Expand Down Expand Up @@ -71,7 +72,7 @@ fun NiaIconToggleButton(
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun IconButtonPreview() {
NiaTheme {
Expand All @@ -94,7 +95,7 @@ fun IconButtonPreview() {
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun IconButtonPreviewUnchecked() {
NiaTheme {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.unit.dp
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -149,7 +150,7 @@ fun NiaOverlayLoadingWheel(
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun NiaLoadingWheelPreview() {
NiaTheme {
Expand All @@ -159,7 +160,7 @@ fun NiaLoadingWheelPreview() {
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun NiaOverlayLoadingWheelPreview() {
NiaTheme {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScope
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.unit.dp
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
Expand Down Expand Up @@ -263,7 +264,7 @@ class NiaNavigationSuiteScope internal constructor(
)
}

@ThemePreviews
@PreviewLightDark
@Composable
fun NiaNavigationBarPreview() {
val items = listOf("For you", "Saved", "Interests")
Expand Down Expand Up @@ -303,7 +304,7 @@ fun NiaNavigationBarPreview() {
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun NiaNavigationRailPreview() {
val items = listOf("For you", "Saved", "Interests")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.unit.dp
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme

Expand Down Expand Up @@ -101,7 +102,7 @@ fun NiaTabRow(
)
}

@ThemePreviews
@PreviewLightDark
@Composable
fun TabsPreview() {
NiaTheme {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import androidx.compose.material3.TextButton
import androidx.compose.material3.contentColorFor
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.PreviewLightDark
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme

@Composable
Expand Down Expand Up @@ -61,7 +62,7 @@ fun NiaTopicTag(
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun TagPreview() {
NiaTheme {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.unit.dp
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
Expand Down Expand Up @@ -109,7 +110,7 @@ private fun NiaViewToggleButtonContent(
}
}

@ThemePreviews
@PreviewLightDark
@Composable
fun ViewTogglePreviewExpanded() {
NiaTheme {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.tooling.preview.PreviewScreenSizes
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.max
import androidx.compose.ui.unit.sp
Expand All @@ -96,7 +97,6 @@ import com.google.samples.apps.nowinandroid.core.designsystem.component.scrollba
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
import com.google.samples.apps.nowinandroid.core.model.data.UserNewsResource
import com.google.samples.apps.nowinandroid.core.ui.DevicePreviews
import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState
import com.google.samples.apps.nowinandroid.core.ui.TrackScreenViewEvent
import com.google.samples.apps.nowinandroid.core.ui.TrackScrollJank
Expand Down Expand Up @@ -500,7 +500,7 @@ private fun feedItemsSize(
return feedSize + onboardingSize
}

@DevicePreviews
@PreviewScreenSizes
@Composable
fun ForYouScreenPopulatedFeed(
@PreviewParameter(UserNewsResourcePreviewParameterProvider::class)
Expand All @@ -524,7 +524,7 @@ fun ForYouScreenPopulatedFeed(
}
}

@DevicePreviews
@PreviewScreenSizes
@Composable
fun ForYouScreenOfflinePopulatedFeed(
@PreviewParameter(UserNewsResourcePreviewParameterProvider::class)
Expand All @@ -548,7 +548,7 @@ fun ForYouScreenOfflinePopulatedFeed(
}
}

@DevicePreviews
@PreviewScreenSizes
@Composable
fun ForYouScreenTopicSelection(
@PreviewParameter(UserNewsResourcePreviewParameterProvider::class)
Expand All @@ -575,7 +575,7 @@ fun ForYouScreenTopicSelection(
}
}

@DevicePreviews
@PreviewScreenSizes
@Composable
fun ForYouScreenLoading() {
NiaTheme {
Expand All @@ -594,7 +594,7 @@ fun ForYouScreenLoading() {
}
}

@DevicePreviews
@PreviewScreenSizes
@Composable
fun ForYouScreenPopulatedAndLoading(
@PreviewParameter(UserNewsResourcePreviewParameterProvider::class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.tooling.preview.PreviewScreenSizes
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheel
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic
import com.google.samples.apps.nowinandroid.core.ui.DevicePreviews
import com.google.samples.apps.nowinandroid.core.ui.FollowableTopicPreviewParameterProvider
import com.google.samples.apps.nowinandroid.core.ui.TrackScreenViewEvent

Expand Down Expand Up @@ -93,7 +93,7 @@ private fun InterestsEmptyScreen() {
Text(text = stringResource(id = R.string.feature_interests_empty_header))
}

@DevicePreviews
@PreviewScreenSizes
@Composable
fun InterestsScreenPopulated(
@PreviewParameter(FollowableTopicPreviewParameterProvider::class)
Expand All @@ -113,7 +113,7 @@ fun InterestsScreenPopulated(
}
}

@DevicePreviews
@PreviewScreenSizes
@Composable
fun InterestsScreenLoading() {
NiaTheme {
Expand All @@ -127,7 +127,7 @@ fun InterestsScreenLoading() {
}
}

@DevicePreviews
@PreviewScreenSizes
@Composable
fun InterestsScreenEmpty() {
NiaTheme {
Expand Down
Loading