From 770e51f43f2da419db06c935c5606a3cdc5df19b Mon Sep 17 00:00:00 2001 From: David Perez Date: Tue, 5 Mar 2024 12:00:54 -0600 Subject: [PATCH] Hide vault listing divider when only one category exists (#1095) --- .../ui/vault/feature/itemlisting/VaultItemListingContent.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt index a5a9f1ab35..9d9451a891 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt @@ -34,7 +34,7 @@ import kotlinx.collections.immutable.toPersistentList /** * Content view for the [VaultItemListingScreen]. */ -@Suppress("LongMethod") +@Suppress("LongMethod", "CyclomaticComplexMethod") @Composable fun VaultItemListingContent( state: VaultItemListingState.ViewState.Content, @@ -140,7 +140,7 @@ fun VaultItemListingContent( } } - if (state.displayItemList.isNotEmpty()) { + if (state.displayItemList.isNotEmpty() && state.displayFolderList.isNotEmpty()) { item { HorizontalDivider( thickness = 1.dp, @@ -150,7 +150,9 @@ fun VaultItemListingContent( .padding(all = 16.dp), ) } + } + if (state.displayItemList.isNotEmpty()) { item { BitwardenListHeaderTextWithSupportLabel( label = stringResource(id = R.string.items),