From 6c003c41022f9549f7350353d8b2ec297542b6ca Mon Sep 17 00:00:00 2001 From: David Perez Date: Mon, 22 Jan 2024 16:59:24 -0600 Subject: [PATCH] Replace Horizontal divider with modifier extension (#715) --- .../x8bit/bitwarden/ui/vault/feature/vault/VaultFilter.kt | 2 ++ .../x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultFilter.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultFilter.kt index f22b3fee8..d9bb8cee4 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultFilter.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultFilter.kt @@ -21,6 +21,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.x8bit.bitwarden.R +import com.x8bit.bitwarden.ui.platform.base.util.bottomDivider import com.x8bit.bitwarden.ui.platform.base.util.scrolledContainerBackground import com.x8bit.bitwarden.ui.platform.components.BitwardenSelectionDialog import com.x8bit.bitwarden.ui.platform.components.BitwardenSelectionRow @@ -70,6 +71,7 @@ fun VaultFilter( Row( modifier = Modifier .scrolledContainerBackground(topAppBarScrollBehavior) + .bottomDivider(color = MaterialTheme.colorScheme.outlineVariant) .padding(vertical = 8.dp) .then(modifier), verticalAlignment = Alignment.CenterVertically, diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt index bda131829..f756e9c9d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt @@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FloatingActionButton -import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.TopAppBarDefaults @@ -349,13 +348,6 @@ private fun VaultScreenScaffold( ) .fillMaxWidth(), ) - - HorizontalDivider( - thickness = 1.dp, - color = MaterialTheme.colorScheme.outlineVariant, - modifier = Modifier - .fillMaxWidth(), - ) } when (val viewState = state.viewState) {