diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_SectionedListTest_failedSection_secondPage.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_SectionedListTest_failedSection_secondPage.png index 38b81563f0..364ff53ad0 100644 --- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_SectionedListTest_failedSection_secondPage.png +++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_SectionedListTest_failedSection_secondPage.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e1d1cebb0c373cbcbf7ede204fa981c6907c2d92c039ae8cd13b560a0e37bce -size 35154 +oid sha256:f65503b76902a691e9cdd9b0c0e657e76d287a70f8afbe6eccf5a92f28d948dd +size 34824 diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_SectionedListTest_loadedSection_secondPage.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_SectionedListTest_loadedSection_secondPage.png index 26f03a7a74..f4ceb4690f 100644 --- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_SectionedListTest_loadedSection_secondPage.png +++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_SectionedListTest_loadedSection_secondPage.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5222c0ad7d8032d672204b08a5814c84fd5cc08136578398e36b4841464064f6 -size 33732 +oid sha256:72f4a677ebdac64b097a23cfc06c0e15886639ac8fd3aa5396256d464902e356 +size 33660 diff --git a/compose-layout/src/main/java/com/google/android/horologist/compose/layout/ScalingLazyColumnDefaults.kt b/compose-layout/src/main/java/com/google/android/horologist/compose/layout/ScalingLazyColumnDefaults.kt index 01be8faff3..285f7b64ee 100644 --- a/compose-layout/src/main/java/com/google/android/horologist/compose/layout/ScalingLazyColumnDefaults.kt +++ b/compose-layout/src/main/java/com/google/android/horologist/compose/layout/ScalingLazyColumnDefaults.kt @@ -165,44 +165,58 @@ public object ScalingLazyColumnDefaults { val configuration = LocalConfiguration.current val screenWidthDp = configuration.screenWidthDp.toFloat() val screenHeightDp = configuration.screenHeightDp.toFloat() - val padding = screenWidthDp * horizontalPaddingPercent - val topPaddingDp: Dp = if (firstItemIsFullWidth && configuration.isScreenRound) { - calculateVerticalOffsetForChip(screenWidthDp, horizontalPaddingPercent) - } else { - 32.dp - } - val sizeRatio = ((screenWidthDp - 192) / (233 - 192).toFloat()).coerceIn(0f, 1.5f) - val presetRatio = 0f + return remember { + val padding = screenWidthDp * horizontalPaddingPercent + val topPaddingDp: Dp = if (firstItemIsFullWidth && configuration.isScreenRound) { + calculateVerticalOffsetForChip(screenWidthDp, horizontalPaddingPercent) + } else { + 32.dp + } + val bottomPaddingDp: Dp = if (configuration.isScreenRound) { + calculateVerticalOffsetForChip(screenWidthDp, horizontalPaddingPercent) + } else { + 0.dp + } + val contentPadding = PaddingValues( + start = padding.dp, + end = padding.dp, + top = topPaddingDp, + bottom = bottomPaddingDp, + ) + + val sizeRatio = ((screenWidthDp - 192) / (233 - 192).toFloat()).coerceIn(0f, 1.5f) + val presetRatio = 0f - val minElementHeight = lerp(0.2f, 0.157f, sizeRatio) - val maxElementHeight = lerp(0.6f, 0.216f, sizeRatio).coerceAtLeast(minElementHeight) - val minTransitionArea = lerp(0.35f, lerp(0.35f, 0.393f, presetRatio), sizeRatio) - val maxTransitionArea = lerp(0.55f, lerp(0.55f, 0.593f, presetRatio), sizeRatio) + val minElementHeight = lerp(0.2f, 0.157f, sizeRatio) + val maxElementHeight = lerp(0.6f, 0.216f, sizeRatio).coerceAtLeast(minElementHeight) + val minTransitionArea = lerp(0.35f, lerp(0.35f, 0.393f, presetRatio), sizeRatio) + val maxTransitionArea = lerp(0.55f, lerp(0.55f, 0.593f, presetRatio), sizeRatio) - val scalingParams = ScalingLazyColumnDefaults.scalingParams( - minElementHeight = minElementHeight, - maxElementHeight = maxElementHeight, - minTransitionArea = minTransitionArea, - maxTransitionArea = maxTransitionArea, - ) + val scalingParams = ScalingLazyColumnDefaults.scalingParams( + minElementHeight = minElementHeight, + maxElementHeight = maxElementHeight, + minTransitionArea = minTransitionArea, + maxTransitionArea = maxTransitionArea, + ) - return remember { val screenHeightPx = with(density) { screenHeightDp.dp.roundToPx() } val topPaddingPx = with(density) { topPaddingDp.roundToPx() } val topScreenOffsetPx = screenHeightPx / 2 - topPaddingPx + val initialScrollPosition = ScalingLazyColumnState.ScrollPosition( + index = 0, + offsetPx = topScreenOffsetPx, + ) ScalingLazyColumnState( - initialScrollPosition = ScalingLazyColumnState.ScrollPosition( - index = 0, - offsetPx = topScreenOffsetPx, - ), + initialScrollPosition = initialScrollPosition, + autoCentering = null, anchorType = ScalingLazyListAnchorType.ItemStart, rotaryMode = RotaryMode.Scroll, verticalArrangement = verticalArrangement, horizontalAlignment = Alignment.CenterHorizontally, - contentPadding = PaddingValues(horizontal = padding.dp), + contentPadding = contentPadding, scalingParams = scalingParams, ) } diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.screens.browse_PlaylistDownloadBrowseScreenA11yScreenshotTest_secondPage.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.screens.browse_PlaylistDownloadBrowseScreenA11yScreenshotTest_secondPage.png index 67af957e26..b7e41ae9e4 100644 --- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.screens.browse_PlaylistDownloadBrowseScreenA11yScreenshotTest_secondPage.png +++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.screens.browse_PlaylistDownloadBrowseScreenA11yScreenshotTest_secondPage.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eab1c2bb989b296c995b90df84e06ab2e421edefdb4e3c6362fe2c683cb32ddf -size 60725 +oid sha256:384981f2403e116aee8d8de34e09fbbb4379d7ec4912320681f11d13b49395f1 +size 60308 diff --git a/sample/src/main/java/com/google/android/horologist/screensizes/ScalingLazyColumnDecoder.kt b/sample/src/main/java/com/google/android/horologist/screensizes/ScalingLazyColumnDecoder.kt index 92c93a1a9b..3c0f7d70d6 100644 --- a/sample/src/main/java/com/google/android/horologist/screensizes/ScalingLazyColumnDecoder.kt +++ b/sample/src/main/java/com/google/android/horologist/screensizes/ScalingLazyColumnDecoder.kt @@ -82,6 +82,7 @@ fun ScalingLazyColumnDecoder(factory: ScalingLazyColumnState.Factory) { with(density) { columnState.contentPadding.calculateLeftPadding(layoutDirection).toPx() } val rightPadding = with(density) { columnState.contentPadding.calculateRightPadding(layoutDirection).toPx() } + val topPadding = with(density) { columnState.contentPadding.calculateTopPadding().toPx() } val scalingParams = columnState.scalingParams Canvas(modifier = Modifier.fillMaxSize()) { drawLine( @@ -156,6 +157,13 @@ fun ScalingLazyColumnDecoder(factory: ScalingLazyColumnState.Factory) { size.height / 2 + 25, paint, ) + if (topPadding > 0f) { + drawLine( + Color.Yellow, + Offset(0f, topPadding), + Offset(size.width, topPadding), + ) + } } } } diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/MediaPlayerLibraryTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/MediaPlayerLibraryTest.kt index f9be09ac6f..d5ebb0ab63 100644 --- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/MediaPlayerLibraryTest.kt +++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/MediaPlayerLibraryTest.kt @@ -42,7 +42,7 @@ import com.google.android.horologist.media.ui.state.model.DownloadMediaUiModel import com.google.android.horologist.media.ui.state.model.PlaylistUiModel import com.google.android.horologist.screenshots.FixedTimeSource -class MediaPlayerLibraryTest(device: Device) : ScreenSizeTest(device = device, showTimeText = true) { +class MediaPlayerLibraryTest(device: Device) : ScreenSizeTest(device = device, showTimeText = false) { @Composable override fun Content() { diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/ScalingLazyColumnDefaultsTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/ScalingLazyColumnDefaultsTest.kt index 603f63bfc1..a7422ddd4e 100644 --- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/ScalingLazyColumnDefaultsTest.kt +++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/ScalingLazyColumnDefaultsTest.kt @@ -16,8 +16,22 @@ package com.google.android.horologist.screensizes +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.wear.compose.material.AppCard +import androidx.wear.compose.material.Text +import com.google.android.horologist.composables.SectionedList +import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults +import com.google.android.horologist.compose.layout.ScalingLazyColumnState +import com.google.android.horologist.compose.material.Title import com.google.android.horologist.compose.tools.Device +import com.google.android.horologist.sample.R +import com.google.android.horologist.sample.Screen import org.junit.Test class ScalingLazyColumnDefaultsTest(device: Device) : @@ -37,4 +51,92 @@ class ScalingLazyColumnDefaultsTest(device: Device) : fun belowTimeText() { runTest { BelowTimeText() } } + + @Test + fun standard_end() { + runTest { + val columnState = ScalingLazyColumnDefaults.scalingLazyColumnDefaults().create() + + SampleMenu(columnState = columnState) + + LaunchedEffect(Unit) { + columnState.state.scrollToItem(100, 0) + } + } + } + + @Test + fun responsive_end() { + runTest { + val columnState = ScalingLazyColumnDefaults.responsive().create() + + SampleMenu(columnState = columnState) + + LaunchedEffect(Unit) { + columnState.state.scrollToItem(100, 0) + } + } + } + + @Test + fun belowTimeText_end() { + runTest { + val columnState = ScalingLazyColumnDefaults.belowTimeText().create() + + SampleMenu(columnState = columnState) + + LaunchedEffect(Unit) { + columnState.state.scrollToItem(100, 0) + } + } + } + + @Composable + fun SampleMenu(columnState: ScalingLazyColumnState, modifier: Modifier = Modifier) { + SectionedList( + columnState = columnState, + modifier = modifier.fillMaxSize(), + ) { + section( + listOf( + Pair( + R.string.sectionedlist_stateless_sections_menu, + Screen.SectionedListStatelessScreen.route, + ), + Pair( + R.string.sectionedlist_stateful_sections_menu, + Screen.SectionedListStatefulScreen.route, + ), + Pair( + R.string.sectionedlist_expandable_sections_menu, + Screen.SectionedListExpandableScreen.route, + ), + ), + ) { + header { + Title( + stringResource(R.string.sectionedlist_samples_title), + Modifier.padding(vertical = 8.dp), + ) + } + + loaded { + AppCard( + onClick = { }, + appName = { + Text("App Name") + }, + time = { + Text("12:05") + }, + title = { + Text("Title") + }, + ) { + Text("Content\nContent\nContent") + } + } + } + } + } } diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[0]_mobvoiticwatchpro5.png index a909f101e1..92321a589f 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[0]_mobvoiticwatchpro5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[0]_mobvoiticwatchpro5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c75b17fab1e38866cabf603b620204456e52c9231df8f0cd481166f96a312c26 -size 37190 +oid sha256:83794727f3518db20825d36c8b60d47b02f4233569be3ee056edea06c287cdd8 +size 37585 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[1]_samsunggalaxywatch5.png index 8c9bd5a457..f70b222ca5 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[1]_samsunggalaxywatch5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[1]_samsunggalaxywatch5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e30a45d3396d9d7fe20e85dd8c7e12e78cf63e124896307c6e08d63e19f1481 -size 30807 +oid sha256:5fa77415e9551ae5cf6e9c0f10d13c58958d820746710bf350922bfcc86d100f +size 31384 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[3]_googlepixelwatch.png index 2afc782d4d..b55b5ec7b5 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[3]_googlepixelwatch.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[3]_googlepixelwatch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16001513ef9f14e256a6ecf071e5c523909c145c36a6ec54f2b18e960a3f5418 -size 30268 +oid sha256:7cd6bdf51d536ee49fbc88f54fc664a8b4567f6a5616edf7006aca005c556575 +size 30845 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[4]_genericsmallround.png index 2afc782d4d..b55b5ec7b5 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[4]_genericsmallround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[4]_genericsmallround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16001513ef9f14e256a6ecf071e5c523909c145c36a6ec54f2b18e960a3f5418 -size 30268 +oid sha256:7cd6bdf51d536ee49fbc88f54fc664a8b4567f6a5616edf7006aca005c556575 +size 30845 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[5]_genericlargeround.png index 36b8a352d9..e7965630c8 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[5]_genericlargeround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[5]_genericlargeround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db9d1515b859788c2f33487e71d4928fcdd191d1dfd83dff0fde98c5826a9a0f -size 35034 +oid sha256:333a7b08fce36f5a98f0da7e1b2db2ad4b3ff83c21996f6730eb9b5d7cf3fd18 +size 35475 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[6]_smalldevicebigfonts.png index 7099ca5ec3..0d72cbc424 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[6]_smalldevicebigfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[6]_smalldevicebigfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8e7b53726fceaff0c6631e3947f8ee89d0c3ab262a0f5b5b8e194969b7cc8cf -size 33958 +oid sha256:c0dae028256a47e1670e6511ba4f75c0439b628a82fa3b4a0134ab2fd3b76bed +size 33748 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[7]_largedevicesmallfonts.png index d862629eeb..2e6c145722 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[7]_largedevicesmallfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[7]_largedevicesmallfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40062dd5ea164cb41e99ed63e4eb07bc258803bbf552693586105b2e0edda5e0 -size 35914 +oid sha256:6763a2dcda98425031c2f1e68e7ff8b310140aadaf22c3659981f854d2bcad3a +size 36386 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[0]_mobvoiticwatchpro5.png new file mode 100644 index 0000000000..333bea0333 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[0]_mobvoiticwatchpro5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15c0448099d2825d9217febbf61c4e5a2aa75a7fe73d364d93b8d846952ea8ea +size 97347 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[1]_samsunggalaxywatch5.png new file mode 100644 index 0000000000..2232f63d96 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[1]_samsunggalaxywatch5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4216d418505fd2af2f36467936277d3ce3c07021d36f0135fcbe14be427b1714 +size 79109 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[2]_samsunggalaxywatch6large.png new file mode 100644 index 0000000000..bd8bcf21ff --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[2]_samsunggalaxywatch6large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f113cc91bfb0cb40df1f34df89055147495e28bedd4c41a12e8594435e3e0735 +size 103647 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[3]_googlepixelwatch.png new file mode 100644 index 0000000000..8a525d209e --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[3]_googlepixelwatch.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd2c9247fedda9fe9d1263e8ed661d48238c772344b77dc9cfec11d4fd4971ca +size 76570 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[4]_genericsmallround.png new file mode 100644 index 0000000000..8a525d209e --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[4]_genericsmallround.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd2c9247fedda9fe9d1263e8ed661d48238c772344b77dc9cfec11d4fd4971ca +size 76570 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[5]_genericlargeround.png new file mode 100644 index 0000000000..4937264e18 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[5]_genericlargeround.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1871fc0d6bd49ed9d9caef6626f8527f7df35651ecb0d2a6a14c8dda63345b3e +size 94978 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[6]_smalldevicebigfonts.png new file mode 100644 index 0000000000..d940fe58c3 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[6]_smalldevicebigfonts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:008ae871219e5e098c1aa69eb990890e22718a38cd4a696c86b713dcc5d498cb +size 76213 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[7]_largedevicesmallfonts.png new file mode 100644 index 0000000000..ad93ded2f6 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[7]_largedevicesmallfonts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2eb275120a8aeeccfed352765483aca4dc21807edc1dc2b94fc669f7de1a48ef +size 94853 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[0]_mobvoiticwatchpro5.png index b9b12d4bbe..0aa659c1d5 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[0]_mobvoiticwatchpro5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[0]_mobvoiticwatchpro5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56c8fe7cea7208efb10af7890309fd630b901f05f500060e4281d861be85ca6d -size 42525 +oid sha256:307ba493112e7bdfbcdaa6a176594f2305756492b99015a02c099efd7c3e9e18 +size 42537 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[1]_samsunggalaxywatch5.png index 00b83990c3..5d527fac08 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[1]_samsunggalaxywatch5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[1]_samsunggalaxywatch5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:295dd0c079e8ee3ed82c8b29ed0840472cf635273421cfc8c4dc2d7a70c377a9 -size 39480 +oid sha256:b58ea713c2bc9b045de63952dfa9b192f75cfccc1c2359835084a1ea11979f8d +size 39466 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[3]_googlepixelwatch.png index 7dea55865b..f1ce03ab2f 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[3]_googlepixelwatch.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[3]_googlepixelwatch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89b0990791b68adb69759870eab714e01a085bceffa6fceb7ecdd3df5adeb2d4 -size 35952 +oid sha256:cbf5aacbbae6d0d4dd13df9229e2ad63ced36dc45a935eb92a5529b9db716afb +size 35989 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[4]_genericsmallround.png index 7dea55865b..f1ce03ab2f 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[4]_genericsmallround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[4]_genericsmallround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89b0990791b68adb69759870eab714e01a085bceffa6fceb7ecdd3df5adeb2d4 -size 35952 +oid sha256:cbf5aacbbae6d0d4dd13df9229e2ad63ced36dc45a935eb92a5529b9db716afb +size 35989 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[5]_genericlargeround.png index 2dc741b376..b544d92606 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[5]_genericlargeround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[5]_genericlargeround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e52a91a6a2e704e3bcb4ea9832b88048fee89c705db3ae850bb924e4c3807e9f -size 41901 +oid sha256:901e5359afa65c4fbfb58e1c914ea12374f5dcd4f447033a4679291d50d4bd5b +size 41917 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[6]_smalldevicebigfonts.png index ee19b5a07f..92e3bf6d01 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[6]_smalldevicebigfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[6]_smalldevicebigfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70bb0ab886ec9b6fcded834ad3ef782be9d4b5e741954398493a845ee7c6c7f1 -size 38333 +oid sha256:1c4bc85f44a1b317246d20460f7da2e384554207f5d275c53d1ea828f21b2ac2 +size 38372 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[7]_largedevicesmallfonts.png index 4bb877c145..d6e8009c50 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[7]_largedevicesmallfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[7]_largedevicesmallfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e2272681684493d38e835fa457e01bad426c354181bf59e2fcc7ec26057c3f2 -size 41775 +oid sha256:0eea5f76ac7647af936cbe27cdd25136b2d34433e83c810fcb374fb5c0cb82c9 +size 41787 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[0]_mobvoiticwatchpro5.png new file mode 100644 index 0000000000..377e44af3b --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[0]_mobvoiticwatchpro5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8f619192b901e55d833f13be857c35b9b3882ba7e370d7b4088f18705e35b5b +size 86964 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[1]_samsunggalaxywatch5.png new file mode 100644 index 0000000000..bebbce0b89 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[1]_samsunggalaxywatch5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f3ad050faabeb1b1435a7e8792a6492328a82ec6969f1df90f5cde1ef80f9e3 +size 70445 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[2]_samsunggalaxywatch6large.png new file mode 100644 index 0000000000..79e6738a81 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[2]_samsunggalaxywatch6large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc7eab024c7c422e6da031b4d978055f193f9fa1bf4a4175b35ff7fc7a8fbd33 +size 91448 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[3]_googlepixelwatch.png new file mode 100644 index 0000000000..0e6971c6ae --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[3]_googlepixelwatch.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:317f8320e83fa2dde76e26977668ac04ed0d625e4139dc537f2405bc89390dcc +size 67209 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[4]_genericsmallround.png new file mode 100644 index 0000000000..0e6971c6ae --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[4]_genericsmallround.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:317f8320e83fa2dde76e26977668ac04ed0d625e4139dc537f2405bc89390dcc +size 67209 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[5]_genericlargeround.png new file mode 100644 index 0000000000..416461302a --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[5]_genericlargeround.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fc1c215aad97d1f65b8edc5c60cf9534072dbed44de0eb8f57cac29640e190f +size 85370 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[6]_smalldevicebigfonts.png new file mode 100644 index 0000000000..b0568ab884 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[6]_smalldevicebigfonts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:288f011263576fffe718b737b175a1888db09dd46d3747fc8a0a627cac17cbe3 +size 73679 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[7]_largedevicesmallfonts.png new file mode 100644 index 0000000000..8fe9378172 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[7]_largedevicesmallfonts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2798868d3d094b1ae8243871438231f5df0ba926b5ed909828193fc581755252 +size 81269 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[0]_mobvoiticwatchpro5.png new file mode 100644 index 0000000000..5bb4bb9b84 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[0]_mobvoiticwatchpro5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9461db3f78aaf8b65cbfa127d445e23aa7b04d184afbcf35e75f73c93e173f46 +size 83131 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[1]_samsunggalaxywatch5.png new file mode 100644 index 0000000000..42af777fbf --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[1]_samsunggalaxywatch5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d46be477353cdbdb4bd82cce5f2401251d221a2df0b4433c137f1ec2c803af65 +size 71016 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[2]_samsunggalaxywatch6large.png new file mode 100644 index 0000000000..5ab59f9d63 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[2]_samsunggalaxywatch6large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:461787537e8a3636f149027a3f149688537dfe1e4c7417425c7a7aa8143a1d42 +size 89557 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[3]_googlepixelwatch.png new file mode 100644 index 0000000000..0c26858fa8 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[3]_googlepixelwatch.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ede47766cae29315a7d8614d68b24bcb14024248d6f1b1c07095822767a47db5 +size 68093 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[4]_genericsmallround.png new file mode 100644 index 0000000000..0c26858fa8 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[4]_genericsmallround.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ede47766cae29315a7d8614d68b24bcb14024248d6f1b1c07095822767a47db5 +size 68093 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[5]_genericlargeround.png new file mode 100644 index 0000000000..e0d0f8edc8 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[5]_genericlargeround.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47745546f131538177db10b8d4a247fe36cce717e2d2a28af6a96dd5ab9a0677 +size 80614 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[6]_smalldevicebigfonts.png new file mode 100644 index 0000000000..ae82542dfa --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[6]_smalldevicebigfonts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa995d994eb115afec427951c786c900890f9f7fa8c5148176aeb9c3b441bfb8 +size 72718 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[7]_largedevicesmallfonts.png new file mode 100644 index 0000000000..249ffd3165 --- /dev/null +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[7]_largedevicesmallfonts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52a7263eeb8ef5e5562c0309241a0bd7255884cc195f6e3b0082c6b3e8c110ff +size 76445