mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-01-30 19:53:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

PM-14621 update the copy for step three instruction and cta button (#4259)

Browse source
This commit is contained in:
Dave Severns 2024-11-08 09:36:54 -05:00 • committed by GitHub
parent 7ccba88780
commit b76f7202a4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt
View file

@ -460,6 +460,7 @@ private fun ImportLoginsStepThreeContent(
), ),
), ),
onBackClick = onBackClick, onBackClick = onBackClick,
ctaText = stringResource(R.string.done_text),
onContinueClick = onContinueClick, onContinueClick = onContinueClick,
onHelpClick = onHelpClick, onHelpClick = onHelpClick,
modifier = modifier, modifier = modifier,

3
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt
View file

@ -40,6 +40,7 @@ import kotlinx.collections.immutable.persistentListOf
fun ImportLoginsInstructionStep( fun ImportLoginsInstructionStep(
stepText: String, stepText: String,
stepTitle: String, stepTitle: String,
ctaText: String = stringResource(R.string.continue_text),
instructions: ImmutableList<InstructionStep>, instructions: ImmutableList<InstructionStep>,
onBackClick: () -> Unit, onBackClick: () -> Unit,
onContinueClick: () -> Unit, onContinueClick: () -> Unit,
@ -88,7 +89,7 @@ fun ImportLoginsInstructionStep(
) )
Spacer(Modifier.height(24.dp)) Spacer(Modifier.height(24.dp))
BitwardenFilledButton( BitwardenFilledButton(
label = stringResource(R.string.continue_text), label = ctaText,
onClick = onContinueClick, onClick = onContinueClick,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()

3
app/src/main/res/values/strings.xml
View file

@ -1035,7 +1035,7 @@ Do you want to switch to this account?</string>
<string name="log_in_to_your_current_browser_or_password_manager_highlight">log in to your current browser or password manager.</string> <string name="log_in_to_your_current_browser_or_password_manager_highlight">log in to your current browser or password manager.</string>
<string name="export_your_passwords_this_option_is_usually_found_in_your_settings">Export your passwords. This option is usually found in your settings.</string> <string name="export_your_passwords_this_option_is_usually_found_in_your_settings">Export your passwords. This option is usually found in your settings.</string>
<string name="export_your_passwords_highlight">Export your passwords.</string> <string name="export_your_passwords_highlight">Export your passwords.</string>
<string name="select_import_data_in_the_web_app_then_done_to_finish_syncing">Select Import data in the web app, then Done to finish syncing.</string> <string name="select_import_data_in_the_web_app_then_done_to_finish_syncing">Select Import data in the web app, then Done below to finish syncing.</string>
<string name="select_import_data_highlight">Select Import data</string> <string name="select_import_data_highlight">Select Import data</string>
<string name="step_1_of_3">Step 1 of 3</string> <string name="step_1_of_3">Step 1 of 3</string>
<string name="export_your_saved_logins">Export your saved logins</string> <string name="export_your_saved_logins">Export your saved logins</string>
@ -1086,4 +1086,5 @@ Do you want to switch to this account?</string>
<string name="log_in_quickly_and_easily_across_devices">Log in quickly and easily across devices</string> <string name="log_in_quickly_and_easily_across_devices">Log in quickly and easily across devices</string>
<string name="bitwarden_can_notify_you_each_time_you_receive_a_new_login_request_from_another_device">Bitwarden can notify you each time you receive a new login request from another device.</string> <string name="bitwarden_can_notify_you_each_time_you_receive_a_new_login_request_from_another_device">Bitwarden can notify you each time you receive a new login request from another device.</string>
<string name="skip_for_now">Skip for now</string> <string name="skip_for_now">Skip for now</string>
<string name="done_text">Done</string>
</resources> </resources>

2
app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt
View file

@ -332,7 +332,7 @@ class ImportLoginsScreenTest : BaseComposeTest() {
.performClick() .performClick()
verifyActionSent(ImportLoginsAction.MoveToStepTwo) verifyActionSent(ImportLoginsAction.MoveToStepTwo)
composeTestRule composeTestRule
.onNodeWithText("Continue") .onNodeWithText("Done")
.performClick() .performClick()
verifyActionSent(ImportLoginsAction.MoveToSyncInProgress) verifyActionSent(ImportLoginsAction.MoveToSyncInProgress)
} }