android: make settings button focusable and clickable (#484)

Fixes tailscale/corp#22717

Signed-off-by: kari-ts <kari@tailscale.com>
pull/486/head^2
kari-ts 1 year ago committed by GitHub
parent eae8789628
commit d94125e767
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -187,14 +187,20 @@ fun MainView(
} }
}, },
trailingContent = { trailingContent = {
Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.CenterEnd) { Box(
modifier =
Modifier.weight(1f)
.focusable()
.clickable { navigation.onNavigateToSettings() }
.padding(8.dp),
contentAlignment = Alignment.CenterEnd) {
when (user) { when (user) {
null -> SettingsButton { navigation.onNavigateToSettings() } null -> SettingsButton { navigation.onNavigateToSettings() }
else -> else ->
Box( Box(
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
modifier = modifier =
Modifier.size(42.dp).clip(CircleShape).clickable { Modifier.size(42.dp).clip(CircleShape).focusable().clickable {
navigation.onNavigateToSettings() navigation.onNavigateToSettings()
}) { }) {
Avatar(profile = user, size = 36) { Avatar(profile = user, size = 36) {

Loading…
Cancel
Save