bitwarden/android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-02 12:54:38 -05:00
Code Issues Packages Projects Releases 169 Wiki Activity

PM-33441: bug: Add external link callout for start registration screen (#6646)

Browse Source
This commit is contained in:
David Perez
2026-03-12 12:47:26 -05:00
committed by GitHub
parent bb46c3812f
commit 8455f7f706
5 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt
View File

@@ -274,8 +274,14 @@ private fun TermsAndPrivacyText(
onPrivacyPolicyClick: () -> Unit,
modifier: Modifier = Modifier,
) {
val strTerms = stringResource(id = BitwardenString.terms_of_service)
val strPrivacy = stringResource(id = BitwardenString.privacy_policy)
val strTerms = stringResource(
id = BitwardenString.external_link_format,
formatArgs = arrayOf(stringResource(id = BitwardenString.terms_of_service)),
)
val strPrivacy = stringResource(
id = BitwardenString.external_link_format,
formatArgs = arrayOf(stringResource(id = BitwardenString.privacy_policy)),
)
Row(
horizontalArrangement = Arrangement.Start,
verticalAlignment = Alignment.CenterVertically,

7
app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dropdown/EnvironmentSelector.kt
View File

@@ -97,7 +97,12 @@ fun EnvironmentSelector(
if (isHelpEnabled) {
BitwardenStandardIconButton(
vectorIconRes = BitwardenDrawable.ic_question_circle_small,
contentDescription = stringResource(BitwardenString.help_with_server_geolocations),
contentDescription = stringResource(
id = BitwardenString.external_link_format,
formatArgs = arrayOf(
stringResource(id = BitwardenString.help_with_server_geolocations),
),
),
onClick = onHelpClick,
contentColor = BitwardenTheme.colorScheme.icon.secondary,
// Align with design but keep accessible touch target of IconButton.

6
app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreenTest.kt
View File

@@ -185,7 +185,7 @@ class StartRegistrationScreenTest : BitwardenComposeTest() {
@Test
fun `clicking the server tool tip should send ServerGeologyHelpClickAction`() {
composeTestRule
.onNodeWithContentDescription("Help with server geolocations.")
.onNodeWithContentDescription("Help with server geolocations, External link")
.performScrollTo()
.performClick()
@@ -262,7 +262,7 @@ class StartRegistrationScreenTest : BitwardenComposeTest() {
fun `when terms and conditions custom action invoked should send TermsClick`() {
composeTestRule
.onNodeWithText("By continuing, you agree to the Terms of Service and Privacy Policy")
.performCustomAccessibilityAction("Terms of Service")
.performCustomAccessibilityAction("Terms of Service, External link")
verify { viewModel.trySendAction(StartRegistrationAction.TermsClick) }
}
@@ -271,7 +271,7 @@ class StartRegistrationScreenTest : BitwardenComposeTest() {
fun `when privacy policy custom action invoked should send TermsClick`() {
composeTestRule
.onNodeWithText("By continuing, you agree to the Terms of Service and Privacy Policy")
.performCustomAccessibilityAction("Privacy Policy")
.performCustomAccessibilityAction("Privacy Policy, External link")
verify { viewModel.trySendAction(StartRegistrationAction.PrivacyPolicyClick) }
}

4
authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsScreen.kt
View File

@@ -38,6 +38,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.CustomAccessibilityAction
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.customActions
import androidx.compose.ui.semantics.hideFromAccessibility
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
@@ -707,6 +708,7 @@ private fun CopyRow(
) {
Text(
modifier = Modifier
.semantics { hideFromAccessibility() }
.padding(end = 16.dp)
.weight(1f),
text = text(),
@@ -715,7 +717,7 @@ private fun CopyRow(
)
Icon(
painter = rememberVectorPainter(id = BitwardenDrawable.ic_copy),
contentDescription = null,
contentDescription = stringResource(id = BitwardenString.copy),
tint = BitwardenTheme.colorScheme.icon.primary,
)
}

2
ui/src/main/res/values/strings.xml
View File

@@ -766,7 +766,7 @@ Do you want to switch to this account?</string>
<string name="write_this_password_down_and_keep_it_somewhere_safe">Write this password down and keep it somewhere safe.</string>
<string name="learn_about_other_ways_to_prevent_account_lockout">Learn about other ways to prevent account lockout</string>
<string name="learn_about_ways_to_prevent_account_lockout"><annotation link="onPreventAccountLockout">Learn about ways to prevent account lockout</annotation></string>
<string name="help_with_server_geolocations">Help with server geolocations.</string>
<string name="help_with_server_geolocations">Help with server geolocations</string>
<string name="email_address_required">Email address (required)</string>
<string name="select_the_link_in_the_email_to_verify_your_email_address_and_continue_creating_your_account">Select the link in the email to verify your email address and continue creating your account.</string>
<string name="change_email_address">Change email address</string>