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

WIP delta

Browse source
This commit is contained in:
Damontecres 2025-10-17 22:19:57 -04:00
parent 5f6eb7d313
commit 5eb534ba77
No known key found for this signature in database
1 changed files with 90 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
@ -57,14 +58,32 @@ fun TvGridBox(
val startHour = 18f val startHour = 18f
var hour by remember { mutableFloatStateOf(startHour) } var hour by remember { mutableFloatStateOf(startHour) }
Timber.v("hour=$hour") Timber.v("hour=$hour")
val hoursToShow = 3f val hoursToShow = 4f
val widthPerHour = 200.dp val widthPerHour = 200.dp
var focusedProgram by remember { mutableStateOf<TvProgram?>(null) }
Column(modifier = modifier) { Column(modifier = modifier) {
// Header // Header
Text( Text(
text = hour.toString(), text = hour.toString(),
) )
focusedProgram?.let {
Text(
text = it.name + " " + it.channelId,
)
}
Row {
Spacer(Modifier.width(220.dp))
var start = hour
while (start < (hour + hoursToShow)) {
Text(
text = start.toString(),
modifier = Modifier.width(widthPerHour),
)
start += 1f
}
}
LazyColumn( LazyColumn(
modifier = modifier =
Modifier, Modifier,
@ -144,11 +163,19 @@ fun TvGridBox(
capturedFocus = false capturedFocus = false
return@onKeyEvent false return@onKeyEvent false
} }
val delta =
focusedProgram?.let { p ->
if (p.start.hours < hour) {
(p.end.hours - hour).coerceAtMost(.5f)
} else {
.5f
}
} ?: .5f
if (it.type == KeyEventType.KeyUp && it.key == Key.DirectionLeft && hour > startHour) { if (it.type == KeyEventType.KeyUp && it.key == Key.DirectionLeft && hour > startHour) {
hour -= .5f hour = (hour - delta).coerceAtLeast(startHour)
return@onKeyEvent true return@onKeyEvent true
} else if (it.type == KeyEventType.KeyUp && it.key == Key.DirectionRight) { } else if (it.type == KeyEventType.KeyUp && it.key == Key.DirectionRight) {
hour += .5f hour += delta
return@onKeyEvent true return@onKeyEvent true
} }
} }
@ -184,9 +211,16 @@ fun TvGridBox(
filtered filtered
.forEach { p -> .forEach { p ->
Timber.v("Showing program: $p") Timber.v("Showing program: $p")
val width = p.duration.inWholeMinutes / 60f * widthPerHour val width =
(p.duration.inWholeMinutes) / 60f * widthPerHour *
if (p.start.hours < hour) {
(hour - p.start.hours).coerceIn(0f, 1f)
} else {
1f
}
val backgroundColor = val backgroundColor =
if (rowHasFocus && p.start.hours <= hour && p.end.hours > (hour)) { if (rowHasFocus && p.start.hours <= hour && p.end.hours > (hour)) {
focusedProgram = p
MaterialTheme.colorScheme.error MaterialTheme.colorScheme.error
} else { } else {
Color.Unspecified Color.Unspecified
@ -220,6 +254,7 @@ val LocalDateTime.hours get() = hour + minute / 60f
val channel1Id = UUID.randomUUID() val channel1Id = UUID.randomUUID()
val channel2Id = UUID.randomUUID() val channel2Id = UUID.randomUUID()
val channel3Id = UUID.randomUUID() val channel3Id = UUID.randomUUID()
val channel4Id = UUID.randomUUID()
val channels = val channels =
listOf( listOf(
@ -241,6 +276,12 @@ val channels =
name = "AQTV", name = "AQTV",
imageUrl = "", imageUrl = "",
), ),
TvChannel(
id = channel4Id,
number = "4.1",
name = "4444",
imageUrl = "",
),
) )
val programs = val programs =
@ -347,6 +388,49 @@ val programs =
id = UUID.randomUUID(), id = UUID.randomUUID(),
channelId = channel3Id, channelId = channel3Id,
start = LocalDateTime.of(2025, 10, 16, 18, 0, 0), start = LocalDateTime.of(2025, 10, 16, 18, 0, 0),
end = LocalDateTime.of(2025, 10, 16, 18, 15, 0),
duration = 15.minutes,
name = "Program #1",
subtitle = null,
seasonEpisode = null,
),
TvProgram(
id = UUID.randomUUID(),
channelId = channel3Id,
start = LocalDateTime.of(2025, 10, 16, 18, 15, 0),
end = LocalDateTime.of(2025, 10, 16, 18, 45, 0),
duration = 30.minutes,
name = "Program #2",
subtitle = null,
seasonEpisode = null,
),
TvProgram(
id = UUID.randomUUID(),
channelId = channel3Id,
start = LocalDateTime.of(2025, 10, 16, 18, 45, 0),
end = LocalDateTime.of(2025, 10, 16, 19, 0, 0),
duration = 15.minutes,
name = "Program #3",
subtitle = null,
seasonEpisode = null,
),
TvProgram(
id = UUID.randomUUID(),
channelId = channel3Id,
start = LocalDateTime.of(2025, 10, 16, 19, 0, 0),
end = LocalDateTime.of(2025, 10, 16, 20, 0, 0),
duration = 60.minutes,
name = "Program #3",
subtitle = null,
seasonEpisode = null,
),
),
channel4Id to
listOf(
TvProgram(
id = UUID.randomUUID(),
channelId = channel4Id,
start = LocalDateTime.of(2025, 10, 16, 18, 0, 0),
end = LocalDateTime.of(2025, 10, 16, 19, 0, 0), end = LocalDateTime.of(2025, 10, 16, 19, 0, 0),
duration = 60.minutes, duration = 60.minutes,
name = "Program #1", name = "Program #1",
@ -355,7 +439,7 @@ val programs =
), ),
TvProgram( TvProgram(
id = UUID.randomUUID(), id = UUID.randomUUID(),
channelId = channel3Id, channelId = channel4Id,
start = LocalDateTime.of(2025, 10, 16, 19, 0, 0), start = LocalDateTime.of(2025, 10, 16, 19, 0, 0),
end = LocalDateTime.of(2025, 10, 16, 19, 30, 0), end = LocalDateTime.of(2025, 10, 16, 19, 30, 0),
duration = 30.minutes, duration = 30.minutes,
@ -365,7 +449,7 @@ val programs =
), ),
TvProgram( TvProgram(
id = UUID.randomUUID(), id = UUID.randomUUID(),
channelId = channel3Id, channelId = channel4Id,
start = LocalDateTime.of(2025, 10, 16, 19, 30, 0), start = LocalDateTime.of(2025, 10, 16, 19, 30, 0),
end = LocalDateTime.of(2025, 10, 16, 20, 0, 0), end = LocalDateTime.of(2025, 10, 16, 20, 0, 0),
duration = 30.minutes, duration = 30.minutes,