From 247262b72620474362195e9a85b9d5ff6c524407 Mon Sep 17 00:00:00 2001 From: Pauljd Date: Sun, 1 Nov 2026 22:55:21 +0000 Subject: [PATCH] Build the main menu from the approved design (0.28.0) Co-Authored-By: Claude Opus 5.5 (1M context) --- VERIFICATION-0.28.0.md | 19 +++ android/app/build.gradle.kts | 4 +- .../java/tv/orbit/classic/ChannelBranding.kt | 8 +- .../main/java/tv/orbit/classic/EmbyClient.kt | 2 +- .../tv/orbit/classic/EmbyConnectionScreen.kt | 20 ++- .../main/java/tv/orbit/classic/GuideGrid.kt | 8 +- .../java/tv/orbit/classic/GuidePicture.kt | 2 +- .../main/java/tv/orbit/classic/HomeScreen.kt | 138 ++++++++++++++++++ .../java/tv/orbit/classic/MainActivity.kt | 45 ++++-- .../java/tv/orbit/classic/OrbitSections.kt | 4 +- .../tv/orbit/classic/SecureMediaDataSource.kt | 2 +- .../res/drawable-nodpi/orbit_icon_all.webp | Bin 0 -> 2052 bytes .../res/drawable-nodpi/orbit_icon_comedy.webp | Bin 0 -> 2690 bytes .../orbit_icon_documentaries.webp | Bin 0 -> 4632 bytes .../orbit_icon_entertainment.webp | Bin 0 -> 1996 bytes .../res/drawable-nodpi/orbit_icon_gear.webp | Bin 0 -> 4548 bytes .../res/drawable-nodpi/orbit_icon_kids.webp | Bin 0 -> 2758 bytes .../res/drawable-nodpi/orbit_icon_movies.webp | Bin 0 -> 3262 bytes .../res/drawable-nodpi/orbit_icon_office.webp | Bin 0 -> 1078 bytes .../drawable-nodpi/orbit_icon_profile.webp | Bin 0 -> 1290 bytes .../res/drawable-nodpi/orbit_icon_sport.webp | Bin 0 -> 608 bytes .../java/tv/orbit/classic/GuideGridTest.kt | 23 +++ 22 files changed, 241 insertions(+), 34 deletions(-) create mode 100644 VERIFICATION-0.28.0.md create mode 100644 android/app/src/main/java/tv/orbit/classic/HomeScreen.kt create mode 100644 android/app/src/main/res/drawable-nodpi/orbit_icon_all.webp create mode 100644 android/app/src/main/res/drawable-nodpi/orbit_icon_comedy.webp create mode 100644 android/app/src/main/res/drawable-nodpi/orbit_icon_documentaries.webp create mode 100644 android/app/src/main/res/drawable-nodpi/orbit_icon_entertainment.webp create mode 100644 android/app/src/main/res/drawable-nodpi/orbit_icon_gear.webp create mode 100644 android/app/src/main/res/drawable-nodpi/orbit_icon_kids.webp create mode 100644 android/app/src/main/res/drawable-nodpi/orbit_icon_movies.webp create mode 100644 android/app/src/main/res/drawable-nodpi/orbit_icon_office.webp create mode 100644 android/app/src/main/res/drawable-nodpi/orbit_icon_profile.webp create mode 100644 android/app/src/main/res/drawable-nodpi/orbit_icon_sport.webp diff --git a/VERIFICATION-0.28.0.md b/VERIFICATION-0.28.0.md new file mode 100644 index 00000000..6a296124 --- /dev/null +++ b/VERIFICATION-0.28.0.md @@ -0,0 +1,19 @@ +# Orbit TV 0.28.0 verification + +Main menu from the approved design. The numbered navbar goes once real channels exist. + +## Changed +- New home screen: category list, the tuned channel playing live with now and next, an On now list and an OrbitOffice card. +- The app opens on home when real channels are available. Back on home goes full screen. Back in the guide returns to home. +- Categories appear only if they hold a channel. Today that is All Channels, Entertainment (Orbit 1, Vortex) and Movies (After Dark). Choosing one opens the guide filtered to it. +- Gear at the top right opens the old menu of setup screens. The profile icon is shown but can't be selected until profiles exist. +- The custom icons are bundled at 96px. +- The demo guide, used before sign-in, keeps its numbered tabs. + +## Checked +- assembleDebug, testDebugUnitTest and lintDebug pass; 132 tests, 0 failures. +- APK signature verified with apksigner. + +## Not checked +- Not yet run on the box. Layout at the box's size, remote focus movement between the columns and the gear, and Back at each level all need Paul's on-TV check. +- The OrbitOffice card uses the existing fictional event and says so. Real events aren't built. diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index fed9198c..cd934b80 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 = 28 - versionName = "0.27.0-guide-picture" + versionCode = 29 + versionName = "0.28.0-home" } buildFeatures { compose = true } compileOptions { sourceCompatibility = JavaVersion.VERSION_17; targetCompatibility = JavaVersion.VERSION_17 } diff --git a/android/app/src/main/java/tv/orbit/classic/ChannelBranding.kt b/android/app/src/main/java/tv/orbit/classic/ChannelBranding.kt index bfb5ce47..dcf77ab9 100644 --- a/android/app/src/main/java/tv/orbit/classic/ChannelBranding.kt +++ b/android/app/src/main/java/tv/orbit/classic/ChannelBranding.kt @@ -1,12 +1,12 @@ package tv.orbit.classic -internal data class ChannelBranding(val presetId: String, val displayName: String, val logo: Int, val background: Int, val bug: Int) +internal data class ChannelBranding(val presetId: String, val displayName: String, val logo: Int, val background: Int, val bug: Int, val category: ChannelCategory) internal object ChannelBrands { private val brands = mapOf( - 101 to ChannelBranding("orbit-1", "Orbit 1", R.drawable.orbit_one_epg, R.drawable.orbit_one_background, R.drawable.orbit_one_bug), - 102 to ChannelBranding("orbit-after-dark", "Orbit After Dark", R.drawable.orbit_after_dark_epg, R.drawable.orbit_after_dark_background, R.drawable.orbit_after_dark_bug), - 103 to ChannelBranding("vortex", "Vortex", R.drawable.vortex_epg, R.drawable.vortex_background, R.drawable.vortex_bug)) + 101 to ChannelBranding("orbit-1", "Orbit 1", R.drawable.orbit_one_epg, R.drawable.orbit_one_background, R.drawable.orbit_one_bug, ChannelCategory.Entertainment), + 102 to ChannelBranding("orbit-after-dark", "Orbit After Dark", R.drawable.orbit_after_dark_epg, R.drawable.orbit_after_dark_background, R.drawable.orbit_after_dark_bug, ChannelCategory.Movies), + 103 to ChannelBranding("vortex", "Vortex", R.drawable.vortex_epg, R.drawable.vortex_background, R.drawable.vortex_bug, ChannelCategory.Entertainment)) fun forNumber(number: Int): ChannelBranding? = brands[number] /** Saved channels keep their original names; what the viewer sees comes from the brand. */ fun displayName(channel: SampleChannel) = brands[channel.number]?.displayName ?: channel.name 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 e937d83e..b4789524 100644 --- a/android/app/src/main/java/tv/orbit/classic/EmbyClient.kt +++ b/android/app/src/main/java/tv/orbit/classic/EmbyClient.kt @@ -41,7 +41,7 @@ internal class HttpsEmbyTransport(internal val deviceId: String = UUID.randomUUI connection.connectTimeout = 10_000 connection.readTimeout = request.readTimeoutMs ?: if (request.path == "/Sessions/Logout") 5_000 else 15_000 connection.setRequestProperty("Accept", "application/json") - connection.setRequestProperty("X-Emby-Authorization", "Emby Client=\"Orbit TV\", Device=\"Orbit TV\", DeviceId=\"$deviceId\", Version=\"0.27.0\"") + connection.setRequestProperty("X-Emby-Authorization", "Emby Client=\"Orbit TV\", Device=\"Orbit TV\", DeviceId=\"$deviceId\", Version=\"0.28.0\"") request.token?.let { connection.setRequestProperty("X-Emby-Token", it) } if (request.method == "POST") { val bytes = request.body.orEmpty().toByteArray(Charsets.UTF_8) 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 1950b929..5508f9cf 100644 --- a/android/app/src/main/java/tv/orbit/classic/EmbyConnectionScreen.kt +++ b/android/app/src/main/java/tv/orbit/classic/EmbyConnectionScreen.kt @@ -50,8 +50,8 @@ import kotlinx.coroutines.withContext @Composable internal fun EmbyConnectionScreen(modifier: Modifier = Modifier, visible: Boolean, - mainGuide: Boolean, onChannelAvailable: (Boolean) -> Unit, onGuide: () -> Unit, - onBack: () -> Unit) { + mainGuide: Boolean, mainHome: Boolean = false, onChannelAvailable: (Boolean) -> Unit, onGuide: () -> Unit, + onHome: () -> Unit = {}, onOffice: () -> Unit = {}, onBack: () -> Unit) { val appContext = androidx.compose.ui.platform.LocalContext.current.applicationContext val savedStore = remember { RememberedConnectionStore.get(appContext) } var setupSaved by remember { mutableStateOf(false) } @@ -88,6 +88,7 @@ internal fun EmbyConnectionScreen(modifier: Modifier = Modifier, visible: Boolea var selectedNumber by remember { mutableIntStateOf(101) } var channel by remember { mutableStateOf(null) } var watchingChannel by remember { mutableStateOf(false) } + var guideCategory by remember { mutableStateOf(ChannelCategory.All) } var channelClockOffset by remember { mutableLongStateOf(0) } var busyLabel by remember { mutableStateOf("Connecting…") } val sessionSlot = remember { EmbySessionSlot() } @@ -211,15 +212,15 @@ internal fun EmbyConnectionScreen(modifier: Modifier = Modifier, visible: Boolea playback = null } } - LaunchedEffect(mainGuide) { - if (!mainGuide) { watchingChannel = false; channelClockOffset = 0 } + LaunchedEffect(mainGuide, mainHome) { + if (!mainGuide && !mainHome) { watchingChannel = false; channelClockOffset = 0 } } val ready = !busy && !restoring && now >= nextAttemptAt && username.isNotBlank() && password.text.isNotEmpty() playback?.let { plan -> session?.let { active -> EmbyPlaybackDialog(active, plan, onClose = { playback = null }) } } val liveSession = session val availableChannels = availableSampleChannels(channel, afterDarkChannel, toonamiChannel) val liveChannel = availableChannels.firstOrNull { it.number == selectedNumber } - if (mainGuide && liveSession != null && liveChannel != null) { + if ((mainGuide || mainHome) && liveSession != null && liveChannel != null) { if (watchingChannel) ScheduledChannelPlayer(liveSession, liveChannel, channelClockOffset, onClose = { watchingChannel = false; channelClockOffset = 0 }, onStep = { step -> @@ -230,10 +231,15 @@ internal fun EmbyConnectionScreen(modifier: Modifier = Modifier, visible: Boolea val previous = lastNumber if (previous != null && availableChannels.any { it.number == previous }) { lastNumber = selectedNumber; selectedNumber = previous; channelClockOffset = 0 } }) - GuideGrid(availableChannels, selectedNumber, modifier, picture = { GuidePicture(liveSession, it, live = !watchingChannel) }, onWatch = { number, offset -> + fun tune(number: Int, offset: Long) { if (number != selectedNumber) { lastNumber = selectedNumber; selectedNumber = number } channelClockOffset = offset; watchingChannel = true - }, onBack = onBack) + } + val picture = @Composable { GuidePicture(liveSession, liveChannel, live = !watchingChannel) } + if (mainHome) HomeScreen(availableChannels, liveChannel, modifier, picture, + onCategory = { guideCategory = it; onGuide() }, onWatch = { tune(it, 0) }, onOffice = onOffice) + else GuideGrid(channelsIn(guideCategory, availableChannels).ifEmpty { availableChannels }, selectedNumber, modifier, guideCategory.label, picture, + onWatch = ::tune, onBack = { guideCategory = ChannelCategory.All; onHome() }) return } if (!visible) return diff --git a/android/app/src/main/java/tv/orbit/classic/GuideGrid.kt b/android/app/src/main/java/tv/orbit/classic/GuideGrid.kt index 0ab39af6..7d2d589d 100644 --- a/android/app/src/main/java/tv/orbit/classic/GuideGrid.kt +++ b/android/app/src/main/java/tv/orbit/classic/GuideGrid.kt @@ -62,7 +62,7 @@ internal fun guideStep(channel: SampleChannel, cursorMs: Long, nowMs: Long, forw } @Composable -internal fun GuideGrid(channels: List, selectedNumber: Int, modifier: Modifier = Modifier, picture: @Composable (SampleChannel) -> Unit = {}, onWatch: (Int, Long) -> Unit, onBack: () -> Unit) { +internal fun GuideGrid(channels: List, selectedNumber: Int, modifier: Modifier = Modifier, title: String = "All Channels", picture: @Composable () -> Unit = {}, onWatch: (Int, Long) -> Unit, onBack: () -> Unit) { var now by remember { mutableLongStateOf(System.currentTimeMillis()) } LaunchedEffect(Unit) { while (true) { delay(1000); now = System.currentTimeMillis() } } var row by remember { mutableIntStateOf(channels.indexOfFirst { it.number == selectedNumber }.coerceAtLeast(0)) } @@ -90,7 +90,7 @@ internal fun GuideGrid(channels: List, selectedNumber: Int, modif val branding = ChannelBrands.forNumber(channel.number) // The picture stays on the tuned channel while the cursor browses, so moving rows never re-tunes. Box(Modifier.width(170.dp).fillMaxHeight().background(Panel)) { - picture(channels.firstOrNull { it.number == selectedNumber } ?: channel) + picture() } // Four lines fill the panel's height. OK Watch is already in the legend below. Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) { @@ -108,7 +108,7 @@ internal fun GuideGrid(channels: List, selectedNumber: Int, modif } } Row(Modifier.fillMaxWidth().height(20.dp).background(Panel), verticalAlignment = Alignment.CenterVertically) { - Text("All Channels", Modifier.width(130.dp).padding(start = 8.dp), color = Color.White, fontSize = 12.sp, fontWeight = FontWeight.SemiBold) + Text(title, Modifier.width(130.dp).padding(start = 8.dp), color = Color.White, fontSize = 12.sp, fontWeight = FontWeight.SemiBold) Row(Modifier.weight(1f)) { repeat(GUIDE_SLOTS) { Text(clock(windowStart + it * GUIDE_SLOT_MS), Modifier.weight(1f).padding(start = 4.dp), color = Color.White, fontSize = 12.sp, fontWeight = FontWeight.SemiBold) } } @@ -156,6 +156,6 @@ internal fun GuideGrid(channels: List, selectedNumber: Int, modif } } } - Text("▲▼ Channel ◄► Time OK Watch Back Menu", color = Muted, fontSize = 11.sp) + Text("▲▼ Channel ◄► Time OK Watch Back Home", color = Muted, fontSize = 11.sp) } } diff --git a/android/app/src/main/java/tv/orbit/classic/GuidePicture.kt b/android/app/src/main/java/tv/orbit/classic/GuidePicture.kt index 6720df36..1b415707 100644 --- a/android/app/src/main/java/tv/orbit/classic/GuidePicture.kt +++ b/android/app/src/main/java/tv/orbit/classic/GuidePicture.kt @@ -113,6 +113,6 @@ private fun GuideLivePlayer(session: EmbySampleSession, plan: EmbyPlaybackPlan, } // The grid keeps the remote; the picture never takes focus. AndroidView(modifier = Modifier.fillMaxSize(), factory = { nativeContext -> - PlayerView(nativeContext).apply { useController = false; isFocusable = false; this.player = player } + PlayerView(nativeContext).apply { useController = false; isFocusable = false; descendantFocusability = android.view.ViewGroup.FOCUS_BLOCK_DESCENDANTS; this.player = player } }) } diff --git a/android/app/src/main/java/tv/orbit/classic/HomeScreen.kt b/android/app/src/main/java/tv/orbit/classic/HomeScreen.kt new file mode 100644 index 00000000..dd6fc1d5 --- /dev/null +++ b/android/app/src/main/java/tv/orbit/classic/HomeScreen.kt @@ -0,0 +1,138 @@ +package tv.orbit.classic + +import androidx.activity.compose.BackHandler +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +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.graphics.Color +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.res.painterResource +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 +import kotlinx.coroutines.delay + +internal enum class ChannelCategory(val label: String, val icon: Int) { + All("All Channels", R.drawable.orbit_icon_all), + Entertainment("Entertainment", R.drawable.orbit_icon_entertainment), + Movies("Movies", R.drawable.orbit_icon_movies), + Comedy("Comedy", R.drawable.orbit_icon_comedy), + Kids("Kids", R.drawable.orbit_icon_kids), + Documentaries("Documentaries", R.drawable.orbit_icon_documentaries), + Sport("Sport", R.drawable.orbit_icon_sport) +} + +/** All Channels, then only the categories that have a channel in them. */ +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 } +} + +internal fun channelsIn(category: ChannelCategory, channels: List) = + if (category == ChannelCategory.All) channels else channels.filter { ChannelBrands.forNumber(it.number)?.category == category } + +/** How far through a programme now is, from 0 to 1. */ +internal fun programmeProgress(startMs: Long, endMs: Long, nowMs: Long): Float = + if (endMs <= startMs) 0f else ((nowMs - startMs).toFloat() / (endMs - startMs)).coerceIn(0f, 1f) + +private val HomeCorner = RoundedCornerShape(6.dp) + +@Composable +internal fun HomeCard(modifier: Modifier = Modifier, focusRequester: FocusRequester? = null, onClick: () -> Unit, content: @Composable (Boolean) -> Unit) { + var focused by remember { mutableStateOf(false) } + val focus = if (focusRequester != null) Modifier.focusRequester(focusRequester) else Modifier + Box(modifier.then(focus).onFocusChanged { focused = it.isFocused }.clip(HomeCorner).background(if (focused) Yellow else Panel).clickable(onClick = onClick)) { + content(focused) + } +} + +@Composable +private fun ProgressBar(fraction: Float, modifier: Modifier = Modifier, focused: Boolean = false) { + Box(modifier.height(4.dp).clip(RoundedCornerShape(2.dp)).background(if (focused) Navy.copy(alpha = .25f) else Navy)) { + Box(Modifier.fillMaxWidth(fraction).fillMaxHeight().background(if (focused) Navy else Color.White)) + } +} + +/** Home opens onto the tuned channel playing, one press from anything else. Back takes it full screen. */ +@Composable +internal fun HomeScreen(channels: List, tuned: SampleChannel, modifier: Modifier = Modifier, + picture: @Composable () -> Unit, onCategory: (ChannelCategory) -> Unit, onWatch: (Int) -> Unit, onOffice: () -> Unit) { + var now by remember { mutableLongStateOf(System.currentTimeMillis()) } + LaunchedEffect(Unit) { while (true) { delay(1000); now = System.currentTimeMillis() } } + val firstFocus = remember { FocusRequester() } + LaunchedEffect(Unit) { firstFocus.requestFocus() } + BackHandler { onWatch(tuned.number) } + Column(modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(Modifier.fillMaxWidth().weight(1f), horizontalArrangement = Arrangement.spacedBy(14.dp)) { + Column(Modifier.width(176.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + homeCategories(channels.map { it.number }).forEachIndexed { index, category -> + HomeCard(Modifier.fillMaxWidth().height(46.dp), if (index == 0) firstFocus else null, onClick = { onCategory(category) }) { focused -> + Row(Modifier.fillMaxSize().padding(horizontal = 10.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + Image(painterResource(category.icon), null, Modifier.size(26.dp), colorFilter = if (focused) ColorFilter.tint(Navy) else null) + Text(category.label, color = if (focused) Navy else Color.White, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, maxLines = 1) + } + } + } + } + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(6.dp)) { + Box(Modifier.fillMaxWidth().aspectRatio(16f / 9f).clip(HomeCorner).background(Panel)) { picture() } + val show = tuned.at(now) + val next = tuned.at(show.endMs) + val branding = ChannelBrands.forNumber(tuned.number) + val (name, detail) = guideTitleParts(show.media.item.title) + Row(Modifier.fillMaxWidth().weight(1f).clip(HomeCorner).background(Panel).padding(horizontal = 12.dp, vertical = 8.dp), horizontalArrangement = Arrangement.spacedBy(14.dp), verticalAlignment = Alignment.CenterVertically) { + if (branding != null) Image(painterResource(branding.logo), branding.displayName, Modifier.width(92.dp).height(34.dp)) + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) { + Text("NOW ${clock(show.startMs)} to ${clock(show.endMs)}", color = Muted, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, maxLines = 1) + Text(name, color = Color.White, fontSize = 18.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, overflow = TextOverflow.Ellipsis) + if (detail != null) Text(detail, color = Color.White, fontSize = 13.sp, maxLines = 1, overflow = TextOverflow.Ellipsis) + ProgressBar(programmeProgress(show.startMs, show.endMs, now), Modifier.fillMaxWidth().padding(vertical = 2.dp)) + Text("NEXT ${clock(next.startMs)} ${guideTitleParts(next.media.item.title).first}", color = Muted, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + } + } + Column(Modifier.width(250.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + Text("On now", color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.SemiBold) + channels.take(3).forEach { line -> + val show = line.at(now) + val mark = ChannelBrands.forNumber(line.number) + HomeCard(Modifier.fillMaxWidth().height(50.dp), onClick = { onWatch(line.number) }) { focused -> + Row(Modifier.fillMaxSize().padding(horizontal = 8.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + if (mark != null) Image(painterResource(mark.logo), mark.displayName, Modifier.width(72.dp).height(28.dp)) + else Text(ChannelBrands.displayName(line), Modifier.width(72.dp), color = if (focused) Navy else Color.White, fontSize = 12.sp, maxLines = 1) + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(4.dp)) { + Text(guideTitleParts(show.media.item.title).first, color = if (focused) Navy else Color.White, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, overflow = TextOverflow.Ellipsis) + ProgressBar(programmeProgress(show.startMs, show.endMs, now), Modifier.fillMaxWidth(), focused) + } + } + } + } + val preview = officeEvents.first() + HomeCard(Modifier.fillMaxWidth().weight(1f), onClick = onOffice) { focused -> + Column { + Row(Modifier.fillMaxWidth().background(if (focused) Yellow else Color(0xFF7A5A12)).padding(horizontal = 10.dp, vertical = 5.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Image(painterResource(R.drawable.orbit_icon_office), null, Modifier.size(20.dp), colorFilter = if (focused) ColorFilter.tint(Navy) else null) + Text("OrbitOffice preview", color = if (focused) Navy else Color.White, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1) + } + Column(Modifier.padding(horizontal = 10.dp, vertical = 8.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { + Text(preview.title, color = if (focused) Navy else Color.White, fontSize = 18.sp, fontWeight = FontWeight.SemiBold, maxLines = 2, overflow = TextOverflow.Ellipsis) + Text("Fictional event, for now", color = if (focused) Navy else Muted, fontSize = 12.sp, maxLines = 1) + } + } + } + } + } + Text("▲▼ Move OK Select ► Picture and events Back Full screen", color = Muted, fontSize = 11.sp) + } +} diff --git a/android/app/src/main/java/tv/orbit/classic/MainActivity.kt b/android/app/src/main/java/tv/orbit/classic/MainActivity.kt index 55d85130..b9451452 100644 --- a/android/app/src/main/java/tv/orbit/classic/MainActivity.kt +++ b/android/app/src/main/java/tv/orbit/classic/MainActivity.kt @@ -80,6 +80,11 @@ private fun OrbitApp() { val selected = Schedule.guide(Schedule.channels[selectedChannel], now)[selectedColumn] var pinned by remember { mutableStateOf(false) } val tabFocus = remember { List(3) { FocusRequester() } } + val gearFocus = remember { FocusRequester() } + LaunchedEffect(realChannelAvailable) { + if (realChannelAvailable && section == "TV Guide") section = "Home" + if (!realChannelAvailable && section == "Home") section = "TV Guide" + } val programme = Schedule.programme(Schedule.channels[tuned], now) val context = androidx.compose.ui.platform.LocalContext.current val player = remember { ExoPlayer.Builder(context).build().apply { @@ -122,12 +127,14 @@ private fun OrbitApp() { onDispose { lifecycle.removeObserver(observer) } } BackHandler(fullscreen || pinned || section != "TV Guide") { - when { fullscreen -> fullscreen = false; pinned -> pinned = false; section == "Services" || section == "Connect Emby" -> section = "Menu"; else -> section = "TV Guide" } + when { fullscreen -> fullscreen = false; pinned -> pinned = false; section == "Services" || section == "Connect Emby" -> section = "Menu"; else -> section = if (realChannelAvailable) "Home" else "TV Guide" } } - LaunchedEffect(section, fullscreen) { + LaunchedEffect(section, fullscreen, realChannelAvailable) { if (!fullscreen) { - val tab = when (section) { "TV Guide" -> 1; "Box Office" -> 2; else -> 0 } - tabFocus[tab].requestFocus() + if (!realChannelAvailable) { + val tab = when (section) { "TV Guide" -> 1; "Box Office" -> 2; else -> 0 } + tabFocus[tab].requestFocus() + } else if (section != "Home" && section != "TV Guide") gearFocus.requestFocus() } } Box(Modifier.fillMaxSize().background(Navy)) { @@ -143,15 +150,28 @@ private fun OrbitApp() { androidx.compose.foundation.Image(androidx.compose.ui.res.painterResource(R.drawable.orbit_logo), "Orbit", Modifier.width(144.dp).height(36.dp)) Spacer(Modifier.weight(1f)) Text(SimpleDateFormat("EEE d MMM HH:mm", Locale.UK).format(Date(now)), color = Color.White, fontSize = 17.sp) - } - Spacer(Modifier.height(8.dp)) - Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) { - listOf("Menu", "TV Guide", "Box Office").forEachIndexed { index, title -> - OrbitButton("${index + 1} $title", Modifier.focusRequester(tabFocus[index]), - section == title, onClick = { section = title; pinned = false }) + if (realChannelAvailable) { + Spacer(Modifier.width(12.dp)) + HomeCard(Modifier.size(38.dp, 32.dp), gearFocus, onClick = { section = "Menu"; pinned = false }) { focused -> + androidx.compose.foundation.Image(androidx.compose.ui.res.painterResource(R.drawable.orbit_icon_gear), "Settings", Modifier.fillMaxSize().padding(5.dp), + colorFilter = if (focused) androidx.compose.ui.graphics.ColorFilter.tint(Navy) else null) + } + Spacer(Modifier.width(8.dp)) + // Shown from the design, but there's nothing to select until profiles exist. + androidx.compose.foundation.Image(androidx.compose.ui.res.painterResource(R.drawable.orbit_icon_profile), "Profile", Modifier.size(38.dp, 32.dp).background(Panel).padding(5.dp)) } } Spacer(Modifier.height(8.dp)) + // The numbered tabs only serve the demo guide. With real channels, home and the gear replace them. + if (!realChannelAvailable) { + Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) { + listOf("Menu", "TV Guide", "Box Office").forEachIndexed { index, title -> + OrbitButton("${index + 1} $title", Modifier.focusRequester(tabFocus[index]), + section == title, onClick = { section = title; pinned = false }) + } + } + Spacer(Modifier.height(8.dp)) + } if (section == "TV Guide" && !realChannelAvailable) { Row(Modifier.fillMaxWidth().height(120.dp), horizontalArrangement = Arrangement.spacedBy(20.dp)) { Box(Modifier.width(256.dp).fillMaxHeight().border(1.dp, Muted)) { @@ -202,7 +222,7 @@ private fun OrbitApp() { // Connection content is kept composed below to retain the temporary session. } else if (section == "Box Office") { OrbOffice(Modifier.weight(1f), onGuide = { section = "TV Guide" }) - } else if (section != "TV Guide") { + } else if (section != "TV Guide" && section != "Home") { Column(Modifier.fillMaxWidth().weight(1f).background(Panel).padding(28.dp)) { Text("Welcome to Orbit Interactive", color = Yellow, fontSize = 27.sp, fontWeight = FontWeight.Bold) Spacer(Modifier.height(20.dp)) @@ -215,8 +235,9 @@ private fun OrbitApp() { } EmbyConnectionScreen(Modifier.weight(1f), visible = section == "Connect Emby", mainGuide = section == "TV Guide" && realChannelAvailable, + mainHome = section == "Home" && realChannelAvailable, onChannelAvailable = { realChannelAvailable = it }, - onGuide = { section = "TV Guide" }, onBack = { section = "Menu" }) + onGuide = { section = "TV Guide" }, onHome = { section = "Home" }, onOffice = { section = "Box Office" }, onBack = { section = "Menu" }) } } } diff --git a/android/app/src/main/java/tv/orbit/classic/OrbitSections.kt b/android/app/src/main/java/tv/orbit/classic/OrbitSections.kt index 0a69e008..42f8a7a7 100644 --- a/android/app/src/main/java/tv/orbit/classic/OrbitSections.kt +++ b/android/app/src/main/java/tv/orbit/classic/OrbitSections.kt @@ -20,9 +20,9 @@ internal val Barlow = FontFamily(Font(R.font.barlow_regular), Font(R.font.barlow private val TicketType = FontFamily(Font(R.font.barlow_condensed_medium)) private val Paper = Color(0xFFF7EAC8) -private data class OfficeEvent(val title: String, val collection: String, val time: String, +internal data class OfficeEvent(val title: String, val collection: String, val time: String, val synopsis: String, val reference: String) -private val officeEvents = listOf( +internal val officeEvents = listOf( OfficeEvent("The Last Shuttle Home", "Orbit premieres", "Tonight at 21:30", "One final journey brings an unlikely crew together. A fictional premiere for your own front-row seat.", "ORB-001"), OfficeEvent("Visitors at Dawn", "After dark", "Tonight at 23:00", 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 731db84b..4f4a1a08 100644 --- a/android/app/src/main/java/tv/orbit/classic/SecureMediaDataSource.kt +++ b/android/app/src/main/java/tv/orbit/classic/SecureMediaDataSource.kt @@ -33,7 +33,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.27.0") + next.setRequestProperty("User-Agent", "OrbitTV/0.28.0") 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/res/drawable-nodpi/orbit_icon_all.webp b/android/app/src/main/res/drawable-nodpi/orbit_icon_all.webp new file mode 100644 index 0000000000000000000000000000000000000000..70390627d16e589c9a88012800783b987661a698 GIT binary patch literal 2052 zcmV+f2>bU^Nk&He2LJ$9MM6+kP&iER2LJ#sU%(d--cZoC4b$+a-R=^I2!(CiAZ^ER zh~5Z8bB2}O(KF2mb@~6(SlPLA?&rM1uYxP!om-Qx;tN5$Z4%smJJVgPGdsZ@I%kUq zJA%8r6?ccs6 z$dR^9k(*QcJUWLX%$77i%#4`M;0swSZ6Dyvy2=?wF42^_N;FZ|hUVGY$SlZK%+QY5 z0pvE497$HL3;RDUdO9Mzdh~g6R`wsxZQG_E+qP}nMrW(Foz6*>A7HCv=Tx?B^ZVkw z`|f7sHj*L_&xselfSGieYGtb9l9swo4FFo=I-3Hm===T!Gj_HzwmSpOKLXA3{Nvi5 zHW-d&7HG@?S8S8m6|M)fVw&4Y>ttsfrxj>k^vb?YPh{IFGq{%Q+Mwe!MY z&$UNa{{IWB`7xB$E=@wfKV_6MQmi&qn1(A0f-=ME zi_2UOf_^>^Y5nWnwMJ{$vX*0`7*Nt2)e9v;87TR$IKNuub7jy`d1KGCS7A8zAyaLd z7>-7DLV(mWc9@)>--B5bh=LQL<<+iw`tpa4ygrI&vCXOWz{TqAzJ`G3U=JltnBWDr z`769`=wr)&dFt}lc{c|x*SvIrBNIplR7@?o$Fq`)|ac_Mw7Ol zLwZN;&DOP(dnpO{Wh~TY;O$ULBInm#)(s^<)0dPvLIAJ5Ox4%MjdFvzA<$G{$mj5V9~yiY$f{St4YXFc&9Vt;+iiWj4Z9p)Xg3PwL9Ho?P)^)x;tvc|WNh zi2&ojOVB5ON))WSlAElZjO>JM;^F^=@zllceOo=G!-RlB(w6iZeD^|K%8<{hT|6ZyQs+88`OE zEs}MUPm~zS7y@KPO`t2%z452_&t5Urn`j^XY6!Fc?31!-&M!s}!d79M2=rRxZEDr0 zXZKA~_Ou;Ty7%mpRg}@uy-?OFq0+_RDWXUa+SQRL`Gr3^IBU3J%Z;32eo=#@jRJtGMOGTDX?ExK?AU zIH)zfRtDDUW7lf6xPi6agcFGgnTH%8i6;{JA{2%nRKWSk=O7&(0KCCG%8R*J^7|*e zu{?dBL5ZucK50L*X!vC9H?hbHYQgSwD z;GhI!v{gjZ_U&LuU|4e-a~HM6RP(6=EG4M~Y5hw3l2vr};r;^*d7^_AKWjQQ1uskU zNjs!u6-;dR3YM_20|$s|B#;shR!j4o6x}7*bW-N5q{N(-l6-ZJ7;h0IaG0JAO7v)- zksLaEP2T~A3CH~>qCPm9jO0KjeHO`+BAt+&cdL|pBRO<-|An|%f@T_$7U33zTMvGi z$f4Fex+W(cC|KBm6HzZihXOE>L#=zKb=RcM20M6ydJjtf{1+y2pyrnpcQjFFUP>lQ zN_5EQVIDsRCON5(r0_$8ZK>;}FKKufXKbG()!i#T7QwbOTU9l%0n*{WpwhI(k^UVL zk_CI9Sug#nk0#l;aDa^PWL&ox5;BHa7AIJR(F@HRF1M)Zie1fZf`mfC9%x#3FbBEF z9dQ3mT$3MN#{^}mZT4)?F%+qWFF+j`G@p%hi|lrN*zT5C zfw#0NlWA83r~g2cV2dXVX%C)A>XZ}vXdJ7krzX{kQ{>^ujRxnJnPe)(Fj))}rH;D) z#G?<%NHv{qVoF3KGs|#$Rx~~`%q~G0CbZaJO;hPz1ztlW6OVAZK5P$NV1BZ8?}ot> z@c{YDa5x<1o_(c!h4aA^uRa#X1TE~xRvg0i$znaOS2SHid&3u2ifq&VY@eMag)A|0)-ZXlijW9>UH}(QU>}IjMTkICFHfwjUSdIhD%43?k zqnE)0bq9lPmBb3oiiGLgv3%Y<8x7m%jW=mQ^3Bdms#UMi?U?hxBm{rZ7b$B_rly&g z-eBJe&NhcbT(EO5*eW$br*;m&dB70J9mc{#g`!I`QR;zGN2M20Ot^&?fH{B*@4ig- z=e3$&0GL&r)|IAZGL4{hrTpt+`PcRG=MwVgD$?gd^5EA)kVl9R|hb60SPo4g8#1})JuuRY&HQ_nf>4Z literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-nodpi/orbit_icon_comedy.webp b/android/app/src/main/res/drawable-nodpi/orbit_icon_comedy.webp new file mode 100644 index 0000000000000000000000000000000000000000..a89d1148a1ee540b5e8faf159d8cc524c9c8e3f8 GIT binary patch literal 2690 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 Oq=#2>6jwc>LIMD68x{Hh literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-nodpi/orbit_icon_entertainment.webp b/android/app/src/main/res/drawable-nodpi/orbit_icon_entertainment.webp new file mode 100644 index 0000000000000000000000000000000000000000..603c3e7580e85239e3fcf598213809dab838724a GIT binary patch literal 1996 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 MepGE;{(B(+03H!}*Z=?k literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-nodpi/orbit_icon_movies.webp b/android/app/src/main/res/drawable-nodpi/orbit_icon_movies.webp new file mode 100644 index 0000000000000000000000000000000000000000..8962beb8e4a9c7cf868b83374a3af77c317ffd04 GIT binary patch literal 3262 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 literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-nodpi/orbit_icon_profile.webp b/android/app/src/main/res/drawable-nodpi/orbit_icon_profile.webp new file mode 100644 index 0000000000000000000000000000000000000000..3608b96313b8a2264cd609525607b45b7dae593b GIT binary patch literal 1290 zcmV+l1@-z;Nk&Ej1pok7MM6+kP&iEW1ONapU%(d-mjyYpZPiMj`@XwI@ss@dQjB2q zY$HiPifr4p();}!$e;v+_(2aUC`OE4+>j$la;@a-*OC)f;3WQF9=ERwj%3@am9@XS z;t)AQu=&SCq!jUY*L%+68&&&Xw_)?L&Mn zSr094!0@3tt_FvYo#o2>oMT{URl zbUq@2GrL}9s4l6>Hyh%ql}PH zX|+w;>$Z-nP^ipHr2?6+yM2=*Q^+{Gwf?SBVPy0kpw8FddX|V|oZQ>QeHMKXI8KFx zdw?_DyOyF@IL~MBfI#}ho`D}nF-ciZSWkvHysz6QQEVLc9kx7A@bKB1re8z`q)oj% z4D6OItp90dgjZ*^=vBq#DLV^hQpZx^?ddV*zllvFl-XiU?x$7-Q>g=s#Ziuq7@is9 zJnRi}AM+bjnG5Osva=V=YBF*2l_cikSGW~M}`EwEZa~=6}Dfx3X`FjERdky(} z8TEVRZ|l7nfIP49&RfM^sih?3>e&mtmo#&%LZpt}drbUEt&2C=>5~laP(3HMOCF~H zaP7#F6&qHsoA&d!gTKsts?*lF4YK6OH2`?Q77M~0fD4D_to?da$9lCJHE*k(`u1U` zZB=}Vj-$R_JLk}aGLQ=`r4%^7bjzg9b((h>mai%mxuEhEs>}|OX3gt#p0s7@`7%Na ziQo}%VAYW3zE8e1R$`v+L|jSOHy@Is3=NXE<6|@X*YEOq(fHsftX=B&_s5d9^M|;; zaZrJBT8ixOiTr+&wABxZ;rSl+ws>lTS3PT|XeB;>=D zjfQ@bC5}_SGEBrtPG;2^ozE;FsYAf#u7Yv8?w!aI;u*OL^I1`@t6L(-leYPtdZ(5x6)gqu0T?Siqa@oR6@!5I~a+?}|)U{@*=5r|2=sOcw>Wn8+* zBog_qWzn{{rHYu`^9GE_tm75&2dR#^bxZc;{9IIzpZ~GN1p5;B*jdH7@qP35CC;CV zo6TWyhu5Bf^NYdp^aS(jmMF-1!IQX~@oXw$2x2m$d69xxX2k7{-1IgD3R0QQ2;%AK z)b_m1e(gP_is}&;IC8w0O4Pf A0ssI2 literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-nodpi/orbit_icon_sport.webp b/android/app/src/main/res/drawable-nodpi/orbit_icon_sport.webp new file mode 100644 index 0000000000000000000000000000000000000000..e4ccbbb35482a49a5fb9131c87f3069fa1920cd6 GIT binary patch literal 608 zcmV-m0-ya-Nk&Fk0ssJ4MM6+kP&iCW0ssInU%(d-kHRRDBt^A*XyHVie+Tel#2)XORk2(oRb zZ5mFwVJI^*Gc#-dyD7=fE|a7$=|}XRf!jukvb;w*rXPskWg$k2c#9+E=>>vRN&G>7 zR+`b|(sIL^2syA>)@oFi)%NY3t-Z@D4l!tU-Y8m?WqtSJ?EG;5fI|$5jXm?E<+!D5 zJ~^_-ry&PtE$@@?(I@JS=#LWp8AboR{`2;_{bj}Q0}4qHcUdMf#yEup?S4;FsV;3u u+~YvI$HZK(wca3qY{1=PVt(3L=zkNq`y(4@3d22?VC0XhVD4Y3fdBv}H!5ZT literal 0 HcmV?d00001 diff --git a/android/app/src/test/java/tv/orbit/classic/GuideGridTest.kt b/android/app/src/test/java/tv/orbit/classic/GuideGridTest.kt index b6cdd034..3296231d 100644 --- a/android/app/src/test/java/tv/orbit/classic/GuideGridTest.kt +++ b/android/app/src/test/java/tv/orbit/classic/GuideGridTest.kt @@ -59,4 +59,27 @@ class GuideGridTest { assertFalse(scheduledRuntimeMatches(1_000_000, 1_002_001)) assertFalse(scheduledRuntimeMatches(null, 1_000_000)) } + + @Test + fun homeOnlyListsCategoriesWithChannels() { + assertEquals(listOf(ChannelCategory.All, ChannelCategory.Entertainment, ChannelCategory.Movies), homeCategories(listOf(101, 102, 103))) + assertEquals(listOf(ChannelCategory.All, ChannelCategory.Movies), homeCategories(listOf(102))) + assertEquals(listOf(ChannelCategory.All), homeCategories(listOf(999))) + } + + @Test + fun aCategoryOpensOnlyItsOwnChannels() { + val dark = SampleChannel(listOf(media("a", 20), media("b", 20)), "Fixture", 102) + val vortex = SampleChannel(listOf(media("c", 20), media("d", 20)), "Fixture", 103) + assertEquals(listOf(102), channelsIn(ChannelCategory.Movies, listOf(dark, vortex)).map { it.number }) + assertEquals(listOf(102, 103), channelsIn(ChannelCategory.All, listOf(dark, vortex)).map { it.number }) + } + + @Test + fun programmeProgressStaysBetweenStartAndEnd() { + assertEquals(.5f, programmeProgress(100, 200, 150), .001f) + assertEquals(0f, programmeProgress(100, 200, 50), .001f) + assertEquals(1f, programmeProgress(100, 200, 300), .001f) + assertEquals(0f, programmeProgress(100, 100, 100), .001f) + } }