More space for Picker font variance (#1675)

google · Sep 14, 2023 · b938ecc · b938ecc
1 parent 6468713
commit b938ecc
Show file tree

Hide file tree

Showing 18 changed files with 618 additions and 551 deletions.
diff --git a/composables/src/main/java/com/google/android/horologist/composables/DatePicker.kt b/composables/src/main/java/com/google/android/horologist/composables/DatePicker.kt
diff --git a/composables/src/main/java/com/google/android/horologist/composables/TimePicker.kt b/composables/src/main/java/com/google/android/horologist/composables/TimePicker.kt
diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/DatePickerTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/DatePickerTest.kt
@@ -41,6 +41,19 @@ class DatePickerTest : ScreenshotBaseTest(
         }
     }
 
+    @Test
+    @Config(
+        fontScale = 1.24f,
+    )
+    fun largestFontScaling() {
+        screenshotTestRule.setContent(takeScreenshot = true) {
+            DatePicker(
+                onDateConfirm = {},
+                date = LocalDate.of(2022, 4, 25),
+            )
+        }
+    }
+
     @Test
     @Config(
         qualifiers = "+w192dp-h192dp",

diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/TimePicker12hTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/TimePicker12hTest.kt
@@ -41,6 +41,19 @@ class TimePicker12hTest : ScreenshotBaseTest(
         }
     }
 
+    @Test
+    @Config(
+        fontScale = 1.24f,
+    )
+    fun largestFontScaling() {
+        screenshotTestRule.setContent(takeScreenshot = true) {
+            TimePickerWith12HourClock(
+                time = LocalTime.of(10, 10, 0),
+                onTimeConfirm = {},
+            )
+        }
+    }
+
     @Test
     @Config(
         qualifiers = "+w192dp-h192dp",

diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/TimePickerTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/TimePickerTest.kt
@@ -41,6 +41,30 @@ class TimePickerTest : ScreenshotBaseTest(
         }
     }
 
+    @Test
+    @Config(
+        fontScale = 1.24f,
+    )
+    fun largestFontScaling() {
+        screenshotTestRule.setContent(takeScreenshot = true) {
+            TimePicker(
+                time = LocalTime.of(10, 10, 0),
+                onTimeConfirm = {},
+            )
+        }
+    }
+
+    @Test
+    fun noSeconds() {
+        screenshotTestRule.setContent(takeScreenshot = true) {
+            TimePicker(
+                time = LocalTime.of(10, 10, 0),
+                onTimeConfirm = {},
+                showSeconds = false,
+            )
+        }
+    }
+
     @Test
     @Config(
         qualifiers = "+w192dp-h192dp",

diff --git a/...om.google.android.horologist.composables_DatePickerA11yTest_interactionTest.png b/...om.google.android.horologist.composables_DatePickerA11yTest_interactionTest.png
diff --git a/....google.android.horologist.composables_DatePickerA11yTest_interactionTest_2.png b/....google.android.horologist.composables_DatePickerA11yTest_interactionTest_2.png
diff --git a/...ots/images/com.google.android.horologist.composables_DatePickerTest_initial.png b/...ots/images/com.google.android.horologist.composables_DatePickerTest_initial.png
diff --git a/...com.google.android.horologist.composables_DatePickerTest_largestFontScaling.png b/...com.google.android.horologist.composables_DatePickerTest_largestFontScaling.png
diff --git a/...ogle.android.horologist.composables_DatePickerTest_smallDeviceLargeFontBold.png b/...ogle.android.horologist.composables_DatePickerTest_smallDeviceLargeFontBold.png
diff --git a/...ges/com.google.android.horologist.composables_TimePicker12hA11yTest_initial.png b/...ges/com.google.android.horologist.composables_TimePicker12hA11yTest_initial.png
diff --git a/.../images/com.google.android.horologist.composables_TimePicker12hTest_initial.png b/.../images/com.google.android.horologist.composables_TimePicker12hTest_initial.png
diff --git a/....google.android.horologist.composables_TimePicker12hTest_largestFontScaling.png b/....google.android.horologist.composables_TimePicker12hTest_largestFontScaling.png
diff --git a/...e.android.horologist.composables_TimePicker12hTest_smallDeviceLargeFontBold.png b/...e.android.horologist.composables_TimePicker12hTest_smallDeviceLargeFontBold.png
diff --git a/...images/com.google.android.horologist.composables_TimePickerA11yTest_initial.png b/...images/com.google.android.horologist.composables_TimePickerA11yTest_initial.png
diff --git a/...com.google.android.horologist.composables_TimePickerTest_largestFontScaling.png b/...com.google.android.horologist.composables_TimePickerTest_largestFontScaling.png
diff --git a/...s/images/com.google.android.horologist.composables_TimePickerTest_noSeconds.png b/...s/images/com.google.android.horologist.composables_TimePickerTest_noSeconds.png
diff --git a/...ogle.android.horologist.composables_TimePickerTest_smallDeviceLargeFontBold.png b/...ogle.android.horologist.composables_TimePickerTest_smallDeviceLargeFontBold.png