Skip to content

Move Vault Listing Dialog clicks to VaultItemListingHandlers #6375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-livefront merged 1 commit into from
Jan 16, 2026
Merged

Move Vault Listing Dialog clicks to VaultItemListingHandlers #6375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions ...c/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenMasterPassword
import com.x8bit.bitwarden.ui.platform.components.listitem.BitwardenGroupItem
import com.x8bit.bitwarden.ui.platform.components.listitem.BitwardenListItem
import com.x8bit.bitwarden.ui.platform.components.listitem.SelectionItemData
import com.x8bit.bitwarden.ui.vault.feature.itemlisting.handlers.VaultItemListingHandlers
import com.x8bit.bitwarden.ui.vault.feature.itemlisting.model.ListingItemOverflowAction
import kotlinx.collections.immutable.toPersistentList

Expand All @@ -40,11 +41,7 @@ fun VaultItemListingContent(
state: VaultItemListingState.ViewState.Content,
policyDisablesSend: Boolean,
showAddTotpBanner: Boolean,
collectionClick: (id: String) -> Unit,
folderClick: (id: String) -> Unit,
vaultItemClick: (id: String, type: VaultItemListingState.DisplayItem.ItemType) -> Unit,
masterPasswordRepromptSubmit: (password: String, data: MasterPasswordRepromptData) -> Unit,
onOverflowItemClick: (action: ListingItemOverflowAction) -> Unit,
vaultItemListingHandlers: VaultItemListingHandlers,
modifier: Modifier = Modifier,
) {
var showConfirmationDialog: ListingItemOverflowAction? by rememberSaveable {
Expand All @@ -59,7 +56,7 @@ fun VaultItemListingContent(
dismissButtonText = stringResource(id = BitwardenString.cancel),
onConfirmClick = {
showConfirmationDialog = null
onOverflowItemClick(option)
vaultItemListingHandlers.overflowItemClick(option)
},
onDismissClick = { showConfirmationDialog = null },
onDismissRequest = { showConfirmationDialog = null },
Expand Down Expand Up @@ -89,7 +86,7 @@ fun VaultItemListingContent(
BitwardenMasterPasswordDialog(
onConfirmClick = { password ->
masterPasswordRepromptData = null
masterPasswordRepromptSubmit(password, data)
vaultItemListingHandlers.masterPasswordRepromptSubmit(password, data)
},
onDismissRequest = {
masterPasswordRepromptData = null
Expand Down Expand Up @@ -145,7 +142,7 @@ fun VaultItemListingContent(
startIcon = IconData.Local(iconRes = BitwardenDrawable.ic_collections),
label = collection.name,
supportingLabel = collection.count.toString(),
onClick = { collectionClick(collection.id) },
onClick = { vaultItemListingHandlers.collectionClick(collection.id) },
cardStyle = state
.displayCollectionList
.toListItemCardStyle(index = index, dividerPadding = 56.dp),
Expand Down Expand Up @@ -175,7 +172,7 @@ fun VaultItemListingContent(
startIcon = IconData.Local(iconRes = BitwardenDrawable.ic_folder),
label = folder.name,
supportingLabel = folder.count.toString(),
onClick = { folderClick(folder.id) },
onClick = { vaultItemListingHandlers.folderClick(folder.id) },
cardStyle = state
.displayFolderList
.toListItemCardStyle(index = index, dividerPadding = 56.dp),
Expand Down Expand Up @@ -221,7 +218,7 @@ fun VaultItemListingContent(
itemType = it.itemType,
)
} else {
vaultItemClick(it.id, it.itemType)
vaultItemListingHandlers.itemClick(it.id, it.itemType)
}
},
trailingLabelIcons = it.extraIconList,
Expand All @@ -245,11 +242,11 @@ fun VaultItemListingContent(
action = option,
)
} else {
onOverflowItemClick(option)
vaultItemListingHandlers.overflowItemClick(option)
}
}

else -> onOverflowItemClick(option)
else -> vaultItemListingHandlers.overflowItemClick(option)
}
},
)
Expand Down
Loading
Loading