From fe7cc6c5b4d6a75481bda5e4836050b67a42faac Mon Sep 17 00:00:00 2001 From: Pauljd Date: Sun, 8 Nov 2026 13:16:22 +0000 Subject: [PATCH] Bring back the four features on top of fixes B and C (0.110.1) Paul, 8 November 2026: continue with the approved features. Coming up next, phone reminders, Continue watching on Home and Orbit TV Times, as built earlier (backlog/features-0.110), now over profiling fixes B and C. Co-Authored-By: Claude Opus 5.5 --- android/app/build.gradle.kts | 4 +- .../app/src/main/assets/phone/companion.html | 7 +- android/app/src/main/assets/phone/times.html | 82 ++++++++++++++++++ .../main/java/tv/orbit/classic/EmbyClient.kt | 4 +- .../tv/orbit/classic/EmbyConnectionScreen.kt | 22 +++-- .../main/java/tv/orbit/classic/HomeScreen.kt | 24 ++++- .../java/tv/orbit/classic/OrbitCompanion.kt | 53 ++++++++++- .../main/java/tv/orbit/classic/PhoneLink.kt | 10 ++- .../main/java/tv/orbit/classic/PhonePages.kt | 1 + .../src/main/java/tv/orbit/classic/Rooms.kt | 2 +- .../tv/orbit/classic/SampleChannelScreens.kt | 3 + .../tv/orbit/classic/SecureMediaDataSource.kt | 2 +- .../main/java/tv/orbit/classic/Settings.kt | 8 ++ .../src/main/java/tv/orbit/classic/UpNext.kt | 54 ++++++++++++ .../java/tv/orbit/classic/PhoneLinkTest.kt | 17 +++- .../tv/orbit/classic/UpNextAndTimesTest.kt | 34 ++++++++ design/times/masthead-preview.png | Bin 0 -> 33312 bytes design/times/masthead.svg | 15 ++++ 18 files changed, 323 insertions(+), 19 deletions(-) create mode 100644 android/app/src/main/assets/phone/times.html create mode 100644 android/app/src/main/java/tv/orbit/classic/UpNext.kt create mode 100644 android/app/src/test/java/tv/orbit/classic/UpNextAndTimesTest.kt create mode 100644 design/times/masthead-preview.png create mode 100644 design/times/masthead.svg diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 948e0761..38cb463a 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -9,8 +9,8 @@ android { applicationId = "tv.orbit.classic" minSdk = 26 targetSdk = 36 - versionCode = 275 - versionName = "0.108.114-pick-card" + versionCode = 276 + versionName = "0.110.1-features" } buildFeatures { compose = true } // The finished build for the TVs (Paul, 6 November 2026: the test build stuttered on the box). Not debuggable, so diff --git a/android/app/src/main/assets/phone/companion.html b/android/app/src/main/assets/phone/companion.html index aa13667e..8b9c25b4 100644 --- a/android/app/src/main/assets/phone/companion.html +++ b/android/app/src/main/assets/phone/companion.html @@ -186,7 +186,8 @@ function guide() { const f = cats.includes(state.filter) ? state.filter : 'all', list = g.channels.filter(c => f === 'all' || c.category === f); const chips = `
${cats.map(k => ``).join('')}
`; if (f === 'Drive-In') return head('Guide') + chips + driveIn(); - return head('Guide') + chips + + const times = `Orbit TV Times · the week's listings, picks and films ›`; + return head('Guide') + times + chips + (list.map(c => ``).join('') || '
No channels here.
'); @@ -196,7 +197,8 @@ function pickSheet(n) { return `
${esc(c.now.title)}
${c.number} ${esc(c.name)} · Live now · ends ${hm(c.now.endMs)}${c.now.sub ? ' · ' + esc(c.now.sub) : ''}
Watching on: ${esc(state.now?.room || 'this TV')}
-
Queue next switches to ${c.number} ${esc(c.name)} when the programme on the TV ends. Next on it at ${hm(c.next.startMs)}: ${esc(c.next.title)}
`; +
Queue next switches to ${c.number} ${esc(c.name)} when the programme on the TV ends. Next on it at ${hm(c.next.startMs)}: ${esc(c.next.title)}
+ `; } // The Drive-In (phase 2): the coming bills, tickets, and out to the lot while one is showing. function driveIn() { @@ -852,6 +854,7 @@ document.addEventListener('click', e => { if (d.filter) { state.filter = d.filter; render(); } if (d.pick) openSheet(pickSheet(+d.pick)); if (d.tune) send('/api/tune', {number: +d.tune}, () => { closeSheet(); toast('Watching on the TV'); setTimeout(() => load('guide'), 700); }); + if (d.remind) { const [number, startMs, on] = d.remind.split(':').map(Number); send('/api/remind', {number, startMs, on: !!on}, () => { closeSheet(); setTimeout(() => load('guide'), 400); toast(on ? 'The TV will remind you before it starts' : 'Reminder taken off'); }); return; } if (d.queue) send('/api/queue', {number: +d.queue}, j => { state.now = {...state.now, queue: j.queue}; closeSheet(); toast('Queued: switches when this one ends'); }); if (d.cupick) { const [n, st] = d.cupick.split(':').map(Number); openSheet(cuSheet(n, st)); return; } if (d.cuq) { const [number, startMs] = d.cuq.split(':').map(Number); send('/api/queue', {number, startMs}, j => { state.now = {...state.now, queue: j.queue}; closeSheet(); render(); toast('Queued for when this one ends'); }); return; } diff --git a/android/app/src/main/assets/phone/times.html b/android/app/src/main/assets/phone/times.html new file mode 100644 index 00000000..e139ce7f --- /dev/null +++ b/android/app/src/main/assets/phone/times.html @@ -0,0 +1,82 @@ + + +Orbit TV Times + + +
ORBIT TV Times THE WEEK'S PROGRAMMES · EVERY CHANNEL FREE WITH YOUR ORBIT PICKS · FILMS · DRIVE-IN
+
‹ Back to Orbit
+
+
Loading this week's listings…
+ + diff --git a/android/app/src/main/java/tv/orbit/classic/EmbyClient.kt b/android/app/src/main/java/tv/orbit/classic/EmbyClient.kt index a1a95811..3cadcced 100644 --- a/android/app/src/main/java/tv/orbit/classic/EmbyClient.kt +++ b/android/app/src/main/java/tv/orbit/classic/EmbyClient.kt @@ -62,9 +62,9 @@ internal class HttpsEmbyTransport(internal val deviceId: String = UUID.randomUUI } /** The sign-in headers for this kind of server. */ internal fun authHeaders(token: String?): Map = when (kind) { - ServerKind.Emby -> mapOf("X-Emby-Authorization" to "Emby Client=\"Orbit TV\", Device=\"Orbit TV\", DeviceId=\"$deviceId\", Version=\"0.108.114\"") + + ServerKind.Emby -> mapOf("X-Emby-Authorization" to "Emby Client=\"Orbit TV\", Device=\"Orbit TV\", DeviceId=\"$deviceId\", Version=\"0.110.1\"") + (token?.let { mapOf("X-Emby-Token" to it) } ?: emptyMap()) - ServerKind.Jellyfin -> mapOf("Authorization" to "MediaBrowser Client=\"Orbit TV\", Device=\"Orbit TV\", DeviceId=\"$deviceId\", Version=\"0.108.114\"" + + ServerKind.Jellyfin -> mapOf("Authorization" to "MediaBrowser Client=\"Orbit TV\", Device=\"Orbit TV\", DeviceId=\"$deviceId\", Version=\"0.110.1\"" + (token?.let { ", Token=\"$it\"" } ?: "")) } /** One picture from the provider, or nothing. Same fixed origin and no redirects, and failures are never shown or logged. */ diff --git a/android/app/src/main/java/tv/orbit/classic/EmbyConnectionScreen.kt b/android/app/src/main/java/tv/orbit/classic/EmbyConnectionScreen.kt index 46a9c56b..942c4208 100644 --- a/android/app/src/main/java/tv/orbit/classic/EmbyConnectionScreen.kt +++ b/android/app/src/main/java/tv/orbit/classic/EmbyConnectionScreen.kt @@ -703,6 +703,12 @@ internal fun EmbyConnectionScreen(modifier: Modifier = Modifier, visible: Boolea if (offset == 0L) liveHandoff.handOver(number) channelClockOffset = offset; watchingChannel = true } + /** Carries on a Continue watching programme from where it was left, from Catch Up or Home, while it's still in Catch Up. */ + fun resumeContinue(c: ContinueEntry) { + if (c.entry.show.startMs < System.currentTimeMillis() - CATCH_UP_MS || lockedOut(c.entry.channel.number) || profileHides(c.entry.channel.number)) return + tune(c.entry.channel.number, c.entry.show.startMs + c.positionMs - System.currentTimeMillis()) + Taste.record(TasteKind.Chose, c.entry.show.media.item.id, (c.entry.channel as? ScheduledChannel)?.seriesIdAt(c.entry.show.startMs), c.entry.show.media.item.title, c.entry.channel.number, "continue") + } // Orbit Companion: the channels this TV shows right now, and tuning as the guide does. Set here, before any screen // returns early, so the phone works from every section (the Drive-In and the Arcade go to the guide to tune). val shownChannels by rememberUpdatedState(availableChannels.filter { !lockedOut(it.number) && !profileHides(it.number) }) @@ -716,6 +722,11 @@ internal fun EmbyConnectionScreen(modifier: Modifier = Modifier, visible: Boolea val companionBills by rememberUpdatedState(driveInPlan.takeIf { Profiles.current?.let { it.kind != ProfileKind.Kids || it.driveIn } ?: true } ?.let { plan -> driveInLineup(driveInBills(plan), System.currentTimeMillis()).filter { !lockedOut(it) } }.orEmpty()) val companionDriveIn by rememberUpdatedState(mainDriveIn) + val companionReminders by rememberUpdatedState(reminders) + val companionRemind by rememberUpdatedState { number: Int, startMs: Long, title: String, on: Boolean -> + val kept = liveReminders(reminders, System.currentTimeMillis()).filterNot { it.channel == number && it.startMs == startMs } + saveReminders(if (on) kept + ProgrammeReminder(number, startMs, title) else kept) + } val companionScreen = remember { CompanionScreen(channels = { shownChannels }, selected = { selectedNumber }, watching = { watchingChannel }, offset = { channelClockOffset }, tune = { n, offset -> companionTune(n, offset) }, driveIn = { companionBills }, tickets = { companionTickets.keys }, @@ -736,7 +747,8 @@ internal fun EmbyConnectionScreen(modifier: Modifier = Modifier, visible: Boolea decision == "approved" -> "${idea.theme} approved for ${idea.evening}. It books once the Drive-In plans that evening, after its films are checked again." decision == "deferred" -> "${idea.theme} deferred: it can come back in four weeks." else -> "${idea.theme} dismissed: it won't be proposed again unless its films change." } - }) + }, + reminders = { companionReminders }, remind = { number, startMs, title, on -> companionRemind(number, startMs, title, on) }) } DisposableEffect(Unit) { PhoneLink.screen = companionScreen @@ -796,12 +808,10 @@ internal fun EmbyConnectionScreen(modifier: Modifier = Modifier, visible: Boolea } val picture = @Composable { GuidePicture(liveSession, liveChannel, live = !watchingChannel, handoff = liveHandoff, onUnplayable = ::rememberUnplayable) } when { - mainHome -> HomeScreen(availableChannels, modifier, onCategory = { guideCategory = it; onGuide() }) + mainHome -> HomeScreen(availableChannels, modifier, onCategory = { guideCategory = it; onGuide() }, + carryOn = continueEntries(availableChannels.filter { !lockedOut(it.number) && !profileHides(it.number) }, ContinueWatching.marks, System.currentTimeMillis()), onResume = ::resumeContinue) mainCatchUp -> CatchUpScreen(availableChannels, liveSession, modifier, onOpen = { catchUpOpen = it }, - onResume = { c -> if (c.entry.show.startMs >= System.currentTimeMillis() - CATCH_UP_MS) { - tune(c.entry.channel.number, c.entry.show.startMs + c.positionMs - System.currentTimeMillis()) - Taste.record(TasteKind.Chose, c.entry.show.media.item.id, (c.entry.channel as? ScheduledChannel)?.seriesIdAt(c.entry.show.startMs), c.entry.show.media.item.title, c.entry.channel.number, "continue") - } }) + onResume = ::resumeContinue) mainWhatsOn -> WhatsOnScreen(liveSession, scheduledChannels.filterKeys { !lockedOut(it) && !profileHides(it) }.mapValues { it.value.plan }, driveInPlan.takeIf { Profiles.current?.let { it.kind != ProfileKind.Kids || it.driveIn } ?: true }, modifier, reminders, onWatch = { tune(it, 0) }, onDriveIn = onDriveIn, onBack = onHome, diff --git a/android/app/src/main/java/tv/orbit/classic/HomeScreen.kt b/android/app/src/main/java/tv/orbit/classic/HomeScreen.kt index 53095759..2a2780b3 100644 --- a/android/app/src/main/java/tv/orbit/classic/HomeScreen.kt +++ b/android/app/src/main/java/tv/orbit/classic/HomeScreen.kt @@ -32,6 +32,9 @@ internal enum class ChannelCategory(val label: String, val icon: Int) { } /** All Channels, then only the categories that have a channel in them. */ +/** Continue watching rows on Home; the rest are in Catch Up. */ +internal const val HOME_CONTINUE_MAX = 3 + internal fun homeCategories(numbers: List): List { val used = numbers.mapNotNull { ChannelBrands.forNumber(it)?.category }.toSet() return ChannelCategory.entries.filter { it == ChannelCategory.All || it in used } @@ -68,7 +71,9 @@ internal fun HomeCard(modifier: Modifier = Modifier, focusRequester: FocusReques * Guide on that category. What's On holds the evening's highlights. */ @Composable -internal fun HomeScreen(channels: List, modifier: Modifier = Modifier, onCategory: (ChannelCategory) -> Unit) { +internal fun HomeScreen(channels: List, modifier: Modifier = Modifier, onCategory: (ChannelCategory) -> Unit, + /** Continue watching, newest first (Paul, 8 November 2026): one press back into a half-watched programme. */ + carryOn: List = emptyList(), onResume: (ContinueEntry) -> Unit = {}) { val firstFocus = remember { FocusRequester() } val nav = LocalNavFocus.current LaunchedEffect(Unit) { runCatching { firstFocus.requestFocus() } } @@ -87,6 +92,23 @@ internal fun HomeScreen(channels: List, modifier: Modifier = Modi } } } } + // Words only, no pictures, so Home stays as quick as it is. + if (carryOn.isNotEmpty()) { + Spacer(Modifier.height(14.dp)) + Text("CONTINUE WATCHING", Modifier.width(400.dp), color = Yellow, fontFamily = Anton, fontSize = 13.sp) + Spacer(Modifier.height(4.dp)) + CompositionLocalProvider(LocalGlide provides glide) { Column(Modifier.width(400.dp).glideArea(glide, Yellow, 6.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { + carryOn.take(HOME_CONTINUE_MAX).forEach { c -> + HomeCard(Modifier.fillMaxWidth().height(31.dp), onClick = { onResume(c) }) { focused -> + Row(Modifier.fillMaxSize().padding(horizontal = 16.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + Text(guideTitle(c.entry.channel.number, c.entry.show).first, Modifier.weight(1f), color = if (focused) OnAccent else Ink, fontSize = 14.sp, + fontWeight = FontWeight.SemiBold, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis) + Text(leftLabel(c.leftMs), color = if (focused) OnAccent else Muted, fontSize = 12.sp, maxLines = 1) + } + } + } + } } + } Spacer(Modifier.height(14.dp)) Text("Tonight's Pick and the evening's highlights are in What's On", color = Muted, fontSize = 11.sp) Spacer(Modifier.weight(1f)) diff --git a/android/app/src/main/java/tv/orbit/classic/OrbitCompanion.kt b/android/app/src/main/java/tv/orbit/classic/OrbitCompanion.kt index 95d71070..f4fa0a5c 100644 --- a/android/app/src/main/java/tv/orbit/classic/OrbitCompanion.kt +++ b/android/app/src/main/java/tv/orbit/classic/OrbitCompanion.kt @@ -45,7 +45,10 @@ internal class CompanionScreen( val director: () -> DeskReport? = { null }, val place: (ChairChoice, Int) -> Unit = { _, _ -> }, val drop: (ChairChoice) -> Unit = {}, - val decideIdea: (DeskEventIdea, String) -> String = { _, _ -> "" }) + val decideIdea: (DeskEventIdea, String) -> String = { _, _ -> "" }, + /** Programme reminders, the same ones the TV guide and What's On set (8 November 2026). */ + val reminders: () -> List = { emptyList() }, + val remind: (number: Int, startMs: Long, title: String, on: Boolean) -> Unit = { _, _, _, _ -> }) /** * Phase 2's queue (Paul, 6 November 2026): what plays when the programme on now ends. A channel, live from then ("switch @@ -138,18 +141,28 @@ internal object OrbitCompanion { /** Every channel's now and next. */ fun guide(screen: CompanionScreen, nowMs: Long): JSONObject = JSONObject().put("selected", screen.selected()).put("serverMs", nowMs).put("channels", JSONArray(screen.channels().map { c -> val on = c.at(nowMs) - channelJson(c).put("category", ChannelBrands.forNumber(c.number)?.category?.label ?: JSONObject.NULL).put("now", programme(on)).put("next", programme(c.at(on.endMs))) })) + channelJson(c).put("category", ChannelBrands.forNumber(c.number)?.category?.label ?: JSONObject.NULL).put("now", programme(on)).put("next", programme(c.at(on.endMs)).let { next -> + next.put("reminded", screen.reminders().any { it.channel == c.number && it.startMs == next.getLong("startMs") }) }) })) fun catchUp(screen: CompanionScreen, nowMs: Long): JSONArray = JSONArray(catchUpShelves(screen.channels(), nowMs).map { shelf -> JSONObject().put("title", shelf.title).put("entries", JSONArray(shelf.entries.map { e -> programme(e.show).put("number", e.channel.number).put("channel", e.channel.name).put("continues", e.continues) })) }) + /** A reminder from the phone, for a programme still to come on a channel this TV shows; false when there's no such programme. */ + fun remind(screen: CompanionScreen, number: Int, startMs: Long, on: Boolean, nowMs: Long): Boolean { + val c = screen.channels().firstOrNull { it.number == number } ?: return false + val show = runCatching { c.at(startMs) }.getOrNull()?.takeIf { it.startMs == startMs && it.startMs > nowMs } ?: return false + screen.remind(number, startMs, guideTitle(number, show).first, on); return true + } + /** The Catch Up programme the phone chose, only if it's still in Catch Up on a channel this TV shows. */ fun catchUpEntry(screen: CompanionScreen, number: Int, startMs: Long, nowMs: Long): CatchUpEntry? = catchUpShelves(screen.channels(), nowMs).flatMap { it.entries }.firstOrNull { it.channel.number == number && it.show.startMs == startMs } const val QUEUE_MAX = 5 + const val TIMES_DAYS = 7 + const val TIMES_FILMS = 12 /** How long before the programme's end the queue takes over. */ const val QUEUE_LEAD_MS = 2_500L var queue by mutableStateOf>(emptyList()) @@ -209,6 +222,42 @@ internal object OrbitCompanion { }) } + /** + * Orbit TV Times (Paul, 8 November 2026): the week ahead as a listings magazine, from the real schedules. Each day is + * What's On's choice for that evening (its pick and highlights), the evening's films across the channels, and the + * Drive-In's bills, only for the channels this TV shows now (Kids' own, and After Dark only while unlocked). + */ + fun times(screen: CompanionScreen, nowMs: Long, zone: java.time.ZoneId = java.time.ZoneId.systemDefault()): JSONObject { + val channels = screen.channels() + val plans = channels.mapNotNull { c -> (c as? ScheduledChannel)?.let { c.number to it.plan } }.toMap() + val names = channels.associate { it.number to ChannelBrands.displayName(it) } + fun item(channel: Int, e: ScheduleEntry, tag: String?, reason: String?) = guideTitleParts(e.media.item.title).let { (title, sub) -> + JSONObject().put("channel", channel).put("name", names[channel] ?: channel.toString()).put("title", title).put("sub", sub ?: JSONObject.NULL) + .put("startMs", e.startMs).put("endMs", e.endMs).put("type", e.media.item.type) + .put("tag", tag ?: JSONObject.NULL).put("reason", reason ?: JSONObject.NULL) + } + val first = whatsOnEdition(nowMs, zone) + val days = JSONArray() + for (d in 0 until TIMES_DAYS) { + val date = first.plusDays(d.toLong()) + val noon = maxOf(nowMs, date.atTime(12, 0).atZone(zone).toInstant().toEpochMilli()) + val evening = date.atTime(18, 0).atZone(zone).toInstant().toEpochMilli(); val night = date.plusDays(1).atTime(0, 0).atZone(zone).toInstant().toEpochMilli() + val end = date.plusDays(1).atTime(6, 0).atZone(zone).toInstant().toEpochMilli() + val page = whatsOnPage(plans, null, noon, zone) + val films = plans.flatMap { (n, plan) -> plan.entries.filter { it.media.item.type == "Movie" && it.startMs in evening until night && !kidsAsleep(takeoverOf(n, it, zone)) }.map { n to it } } + .sortedBy { it.second.startMs }.distinctBy { it.second.media.item.id }.take(TIMES_FILMS) + val bills = screen.driveIn().filter { it.startMs in noon until end } + if (page.pick == null && page.tonight.isEmpty() && films.isEmpty() && bills.isEmpty()) continue + days.put(JSONObject().put("date", date.toString()).put("noonMs", noon) + .put("pick", page.pick?.let { item(it.channel, it.entry, it.tag, it.reason) } ?: JSONObject.NULL) + .put("highlights", JSONArray(page.tonight.map { item(it.channel, it.entry, it.tag, it.reason) })) + .put("films", JSONArray(films.map { (n, e) -> item(n, e, null, null) })) + .put("drivein", JSONArray(bills.map { b -> JSONObject().put("kind", b.kind.label).put("event", b.event ?: JSONObject.NULL).put("startMs", b.startMs).put("endMs", b.endMs) + .put("films", JSONArray(b.entries.map { guideTitleParts(it.media.item.title).first })) }))) + } + return JSONObject().put("generatedMs", nowMs).put("room", Rooms.name).put("days", days) + } + // --- Phase 3: Director approvals and profiles. --- private fun choiceJson(c: ChairChoice) = JSONObject().put("id", c.id).put("title", c.title).put("type", c.type).put("year", c.year ?: JSONObject.NULL) .put("line", c.line).put("ask", c.ask).put("options", JSONArray(c.options.map { JSONObject().put("number", it.number).put("name", it.name).put("reason", it.reason) })) diff --git a/android/app/src/main/java/tv/orbit/classic/PhoneLink.kt b/android/app/src/main/java/tv/orbit/classic/PhoneLink.kt index b3a1a5a5..41c54de1 100644 --- a/android/app/src/main/java/tv/orbit/classic/PhoneLink.kt +++ b/android/app/src/main/java/tv/orbit/classic/PhoneLink.kt @@ -241,6 +241,7 @@ internal object PhoneLink { phone == null -> page(out, PhonePages.join(null)) r.path == "/" -> page(out, PhonePages.companion()) r.path == "/create" -> page(out, PhonePages.app()) + r.path == "/times" -> page(out, PhonePages.times()) r.method == "POST" && r.headers["x-orbit"] != "1" -> json(out, 403, JSONObject().put("error", "Refused")) else -> api(r, out, phone) } @@ -479,7 +480,7 @@ internal object PhoneLink { } private val companionRoutes = setOf("GET /api/now", "GET /api/guide", "GET /api/catchup", "GET /api/rooms", "GET /api/looks", "POST /api/key", "POST /api/volume", - "POST /api/channel", "POST /api/tune", "POST /api/section", "POST /api/catchup/watch", + "POST /api/channel", "POST /api/tune", "POST /api/remind", "GET /api/times", "POST /api/section", "POST /api/catchup/watch", "GET /api/queue", "POST /api/queue", "POST /api/queue/remove", "GET /api/drivein", "POST /api/drivein/ticket", "POST /api/drivein/watch", "GET /api/director", "POST /api/director/place", "POST /api/director/drop", "POST /api/director/idea", "GET /api/profiles", "POST /api/profile", "POST /api/profile/add", "POST /api/profile/rename", "POST /api/profile/remove") @@ -516,6 +517,13 @@ internal object PhoneLink { val number = body().optInt("number").takeIf { n -> s.channels().any { it.number == n } } ?: return json(out, 404, JSONObject().put("error", "That channel isn't on this TV right now.")) onScreen { s.tune(number, 0) }; json(out, 200, JSONObject().put("number", number)) } + "GET /api/times" -> json(out, 200, OrbitCompanion.times(s, now)) + "POST /api/remind" -> { + val o = body(); var done = false + onScreen { done = OrbitCompanion.remind(s, o.optInt("number"), o.optLong("startMs"), o.optBoolean("on", true), now) } + if (!done) return json(out, 404, JSONObject().put("error", "That programme isn't coming up on this TV.")) + json(out, 200, JSONObject().put("ok", true)) + } "POST /api/section" -> { val section = OrbitCompanion.sections[body().optString("section")] ?: return json(out, 400, JSONObject().put("error", "Unknown place")) onScreen { OrbitCompanion.open(section) }; json(out, 200, JSONObject().put("ok", true)) diff --git a/android/app/src/main/java/tv/orbit/classic/PhonePages.kt b/android/app/src/main/java/tv/orbit/classic/PhonePages.kt index d7c657bd..f2f42cec 100644 --- a/android/app/src/main/java/tv/orbit/classic/PhonePages.kt +++ b/android/app/src/main/java/tv/orbit/classic/PhonePages.kt @@ -21,6 +21,7 @@ background:#ffde59;color:#071632;font-size:18px;font-weight:700}.note{color:#ffd fun app(): String = asset("app.html") /** The Companion, at /: Remote, Guide, Catch Up, Rooms and More (which leads to Create your own). */ fun companion(): String = asset("companion.html") + fun times(): String = asset("times.html") /** For "Add to home screen": Orbit's icon and name, opening on the remote. */ val icons = setOf("/icon-180.png", "/icon-192.png", "/icon-512.png") fun icon(path: String): ByteArray? = runCatching { PhoneLink.context()?.assets?.open("phone" + path)?.use { it.readBytes() } }.getOrNull() diff --git a/android/app/src/main/java/tv/orbit/classic/Rooms.kt b/android/app/src/main/java/tv/orbit/classic/Rooms.kt index 7484c760..ed157e03 100644 --- a/android/app/src/main/java/tv/orbit/classic/Rooms.kt +++ b/android/app/src/main/java/tv/orbit/classic/Rooms.kt @@ -69,7 +69,7 @@ internal enum class RoomPart(val title: String, val line: String) { } /** On screen and Arcade settings that may travel; the sound output and anything about this box stay where they are. */ -private val LookKeys = listOf("look", "subtitles_on", "channel_logo", "idents", "ident_sound", "special_idents", "block_ident_sound", "squeeze_back", +private val LookKeys = listOf("look", "subtitles_on", "channel_logo", "idents", "ident_sound", "special_idents", "block_ident_sound", "squeeze_back", "up_next", "cast_on", "drive_in_intro", "reduce_motion") private val ArcadeKeys = listOf("snake_best", "block_drop_best", "brick_break_best", "pairs_best", "patience_wins", "orb_man_best", "blast_best", "skydoku_solved", "snake_music") private val DirectorFiles = listOf("director-decisions-0.json", "director-learning-0.json", "event-ideas-history-0.json") diff --git a/android/app/src/main/java/tv/orbit/classic/SampleChannelScreens.kt b/android/app/src/main/java/tv/orbit/classic/SampleChannelScreens.kt index e1b4cd5b..b637047a 100644 --- a/android/app/src/main/java/tv/orbit/classic/SampleChannelScreens.kt +++ b/android/app/src/main/java/tv/orbit/classic/SampleChannelScreens.kt @@ -71,6 +71,7 @@ internal fun ScheduledChannelPlayer(session: EmbySampleSession, channel: SampleC val squeezeOn = remember { OrbitSettings(settingsContext).squeezeBack } val cameosOn = remember { OrbitSettings(settingsContext).let { it.characterCameos && it.castOn } } val calmMotion = remember { OrbitSettings(settingsContext).reduceMotion } + val upNextOn = remember { OrbitSettings(settingsContext).upNext } val squeezing = squeezeOn && channel is ScheduledChannel && squeezeBackDue(channel.number, current.startMs, current.endMs, next.startMs, now, if (identsHere) identMs else 0L, clockOffsetMs, squeezeLength(current.media.item.type)) val squeeze by androidx.compose.animation.core.animateFloatAsState(if (squeezing) 1f else 0f, if (calmMotion) androidx.compose.animation.core.snap() else androidx.compose.animation.core.tween(1_000), label = "squeeze") @@ -218,6 +219,8 @@ internal fun ScheduledChannelPlayer(session: EmbySampleSession, channel: SampleC } } if (plan != null && squeeze > 0f) SqueezePanel(session, channel, current, next, now, squeeze) + if (plan != null && upNextOn && squeeze == 0f && phase == IdentPhase.None && channel is ScheduledChannel && clockOffsetMs == 0L && next.startMs == current.endMs) + UpNextBanner(channel, current, next, now) heldIdent?.let { held -> key(held.startMs) { val early = endedEarly == held.startMs diff --git a/android/app/src/main/java/tv/orbit/classic/SecureMediaDataSource.kt b/android/app/src/main/java/tv/orbit/classic/SecureMediaDataSource.kt index 88142cb7..0699535c 100644 --- a/android/app/src/main/java/tv/orbit/classic/SecureMediaDataSource.kt +++ b/android/app/src/main/java/tv/orbit/classic/SecureMediaDataSource.kt @@ -39,7 +39,7 @@ internal class SecureMediaDataSource(private val session: EmbySampleSession) : B next.instanceFollowRedirects = false next.connectTimeout = 10_000 next.readTimeout = 20_000 - next.setRequestProperty("User-Agent", "OrbitTV/0.108.114") + next.setRequestProperty("User-Agent", "OrbitTV/0.110.1") next.setRequestProperty("Accept-Encoding", "identity") session.mediaHeaders(address).forEach { (key, value) -> next.setRequestProperty(key, value) } if (dataSpec.position != 0L || dataSpec.length != C.LENGTH_UNSET.toLong()) { diff --git a/android/app/src/main/java/tv/orbit/classic/Settings.kt b/android/app/src/main/java/tv/orbit/classic/Settings.kt index a3e262d1..bebe3575 100644 --- a/android/app/src/main/java/tv/orbit/classic/Settings.kt +++ b/android/app/src/main/java/tv/orbit/classic/Settings.kt @@ -102,6 +102,10 @@ internal class OrbitSettings(context: Context) { var identSoundNightQuiet: Boolean get() = saved.getBoolean("ident_sound_night_quiet", true) set(value) { saved.edit().putBoolean("ident_sound_night_quiet", value).apply() } + /** A small "Coming up next" card near the end of each programme (Paul, 8 November 2026). On by default. */ + var upNext: Boolean + get() = saved.getBoolean("up_next", true) + set(value) { saved.edit().putBoolean("up_next", value).apply() } var driveInIntro: Boolean get() = saved.getBoolean("drive_in_intro", true) set(value) { saved.edit().putBoolean("drive_in_intro", value).apply() } @@ -270,6 +274,7 @@ private fun ViewingDetail(firstSwitch: FocusRequester, modifier: Modifier, top: var identSound by remember { mutableStateOf(settings.identSound) } var identSoundQuiet by remember { mutableStateOf(settings.identSoundQuiet) } var identSoundNightQuiet by remember { mutableStateOf(settings.identSoundNightQuiet) } + var upNext by remember { mutableStateOf(settings.upNext) } var driveInIntro by remember { mutableStateOf(settings.driveInIntro) } var reduceMotion by remember { mutableStateOf(settings.reduceMotion) } var squeezeBack by remember { mutableStateOf(settings.squeezeBack) } @@ -300,6 +305,9 @@ private fun ViewingDetail(firstSwitch: FocusRequester, modifier: Modifier, top: SettingLine("Quieter late at night", "From 11pm to 7am, ident sounds play softly on their own, so nobody's woken.") { OnOff(identSoundNightQuiet, Modifier, enabled = identSound && !identSoundQuiet, onClick = { identSoundNightQuiet = !identSoundNightQuiet; settings.identSoundNightQuiet = identSoundNightQuiet }) } + SettingLine("Coming up next", "Near the end of a programme, a small card in the corner says what's on next.") { + OnOff(upNext, Modifier, onClick = { upNext = !upNext; settings.upNext = upNext }) + } SettingLine("Special idents", "Give named blocks and events their own ident as they begin, such as Riot Laughs or PPV Sunday. Off uses each channel's usual ident.") { OnOff(specialIdents, Modifier, onClick = { specialIdents = !specialIdents; settings.specialIdents = specialIdents }) } diff --git a/android/app/src/main/java/tv/orbit/classic/UpNext.kt b/android/app/src/main/java/tv/orbit/classic/UpNext.kt new file mode 100644 index 00000000..78839039 --- /dev/null +++ b/android/app/src/main/java/tv/orbit/classic/UpNext.kt @@ -0,0 +1,54 @@ +package tv.orbit.classic + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableLongStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.tv.material3.Text + +/** + * Coming up next (Paul, 8 November 2026): near the end of a programme, a small card in the corner names what's on next, as + * a channel would, for [UP_NEXT_SHOW_MS] and once per programme. It comes in the last few minutes, before the squeeze-back + * and the ident, so they never overlap. + */ +internal const val UP_NEXT_FROM_MS = 3 * 60_000L +internal const val UP_NEXT_UNTIL_MS = 75_000L +internal const val UP_NEXT_SHOW_MS = 10_000L + +/** Whether the card may start now, with [remainingMs] of the programme left. */ +internal fun upNextMayStart(remainingMs: Long) = remainingMs in (UP_NEXT_UNTIL_MS + 1)..UP_NEXT_FROM_MS + +/** The words on the card: "in 3 min", or "next" in the final minute or so. */ +internal fun upNextWhen(remainingMs: Long): String = ((remainingMs + 59_999) / 60_000).let { m -> if (m <= 1) "in a minute" else "in $m min" } + +@Composable +internal fun UpNextBanner(channel: SampleChannel, current: SampleBroadcast, next: SampleBroadcast, now: Long, modifier: Modifier = Modifier) { + // Kids never sees what a grown-up takeover will show, and nothing is named when the channel goes to sleep. + if (kidsAsleep(takeoverOf(channel.number, next))) return + var until by remember(current.startMs) { mutableLongStateOf(0L) } + val remaining = current.endMs - now + LaunchedEffect(current.startMs, upNextMayStart(remaining)) { if (until == 0L && upNextMayStart(remaining)) until = now + UP_NEXT_SHOW_MS } + if (until == 0L || now >= until) return + val (title, detail) = guideTitle(channel.number, next) + val corner = RoundedCornerShape(10.dp) + Box(Modifier.fillMaxSize().padding(36.dp), contentAlignment = Alignment.BottomEnd) { + Column(modifier.riseIn(0).widthIn(max = 460.dp).background(Navy.copy(alpha = .94f), corner).border(2.dp, Yellow, corner).padding(horizontal = 18.dp, vertical = 12.dp), + verticalArrangement = Arrangement.spacedBy(3.dp)) { + Text("COMING UP NEXT • ${upNextWhen(remaining).uppercase()}", color = Yellow, fontFamily = Anton, fontSize = 14.sp) + Text(title, color = Ink, fontSize = 20.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(listOfNotNull(detail, "${channel.number} ${ChannelBrands.displayName(channel)}").joinToString(" • "), color = Muted, fontSize = 13.sp, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + } +} diff --git a/android/app/src/test/java/tv/orbit/classic/PhoneLinkTest.kt b/android/app/src/test/java/tv/orbit/classic/PhoneLinkTest.kt index 276d9a46..87c902c0 100644 --- a/android/app/src/test/java/tv/orbit/classic/PhoneLinkTest.kt +++ b/android/app/src/test/java/tv/orbit/classic/PhoneLinkTest.kt @@ -145,7 +145,9 @@ class PhoneLinkTest { val pressed = mutableListOf(); val volume = mutableListOf() OrbitCompanion.inject = { synchronized(pressed) { pressed += it } }; OrbitCompanion.volume = { volume += it } PhoneLink.clock = { now } - PhoneLink.screen = CompanionScreen({ companionChannels }, { selected }, { true }, { 0 }, { n, o -> tuned += n to o; selected = n }) + val reminders = mutableListOf() + PhoneLink.screen = CompanionScreen({ companionChannels }, { selected }, { true }, { 0 }, { n, o -> tuned += n to o; selected = n }, + reminders = { reminders.toList() }, remind = { n, start, title, on -> reminders.removeAll { it.channel == n && it.startMs == start }; if (on) reminders += ProgrammeReminder(n, start, title) }) try { assertTrue(call("/api/now").body.contains("Enter the code")) // not joined: nothing // The home-screen manifest needs no phone, and carries Orbit's name only. @@ -191,6 +193,19 @@ class PhoneLinkTest { assertEquals(0, JSONObject(call("/api/drivein", cookie = cookie).body).getJSONArray("bills").length()) assertEquals(404, call("/api/drivein/ticket", "POST", """{"startMs":1}""", cookie = cookie).status) assertEquals(409, call("/api/drivein/watch", "POST", "{}", cookie = cookie).status) + // Reminders from the phone (8 November 2026): only for a programme still to come on a channel this TV shows. + val next = JSONObject(call("/api/guide", cookie = cookie).body).getJSONArray("channels").getJSONObject(0).getJSONObject("next") + assertFalse(next.getBoolean("reminded")) + assertEquals(200, call("/api/remind", "POST", """{"number":101,"startMs":${next.getLong("startMs")},"on":true}""", cookie = cookie).status) + assertEquals(listOf(101 to "Friends"), reminders.map { it.channel to it.title }) + assertTrue(JSONObject(call("/api/guide", cookie = cookie).body).getJSONArray("channels").getJSONObject(0).getJSONObject("next").getBoolean("reminded")) + assertEquals(404, call("/api/remind", "POST", """{"number":999,"startMs":${next.getLong("startMs")}}""", cookie = cookie).status) + assertEquals(404, call("/api/remind", "POST", """{"number":101,"startMs":${next.getLong("startMs") + 1}}""", cookie = cookie).status) + assertEquals(200, call("/api/remind", "POST", """{"number":101,"startMs":${next.getLong("startMs")},"on":false}""", cookie = cookie).status) + assertTrue(reminders.isEmpty()) + // Orbit TV Times: the page and its listings, for a joined phone. + assertTrue(call("/times", cookie = cookie).status == 200) + assertTrue(JSONObject(call("/api/times", cookie = cookie).body).has("days")) // Titles and times only. val everything = call("/api/now", cookie = cookie).body + call("/api/guide", cookie = cookie).body + call("/api/rooms", cookie = cookie).body listOf("token", "api_key", "password", "X-Emby", "MediaBrowser", "s-a1", "a1").forEach { assertFalse(it, everything.contains("\"$it\"", ignoreCase = true)) } diff --git a/android/app/src/test/java/tv/orbit/classic/UpNextAndTimesTest.kt b/android/app/src/test/java/tv/orbit/classic/UpNextAndTimesTest.kt new file mode 100644 index 00000000..24a6c977 --- /dev/null +++ b/android/app/src/test/java/tv/orbit/classic/UpNextAndTimesTest.kt @@ -0,0 +1,34 @@ +package tv.orbit.classic + +import org.junit.Assert.* +import org.junit.Test +import java.time.ZoneId +import java.time.ZonedDateTime + +/** 8 November 2026: the Coming up next card's timing, and Orbit TV Times built from real plans. */ +class UpNextAndTimesTest { + private val minute = 60_000L + @Test fun comingUpNextShowsBetweenThreeMinutesAndTheSqueeze() { + assertFalse(upNextMayStart(3 * minute + 1)); assertTrue(upNextMayStart(3 * minute)); assertTrue(upNextMayStart(76_000)) + assertFalse(upNextMayStart(75_000)); assertFalse(upNextMayStart(10_000)) + assertEquals("in 3 min", upNextWhen(3 * minute)); assertEquals("in 2 min", upNextWhen(90_000)); assertEquals("in a minute", upNextWhen(50_000)) + } + + @Test fun tvTimesListsEachEveningsFilmsAndPicksFromThePlans() { + val zone = ZoneId.of("Europe/London") + val day = ZonedDateTime.of(2026, 11, 9, 13, 0, 0, 0, zone).toInstant().toEpochMilli() + val eight = ZonedDateTime.of(2026, 11, 9, 20, 0, 0, 0, zone).toInstant().toEpochMilli() + fun film(id: String, title: String, at: Long) = ScheduleEntry("", EpisodeMark(0, 0), ScheduledMedia(SampleItem(title, "Movie", 100, "", id, 100 * minute), "s-$id", 100 * minute), at) + val plan = ChannelPlan(listOf(film("f1", "Hot Fuzz", eight), film("f2", "Paul", eight + 100 * minute)), ScheduleCursor()) + val channel = ScheduledChannel(SampleChannel(plan.entries.map { it.media }, "BritX", 309), plan) + val screen = CompanionScreen({ listOf(channel) }, { 309 }, { false }, { 0 }, { _, _ -> }) + val times = OrbitCompanion.times(screen, day, zone) + val first = times.getJSONArray("days").getJSONObject(0) + assertEquals("2026-11-09", first.getString("date")) + val films = first.getJSONArray("films") + assertEquals(listOf("Hot Fuzz", "Paul"), (0 until films.length()).map { films.getJSONObject(it).getString("title") }) + assertEquals(309, films.getJSONObject(0).getInt("channel")) + // Ids and sources never go to the phone. + assertFalse(times.toString().contains("s-f1")); assertFalse(times.toString().contains("\"f1\"")) + } +} diff --git a/design/times/masthead-preview.png b/design/times/masthead-preview.png new file mode 100644 index 0000000000000000000000000000000000000000..aa30768802fb4ed9a078bcdc8c8b50854f467fc8 GIT binary patch literal 33312 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 literal 0 HcmV?d00001 diff --git a/design/times/masthead.svg b/design/times/masthead.svg new file mode 100644 index 00000000..1f3e0c9a --- /dev/null +++ b/design/times/masthead.svg @@ -0,0 +1,15 @@ + + + + + + + + + + ORBIT + TV Times + THE WEEK'S PROGRAMMES · EVERY CHANNEL + FREE WITH YOUR ORBIT + PICKS · FILMS · DRIVE-IN +