Change to toggleable Surface

Change-Id: I2de9aa0da57adf298b3b0219854d1c1db63fd1fe
dt/improve-accessibility
Don Turner 5 months ago
parent ee0d486a81
commit 0095041745

@ -389,11 +389,6 @@ private fun SingleTopicButton(
) = trace("SingleTopicButton") { ) = trace("SingleTopicButton") {
val actionLabel = "Follow or unfollow" val actionLabel = "Follow or unfollow"
val toggleTopicFollowed = { onClick(topicId, !isSelected) }
val accessibleToggleTopicFollowed : () -> Boolean = {
toggleTopicFollowed()
true
}
Surface( Surface(
modifier = Modifier modifier = Modifier
@ -406,13 +401,18 @@ private fun SingleTopicButton(
"Not following" "Not following"
} }
customActions = listOf( customActions = listOf(
CustomAccessibilityAction(actionLabel, accessibleToggleTopicFollowed) CustomAccessibilityAction(actionLabel) {
onClick(topicId, !isSelected)
true
}
) )
}, },
shape = RoundedCornerShape(corner = CornerSize(8.dp)), shape = RoundedCornerShape(corner = CornerSize(8.dp)),
color = MaterialTheme.colorScheme.surface, color = MaterialTheme.colorScheme.surface,
selected = isSelected, checked = isSelected,
onClick = toggleTopicFollowed, onCheckedChange = {
onClick(topicId, it)
},
) { ) {
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,

Loading…
Cancel
Save