From 402e20c211b59188a2db8e8952c654e751645bad Mon Sep 17 00:00:00 2001 From: Daniele Favaro Date: Thu, 6 Nov 2025 21:53:44 +0100 Subject: [PATCH 1/2] Fixes #14407 --- .../ui/countrycode/CountryCodeSelectScreen.kt | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeSelectScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeSelectScreen.kt index ae3612cb742..d3c3c3447b9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeSelectScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeSelectScreen.kt @@ -11,7 +11,6 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.defaultMinSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn @@ -48,6 +47,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.withStyle +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch import org.signal.core.ui.compose.DayNightPreviews @@ -269,9 +269,10 @@ private fun SearchBar( shape = RoundedCornerShape(32.dp), modifier = modifier .background(MaterialTheme.colorScheme.background) - .padding(bottom = 18.dp, start = 16.dp, end = 16.dp) + .padding(bottom = 18.dp) + .padding(horizontal = 16.dp) .fillMaxWidth() - .height(54.dp) + .defaultMinSize(54.dp) .focusRequester(focusRequester), visualTransformation = VisualTransformation.None, colors = TextFieldDefaults.colors( @@ -318,3 +319,28 @@ private fun LoadingScreenPreview() { ) } } + +@Preview( + name = "large font", + group = "font scales", + fontScale = 2f +) +@Composable +private fun LargeFontScreenPreview() { + Previews.Preview { + CountryCodeSelectScreen( + state = CountryCodeState( + countryList = mutableListOf( + Country("\uD83C\uDDFA\uD83C\uDDF8", "United States", 1, "US"), + Country("\uD83C\uDDE8\uD83C\uDDE6", "Canada", 2, "CA"), + Country("\uD83C\uDDF2\uD83C\uDDFD", "Mexico", 3, "MX") + ), + commonCountryList = mutableListOf( + Country("\uD83C\uDDFA\uD83C\uDDF8", "United States", 4, "US"), + Country("\uD83C\uDDE8\uD83C\uDDE6", "Canada", 5, "CA") + ) + ), + title = "Your country" + ) + } +} \ No newline at end of file From bdb3ce1b16b9b822e5b05ea44861a991c63a96ee Mon Sep 17 00:00:00 2001 From: Daniele Favaro Date: Thu, 13 Nov 2025 21:23:04 +0100 Subject: [PATCH 2/2] Update app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeSelectScreen.kt Co-authored-by: jeffrey-signal --- .../ui/countrycode/CountryCodeSelectScreen.kt | 10 +++------- .../java/org/signal/core/ui/compose/SignalPreviews.kt | 3 +++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeSelectScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeSelectScreen.kt index d3c3c3447b9..6cbcb1a93e1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeSelectScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeSelectScreen.kt @@ -47,12 +47,12 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.withStyle -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch import org.signal.core.ui.compose.DayNightPreviews import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.IconButtons.IconButton +import org.signal.core.ui.compose.LargeFontPreviews import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Scaffolds import org.thoughtcrime.securesms.R @@ -272,7 +272,7 @@ private fun SearchBar( .padding(bottom = 18.dp) .padding(horizontal = 16.dp) .fillMaxWidth() - .defaultMinSize(54.dp) + .defaultMinSize(minHeight = 54.dp) .focusRequester(focusRequester), visualTransformation = VisualTransformation.None, colors = TextFieldDefaults.colors( @@ -320,11 +320,7 @@ private fun LoadingScreenPreview() { } } -@Preview( - name = "large font", - group = "font scales", - fontScale = 2f -) +@LargeFontPreviews @Composable private fun LargeFontScreenPreview() { Previews.Preview { diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/SignalPreviews.kt b/core-ui/src/main/java/org/signal/core/ui/compose/SignalPreviews.kt index db0a65e57f4..8c69544fa06 100644 --- a/core-ui/src/main/java/org/signal/core/ui/compose/SignalPreviews.kt +++ b/core-ui/src/main/java/org/signal/core/ui/compose/SignalPreviews.kt @@ -43,3 +43,6 @@ annotation class AllNightPreviews @FoldablePreviews @TabletPreviews annotation class AllDevicePreviews + +@Preview(name = "large font", fontScale = 2f) +annotation class LargeFontPreviews \ No newline at end of file