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

Handle fake programs better

Browse source
This commit is contained in:
Damontecres 2025-10-21 14:47:35 -04:00
parent 9dd3813b35
commit 5656703080
No known key found for this signature in database
2 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/github/damontecres/wholphin/ui/detail/livetv/LiveTvViewModel.kt
View file

@ -124,6 +124,7 @@ class LiveTvViewModel
},
isRecording = dto.timerId.isNotNullOrBlank(),
isSeriesRecording = dto.seriesTimerId.isNotNullOrBlank(),
isFake = false,
)
}.filter { it.startHours >= 0 && it.endHours >= 0 } // TODO shouldn't need to filter client side
@ -148,6 +149,7 @@ class LiveTvViewModel
seasonEpisode = null,
isRecording = false,
isSeriesRecording = false,
isFake = true,
)
}
put(channel.id, fakePrograms)
@ -303,4 +305,5 @@ data class TvProgram(
val seasonEpisode: SeasonEpisode?,
val isRecording: Boolean,
val isSeriesRecording: Boolean,
val isFake: Boolean,
)

33
app/src/main/java/com/github/damontecres/wholphin/ui/detail/livetv/TvGuideGrid.kt
View file

@ -1,6 +1,7 @@
package com.github.damontecres.wholphin.ui.detail.livetv
import android.text.format.DateUtils
import android.widget.Toast
import androidx.compose.foundation.background
import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.Arrangement
@ -92,6 +93,7 @@ fun TvGuideGrid(
-> LoadingPage(modifier)
LoadingState.Success -> {
val context = LocalContext.current
val fetchedItem by viewModel.fetchedItem.observeAsState(null)
val loadingItem by viewModel.fetchingItem.observeAsState(LoadingState.Pending)
var showItemDialog by remember { mutableStateOf<Int?>(null) }
@ -108,8 +110,24 @@ fun TvGuideGrid(
programs = programsByChannel,
start = viewModel.start,
onClick = { index, program ->
viewModel.getItem(program.id)
showItemDialog = index
if (program.isFake) {
val now = LocalDateTime.now()
if (now.isAfter(program.start) && now.isBefore(program.end)) {
viewModel.navigationManager.navigateTo(
Destination.Playback(
itemId = program.channelId,
positionMs = 0L,
),
)
} else {
Toast
.makeText(context, "No guide data found!", Toast.LENGTH_SHORT)
.show()
}
} else {
viewModel.getItem(program.id)
showItemDialog = index
}
},
modifier =
Modifier
@ -174,12 +192,14 @@ fun ProgramDialog(
Dialog(
onDismissRequest = onDismissRequest,
) {
val focusRequester = remember { FocusRequester() }
Box(
modifier =
Modifier.background(
MaterialTheme.colorScheme.surfaceColorAtElevation(10.dp),
shape = RoundedCornerShape(16.dp),
),
Modifier
.background(
MaterialTheme.colorScheme.surfaceColorAtElevation(10.dp),
shape = RoundedCornerShape(16.dp),
).focusRequester(focusRequester),
) {
Column(
verticalArrangement = Arrangement.spacedBy(8.dp),
@ -204,6 +224,7 @@ fun ProgramDialog(
val dto = item.data
val isRecording = dto.timerId.isNotNullOrBlank()
val isSeriesRecording = dto.seriesTimerId.isNotNullOrBlank()
LaunchedEffect(Unit) { focusRequester.tryRequestFocus() }
Text(
text = item.name ?: "",
color = MaterialTheme.colorScheme.onSurface,