justinzeus/wolfskin
1
0
Fork 0
Code Issues 2 Pull requests 4 Releases 3 Packages Activity

Focus the active profile in the user selector
All checks were successful
review/firstmate Diff byte-identical to Justin's upstream commit f816ef03 (Wholphin#2003); worker ran make test + apk-debug green

Browse source
This commit is contained in:
justinzeus 2026-09-24 22:00:49 +02:00
parent 7d6f041b55
commit 344aa9990d
2 changed files with 100 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/com/github/damontecres/wholphin/ui/setup/UserList.kt
View file

@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
@ -88,19 +89,24 @@ fun UserList(
modifier = Modifier.fillMaxWidth(),
contentAlignment = Alignment.Center,
) {
val focusRequester = remember { FocusRequester() }
val firstFocusRequester = remember { FocusRequester() }
if (users.isNotEmpty()) {
LaunchedEffect(Unit) { focusRequester.tryRequestFocus() }
val listState = rememberLazyListState()
val initialFocusRequester = remember { FocusRequester() }
val initialIndex =
users.indexOfFirst { it.user.id == currentUser?.id }.takeIf { it >= 0 } ?: 0
LaunchedEffect(users, currentUser?.id) {
if (users.isNotEmpty()) {
listState.scrollToItem(initialIndex)
initialFocusRequester.tryRequestFocus()
}
}
LazyRow(
state = listState,
horizontalArrangement = Arrangement.spacedBy(24.dp), // Spacing to accommodate 20% scale
contentPadding = PaddingValues(horizontal = 48.dp, vertical = 16.dp), // Increased padding to accommodate 20% scale
modifier =
Modifier
.wrapContentWidth()
.focusRestorer(firstFocusRequester)
.focusRequester(focusRequester),
.focusRestorer(initialFocusRequester),
) {
itemsIndexed(users) { index, user ->
UserIconCard(
@ -108,7 +114,7 @@ fun UserList(
isCurrentUser = user.user.id == currentUser?.id,
onClick = { onSwitchUser.invoke(user.user) },
onLongClick = { showDeleteDialog = user },
modifier = if (index == 0) Modifier.focusRequester(firstFocusRequester) else Modifier,
modifier = if (index == initialIndex) Modifier.focusRequester(initialFocusRequester) else Modifier,
)
}
// Add User card - always rightmost