Add a test for responsive layout (#1792)

google · Nov 6, 2023 · eea2991 · eea2991
1 parent a0f2a63
commit eea2991
Show file tree

Hide file tree

Showing 27 changed files with 252 additions and 3 deletions.
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
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.horologist.screensizes
+
+import android.graphics.Paint
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
+import androidx.compose.ui.graphics.nativeCanvas
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.wear.compose.material.PositionIndicator
+import androidx.wear.compose.material.Scaffold
+import androidx.wear.compose.material.Text
+import androidx.wear.compose.material.TimeSource
+import androidx.wear.compose.material.TimeText
+import androidx.wear.compose.material.curvedText
+import androidx.wear.compose.ui.tooling.preview.WearPreviewDevices
+import com.google.android.horologist.compose.layout.ScalingLazyColumn
+import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults
+import com.google.android.horologist.compose.layout.ScalingLazyColumnState
+import com.google.android.horologist.compose.material.Chip
+
+@Composable
+fun ScalingLazyColumnDecoder(factory: ScalingLazyColumnState.Factory) {
+    val state = factory.create()
+
+    Scaffold(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(Color.Black),
+        positionIndicator = {
+            PositionIndicator(state.state)
+        },
+        timeText = {
+            val size = LocalConfiguration.current.screenWidthDp
+            TimeText(
+                modifier = Modifier, // .scrollAway(state),
+                timeSource = FixedTimeSource,
+                startCurvedContent = { curvedText("${state.state.centerItemIndex}/${state.state.centerItemScrollOffset}") },
+                endCurvedContent = { curvedText("${size}dp") },
+                startLinearContent = { Text("${state.state.centerItemIndex}/${state.state.centerItemScrollOffset}") },
+                endLinearContent = { Text("${size}dp") },
+            )
+        },
+    ) {
+        ScalingLazyColumn(columnState = state) {
+            items(10) {
+                Chip(label = "Item $it", onClick = { /*TODO*/ })
+            }
+        }
+        val paint = remember {
+            Paint().apply {
+                this.textSize = 16f
+                this.color = android.graphics.Color.WHITE
+            }
+        }
+        Canvas(modifier = Modifier.fillMaxSize()) {
+            drawLine(
+                Color.Red,
+                Offset(0f, size.height / 2f),
+                Offset(size.width, size.height / 2f),
+            )
+            val minTransition = state.scalingParams.minTransitionArea * size.height
+            val maxTransition = state.scalingParams.maxTransitionArea * size.height
+            drawLine(
+                Color.Green,
+                Offset(0f, minTransition),
+                Offset(size.width, minTransition),
+            )
+            drawLine(
+                Color.Green,
+                Offset(0f, maxTransition),
+                Offset(size.width, maxTransition),
+            )
+            drawLine(
+                Color.Green,
+                Offset(0f, size.height - minTransition),
+                Offset(size.width, size.height - minTransition),
+            )
+            drawLine(
+                Color.Green,
+                Offset(0f, size.height - maxTransition),
+                Offset(size.width, size.height - maxTransition),
+            )
+            drawIntoCanvas {
+                it.nativeCanvas.drawText("Min Height " + state.scalingParams.minElementHeight, 30f, minTransition, paint)
+                it.nativeCanvas.drawText("Max Height " + state.scalingParams.maxElementHeight, 30f, maxTransition, paint)
+            }
+        }
+    }
+}
+
+public object FixedTimeSource : TimeSource {
+    override val currentTime: String
+        @Composable get() = "10:10"
+}
+
+@WearPreviewDevices
+@Composable
+fun Standard() {
+    ScalingLazyColumnDecoder(factory = ScalingLazyColumnDefaults.scalingLazyColumnDefaults())
+}
+
+@WearPreviewDevices
+@Composable
+fun BelowTimeText() {
+    ScalingLazyColumnDecoder(factory = ScalingLazyColumnDefaults.belowTimeText())
+}
+
+@WearPreviewDevices
+@Composable
+fun Responsive() {
+    ScalingLazyColumnDecoder(factory = ScalingLazyColumnDefaults.responsive())
+}
diff --git a/...rc/test/kotlin/com/google/android/horologist/screensizes/ScalingLazyColumnDefaultsTest.kt b/...rc/test/kotlin/com/google/android/horologist/screensizes/ScalingLazyColumnDefaultsTest.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.horologist.screensizes
+
+import androidx.compose.runtime.Composable
+import com.google.android.horologist.compose.tools.Device
+import org.junit.Test
+
+class ScalingLazyColumnDefaultsTest(device: Device) :
+    ScreenSizeTest(device = device, showTimeText = false) {
+
+        @Composable
+        override fun Content() {
+            Standard()
+        }
+
+        @Test
+        fun responsive() {
+            runTest { Responsive() }
+        }
+
+        @Test
+        fun belowTimeText() {
+            runTest { BelowTimeText() }
+        }
+    }
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/ScreenSizeTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/ScreenSizeTest.kt
@@ -53,6 +53,10 @@ abstract class ScreenSizeTest(
 
     @Test
     fun screenshot() {
+        runTest { Content() }
+    }
+
+    fun runTest(content: @Composable () -> Unit) {
         val shadowDisplay = Shadows.shadowOf(ShadowDisplay.getDefaultDisplay())
         shadowDisplay.setDensity(device.density)
         shadowDisplay.setHeight(device.screenSizePx)
@@ -66,9 +70,8 @@ abstract class ScreenSizeTest(
                 typography = MaterialTheme.typography.copy {
                     this.copy(fontWeight = if (device.boldText) FontWeight.Bold else FontWeight.Medium)
                 },
-            ) {
-                Content()
-            }
+                content = content,
+            )
         }
     }
 

diff --git a/...reensizes_ScalingLazyColumnDefaultsTest_belowTimeText[0]_mobvoiticwatchpro5.png b/...reensizes_ScalingLazyColumnDefaultsTest_belowTimeText[0]_mobvoiticwatchpro5.png
diff --git a/...eensizes_ScalingLazyColumnDefaultsTest_belowTimeText[1]_samsunggalaxywatch5.png b/...eensizes_ScalingLazyColumnDefaultsTest_belowTimeText[1]_samsunggalaxywatch5.png
diff --git a/...zes_ScalingLazyColumnDefaultsTest_belowTimeText[2]_samsunggalaxywatch6large.png b/...zes_ScalingLazyColumnDefaultsTest_belowTimeText[2]_samsunggalaxywatch6large.png
diff --git a/...screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[3]_googlepixelwatch.png b/...screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[3]_googlepixelwatch.png
diff --git a/...creensizes_ScalingLazyColumnDefaultsTest_belowTimeText[4]_genericsmallround.png b/...creensizes_ScalingLazyColumnDefaultsTest_belowTimeText[4]_genericsmallround.png
diff --git a/...creensizes_ScalingLazyColumnDefaultsTest_belowTimeText[5]_genericlargeround.png b/...creensizes_ScalingLazyColumnDefaultsTest_belowTimeText[5]_genericlargeround.png
diff --git a/...eensizes_ScalingLazyColumnDefaultsTest_belowTimeText[6]_smalldevicebigfonts.png b/...eensizes_ScalingLazyColumnDefaultsTest_belowTimeText[6]_smalldevicebigfonts.png
diff --git a/...nsizes_ScalingLazyColumnDefaultsTest_belowTimeText[7]_largedevicesmallfonts.png b/...nsizes_ScalingLazyColumnDefaultsTest_belowTimeText[7]_largedevicesmallfonts.png
diff --git a/....screensizes_ScalingLazyColumnDefaultsTest_responsive[0]_mobvoiticwatchpro5.png b/....screensizes_ScalingLazyColumnDefaultsTest_responsive[0]_mobvoiticwatchpro5.png
diff --git a/...screensizes_ScalingLazyColumnDefaultsTest_responsive[1]_samsunggalaxywatch5.png b/...screensizes_ScalingLazyColumnDefaultsTest_responsive[1]_samsunggalaxywatch5.png
diff --git a/...nsizes_ScalingLazyColumnDefaultsTest_responsive[2]_samsunggalaxywatch6large.png b/...nsizes_ScalingLazyColumnDefaultsTest_responsive[2]_samsunggalaxywatch6large.png
diff --git a/...st.screensizes_ScalingLazyColumnDefaultsTest_responsive[3]_googlepixelwatch.png b/...st.screensizes_ScalingLazyColumnDefaultsTest_responsive[3]_googlepixelwatch.png
diff --git a/...t.screensizes_ScalingLazyColumnDefaultsTest_responsive[4]_genericsmallround.png b/...t.screensizes_ScalingLazyColumnDefaultsTest_responsive[4]_genericsmallround.png
diff --git a/...t.screensizes_ScalingLazyColumnDefaultsTest_responsive[5]_genericlargeround.png b/...t.screensizes_ScalingLazyColumnDefaultsTest_responsive[5]_genericlargeround.png
diff --git a/...screensizes_ScalingLazyColumnDefaultsTest_responsive[6]_smalldevicebigfonts.png b/...screensizes_ScalingLazyColumnDefaultsTest_responsive[6]_smalldevicebigfonts.png
diff --git a/...reensizes_ScalingLazyColumnDefaultsTest_responsive[7]_largedevicesmallfonts.png b/...reensizes_ScalingLazyColumnDefaultsTest_responsive[7]_largedevicesmallfonts.png
diff --git a/....screensizes_ScalingLazyColumnDefaultsTest_screenshot[0]_mobvoiticwatchpro5.png b/....screensizes_ScalingLazyColumnDefaultsTest_screenshot[0]_mobvoiticwatchpro5.png
diff --git a/...screensizes_ScalingLazyColumnDefaultsTest_screenshot[1]_samsunggalaxywatch5.png b/...screensizes_ScalingLazyColumnDefaultsTest_screenshot[1]_samsunggalaxywatch5.png
diff --git a/...nsizes_ScalingLazyColumnDefaultsTest_screenshot[2]_samsunggalaxywatch6large.png b/...nsizes_ScalingLazyColumnDefaultsTest_screenshot[2]_samsunggalaxywatch6large.png
diff --git a/...st.screensizes_ScalingLazyColumnDefaultsTest_screenshot[3]_googlepixelwatch.png b/...st.screensizes_ScalingLazyColumnDefaultsTest_screenshot[3]_googlepixelwatch.png
diff --git a/...t.screensizes_ScalingLazyColumnDefaultsTest_screenshot[4]_genericsmallround.png b/...t.screensizes_ScalingLazyColumnDefaultsTest_screenshot[4]_genericsmallround.png
diff --git a/...t.screensizes_ScalingLazyColumnDefaultsTest_screenshot[5]_genericlargeround.png b/...t.screensizes_ScalingLazyColumnDefaultsTest_screenshot[5]_genericlargeround.png
diff --git a/...screensizes_ScalingLazyColumnDefaultsTest_screenshot[6]_smalldevicebigfonts.png b/...screensizes_ScalingLazyColumnDefaultsTest_screenshot[6]_smalldevicebigfonts.png
diff --git a/...reensizes_ScalingLazyColumnDefaultsTest_screenshot[7]_largedevicesmallfonts.png b/...reensizes_ScalingLazyColumnDefaultsTest_screenshot[7]_largedevicesmallfonts.png