github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-06-07 14:57:41 -05:00
Code Issues 2.1k Packages Projects Releases 127 Wiki Activity

BIT-1411, BIT-1414: Add delete send confirmation dialog (#680)

Browse Source
This commit is contained in:
David Perez
2024-01-19 09:55:51 -06:00
committed by Álison Fernandes
parent a706db2b28
commit 2fa7851b42
4 changed files with 93 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt
View File

@@ -30,6 +30,7 @@ import com.x8bit.bitwarden.ui.platform.components.BitwardenOverflowActionItem
import com.x8bit.bitwarden.ui.platform.components.BitwardenScaffold
import com.x8bit.bitwarden.ui.platform.components.BitwardenSearchActionItem
import com.x8bit.bitwarden.ui.platform.components.BitwardenTopAppBar
import com.x8bit.bitwarden.ui.platform.components.BitwardenTwoButtonDialog
import com.x8bit.bitwarden.ui.platform.components.LoadingDialogState
import com.x8bit.bitwarden.ui.platform.components.OverflowMenuItemData
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
@@ -92,6 +93,9 @@ fun VaultItemListingScreen(
VaultItemListingDialogs(
dialogState = state.dialogState,
onDeleteSendConfirm = remember(viewModel) {
{ viewModel.trySendAction(VaultItemListingsAction.DeleteSendConfirmClick(it)) }
},
onDismissRequest = remember(viewModel) {
{ viewModel.trySendAction(VaultItemListingsAction.DismissDialogClick) }
},
@@ -108,9 +112,20 @@ fun VaultItemListingScreen(
@Composable
private fun VaultItemListingDialogs(
dialogState: VaultItemListingState.DialogState?,
onDeleteSendConfirm: (sendId: String) -> Unit,
onDismissRequest: () -> Unit,
) {
when (dialogState) {
is VaultItemListingState.DialogState.DeleteSendConfirmation -> BitwardenTwoButtonDialog(
title = stringResource(id = R.string.delete),
message = stringResource(id = R.string.are_you_sure_delete_send),
confirmButtonText = stringResource(id = R.string.yes),
dismissButtonText = stringResource(id = R.string.cancel),
onConfirmClick = { onDeleteSendConfirm(dialogState.sendId) },
onDismissClick = onDismissRequest,
onDismissRequest = onDismissRequest,
)
is VaultItemListingState.DialogState.Error -> BitwardenBasicDialog(
visibilityState = BasicDialogState.Shown(
title = dialogState.title,

29
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt
View File

@@ -86,6 +86,10 @@ class VaultItemListingViewModel @Inject constructor(
is VaultItemListingsAction.RefreshClick -> handleRefreshClick()
is VaultItemListingsAction.CopySendUrlClick -> handleCopySendUrlClick(action)
is VaultItemListingsAction.DeleteSendClick -> handleDeleteSendClick(action)
is VaultItemListingsAction.DeleteSendConfirmClick -> {
handleDeleteSendConfirmClick(action)
}
is VaultItemListingsAction.ShareSendUrlClick -> handleShareSendUrlClick(action)
is VaultItemListingsAction.RemoveSendPasswordClick -> {
handleRemoveSendPasswordClick(action)
@@ -105,6 +109,18 @@ class VaultItemListingViewModel @Inject constructor(
}
private fun handleDeleteSendClick(action: VaultItemListingsAction.DeleteSendClick) {
mutableStateFlow.update {
it.copy(
dialogState = VaultItemListingState.DialogState.DeleteSendConfirmation(
sendId = action.sendId,
),
)
}
}
private fun handleDeleteSendConfirmClick(
action: VaultItemListingsAction.DeleteSendConfirmClick,
) {
mutableStateFlow.update {
it.copy(
dialogState = VaultItemListingState.DialogState.Loading(
@@ -395,6 +411,14 @@ data class VaultItemListingState(
*/
sealed class DialogState : Parcelable {
/**
* Represents a dismissible dialog with the given error [message].
*/
@Parcelize
data class DeleteSendConfirmation(
val sendId: String,
) : DialogState()
/**
* Represents a dismissible dialog with the given error [message].
*/
@@ -710,6 +734,11 @@ sealed class VaultItemListingsAction {
*/
data class DeleteSendClick(val sendId: String) : VaultItemListingsAction()
/**
* Click on the delete send confirmation button.
*/
data class DeleteSendConfirmClick(val sendId: String) : VaultItemListingsAction()
/**
* Models actions that the [VaultItemListingViewModel] itself might send.
*/