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

Animate room filter colours

Browse source 
This is much closer to how iOS looks, and is much nicer on the eyes.

Signed-off-by: Joe Groocock <me@frebib.net>
This commit is contained in:
Joe Groocock 2024-05-08 09:54:48 +01:00
parent 102025f1a6
commit 9fa8d97d57
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersView.kt
View file

@ -16,6 +16,9 @@
package io.element.android.features.roomlist.impl.filters package io.element.android.features.roomlist.impl.filters
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.Spring
import androidx.compose.animation.core.spring
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
@ -139,16 +142,27 @@ private fun RoomListFilterView(
onClick: (RoomListFilter) -> Unit, onClick: (RoomListFilter) -> Unit,
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
val background = animateColorAsState(
targetValue = if (selected) ElementTheme.colors.bgActionPrimaryRest else ElementTheme.colors.bgCanvasDefault,
animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
label = "chip background colour",
)
val textColour = animateColorAsState(
targetValue = if (selected) ElementTheme.colors.textOnSolidPrimary else ElementTheme.colors.textPrimary,
animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
label = "chip text colour",
)
FilterChip( FilterChip(
selected = selected, selected = selected,
onClick = { onClick(roomListFilter) }, onClick = { onClick(roomListFilter) },
modifier = modifier.height(36.dp), modifier = modifier.height(36.dp),
shape = CircleShape, shape = CircleShape,
colors = FilterChipDefaults.filterChipColors( colors = FilterChipDefaults.filterChipColors(
containerColor = ElementTheme.colors.bgCanvasDefault, containerColor = background.value,
selectedContainerColor = ElementTheme.colors.bgActionPrimaryRest, selectedContainerColor = background.value,
labelColor = ElementTheme.colors.textPrimary, labelColor = textColour.value,
selectedLabelColor = ElementTheme.colors.textOnSolidPrimary, selectedLabelColor = textColour.value
), ),
label = { label = {
Text(text = stringResource(id = roomListFilter.stringResource)) Text(text = stringResource(id = roomListFilter.stringResource))