Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-08-04 20:34:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Additional UI tweaks to link account screen.

Browse Source
This commit is contained in:
Cody Henthorne
2026-07-23 13:38:55 -04:00
committed by Michelle Tang
parent a5fe925958
commit 22f8996d3f
19 changed files with 47 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/ui/src/main/assets/fonts/SignalSymbols-Bold.otf
BIN
View File
Binary file not shown.
core/ui/src/main/assets/fonts/SignalSymbols-Regular.otf
BIN
View File
Binary file not shown.
core/ui/src/main/java/org/signal/core/ui/fonts/SignalSymbols.kt
+1
View File
@@ -106,6 +106,7 @@ object SignalSymbols {
CHEVRON_SQUARE_UP('\uE02E'),
CHEVRON_SQUARE_DOWN('\uE02F'),
CREDIT_CARD('\uE127'),
DEVICE_PHONE('\uE0F2'),
DROPDOWN_DOWN('\uE07F'),
DROPDOWN_UP('\uE080'),
DROPDOWN_TRIANGLE_DOWN('\uE082'),
feature/registration/src/main/java/org/signal/registration/screens/linkaccount/LinkAccountScreen.kt
+16 -23
View File
@@ -58,6 +58,7 @@ import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.TextLinkStyles
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.text.withLink
import androidx.compose.ui.unit.Dp
@@ -77,6 +78,8 @@ import org.signal.core.ui.compose.Previews
import org.signal.core.ui.compose.QrCode
import org.signal.core.ui.compose.QrCodeData
import org.signal.core.ui.compose.SignalIcons
import org.signal.core.ui.fonts.SignalSymbols
import org.signal.core.ui.fonts.SignalSymbols.SignalSymbol
import org.signal.core.ui.rememberWindowBreakpoint
import org.signal.registration.R
import org.signal.registration.screens.OnePaneRegistrationScaffold
@@ -611,10 +614,7 @@ private fun OnePaneFooterContent(
.fillMaxWidth()
.padding(params.footerPadding)
) {
Row {
DontHaveSignal()
}
CreateAccount(onEvent)
DontHaveSignal(onEvent)
}
}
}
@@ -635,8 +635,7 @@ private fun TwoPaneFooterContent(
) {
Spacer(modifier = Modifier.weight(1f))
DontHaveSignal()
CreateAccount(onEvent)
DontHaveSignal(onEvent)
Spacer(modifier = Modifier.weight(1f))
}
@@ -644,29 +643,20 @@ private fun TwoPaneFooterContent(
}
@Composable
private fun DontHaveSignal() {
Icon(
imageVector = SignalIcons.DevicePhone.imageVector,
tint = MaterialTheme.colorScheme.onSurfaceVariant,
contentDescription = null
)
Text(
text = stringResource(R.string.LinkAccountScreen__dont_have_signal_on_another_device),
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
@Composable
private fun CreateAccount(onEvent: (LinkAccountScreenEvent) -> Unit) {
private fun DontHaveSignal(onEvent: (LinkAccountScreenEvent) -> Unit) {
Text(
text = buildAnnotatedString {
SignalSymbol(glyph = SignalSymbols.Glyph.DEVICE_PHONE)
append(' ')
append(stringResource(R.string.LinkAccountScreen__dont_have_signal_on_another_device))
append(' ')
withLink(
LinkAnnotation.Clickable(
tag = "create-account",
styles = TextLinkStyles(
style = SpanStyle(
color = MaterialTheme.colorScheme.onSurface,
color = MaterialTheme.colorScheme.onSurfaceVariant,
fontWeight = FontWeight.Bold,
textDecoration = TextDecoration.Underline
)
@@ -676,9 +666,12 @@ private fun CreateAccount(onEvent: (LinkAccountScreenEvent) -> Unit) {
}
)
) {
append(stringResource(R.string.LinkAccountScreen__create_account))
append(stringResource(R.string.LinkAccountScreen__create_account).replace(' ', '\u00A0'))
}
},
color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center,
style = MaterialTheme.typography.bodyMedium,
modifier = Modifier.testTag(TestTags.LINK_ACCOUNT_CREATE_ACCOUNT_LINK)
)
}
feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/linkaccount/LinkAccountScreenScreenshotTests/LinkAccountScreenPreview_foldable landscape (day)_41c0d57c_0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ed7d80badda8145290d033ed4bad64d3b0e1aeb685d9fa4fe2c7ea4f18423342
size 144611
oid sha256:0323184f66ea16997ef89557eaa7a95d89b49c155446a60bc4fb245850933f50
size 141696
feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/linkaccount/LinkAccountScreenScreenshotTests/LinkAccountScreenPreview_foldable landscape (night)_9dae7e43_0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d48d3ad9cfd8a0d65ea330a9e92a418ec798024303c692bbd30b77c9e318422d
size 145228
oid sha256:0fefff3f8dfc8f99720151602bb953deac481152b00267b0a8dcb69888e6194a
size 142280
feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/linkaccount/LinkAccountScreenScreenshotTests/LinkAccountScreenPreview_foldable portrait (day)_bf09cc79_0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:354e2cfd4f4711677f88bcefd8df52b43fb1dc7b23a624c2b3aa6078d2b11b7e
size 147390
oid sha256:46bb472a418b6377c6365879565552a2a0b7980212507b5c054fc16ed7e11b5d
size 144443
feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/linkaccount/LinkAccountScreenScreenshotTests/LinkAccountScreenPreview_phone landscape (day)_38357cfa_0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d509dc743ef920c6bb6141c48a10b52baa5f70a332bd7c3bc5ca18e723caf612
size 66012
oid sha256:5c9e087cfdafcc605a52500725a5e75fbe4523f51de94fb02350ff4d840a4dc0
size 68061
feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/linkaccount/LinkAccountScreenScreenshotTests/LinkAccountScreenPreview_phone landscape (night)_2eebbf71_0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:797c4dbb2c5abc8e9a4135bbb936fb3380ad55fffa319f8ec8e51afdcfddec65
size 66118
oid sha256:291a817c5dadf6ad3a493afa8a25d05aba12e1729209581e62aabf6bf0e7176b
size 68098
feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/linkaccount/LinkAccountScreenScreenshotTests/LinkAccountScreenPreview_phone portrait (day)_1526b652_0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:09689f4dccaaaec8625a898882c95a572603bbd9dadee030101682a9ccf3d509
size 101353
oid sha256:e8b8c3a3a2aba25ec76c446dacf00f59a069e0c4b1270a6e5cba91e82d3b593d
size 99432
feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/linkaccount/LinkAccountScreenScreenshotTests/LinkAccountScreenPreview_rtl_5cbb5cfd_0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1b8de9f3bc4ca18e25eaabddfbf96b3e3e706b364b04880c680431183cb4f7e4
size 127908
oid sha256:6204c72c39b0d9a53429a67365ff9b5d84b4e1407e4ba20f5e57e1218166f325
size 124765
feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/linkaccount/LinkAccountScreenScreenshotTests/LinkAccountScreenPreview_small foldable landscape (day)_de1bb092_0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f749e90328c6cfb7454b15a516d20023594d8076cb1dfcb5ca88950a143e445
size 135854
oid sha256:96742d31f0cb13fe05640839f4c0b8cd9000561a30e0e3d8a65a0d4a7800dfa9
size 132993
feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/linkaccount/LinkAccountScreenScreenshotTests/LinkAccountScreenPreview_small foldable landscape (night)_fe962c61_0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b831e2d61735c55c7c7a984ae20070a7c1209144cc50caa07eb76bef21929bd1
size 136407
oid sha256:42dbccce4abad1489aa6e5e482e1e602264beec7d7aa5062c88e3afa480e69c1
size 133591
feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/linkaccount/LinkAccountScreenScreenshotTests/LinkAccountScreenPreview_small foldable portrait (day)_e269713d_0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:088a8f5c746e320500cefc24ddc50968bc9e352a61a38c14e265b2f1ebb132f1
size 136796
oid sha256:9e36a15d1dae74aa3d54367aa123532ee12b7e4b0110b4ca620a6d16ad2f90ea
size 134001
feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/linkaccount/LinkAccountScreenScreenshotTests/LinkAccountScreenPreview_tablet landscape (day)_308754cb_0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c4a8953f9a2adfc3b5bfa525228a5fb6c4565323208ec536f8bad95548cb842
size 166484
oid sha256:6bb3e2597db339d20d7eb652926b2bf67ff3d3d62abc534899f17d91dba8becf
size 163614
feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/linkaccount/LinkAccountScreenScreenshotTests/LinkAccountScreenPreview_tablet landscape (night)_d25401fe_0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:373ec374e991cd7f06b4b461dfc517a6b8c048f19cf1601a84241c06b3a5b500
size 166756
oid sha256:d28b2782c084109bd791b1f7944ec82da6498a29353da23bc3358c2e1534d860
size 163886
feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/linkaccount/LinkAccountScreenScreenshotTests/LinkAccountScreenPreview_tablet portrait (day)_ae17fb11_0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d7d65a52d3b9a9d074dd4a26c83ed1988c1561cfdbcbfc9eaa3e312d75262b21
size 160919
oid sha256:f48a6561695b553763986d6ba63728c104f4e261b950e25bbccc774b754f2ed3
size 157770
feature/registration/src/screenshotTestDebug/reference/org/signal/registration/screens/linkaccount/LinkAccountScreenScreenshotTests/LinkAccountScreenPreview_tablet portrait (night)_4413f5b7_0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ec9e5ad4684887eea35642b97266f7c8237178e90619772595bc668cd481bba4
size 160980
oid sha256:5df2ea996d3652836c97831ea1bfa05ee65902b608054d7d00a554e990354060
size 157697
feature/registration/src/test/java/org/signal/registration/screens/linkaccount/LinkAccountScreenTest.kt
+2 -1
View File
@@ -9,6 +9,7 @@ import android.app.Application
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performFirstLinkClick
import androidx.compose.ui.test.performScrollTo
import androidx.test.core.app.ApplicationProvider
import org.junit.Rule
@@ -63,7 +64,7 @@ class LinkAccountScreenTest {
}
}
composeTestRule.onNodeWithTag(TestTags.LINK_ACCOUNT_CREATE_ACCOUNT_LINK).performClick()
composeTestRule.onNodeWithTag(TestTags.LINK_ACCOUNT_CREATE_ACCOUNT_LINK).performFirstLinkClick()
assert(emittedEvent == LinkAccountScreenEvent.CreateAccountClick)
}