Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-20 19:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent errant click-through to settings button when search is open.

Browse Source
This commit is contained in:
Alex Hart
2025-11-17 14:43:15 -04:00
committed by Cody Henthorne
parent 8f83bf43af
commit b5f444d1cf
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
View File

@@ -188,7 +188,11 @@ fun MainToolbar(
maxWidth.toPx() maxWidth.toPx()
} }
PrimaryToolbar(state, callback) { PrimaryToolbar(
state = state,
callback = callback,
enabled = state.mode != MainToolbarMode.SEARCH
) {
revealOffset = Offset(it / maxWidth, 0.5f) revealOffset = Offset(it / maxWidth, 0.5f)
} }
@@ -338,6 +342,7 @@ private fun ArchiveToolbar(
private fun PrimaryToolbar( private fun PrimaryToolbar(
state: MainToolbarState, state: MainToolbarState,
callback: MainToolbarCallback, callback: MainToolbarCallback,
enabled: Boolean = true,
onSearchButtonPositioned: (Float) -> Unit onSearchButtonPositioned: (Float) -> Unit
) { ) {
TopAppBar( TopAppBar(
@@ -365,6 +370,7 @@ private fun PrimaryToolbar(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.clickable( .clickable(
enabled = enabled,
onClick = callback::onSettingsClick, onClick = callback::onSettingsClick,
interactionSource = interactionSource, interactionSource = interactionSource,
indication = ripple(radius = 14.dp) indication = ripple(radius = 14.dp)