From 7e5dcd381464979f6c40149c089390ad5007ca31 Mon Sep 17 00:00:00 2001 From: Andrew Haisting <142518658+ahaisting-livefront@users.noreply.github.com> Date: Fri, 8 Nov 2024 14:47:37 -0600 Subject: [PATCH] BITAU-197 Update copy in all Save to Bitwarden scenarios (#271) --- .../feature/manualcodeentry/SaveManualCodeButtons.kt | 8 ++++---- .../feature/qrcodescan/ChooseSaveLocationDialog.kt | 2 +- .../ui/platform/util/DefaultSaveOptionExtensions.kt | 2 +- app/src/main/res/values/strings.xml | 6 +----- .../feature/manualcodeentry/ManualCodeEntryScreenTest.kt | 8 ++++---- .../feature/qrcodescan/QrCodeScanScreenTest.kt | 4 ++-- .../ui/platform/util/DefaultSaveOptionExtensionsTest.kt | 2 +- 7 files changed, 14 insertions(+), 18 deletions(-) diff --git a/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/manualcodeentry/SaveManualCodeButtons.kt b/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/manualcodeentry/SaveManualCodeButtons.kt index 974ec424cf..abdfac93eb 100644 --- a/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/manualcodeentry/SaveManualCodeButtons.kt +++ b/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/manualcodeentry/SaveManualCodeButtons.kt @@ -43,14 +43,14 @@ fun SaveManualCodeButtons( ManualCodeEntryState.ButtonState.SaveLocallyPrimary -> { Column { BitwardenFilledButton( - label = stringResource(id = R.string.add_code_locally), + label = stringResource(id = R.string.save_here), onClick = onSaveLocallyClick, modifier = Modifier .fillMaxWidth() .padding(horizontal = 16.dp), ) BitwardenOutlinedButton( - label = stringResource(R.string.add_code_to_bitwarden), + label = stringResource(R.string.save_to_bitwarden), onClick = onSaveToBitwardenClick, modifier = Modifier .fillMaxWidth() @@ -62,14 +62,14 @@ fun SaveManualCodeButtons( ManualCodeEntryState.ButtonState.SaveToBitwardenPrimary -> { Column { BitwardenFilledButton( - label = stringResource(id = R.string.add_code_to_bitwarden), + label = stringResource(id = R.string.save_to_bitwarden), onClick = onSaveToBitwardenClick, modifier = Modifier .fillMaxWidth() .padding(horizontal = 16.dp), ) BitwardenOutlinedButton( - label = stringResource(R.string.add_code_locally), + label = stringResource(R.string.save_here), onClick = onSaveLocallyClick, modifier = Modifier .fillMaxWidth() diff --git a/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/qrcodescan/ChooseSaveLocationDialog.kt b/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/qrcodescan/ChooseSaveLocationDialog.kt index 3588677f50..ad6cb6e47d 100644 --- a/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/qrcodescan/ChooseSaveLocationDialog.kt +++ b/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/qrcodescan/ChooseSaveLocationDialog.kt @@ -108,7 +108,7 @@ fun ChooseSaveLocationDialog( BitwardenTextButton( modifier = Modifier .padding(horizontal = 4.dp), - label = stringResource(R.string.take_me_to_bitwarden), + label = stringResource(R.string.save_to_bitwarden), labelTextColor = MaterialTheme.colorScheme.primary, onClick = { onTakeMeToBitwardenClick.invoke(isSaveAsDefaultChecked) }, ) diff --git a/app/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/DefaultSaveOptionExtensions.kt b/app/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/DefaultSaveOptionExtensions.kt index 0c83dc22c9..3e563551bd 100644 --- a/app/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/DefaultSaveOptionExtensions.kt +++ b/app/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/DefaultSaveOptionExtensions.kt @@ -11,6 +11,6 @@ import com.bitwarden.authenticator.ui.platform.feature.settings.data.model.Defau val DefaultSaveOption.displayLabel: Text get() = when (this) { DefaultSaveOption.NONE -> R.string.none.asText() - DefaultSaveOption.LOCAL -> R.string.save_locally.asText() + DefaultSaveOption.LOCAL -> R.string.save_here.asText() DefaultSaveOption.BITWARDEN_APP -> R.string.save_to_bitwarden.asText() } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 874d5cb7f0..dbc5af4139 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -135,16 +135,12 @@ Move to Bitwarden Default save option Save to Bitwarden - Save locally + Save here None Select where you would like to save new verification codes. Confirm - Save here - Take me to Bitwarden Verification code created Save this authenticator key here, or add it to a login in your Bitwarden app. Save option as default Account synced from Bitwarden app - Add code to Bitwarden - Add code locally diff --git a/app/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/manualcodeentry/ManualCodeEntryScreenTest.kt b/app/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/manualcodeentry/ManualCodeEntryScreenTest.kt index 78e2838e81..9e8c0281ff 100644 --- a/app/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/manualcodeentry/ManualCodeEntryScreenTest.kt +++ b/app/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/manualcodeentry/ManualCodeEntryScreenTest.kt @@ -64,7 +64,7 @@ class ManualCodeEntryScreenTest : BaseComposeTest() { it.copy(buttonState = ManualCodeEntryState.ButtonState.SaveToBitwardenPrimary) } composeTestRule - .onNodeWithText("Add code to Bitwarden") + .onNodeWithText("Save to Bitwarden") .performClick() // Make sure locally only save isn't showing: @@ -74,7 +74,7 @@ class ManualCodeEntryScreenTest : BaseComposeTest() { // Make sure locally option is showing: composeTestRule - .onNodeWithText("Add code locally") + .onNodeWithText("Save here") .assertIsDisplayed() verify { viewModel.trySendAction(ManualCodeEntryAction.SaveToBitwardenClick) } @@ -86,7 +86,7 @@ class ManualCodeEntryScreenTest : BaseComposeTest() { it.copy(buttonState = ManualCodeEntryState.ButtonState.SaveLocallyPrimary) } composeTestRule - .onNodeWithText("Add code locally") + .onNodeWithText("Save here") .performClick() // Make sure locally only save isn't showing: @@ -96,7 +96,7 @@ class ManualCodeEntryScreenTest : BaseComposeTest() { // Make sure save to bitwarden option is showing: composeTestRule - .onNodeWithText("Add code to Bitwarden") + .onNodeWithText("Save to Bitwarden") .assertIsDisplayed() verify { viewModel.trySendAction(ManualCodeEntryAction.SaveLocallyClick) } diff --git a/app/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/qrcodescan/QrCodeScanScreenTest.kt b/app/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/qrcodescan/QrCodeScanScreenTest.kt index c11296bff4..761f6c2bc1 100644 --- a/app/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/qrcodescan/QrCodeScanScreenTest.kt +++ b/app/src/test/java/com/bitwarden/authenticator/ui/authenticator/feature/qrcodescan/QrCodeScanScreenTest.kt @@ -88,7 +88,7 @@ class QrCodeScanScreenTest : BaseComposeTest() { ) } composeTestRule - .onNodeWithText("Take me to Bitwarden") + .onNodeWithText("Save to Bitwarden") .assertIsDisplayed() .assert(hasAnyAncestor(isDialog())) .performClick() @@ -99,7 +99,7 @@ class QrCodeScanScreenTest : BaseComposeTest() { .onNodeWithText("Save option as default") .performClick() composeTestRule - .onNodeWithText("Take me to Bitwarden") + .onNodeWithText("Save to Bitwarden") .assertIsDisplayed() .assert(hasAnyAncestor(isDialog())) .performClick() diff --git a/app/src/test/java/com/bitwarden/authenticator/ui/platform/util/DefaultSaveOptionExtensionsTest.kt b/app/src/test/java/com/bitwarden/authenticator/ui/platform/util/DefaultSaveOptionExtensionsTest.kt index 5117052b55..c7e741cb5f 100644 --- a/app/src/test/java/com/bitwarden/authenticator/ui/platform/util/DefaultSaveOptionExtensionsTest.kt +++ b/app/src/test/java/com/bitwarden/authenticator/ui/platform/util/DefaultSaveOptionExtensionsTest.kt @@ -13,7 +13,7 @@ class DefaultSaveOptionExtensionsTest { DefaultSaveOption.entries.forEach { val expected = when (it) { DefaultSaveOption.BITWARDEN_APP -> R.string.save_to_bitwarden.asText() - DefaultSaveOption.LOCAL -> R.string.save_locally.asText() + DefaultSaveOption.LOCAL -> R.string.save_here.asText() DefaultSaveOption.NONE -> R.string.none.asText() } assertEquals(