google · yschimke · Nov 8, 2024 · Nov 8, 2024 · Nov 8, 2024 · Nov 8, 2024
diff --git a/compose-layout/build.gradle.kts b/compose-layout/build.gradle.kts
@@ -107,6 +107,8 @@ dependencies {
     debugImplementation(libs.androidx.activity.compose)
     debugImplementation(libs.compose.ui.test.manifest)
 
+    testImplementation(libs.compose.material.iconscore)
+    testImplementation(libs.compose.material.iconsext)
     testImplementation(libs.androidx.wear.compose.material3)
     testImplementation(libs.junit)
     testImplementation(libs.truth)

diff --git a/...t/java/com/google/android/horologist/compose/layout/TransformingLazyColumnDefaultsTest.kt b/...t/java/com/google/android/horologist/compose/layout/TransformingLazyColumnDefaultsTest.kt
@@ -18,16 +18,25 @@ package com.google.android.horologist.compose.layout
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.ArrowUpward
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import androidx.wear.compose.foundation.lazy.TransformingLazyColumn
 import androidx.wear.compose.foundation.lazy.TransformingLazyColumnState
 import androidx.wear.compose.foundation.lazy.rememberTransformingLazyColumnState
 import androidx.wear.compose.material3.AppScaffold
+import androidx.wear.compose.material3.EdgeButton
+import androidx.wear.compose.material3.EdgeButtonSize
+import androidx.wear.compose.material3.Icon
+import androidx.wear.compose.material3.IconButton
 import androidx.wear.compose.material3.ListHeader
 import androidx.wear.compose.material3.MaterialTheme
 import androidx.wear.compose.material3.ScreenScaffold
+import androidx.wear.compose.material3.ScreenScaffoldDefaults
 import androidx.wear.compose.material3.Text
 import androidx.wear.compose.material3.TimeText
 import androidx.wear.compose.material3.TitleCard
@@ -41,6 +50,11 @@ import org.robolectric.ParameterizedRobolectricTestRunner
 
 @RunWith(ParameterizedRobolectricTestRunner::class)
 class TransformingLazyColumnDefaultsTest(override val device: WearDevice) : WearScreenshotTest() {
+
+    override fun testName(suffix: String): String =
+        "src/test/screenshots/${this.javaClass.simpleName}_${testInfo.methodName}_" +
+            "${device.id}$suffix.png"
+
     @Composable
     override fun TestScaffold(content: @Composable (() -> Unit)) {
         content()
@@ -67,7 +81,9 @@ class TransformingLazyColumnDefaultsTest(override val device: WearDevice) : Wear
                             first = ColumnItemType.ListHeader,
                             last = ColumnItemType.Card,
                         ),
-                        modifier = Modifier.fillMaxSize().testTag("TransformingLazyColumn"),
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .testTag("TransformingLazyColumn"),
                     ) {
                         item {
                             ListHeader(modifier = Modifier.scrollTransform(this)) {
@@ -96,6 +112,133 @@ class TransformingLazyColumnDefaultsTest(override val device: WearDevice) : Wear
         captureScreenshot("_end")
     }
 
+    class EdgeButtonPadding(val buttonSize: EdgeButtonSize) : ColumnItemType {
+        @Composable
+        override fun topPadding(horizontalPercent: Float): Dp = 0.dp
+
+        @Composable
+        override fun bottomPadding(horizontalPercent: Float): Dp =
+            ScreenScaffoldDefaults.contentPaddingWithEdgeButton(buttonSize).calculateBottomPadding()
+    }
+
+    @Test
+    fun ButtonAndEdgeButton() {
+        lateinit var columnState: TransformingLazyColumnState
+        runTest {
+            AppScaffold(
+                timeText = {
+                    TimeText {
+                        text("10:10")
+                    }
+                },
+                // Why black needed here
+                modifier = Modifier.background(MaterialTheme.colorScheme.background),
+            ) {
+                columnState = rememberTransformingLazyColumnState()
+                ScreenScaffold(scrollState = columnState, edgeButton = {
+                    EdgeButton(onClick = { }, buttonSize = EdgeButtonSize.Large) {
+                        Text("To top")
+                    }
+                }) {
+                    TransformingLazyColumn(
+                        state = columnState,
+                        contentPadding = rememberResponsiveColumnPadding(
+                            first = ColumnItemType.IconButton,
+                            last = EdgeButtonPadding(buttonSize = EdgeButtonSize.Large),
+                        ),
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .testTag("TransformingLazyColumn"),
+                    ) {
+                        item {
+                            IconButton(onClick = {}) {
+                                Icon(
+                                    imageVector = Icons.Rounded.ArrowUpward,
+                                    contentDescription = null,
+                                )
+                            }
+                        }
+                        items(3) {
+                            TitleCard(
+                                modifier = Modifier.scrollTransform(this),
+                                onClick = { /* Do something */ },
+                                title = { Text("Title card") },
+                                time = { Text("now") },
+                            ) { Text("Card content") }
+                        }
+                    }
+                }
+            }
+        }
+
+        composeRule.waitForIdle()
+
+        runBlocking {
+            columnState.scrollToItem(5)
+        }
+
+        captureScreenshot("_end")
+    }
+
+    @Test
+    fun ButtonAndExtraSmallEdgeButton() {
+        lateinit var columnState: TransformingLazyColumnState
+        runTest {
+            AppScaffold(
+                timeText = {
+                    TimeText {
+                        text("10:10")
+                    }
+                },
+                // Why black needed here
+                modifier = Modifier.background(MaterialTheme.colorScheme.background),
+            ) {
+                columnState = rememberTransformingLazyColumnState()
+                ScreenScaffold(scrollState = columnState, edgeButton = {
+                    EdgeButton(onClick = { }, buttonSize = EdgeButtonSize.ExtraSmall) {
+                        Text("To top")
+                    }
+                }) {
+                    TransformingLazyColumn(
+                        state = columnState,
+                        contentPadding = rememberResponsiveColumnPadding(
+                            first = ColumnItemType.IconButton,
+                            last = EdgeButtonPadding(buttonSize = EdgeButtonSize.ExtraSmall),
+                        ),
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .testTag("TransformingLazyColumn"),
+                    ) {
+                        item {
+                            IconButton(onClick = {}) {
+                                Icon(
+                                    imageVector = Icons.Rounded.ArrowUpward,
+                                    contentDescription = null,
+                                )
+                            }
+                        }
+                        items(3) {
+                            TitleCard(
+                                modifier = Modifier.scrollTransform(this),
+                                onClick = { /* Do something */ },
+                                title = { Text("Title card") },
+                                time = { Text("now") },
+                            ) { Text("Card content") }
+                        }
+                    }
+                }
+            }
+        }
+
+        composeRule.waitForIdle()
+
+        runBlocking {
+            columnState.scrollToItem(5)
+        }
+
+        captureScreenshot("_end")
+    }
+
     companion object {
         @JvmStatic
         @ParameterizedRobolectricTestRunner.Parameters

diff --git a/...ts/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[0]_ticwatch_pro_5.png b/...ts/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[0]_ticwatch_pro_5.png
diff --git a/...ransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[0]_ticwatch_pro_5_end.png b/...ransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[0]_ticwatch_pro_5_end.png
diff --git a/...ts/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[1]_galaxy_watch_5.png b/...ts/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[1]_galaxy_watch_5.png
diff --git a/...ransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[1]_galaxy_watch_5_end.png b/...ransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[1]_galaxy_watch_5_end.png
diff --git a/...ts/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[2]_galaxy_watch_6.png b/...ts/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[2]_galaxy_watch_6.png
diff --git a/...ransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[2]_galaxy_watch_6_end.png b/...ransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[2]_galaxy_watch_6_end.png
diff --git a/...shots/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[3]_pixel_watch.png b/...shots/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[3]_pixel_watch.png
diff --git a/...s/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[3]_pixel_watch_end.png b/...s/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[3]_pixel_watch_end.png
diff --git a/...shots/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[4]_small_round.png b/...shots/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[4]_small_round.png
diff --git a/...s/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[4]_small_round_end.png b/...s/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[4]_small_round_end.png
diff --git a/...shots/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[5]_large_round.png b/...shots/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[5]_large_round.png
diff --git a/...s/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[5]_large_round_end.png b/...s/TransformingLazyColumnDefaultsTest_ButtonAndEdgeButton[5]_large_round_end.png
diff --git a/...mingLazyColumnDefaultsTest_ButtonAndEdgeButton[6]_galaxy_watch_6_small_font.png b/...mingLazyColumnDefaultsTest_ButtonAndEdgeButton[6]_galaxy_watch_6_small_font.png
diff --git a/...LazyColumnDefaultsTest_ButtonAndEdgeButton[6]_galaxy_watch_6_small_font_end.png b/...LazyColumnDefaultsTest_ButtonAndEdgeButton[6]_galaxy_watch_6_small_font_end.png
diff --git a/...formingLazyColumnDefaultsTest_ButtonAndEdgeButton[7]_pixel_watch_large_font.png b/...formingLazyColumnDefaultsTest_ButtonAndEdgeButton[7]_pixel_watch_large_font.png
diff --git a/...ingLazyColumnDefaultsTest_ButtonAndEdgeButton[7]_pixel_watch_large_font_end.png b/...ingLazyColumnDefaultsTest_ButtonAndEdgeButton[7]_pixel_watch_large_font_end.png
diff --git a/...rmingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[0]_ticwatch_pro_5.png b/...rmingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[0]_ticwatch_pro_5.png
diff --git a/...gLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[0]_ticwatch_pro_5_end.png b/...gLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[0]_ticwatch_pro_5_end.png
diff --git a/...rmingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[1]_galaxy_watch_5.png b/...rmingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[1]_galaxy_watch_5.png
diff --git a/...gLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[1]_galaxy_watch_5_end.png b/...gLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[1]_galaxy_watch_5_end.png
diff --git a/...rmingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[2]_galaxy_watch_6.png b/...rmingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[2]_galaxy_watch_6.png
diff --git a/...gLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[2]_galaxy_watch_6_end.png b/...gLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[2]_galaxy_watch_6_end.png
diff --git a/...sformingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[3]_pixel_watch.png b/...sformingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[3]_pixel_watch.png
diff --git a/...mingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[3]_pixel_watch_end.png b/...mingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[3]_pixel_watch_end.png
diff --git a/...sformingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[4]_small_round.png b/...sformingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[4]_small_round.png
diff --git a/...mingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[4]_small_round_end.png b/...mingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[4]_small_round_end.png
diff --git a/...sformingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[5]_large_round.png b/...sformingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[5]_large_round.png
diff --git a/...mingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[5]_large_round_end.png b/...mingLazyColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[5]_large_round_end.png
diff --git a/...lumnDefaultsTest_ButtonAndExtraSmallEdgeButton[6]_galaxy_watch_6_small_font.png b/...lumnDefaultsTest_ButtonAndExtraSmallEdgeButton[6]_galaxy_watch_6_small_font.png
diff --git a/...DefaultsTest_ButtonAndExtraSmallEdgeButton[6]_galaxy_watch_6_small_font_end.png b/...DefaultsTest_ButtonAndExtraSmallEdgeButton[6]_galaxy_watch_6_small_font_end.png
diff --git a/...yColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[7]_pixel_watch_large_font.png b/...yColumnDefaultsTest_ButtonAndExtraSmallEdgeButton[7]_pixel_watch_large_font.png
diff --git a/...umnDefaultsTest_ButtonAndExtraSmallEdgeButton[7]_pixel_watch_large_font_end.png b/...umnDefaultsTest_ButtonAndExtraSmallEdgeButton[7]_pixel_watch_large_font_end.png
diff --git a/...reenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[0]_ticwatch_pro_5.png b/...reenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[0]_ticwatch_pro_5.png
diff --git a/...ColumnDefaultsTest_ticwatch_pro_5_end.png → ...st_TitleAndCard[0]_ticwatch_pro_5_end.png b/...ColumnDefaultsTest_ticwatch_pro_5_end.png → ...st_TitleAndCard[0]_ticwatch_pro_5_end.png
diff --git a/...reenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[1]_galaxy_watch_5.png b/...reenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[1]_galaxy_watch_5.png
diff --git a/...ColumnDefaultsTest_galaxy_watch_5_end.png → ...st_TitleAndCard[1]_galaxy_watch_5_end.png b/...ColumnDefaultsTest_galaxy_watch_5_end.png → ...st_TitleAndCard[1]_galaxy_watch_5_end.png
diff --git a/...reenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[2]_galaxy_watch_6.png b/...reenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[2]_galaxy_watch_6.png
diff --git a/...ColumnDefaultsTest_galaxy_watch_6_end.png → ...st_TitleAndCard[2]_galaxy_watch_6_end.png b/...ColumnDefaultsTest_galaxy_watch_6_end.png → ...st_TitleAndCard[2]_galaxy_watch_6_end.png
diff --git a/.../screenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[3]_pixel_watch.png b/.../screenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[3]_pixel_watch.png
diff --git a/...azyColumnDefaultsTest_pixel_watch_end.png → ...sTest_TitleAndCard[3]_pixel_watch_end.png b/...azyColumnDefaultsTest_pixel_watch_end.png → ...sTest_TitleAndCard[3]_pixel_watch_end.png
diff --git a/.../screenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[4]_small_round.png b/.../screenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[4]_small_round.png
diff --git a/...azyColumnDefaultsTest_small_round_end.png → ...sTest_TitleAndCard[4]_small_round_end.png b/...azyColumnDefaultsTest_small_round_end.png → ...sTest_TitleAndCard[4]_small_round_end.png
diff --git a/.../screenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[5]_large_round.png b/.../screenshots/TransformingLazyColumnDefaultsTest_TitleAndCard[5]_large_round.png
diff --git a/...azyColumnDefaultsTest_large_round_end.png → ...sTest_TitleAndCard[5]_large_round_end.png b/...azyColumnDefaultsTest_large_round_end.png → ...sTest_TitleAndCard[5]_large_round_end.png
diff --git a/...ransformingLazyColumnDefaultsTest_TitleAndCard[6]_galaxy_watch_6_small_font.png b/...ransformingLazyColumnDefaultsTest_TitleAndCard[6]_galaxy_watch_6_small_font.png
diff --git a/...ltsTest_galaxy_watch_6_small_font_end.png → ...Card[6]_galaxy_watch_6_small_font_end.png b/...ltsTest_galaxy_watch_6_small_font_end.png → ...Card[6]_galaxy_watch_6_small_font_end.png
diff --git a/...mnDefaultsTest_pixel_watch_large_font.png → ...itleAndCard[7]_pixel_watch_large_font.png b/...mnDefaultsTest_pixel_watch_large_font.png → ...itleAndCard[7]_pixel_watch_large_font.png
diff --git a/...ansformingLazyColumnDefaultsTest_TitleAndCard[7]_pixel_watch_large_font_end.png b/...ansformingLazyColumnDefaultsTest_TitleAndCard[7]_pixel_watch_large_font_end.png
diff --git a/...yout/src/test/screenshots/TransformingLazyColumnDefaultsTest_galaxy_watch_5.png b/...yout/src/test/screenshots/TransformingLazyColumnDefaultsTest_galaxy_watch_5.png
diff --git a/...yout/src/test/screenshots/TransformingLazyColumnDefaultsTest_galaxy_watch_6.png b/...yout/src/test/screenshots/TransformingLazyColumnDefaultsTest_galaxy_watch_6.png
diff --git a/...st/screenshots/TransformingLazyColumnDefaultsTest_galaxy_watch_6_small_font.png b/...st/screenshots/TransformingLazyColumnDefaultsTest_galaxy_watch_6_small_font.png
diff --git a/...-layout/src/test/screenshots/TransformingLazyColumnDefaultsTest_large_round.png b/...-layout/src/test/screenshots/TransformingLazyColumnDefaultsTest_large_round.png
diff --git a/...-layout/src/test/screenshots/TransformingLazyColumnDefaultsTest_pixel_watch.png b/...-layout/src/test/screenshots/TransformingLazyColumnDefaultsTest_pixel_watch.png
diff --git a/...t/screenshots/TransformingLazyColumnDefaultsTest_pixel_watch_large_font_end.png b/...t/screenshots/TransformingLazyColumnDefaultsTest_pixel_watch_large_font_end.png
diff --git a/...-layout/src/test/screenshots/TransformingLazyColumnDefaultsTest_small_round.png b/...-layout/src/test/screenshots/TransformingLazyColumnDefaultsTest_small_round.png
diff --git a/...yout/src/test/screenshots/TransformingLazyColumnDefaultsTest_ticwatch_pro_5.png b/...yout/src/test/screenshots/TransformingLazyColumnDefaultsTest_ticwatch_pro_5.png