Update Confirmation - maxLines is always 3 and set text to fillMaxWid…

…th. (google#2142) Co-authored-by: stevebower <stevebower@google.com>
kul3r4 · Mar 18, 2024 · d671e45 · d671e45
1 parent 536a255
commit d671e45
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 9 deletions.
diff --git a/...ose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt b/...ose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt
@@ -19,6 +19,7 @@ package com.google.android.horologist.compose.material
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -115,10 +116,11 @@ public fun ConfirmationContent(
         title = title?.let {
             {
                 Text(
+                    modifier = Modifier.fillMaxWidth(),
                     text = it,
                     color = MaterialTheme.colors.onBackground,
                     textAlign = TextAlign.Center,
-                    maxLines = if (icon == null) 3 else 2,
+                    maxLines = 3,
                     overflow = TextOverflow.Ellipsis,
                 )
             }

diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/DialogTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/DialogTest.kt
@@ -218,4 +218,20 @@ class DialogTest(device: Device) : ScreenSizeTest(
             )
         }
     }
+
+    @Test
+    fun multiLineConfirmationScreen() {
+        runTest {
+            ConfirmationContent(
+                icon = {
+                    Icon(
+                        imageVector = Icons.Filled.Check,
+                        contentDescription = "Completed",
+                        tint = Color.Green,
+                    )
+                },
+                title = "This example uses three lines of text to show max limit",
+            )
+        }
+    }
 }
diff --git a/...logist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png b/...logist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png
diff --git a/....screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png b/....screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png
diff --git a/...ologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png b/...ologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png
diff --git a/...ist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png b/...ist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png
diff --git a/...st.screensizes_DialogTest_multiLineConfirmationScreen[0]_mobvoiticwatchpro5.png b/...st.screensizes_DialogTest_multiLineConfirmationScreen[0]_mobvoiticwatchpro5.png
diff --git a/...t.screensizes_DialogTest_multiLineConfirmationScreen[1]_samsunggalaxywatch5.png b/...t.screensizes_DialogTest_multiLineConfirmationScreen[1]_samsunggalaxywatch5.png
diff --git a/...eensizes_DialogTest_multiLineConfirmationScreen[2]_samsunggalaxywatch6large.png b/...eensizes_DialogTest_multiLineConfirmationScreen[2]_samsunggalaxywatch6large.png
diff --git a/...gist.screensizes_DialogTest_multiLineConfirmationScreen[3]_googlepixelwatch.png b/...gist.screensizes_DialogTest_multiLineConfirmationScreen[3]_googlepixelwatch.png
diff --git a/...ist.screensizes_DialogTest_multiLineConfirmationScreen[4]_genericsmallround.png b/...ist.screensizes_DialogTest_multiLineConfirmationScreen[4]_genericsmallround.png
diff --git a/...ist.screensizes_DialogTest_multiLineConfirmationScreen[5]_genericlargeround.png b/...ist.screensizes_DialogTest_multiLineConfirmationScreen[5]_genericlargeround.png
diff --git a/...t.screensizes_DialogTest_multiLineConfirmationScreen[6]_smalldevicebigfonts.png b/...t.screensizes_DialogTest_multiLineConfirmationScreen[6]_smalldevicebigfonts.png
diff --git a/...screensizes_DialogTest_multiLineConfirmationScreen[7]_largedevicesmallfonts.png b/...screensizes_DialogTest_multiLineConfirmationScreen[7]_largedevicesmallfonts.png