diff --git a/feature/app-settings/src/main/java/org/signal/appsettings/account/AccountSettingsScreen.kt b/feature/app-settings/src/main/java/org/signal/appsettings/account/AccountSettingsScreen.kt index 02adeee904..7a16a27029 100644 --- a/feature/app-settings/src/main/java/org/signal/appsettings/account/AccountSettingsScreen.kt +++ b/feature/app-settings/src/main/java/org/signal/appsettings/account/AccountSettingsScreen.kt @@ -32,7 +32,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester -import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.painterResource @@ -350,12 +349,9 @@ private fun SignalLoginCard( verticalAlignment = Alignment.CenterVertically ) { Image( - painter = painterResource(R.drawable.image_signal_login_card), + painter = painterResource(R.drawable.image_signal_login_card_small), contentDescription = null, - contentScale = ContentScale.FillBounds, - modifier = Modifier - .size(width = 91.dp, height = 52.dp) - .clip(RoundedCornerShape(8.dp)) + modifier = Modifier.size(width = 91.dp, height = 52.dp) ) Text( diff --git a/feature/app-settings/src/main/res/drawable/image_signal_login_card.xml b/feature/app-settings/src/main/res/drawable/image_signal_login_card.xml index e09443fd2e..5158fa1445 100644 --- a/feature/app-settings/src/main/res/drawable/image_signal_login_card.xml +++ b/feature/app-settings/src/main/res/drawable/image_signal_login_card.xml @@ -1,39 +1,65 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/feature/app-settings/src/main/res/drawable/image_signal_login_card_small.xml b/feature/app-settings/src/main/res/drawable/image_signal_login_card_small.xml new file mode 100644 index 0000000000..e5eadd77b5 --- /dev/null +++ b/feature/app-settings/src/main/res/drawable/image_signal_login_card_small.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameScreen.kt index 4e1e8db682..a21ea5805b 100644 --- a/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameScreen.kt +++ b/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameScreen.kt @@ -7,7 +7,6 @@ package org.signal.registration.screens.addusername import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.Row @@ -25,7 +24,6 @@ import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.Icon import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface @@ -40,7 +38,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester -import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.testTag @@ -63,7 +60,6 @@ import org.signal.core.ui.compose.Buttons import org.signal.core.ui.compose.Dialogs import org.signal.core.ui.compose.Dividers import org.signal.core.ui.compose.Previews -import org.signal.core.ui.compose.SignalIcons import org.signal.core.util.UsernameUtil import org.signal.libsignal.usernames.Username import org.signal.registration.R @@ -73,11 +69,8 @@ import org.signal.registration.screens.TwoPaneRegistrationScaffold import org.signal.registration.screens.attachDebugLogHelper import org.signal.registration.test.TestTags -/** Size of the avatar artwork, whose sphere occupies the inner 72dp of its 80dp box. */ -private val AVATAR_SIZE = 80.dp - -/** Size of the glyph centered on the avatar, per the design's 36dp icon box. */ -private val AVATAR_GLYPH_SIZE = 36.dp +/** Size of the avatar artwork, whose sphere fills its box edge to edge. */ +private val AVATAR_SIZE = 72.dp /** The discriminator field is sized to its content, but never narrower than this many digits. */ private const val DISCRIMINATOR_MIN_WIDTH_TEMPLATE = "00" @@ -371,28 +364,15 @@ private fun DiscriminatorField( } /** - * The designed avatar sphere with the "@" glyph on top. The sphere art is shared, so the glyph is drawn separately - * rather than baked into the drawable. + * The designed avatar sphere with the "@" glyph baked in. */ @Composable private fun UsernameAvatar(modifier: Modifier = Modifier) { - Box( - contentAlignment = Alignment.Center, + Image( + painter = painterResource(R.drawable.image_registration_usernames), + contentDescription = null, modifier = modifier.size(AVATAR_SIZE) - ) { - Image( - painter = painterResource(R.drawable.image_signal_login_avatar_background), - contentDescription = null, - modifier = Modifier.fillMaxSize() - ) - - Icon( - painter = SignalIcons.At.painter, - contentDescription = null, - tint = Color.White, - modifier = Modifier.size(AVATAR_GLYPH_SIZE) - ) - } + ) } @Composable diff --git a/feature/registration/src/main/java/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreen.kt index dacc38fedb..fa42afc490 100644 --- a/feature/registration/src/main/java/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreen.kt +++ b/feature/registration/src/main/java/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreen.kt @@ -211,7 +211,7 @@ private fun Header(twoPane: Boolean = false) { Image( painter = painterResource(R.drawable.image_signal_login_ring), contentDescription = null, - modifier = Modifier.size(64.dp) + modifier = Modifier.size(72.dp) ) Spacer(modifier = Modifier.height(20.dp)) diff --git a/feature/registration/src/main/java/org/signal/registration/screens/signallogininfo/SignalLoginInfoScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/signallogininfo/SignalLoginInfoScreen.kt index ab3ac81f34..106a4c1bb4 100644 --- a/feature/registration/src/main/java/org/signal/registration/screens/signallogininfo/SignalLoginInfoScreen.kt +++ b/feature/registration/src/main/java/org/signal/registration/screens/signallogininfo/SignalLoginInfoScreen.kt @@ -189,12 +189,12 @@ private fun TopBar(scrollBehavior: TopAppBarScrollBehavior) { @Composable private fun ColumnScope.Header(twoPane: Boolean = false) { Image( - painter = painterResource(R.drawable.image_signal_login_key), + painter = painterResource(R.drawable.image_signal_login_keys_checkmark), contentDescription = null, modifier = Modifier .padding(bottom = 24.dp) .align(Alignment.CenterHorizontally) - .size(width = 84.dp, height = 92.dp) + .size(96.dp) ) Text( diff --git a/feature/registration/src/main/java/org/signal/registration/screens/signalloginpayment/SignalLoginPaymentScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/signalloginpayment/SignalLoginPaymentScreen.kt index 4e329fd1aa..007dd51215 100644 --- a/feature/registration/src/main/java/org/signal/registration/screens/signalloginpayment/SignalLoginPaymentScreen.kt +++ b/feature/registration/src/main/java/org/signal/registration/screens/signalloginpayment/SignalLoginPaymentScreen.kt @@ -198,7 +198,7 @@ private fun Header( Image( painter = painterResource(R.drawable.image_signal_login_ring), contentDescription = null, - modifier = Modifier.size(64.dp) + modifier = Modifier.size(72.dp) ) Spacer(modifier = Modifier.height(20.dp)) diff --git a/feature/registration/src/main/res/drawable-night/image_registration_backups.xml b/feature/registration/src/main/res/drawable-night/image_registration_backups.xml new file mode 100644 index 0000000000..26f8d0df98 --- /dev/null +++ b/feature/registration/src/main/res/drawable-night/image_registration_backups.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + diff --git a/feature/registration/src/main/res/drawable-night/image_registration_profile.xml b/feature/registration/src/main/res/drawable-night/image_registration_profile.xml new file mode 100644 index 0000000000..90e6ae18b0 --- /dev/null +++ b/feature/registration/src/main/res/drawable-night/image_registration_profile.xml @@ -0,0 +1,27 @@ + + + + + + + + diff --git a/feature/registration/src/main/res/drawable-night/image_registration_usernames.xml b/feature/registration/src/main/res/drawable-night/image_registration_usernames.xml new file mode 100644 index 0000000000..621eecbfb0 --- /dev/null +++ b/feature/registration/src/main/res/drawable-night/image_registration_usernames.xml @@ -0,0 +1,23 @@ + + + + + + + diff --git a/feature/registration/src/main/res/drawable-night/image_signal_login_keys.xml b/feature/registration/src/main/res/drawable-night/image_signal_login_keys.xml new file mode 100644 index 0000000000..798082250f --- /dev/null +++ b/feature/registration/src/main/res/drawable-night/image_signal_login_keys.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + diff --git a/feature/registration/src/main/res/drawable-night/image_signal_login_keys_checkmark.xml b/feature/registration/src/main/res/drawable-night/image_signal_login_keys_checkmark.xml new file mode 100644 index 0000000000..6149ed36fd --- /dev/null +++ b/feature/registration/src/main/res/drawable-night/image_signal_login_keys_checkmark.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + diff --git a/feature/registration/src/main/res/drawable-night/image_signal_login_ring.xml b/feature/registration/src/main/res/drawable-night/image_signal_login_ring.xml new file mode 100644 index 0000000000..ed76fd9d03 --- /dev/null +++ b/feature/registration/src/main/res/drawable-night/image_signal_login_ring.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/feature/registration/src/main/res/drawable/image_registration_backups.xml b/feature/registration/src/main/res/drawable/image_registration_backups.xml new file mode 100644 index 0000000000..07d993b1a2 --- /dev/null +++ b/feature/registration/src/main/res/drawable/image_registration_backups.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + diff --git a/feature/registration/src/main/res/drawable/image_registration_profile.xml b/feature/registration/src/main/res/drawable/image_registration_profile.xml new file mode 100644 index 0000000000..11dfa16432 --- /dev/null +++ b/feature/registration/src/main/res/drawable/image_registration_profile.xml @@ -0,0 +1,27 @@ + + + + + + + + diff --git a/feature/registration/src/main/res/drawable/image_registration_usernames.xml b/feature/registration/src/main/res/drawable/image_registration_usernames.xml new file mode 100644 index 0000000000..2c345f2c87 --- /dev/null +++ b/feature/registration/src/main/res/drawable/image_registration_usernames.xml @@ -0,0 +1,23 @@ + + + + + + + diff --git a/feature/registration/src/main/res/drawable/image_signal_login_avatar_background.xml b/feature/registration/src/main/res/drawable/image_signal_login_avatar_background.xml deleted file mode 100644 index bc1daff8f7..0000000000 --- a/feature/registration/src/main/res/drawable/image_signal_login_avatar_background.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/feature/registration/src/main/res/drawable/image_signal_login_key.xml b/feature/registration/src/main/res/drawable/image_signal_login_key.xml deleted file mode 100644 index 07ed74de80..0000000000 --- a/feature/registration/src/main/res/drawable/image_signal_login_key.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/feature/registration/src/main/res/drawable/image_signal_login_keys.xml b/feature/registration/src/main/res/drawable/image_signal_login_keys.xml new file mode 100644 index 0000000000..62c9cc8a88 --- /dev/null +++ b/feature/registration/src/main/res/drawable/image_signal_login_keys.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + diff --git a/feature/registration/src/main/res/drawable/image_signal_login_keys_checkmark.xml b/feature/registration/src/main/res/drawable/image_signal_login_keys_checkmark.xml new file mode 100644 index 0000000000..4cca96447c --- /dev/null +++ b/feature/registration/src/main/res/drawable/image_signal_login_keys_checkmark.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + diff --git a/feature/registration/src/main/res/drawable/image_signal_login_ring.xml b/feature/registration/src/main/res/drawable/image_signal_login_ring.xml index 13b5229dbb..82daff5aea 100644 --- a/feature/registration/src/main/res/drawable/image_signal_login_ring.xml +++ b/feature/registration/src/main/res/drawable/image_signal_login_ring.xml @@ -3,164 +3,101 @@ android:height="64dp" android:viewportWidth="64" android:viewportHeight="64"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_foldable landscape (day)_41c0d57c_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_foldable landscape (day)_41c0d57c_0.png index 0bb60678d6..90914bb637 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_foldable landscape (day)_41c0d57c_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_foldable landscape (day)_41c0d57c_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cd1462cb348709863f0eac0cdb2be92308c9d7e8eec2721562f60c231f5a8a7 -size 87610 +oid sha256:d7389b2053a751ace0084968a5bc776fab884f2f6571e2f85962cf18bd6d20d7 +size 88744 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_foldable portrait (day)_bf09cc79_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_foldable portrait (day)_bf09cc79_0.png index 3d3333b45b..c1f5f20702 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_foldable portrait (day)_bf09cc79_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_foldable portrait (day)_bf09cc79_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6181b64094fb0da1c3f59acdcc46c958c09fc0ff2e61d5a246c2172938f2a3e5 -size 87700 +oid sha256:d75adf75db57082d7995f1cd863536b64f9dd062af31437f0b3eab1dd5f3fc7f +size 88815 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_foldable portrait (night)_7382068f_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_foldable portrait (night)_7382068f_0.png index d07fbe855d..79c7943a4d 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_foldable portrait (night)_7382068f_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_foldable portrait (night)_7382068f_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a3a2ca46117e189d678857e3a4fe7ac0092b6b8ca5d191e464c11477409acbd -size 88170 +oid sha256:3001618df981a37386ddd775c70c4a27fbeda7b0015fbf3b6485f0beb8a65ea9 +size 89071 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_phone landscape (day)_5d9eaff2_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_phone landscape (day)_5d9eaff2_0.png index 91d40d61f4..3463866837 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_phone landscape (day)_5d9eaff2_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_phone landscape (day)_5d9eaff2_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e8f90ce0441a30e396c64283de3e0caa478ec3796c77727d1c2d5345103ad86 -size 44668 +oid sha256:a9f46a712fc6b58e9d2d3d3507d2ba14c35a56bccc61353a8a256d0697a4d297 +size 45706 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_phone portrait (day)_e052ce8c_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_phone portrait (day)_e052ce8c_0.png index d38543d26e..79e396d3c9 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_phone portrait (day)_e052ce8c_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_phone portrait (day)_e052ce8c_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f9b7d98b41d6e99eca4f0a83ba7bf61c5c0e21eeba80cca8d443cae961387a9 -size 65630 +oid sha256:b91f8c28f27edf17f052ca15418c8532c28eafeac50c13ad60374564110f76da +size 66777 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_phone portrait (night)_cc3c9530_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_phone portrait (night)_cc3c9530_0.png index 34b33390c3..5a87b5bcf2 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_phone portrait (night)_cc3c9530_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_phone portrait (night)_cc3c9530_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:636f75a3b0fd5403f868c4a7c1887ba8612565832f28cdd43c7eee9192b4a211 -size 66127 +oid sha256:7c8c547a282842eb464afbd33dc08abafeec7a7d020018964bd259c0aa555150 +size 66958 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_rtl_5cbb5cfd_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_rtl_5cbb5cfd_0.png index d04e3f54fc..a3e78ddd9c 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_rtl_5cbb5cfd_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_rtl_5cbb5cfd_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b29584319ef35c3d61803089206ea0bd865256f12720a6f9bac4e1b92888a8f -size 70983 +oid sha256:cdb8900626219d7d4797230928b7004a2cae87d57e6398a90387f03b28ead679 +size 71824 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_tablet landscape (day)_308754cb_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_tablet landscape (day)_308754cb_0.png index 64f3e3c16c..ec846163e6 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_tablet landscape (day)_308754cb_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_tablet landscape (day)_308754cb_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e318874b37a907aa1f6dd59578e454ad705fcf6a002ff7a2315bc6eb5aed037a -size 95639 +oid sha256:9809e7059b8245449c3010d800d126fdd2417f061441ecff1938bd7f4feb3466 +size 96858 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_tablet landscape (night)_d25401fe_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_tablet landscape (night)_d25401fe_0.png index 0f391aa5d9..1da591b865 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_tablet landscape (night)_d25401fe_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_tablet landscape (night)_d25401fe_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b99f4a69b489277df80dc1c71a9d3bcfa46e96d9673dfd2027803d37fecd8e8c -size 96116 +oid sha256:0698018f8584d0b4bd538c4d26a214db993f12f2dd374647828041688e1de6c4 +size 97064 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_tablet portrait (day)_ae17fb11_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_tablet portrait (day)_ae17fb11_0.png index e42d43efc4..ce9dc4a3ab 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_tablet portrait (day)_ae17fb11_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenPreview_tablet portrait (day)_ae17fb11_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f2150fbe9db06bec98f0bbd693731a25ada12f11a368afae6dd0c7856586366 -size 92499 +oid sha256:dc9b24b9dc3dc924fd85f67ca421a216fe556cb7c039f9d5eeb1bae1923d9289 +size 93647 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_foldable landscape (day)_41c0d57c_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_foldable landscape (day)_41c0d57c_0.png index b741bf3f85..a940d10032 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_foldable landscape (day)_41c0d57c_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_foldable landscape (day)_41c0d57c_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31ee6385b9fda0b2b56f7ec6feeaf78867e6708e1da46fff82659e6771138ef6 -size 111836 +oid sha256:8fd3157a72751ebe1261add767d4453d4f602d5726616391ee1b0b934c80d3ee +size 113008 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_foldable portrait (day)_bf09cc79_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_foldable portrait (day)_bf09cc79_0.png index 2e354be676..43b0ef8327 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_foldable portrait (day)_bf09cc79_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_foldable portrait (day)_bf09cc79_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98d1ae5efd5aa61dcf3a3a93f9dbfca6e3833e56e7763508e7586c11099f9b43 -size 111868 +oid sha256:645b768ff66687b4f4f9ff315ecf7ca08dce157e178f23f5b88dd368e23b7fc0 +size 112997 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_foldable portrait (night)_7382068f_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_foldable portrait (night)_7382068f_0.png index 7392dbf524..bbf8339e36 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_foldable portrait (night)_7382068f_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_foldable portrait (night)_7382068f_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ff8d8d2d222d7de4de1d55fda4129eb6d6ff92f4c2e253f5b74925079f2dc96 -size 112086 +oid sha256:db7fbb9082a567db444afb42b738aa1760b6f27708c278fd87fa1908023d7d99 +size 112997 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_phone landscape (day)_5d9eaff2_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_phone landscape (day)_5d9eaff2_0.png index 91d40d61f4..3463866837 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_phone landscape (day)_5d9eaff2_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_phone landscape (day)_5d9eaff2_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e8f90ce0441a30e396c64283de3e0caa478ec3796c77727d1c2d5345103ad86 -size 44668 +oid sha256:a9f46a712fc6b58e9d2d3d3507d2ba14c35a56bccc61353a8a256d0697a4d297 +size 45706 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_phone portrait (day)_e052ce8c_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_phone portrait (day)_e052ce8c_0.png index 2178259507..7d8e9451cb 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_phone portrait (day)_e052ce8c_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_phone portrait (day)_e052ce8c_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a10e916d1e7438df204ddd736fac222d69aac90674e541529e2fca06776a2ab1 -size 87932 +oid sha256:64e9723b94caea8384574ea5f1fbeb758e27d6aa21169da16cad17bc222598a9 +size 89056 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_phone portrait (night)_cc3c9530_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_phone portrait (night)_cc3c9530_0.png index 9df2b2223e..09a2d37322 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_phone portrait (night)_cc3c9530_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_phone portrait (night)_cc3c9530_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d03495dad3d164fd1f0321904f0341c1803914c9cfa4770c8f152fe586956085 -size 88181 +oid sha256:938e042b23448da6b48c34eed715dbaa77cdc8ca1003b600241bd49f8a61e95f +size 88942 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_rtl_5cbb5cfd_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_rtl_5cbb5cfd_0.png index 82663ce1ec..0c68fccabc 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_rtl_5cbb5cfd_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_rtl_5cbb5cfd_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a7689d4db7c4a674972a7611b716f69616b0c2203c644c8fca43af93944aaed -size 92504 +oid sha256:e7a58ba59b0b8aa5767cb52c24293c15e3e9bd54933aadb393739d31f355f375 +size 93669 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_tablet landscape (day)_308754cb_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_tablet landscape (day)_308754cb_0.png index da3e9ce601..74458f9b47 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_tablet landscape (day)_308754cb_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_tablet landscape (day)_308754cb_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d25fbc34aa1eb3aa61f015f3203bc00b963488e43286a0649dd38036b8e1a78 -size 118159 +oid sha256:ba2f602ceb6de813eea078bfdfe88dc7054d7c554d64ea8685623f5837c4fdce +size 119428 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_tablet landscape (night)_d25401fe_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_tablet landscape (night)_d25401fe_0.png index 12b8e75f93..09d95392e7 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_tablet landscape (night)_d25401fe_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_tablet landscape (night)_d25401fe_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2dd6791f21d969a27078997ac7eb17f2647b836a3d03caf2b897eddd8ff050be -size 118334 +oid sha256:0ce9ff1c55b5bca66c46a44e9f1bf1a01f6fac48d38a265acb95398ba10442f8 +size 119353 diff --git a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_tablet portrait (day)_ae17fb11_0.png b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_tablet portrait (day)_ae17fb11_0.png index 9e3197e3b0..ddb82b0a2a 100644 --- a/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_tablet portrait (day)_ae17fb11_0.png +++ b/feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/signallogincredentials/SignalLoginCredentialEntryScreenScreenshotTests/SignalLoginCredentialEntryScreenRevealedPreview_tablet portrait (day)_ae17fb11_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d45c15675a4c6bd7847421fd7006dbd0cdda2f5f2a6bb73b2eb450bdb6876e05 -size 113490 +oid sha256:a45542dfe5ffed4cdcb2eea1248450b0095eb34c99293ab87931323dc75186d4 +size 114513 diff --git a/lib/signal-login/src/main/java/org/signal/signallogin/card/SignalLoginCard.kt b/lib/signal-login/src/main/java/org/signal/signallogin/card/SignalLoginCard.kt index 84693bc463..a41c79458a 100644 --- a/lib/signal-login/src/main/java/org/signal/signallogin/card/SignalLoginCard.kt +++ b/lib/signal-login/src/main/java/org/signal/signallogin/card/SignalLoginCard.kt @@ -44,9 +44,9 @@ import org.signal.signallogin.fonts.MonoTypeface import java.util.UUID /** Aspect ratio of the credential card artwork, so it scales with the available width. */ -private const val CARD_ASPECT_RATIO = 363f / 220f +private const val CARD_ASPECT_RATIO = 360f / 220f -private val CARD_MAX_WIDTH = 363.dp +private val CARD_MAX_WIDTH = 360.dp /** Number of masking dots shown in front of the revealed suffix of each credential. */ private const val MASK_DOT_COUNT = 4 diff --git a/lib/signal-login/src/main/res/drawable/image_signal_login_card.xml b/lib/signal-login/src/main/res/drawable/image_signal_login_card.xml index e09443fd2e..5158fa1445 100644 --- a/lib/signal-login/src/main/res/drawable/image_signal_login_card.xml +++ b/lib/signal-login/src/main/res/drawable/image_signal_login_card.xml @@ -1,39 +1,65 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + +