Merge pull request #1011 from android/compose-starter-screenshots

Adds font scaling screenshot tests
android · Feb 28, 2024 · 017b88d · 017b88d
2 parents 725689c + ed98439
commit 017b88d
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 2 deletions.
diff --git a/ComposeStarter/app/src/test/java/presentation/WearDevice.kt b/ComposeStarter/app/src/test/java/presentation/WearDevice.kt
@@ -21,7 +21,8 @@ enum class WearDevice(
     val id: String,
     val modelName: String,
     val screenSizePx: Int,
-    val density: Float
+    val density: Float,
+    val fontScale: Float = 1f
 ) {
     MobvoiTicWatchPro5(
         id = "ticwatch_pro_5",
@@ -35,7 +36,7 @@ enum class WearDevice(
         screenSizePx = 396,
         density = 2.0f
     ),
-    SamsungGalaxyWatch6Large(
+    SamsungGalaxyWatch6(
         id = "galaxy_watch_6",
         modelName = "Samsung Galaxy Watch 6 Large",
         screenSizePx = 480,
@@ -58,6 +59,20 @@ enum class WearDevice(
         modelName = "Generic Large Round",
         screenSizePx = 454,
         density = 2.0f
+    ),
+    SamsungGalaxyWatch6SmallFont(
+        id = "galaxy_watch_6_small_font",
+        modelName = "Samsung Galaxy Watch 6 Large",
+        screenSizePx = 480,
+        density = 2.125f,
+        fontScale = 0.94f
+    ),
+    GooglePixelWatchLargeFont(
+        id = "pixel_watch_large_font",
+        modelName = "Google Pixel Watch",
+        screenSizePx = 384,
+        density = 2.0f,
+        fontScale = 1.24f
     );
 
     val dp: Int = (screenSizePx / density).roundToInt()

diff --git a/ComposeStarter/app/src/test/java/presentation/WearScreenshotTest.kt b/ComposeStarter/app/src/test/java/presentation/WearScreenshotTest.kt
@@ -44,6 +44,8 @@ abstract class WearScreenshotTest {
     @OptIn(ExperimentalRoborazziApi::class)
     fun runTest(content: @Composable () -> Unit) {
         RuntimeEnvironment.setQualifiers("+w${device.dp}dp-h${device.dp}dp")
+        RuntimeEnvironment.setFontScale(device.fontScale)
+
         composeRule.setContent {
             content()
         }

diff --git a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_5.png b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_5.png
diff --git a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_6.png b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_6.png
diff --git a/...arter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_6_small_font.png b/...arter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_6_small_font.png
diff --git a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_large_round.png b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_large_round.png
diff --git a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_pixel_watch.png b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_pixel_watch.png
diff --git a/...eStarter/app/src/test/screenshots/GreetingScreenTest_pixel_watch_large_font.png b/...eStarter/app/src/test/screenshots/GreetingScreenTest_pixel_watch_large_font.png
diff --git a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_small_round.png b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_small_round.png
diff --git a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_ticwatch_pro_5.png b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_ticwatch_pro_5.png
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_5.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_5.png
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_6.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_6.png
diff --git a/...seStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_6_small_font.png b/...seStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_6_small_font.png
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_large_round.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_large_round.png
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_pixel_watch.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_pixel_watch.png
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_pixel_watch_large_font.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_pixel_watch_large_font.png
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_small_round.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_small_round.png
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_ticwatch_pro_5.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_ticwatch_pro_5.png