mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-20 02:58:45 +00:00
Prevent errant click-through to settings button when search is open.
This commit is contained in:
committed by
Cody Henthorne
parent
8f83bf43af
commit
b5f444d1cf
@@ -188,7 +188,11 @@ fun MainToolbar(
|
||||
maxWidth.toPx()
|
||||
}
|
||||
|
||||
PrimaryToolbar(state, callback) {
|
||||
PrimaryToolbar(
|
||||
state = state,
|
||||
callback = callback,
|
||||
enabled = state.mode != MainToolbarMode.SEARCH
|
||||
) {
|
||||
revealOffset = Offset(it / maxWidth, 0.5f)
|
||||
}
|
||||
|
||||
@@ -338,6 +342,7 @@ private fun ArchiveToolbar(
|
||||
private fun PrimaryToolbar(
|
||||
state: MainToolbarState,
|
||||
callback: MainToolbarCallback,
|
||||
enabled: Boolean = true,
|
||||
onSearchButtonPositioned: (Float) -> Unit
|
||||
) {
|
||||
TopAppBar(
|
||||
@@ -365,6 +370,7 @@ private fun PrimaryToolbar(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.clickable(
|
||||
enabled = enabled,
|
||||
onClick = callback::onSettingsClick,
|
||||
interactionSource = interactionSource,
|
||||
indication = ripple(radius = 14.dp)
|
||||
|
||||
Reference in New Issue
Block a user