vaultwarden/keyguard-app-Bitwarden-Vaultwarden
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Use nav bar color for the selection bar

Browse Source
This commit is contained in:
Artem Chepurnoy 2024-02-25 22:54:52 +02:00
parent 02497233dc
commit 92718d2fab
No known key found for this signature in database
GPG Key ID: FAC37D0CF674043E
1 changed files with 47 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/commonMain/kotlin/com/artemchep/keyguard/ui/selection/SelectionBar.kt
View File

@ -1,5 +1,6 @@
package com.artemchep.keyguard.ui.selection package com.artemchep.keyguard.ui.selection
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.RowScope
@ -19,7 +20,6 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.LocalTextStyle
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
@ -27,6 +27,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.artemchep.keyguard.platform.leNavigationBars import com.artemchep.keyguard.platform.leNavigationBars
import com.artemchep.keyguard.ui.icons.IconBox import com.artemchep.keyguard.ui.icons.IconBox
import com.artemchep.keyguard.ui.surface.LocalBackgroundManager
import com.artemchep.keyguard.ui.theme.Dimens import com.artemchep.keyguard.ui.theme.Dimens
import com.artemchep.keyguard.ui.util.HorizontalDivider import com.artemchep.keyguard.ui.util.HorizontalDivider
@ -36,11 +37,10 @@ fun SelectionBar(
trailing: (@Composable RowScope.() -> Unit)? = null, trailing: (@Composable RowScope.() -> Unit)? = null,
onClear: (() -> Unit)?, onClear: (() -> Unit)?,
) { ) {
Column { Column(
Surface(
modifier = Modifier modifier = Modifier
.fillMaxWidth(), .fillMaxWidth()
tonalElevation = 3.dp, .background(LocalBackgroundManager.current.colorHighest),
) { ) {
val navBarInsets = WindowInsets.leNavigationBars val navBarInsets = WindowInsets.leNavigationBars
.only(WindowInsetsSides.Bottom) .only(WindowInsetsSides.Bottom)
@ -93,9 +93,6 @@ fun SelectionBar(
) )
trailing?.invoke(this) trailing?.invoke(this)
} }
} HorizontalDivider()
HorizontalDivider(
transparency = false,
)
} }
} }