Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix display of trailing icon in the search bar

Browse source
This commit is contained in:
Maxime NATUREL 2023-03-10 10:43:45 +01:00
parent 06f8cbf77c
commit 76045600ca
1 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
View file

@ -154,18 +154,24 @@ fun CreateRoomSearchBar(
leadingIcon = if (active) { leadingIcon = if (active) {
{ BackButton(onClick = { onActiveChanged(false) }) } { BackButton(onClick = { onActiveChanged(false) }) }
} else null, } else null,
trailingIcon = { trailingIcon = when {
if (active) { active && text.isNotEmpty() -> {
IconButton(onClick = { onTextChanged("") }) { {
Icon(Icons.Default.Close, stringResource(StringR.string.a11y_clear)) IconButton(onClick = { onTextChanged("") }) {
Icon(Icons.Default.Close, stringResource(StringR.string.a11y_clear))
}
} }
} else {
Icon(
imageVector = Icons.Default.Search,
contentDescription = stringResource(StringR.string.search),
modifier = Modifier.alpha(0.4f), // FIXME align on Design system theme (removing alpha should be fine)
)
} }
!active -> {
{
Icon(
imageVector = Icons.Default.Search,
contentDescription = stringResource(StringR.string.search),
modifier = Modifier.alpha(0.4f), // FIXME align on Design system theme (removing alpha should be fine)
)
}
}
else -> null
}, },
shape = if (!active) SearchBarDefaults.dockedShape else SearchBarDefaults.fullScreenShape, shape = if (!active) SearchBarDefaults.dockedShape else SearchBarDefaults.fullScreenShape,
colors = if (!active) SearchBarDefaults.colors() else SearchBarDefaults.colors(containerColor = Color.Transparent), colors = if (!active) SearchBarDefaults.colors() else SearchBarDefaults.colors(containerColor = Color.Transparent),