justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-09 08:01:20 +02:00
Code Issues Projects Packages Wiki Activity Actions

Fixes after merge

Browse source
This commit is contained in:
Damontecres 2026-01-12 03:06:06 -05:00
parent 84fb998cc5
commit 3670736611
No known key found for this signature in database
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/github/damontecres/wholphin/ui/discover/DiscoverPage.kt
View file

@ -47,6 +47,7 @@ fun DiscoverPage(
) )
var selectedTabIndex by rememberSaveable { mutableIntStateOf(rememberedTabIndex) } var selectedTabIndex by rememberSaveable { mutableIntStateOf(rememberedTabIndex) }
val focusRequester = remember { FocusRequester() } val focusRequester = remember { FocusRequester() }
val tabFocusRequesters = remember(tabs) { List(tabs.size) { FocusRequester() } }
val firstTabFocusRequester = remember { FocusRequester() } val firstTabFocusRequester = remember { FocusRequester() }
LaunchedEffect(Unit) { firstTabFocusRequester.tryRequestFocus() } LaunchedEffect(Unit) { firstTabFocusRequester.tryRequestFocus() }
@ -76,6 +77,7 @@ fun DiscoverPage(
.focusRequester(firstTabFocusRequester), .focusRequester(firstTabFocusRequester),
tabs = tabs, tabs = tabs,
onClick = { selectedTabIndex = it }, onClick = { selectedTabIndex = it },
focusRequesters = tabFocusRequesters,
) )
} }
when (selectedTabIndex) { when (selectedTabIndex) {
@ -93,6 +95,7 @@ fun DiscoverPage(
// Requests // Requests
1 -> { 1 -> {
SeerrRequestsPage( SeerrRequestsPage(
focusRequesterOnEmpty = tabFocusRequesters.getOrNull(selectedTabIndex),
modifier = modifier =
Modifier Modifier
.fillMaxSize() .fillMaxSize()

3
app/src/main/java/com/github/damontecres/wholphin/ui/discover/SeerrRequestsPage.kt
View file

@ -143,6 +143,7 @@ data class RequestGridItem(
@Composable @Composable
fun SeerrRequestsPage( fun SeerrRequestsPage(
focusRequesterOnEmpty: FocusRequester?,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
viewModel: SeerrRequestsViewModel = hiltViewModel(), viewModel: SeerrRequestsViewModel = hiltViewModel(),
) { ) {
@ -164,6 +165,8 @@ fun SeerrRequestsPage(
LaunchedEffect(Unit) { LaunchedEffect(Unit) {
if (state.data.isNotEmpty()) { if (state.data.isNotEmpty()) {
focusRequester.tryRequestFocus() focusRequester.tryRequestFocus()
} else {
focusRequesterOnEmpty?.tryRequestFocus()
} }
} }
Column(modifier = modifier) { Column(modifier = modifier) {