jeena/jtube-tv
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

ui: Visible drawer focus + subscriptions row on Home

Browse source 
Menu items now flip to white/dark on focus (before, focus moved
invisibly so navigation looked broken) with explicit UP/DOWN key
handling. Home gains a 'New from your subscriptions' row (first page,
refreshed with the rest after playback).
This commit is contained in:
Jeena 2026-10-10 22:29:00 +00:00
parent 60ef94c52e
commit 694467b038
2 changed files with 60 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/net/jeena/jtubetv/ui/screens/HomeRows.kt
View file

@ -55,10 +55,18 @@ class HomeRowsViewModel(private val repository: PeerTubeRepository) : ViewModel(
private set
var continueLoading by mutableStateOf(true)
private set
var subItems by mutableStateOf<List<VideoDto>>(emptyList())
private set
private var loaded = false
val recent = RecentVideosViewModel(repository)
private fun fetchSubs() {
viewModelScope.launch {
subItems = repository.subscriptionVideos(0, 12).getOrNull()?.data ?: emptyList()
}
}
/** History's newest entries + resume positions from the video detail endpoint. */
fun load() {
if (loaded) return
@ -71,10 +79,12 @@ class HomeRowsViewModel(private val repository: PeerTubeRepository) : ViewModel(
continueItems = emptyList()
loaded = true
fetchContinue()
fetchSubs()
recent.refresh()
}
private fun fetchContinue() {
fetchSubs()
viewModelScope.launch {
continueLoading = true
val history = repository.history(0, 12).getOrNull()?.takeIf { it.isNotEmpty() }
@ -199,6 +209,24 @@ fun HomeRowsScreen(
}
}
}
if (viewModel.subItems.isNotEmpty()) {
item {
Text(
text = "New from your subscriptions",
style = MaterialTheme.typography.titleMedium,
color = Color.White,
modifier = Modifier.padding(start = 16.dp, top = 16.dp, bottom = 4.dp),
)
}
item {
FocusScrollRow(
videos = viewModel.subItems,
progressOf = { null },
onOpenVideo = onOpenVideo,
onLeftAtStart = { },
)
}
}
}
}
/**

34
app/src/main/java/net/jeena/jtubetv/ui/screens/HomeScreen.kt
View file

@ -36,6 +36,12 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.input.key.Key
import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.input.key.type
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.input.pointer.pointerInput
@ -327,12 +333,36 @@ private fun MenuDrawerItem(
onClick: () -> Unit,
modifier: Modifier = Modifier,
) {
val labelColor = if (selected) Color(0xFFE0E0E0) else Color(0xFFB0B0B0)
val focusManager = androidx.compose.ui.platform.LocalFocusManager.current
var focused by remember { mutableStateOf(false) }
val labelColor = when {
focused -> Color(0xFF101010)
selected -> Color(0xFFE0E0E0)
else -> Color(0xFFB0B0B0)
}
Row(
modifier = modifier
.fillMaxWidth()
.then(if (selected) Modifier.background(Color(0x33CE2B2B)) else Modifier)
.onFocusChanged { focused = it.isFocused }
.background(
when {
focused -> Color.White
selected -> Color(0x33CE2B2B)
else -> Color.Transparent
}
)
.focusable()
.onPreviewKeyEvent { ke ->
when (ke.key) {
androidx.compose.ui.input.key.Key.DirectionDown -> {
focusManager?.moveFocus(androidx.compose.ui.focus.FocusDirection.Down); true
}
androidx.compose.ui.input.key.Key.DirectionUp -> {
focusManager?.moveFocus(androidx.compose.ui.focus.FocusDirection.Up); true
}
else -> false
}
}
.clickable(onClick = onClick)
.padding(horizontal = 24.dp, vertical = 14.dp),
verticalAlignment = Alignment.CenterVertically,