diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt index 41b03b8c38..5418e09fc2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt @@ -234,8 +234,8 @@ fun GeneratorScreen( onCloseClick = remember(viewModel) { { viewModel.trySendAction(GeneratorAction.CloseClick) } }, - onSelectClick = remember(viewModel) { - { viewModel.trySendAction(GeneratorAction.SelectClick) } + onSaveClick = remember(viewModel) { + { viewModel.trySendAction(GeneratorAction.SaveClick) } }, ) } @@ -333,7 +333,7 @@ private fun ModalAppBar( generatorMode: GeneratorMode.Modal, scrollBehavior: TopAppBarScrollBehavior, onCloseClick: () -> Unit, - onSelectClick: () -> Unit, + onSaveClick: () -> Unit, modifier: Modifier = Modifier, ) { BitwardenTopAppBar( @@ -348,9 +348,9 @@ private fun ModalAppBar( }, actions = { BitwardenTextButton( - label = stringResource(id = R.string.select), - onClick = onSelectClick, - modifier = Modifier.testTag("SelectButton"), + label = stringResource(id = R.string.save), + onClick = onSaveClick, + modifier = Modifier.testTag("SaveButton"), ) }, modifier = modifier, diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModel.kt index 70af7986f7..6d7f6af2b1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModel.kt @@ -141,7 +141,7 @@ class GeneratorViewModel @Inject constructor( when (action) { is GeneratorAction.PasswordHistoryClick -> handlePasswordHistoryClick() is GeneratorAction.CloseClick -> handleCloseClick() - is GeneratorAction.SelectClick -> handleSelectClick() + is GeneratorAction.SaveClick -> handleSaveClick() is GeneratorAction.RegenerateClick -> handleRegenerationClick() is GeneratorAction.CopyClick -> handleCopyClick() is GeneratorAction.MainTypeOptionSelect -> handleMainTypeOptionSelect(action) @@ -283,7 +283,7 @@ class GeneratorViewModel @Inject constructor( sendEvent(GeneratorEvent.NavigateBack) } - private fun handleSelectClick() { + private fun handleSaveClick() { when (state.selectedType) { is GeneratorState.MainType.Passphrase, is GeneratorState.MainType.Password, @@ -2202,7 +2202,7 @@ sealed class GeneratorAction { /** * Indicates the user has selected a generated string from the modal generator */ - data object SelectClick : GeneratorAction() + data object SaveClick : GeneratorAction() /** * Indicates the user has clicked the close button. diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreenTest.kt index bba2c8e00d..0ed929118b 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreenTest.kt @@ -88,7 +88,7 @@ class GeneratorScreenTest : BaseComposeTest() { .assertIsDisplayed() composeTestRule - .onNodeWithText(text = "Select") + .onNodeWithText(text = "Save") .assertIsDisplayed() } @@ -105,7 +105,7 @@ class GeneratorScreenTest : BaseComposeTest() { .assertIsDisplayed() composeTestRule - .onNodeWithText(text = "Select") + .onNodeWithText(text = "Save") .assertIsDisplayed() } @@ -127,7 +127,7 @@ class GeneratorScreenTest : BaseComposeTest() { } @Test - fun `on select click should send SelectClick`() { + fun `on save click should send SaveClick`() { updateState( DEFAULT_STATE.copy( generatorMode = GeneratorMode.Modal.Username(website = null), @@ -135,11 +135,11 @@ class GeneratorScreenTest : BaseComposeTest() { ) composeTestRule - .onNodeWithText(text = "Select") + .onNodeWithText(text = "Save") .performClick() verify { - viewModel.trySendAction(GeneratorAction.SelectClick) + viewModel.trySendAction(GeneratorAction.SaveClick) } } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt index 0ff89ea10c..2d805738fc 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt @@ -303,7 +303,7 @@ class GeneratorViewModelTest : BaseViewModelTest() { } @Test - fun `SelectClick should emit the NavigateBack event with GeneratorResult`() = runTest { + fun `SaveClick should emit the NavigateBack event with GeneratorResult`() = runTest { turbineScope { val viewModel = createViewModel(state = initialUsernameModeState) val eventTurbine = viewModel @@ -313,7 +313,7 @@ class GeneratorViewModelTest : BaseViewModelTest() { .generatorResultFlow .testIn(backgroundScope) - viewModel.trySendAction(GeneratorAction.SelectClick) + viewModel.trySendAction(GeneratorAction.SaveClick) assertEquals(GeneratorEvent.NavigateBack, eventTurbine.awaitItem()) assertEquals(