diff --git a/android/app/src/main/java/tv/orbit/classic/ChannelIdentities.kt b/android/app/src/main/java/tv/orbit/classic/ChannelIdentities.kt index 1f4b2284..52367199 100644 --- a/android/app/src/main/java/tv/orbit/classic/ChannelIdentities.kt +++ b/android/app/src/main/java/tv/orbit/classic/ChannelIdentities.kt @@ -146,6 +146,19 @@ internal val VortexPremiereFilms = listOf("Dragon Ball: Mystical Adventure", "Dr * Movie Night comes first, so on Friday and Saturday it takes 20:00 to 22:00 and Toonami's evening hour picks up after the film. * Daytime suggestions not yet placed by hand go late, never into the daytime. Evening suggestions keep their evening. */ +/** + * Saturday Mornings (Paul, 6 November 2026, from the Nostalgia TV comparison): a weekend event across the cartoon channels + * rather than a channel. Heroes and Orbit X already keep their Saturday mornings (Marvel, and the core); Sunday mornings now + * follow, with DC's classics on Heroes, and Rewind gains both mornings. Vortex's mornings are its staples already. It shapes + * the weekends planned from now on, never anything booked. + */ +internal val HeroesSaturday = listOf("Batman: The Animated Series", "X-Men: The Animated Series", "Spider-Man: The Animated Series", "Superman: The Animated Series", + "Fantastic Four", "Static Shock", "Batman Beyond", "Teen Titans", "The Batman") +internal val OrbitXSaturday = listOf("Teenage Mutant Ninja Turtles", "The Real Ghostbusters", "ThunderCats", "She-Ra: Princess of Power", "M.A.S.K.", "Captain Planet and the Planeteers", + "Biker Mice from Mars", "Swat Kats: The Radical Squadron", "Gargoyles", "Street Sharks", "Digimon: Digital Monsters") +internal val RewindSaturday = listOf("Rugrats", "Doug", "Animaniacs", "Pinky and the Brain", "Hey Arnold!", "Rocko's Modern Life", "Dexter's Laboratory", "Recess", "CatDog", + "SpongeBob SquarePants", "Ed, Edd n Eddy", "The Wild Thornberrys") + internal val VortexDayParts get() = listOf( // The premiere comes first, then on its nights a shorter, Dragon Ball Movie Night that ends before it; other Saturdays are as before. DayPart(21, 22, listOf(BEERUS), days = setOf(DayOfWeek.SATURDAY), onTime = true, key = "vortex.afterburn.premiere", from = BeerusPremiereFrom, premiere = true, premiereBuffer = 2, graceMs = 10 * 60_000L), @@ -170,6 +183,7 @@ private val HeroesAfterSchool = listOf("Batman: The Animated Series", "Superman: internal val HeroesShows get() = (HeroesCore + HeroesSupporting).distinct() internal val HeroesDayParts get() = listOf( DayPart(7, 11, HeroesMarvel, days = setOf(DayOfWeek.SATURDAY)), + DayPart(7, 11, HeroesSaturday, days = setOf(DayOfWeek.SUNDAY)), DayPart(6, 15, HeroesShows), DayPart(15, 18, HeroesAfterSchool), DayPart(18, 22, HeroesCore + listOf("Young Justice", "The Avengers: Earth's Mightiest Heroes", "The Spectacular Spider-Man")), DayPart(22, 6, HeroesShows)) /** Self-contained episodes mix. Shows with story arcs stay in order. */ @@ -188,6 +202,7 @@ private val OrbitXEarlierNames = listOf("Digimon Adventure", "Mighty Morphin Pow internal val OrbitXShows get() = (OrbitXCore + OrbitXSupporting + OrbitXGuests + OrbitXEarlierNames).distinct() internal val OrbitXDayParts get() = listOf( DayPart(7, 12, OrbitXCore + OrbitXEarlierNames + OrbitXGuests, days = setOf(DayOfWeek.SATURDAY)), + DayPart(7, 12, OrbitXSaturday, days = setOf(DayOfWeek.SUNDAY)), DayPart(15, 18, OrbitXCore + OrbitXEarlierNames + OrbitXGuests, days = Weekdays), DayPart(6, 18, OrbitXCore + OrbitXSupporting + OrbitXEarlierNames), DayPart(18, 23, OrbitXShows), DayPart(23, 6, OrbitXCore + OrbitXSupporting + OrbitXEarlierNames)) internal val OrbitXMixed get() = setOf("Biker Mice from Mars", "Teenage Mutant Ninja Turtles", "The Transformers", "He-Man and the Masters of the Universe", "ThunderCats", @@ -205,6 +220,7 @@ private val RewindSupporting = listOf("Rugrats", "Hey Arnold!", "Doug", "CatDog" private val RewindNewer = listOf("Regular Show", "Gravity Falls") internal val RewindShows get() = (RewindCore + RewindSupporting + RewindNewer).distinct() internal val RewindDayParts get() = listOf( + DayPart(7, 12, RewindSaturday, days = Weekend), DayPart(6, 9, RewindCore + listOf("Rugrats", "Hey Arnold!", "Doug")), DayPart(9, 15, RewindShows), DayPart(15, 19, RewindCore), DayPart(19, 23, RewindShows), DayPart(23, 6, RewindCore)) internal val RewindMixed get() = RewindShows.toSet() - "Gravity Falls" @@ -368,8 +384,11 @@ private val JuniorAfterSchool = listOf("Grange Hill", "Byker Grove", "The Story "The Animals of Farthing Wood", "Grizzly Tales for Gruesome Kids", "ChuckleVision") private val JuniorTeatime = listOf("Goosebumps", "Are You Afraid of the Dark?", "Thunderbirds", "Stingray", "Captain Scarlet and the Mysterons", "Horrible Histories") /** Nite Owl (Paul, 6 November 2026): classic sitcoms on Junior from 21:00 till dawn, Orbit's Nick at Nite. */ +/** Comfort Repeats (Paul, 6 November 2026): the sitcoms everyone rewatches, as part of Nite Owl's overnight rather than a channel of their own. */ +internal val NiteOwlComfort = listOf("Friends", "The Office", "Community", "Brooklyn Nine-Nine", "Parks and Recreation", "Scrubs", "The Fresh Prince of Bel-Air", + "Everybody Loves Raymond", "The IT Crowd", "Gavin & Stacey", "Malcolm in the Middle", "How I Met Your Mother", "The Office (US)") internal val NiteOwlShows = listOf("Cheers", "Frasier", "Taxi", "M*A*S*H", "Fawlty Towers", "Only Fools and Horses", "Seinfeld", "The Golden Girls", "Porridge", - "Dad's Army", "Blackadder", "Red Dwarf", "Open All Hours", "Night Court", "Father Ted", "Black Books", "Steptoe and Son", "Keeping Up Appearances") + "Dad's Army", "Blackadder", "Red Dwarf", "Open All Hours", "Night Court", "Father Ted", "Black Books", "Steptoe and Son", "Keeping Up Appearances") + NiteOwlComfort internal val JuniorShows get() = (JuniorBreakfast + JuniorDaytime + JuniorAfterSchool + JuniorTeatime + NiteOwlShows).distinct() internal val JuniorDayParts get() = listOf( DayPart(6, 9, JuniorBreakfast), DayPart(9, 15, JuniorDaytime + JuniorAfterSchool), DayPart(15, 18, JuniorAfterSchool), DayPart(18, 20, JuniorTeatime), diff --git a/android/app/src/main/java/tv/orbit/classic/Takeovers.kt b/android/app/src/main/java/tv/orbit/classic/Takeovers.kt index 74741860..28e92d00 100644 --- a/android/app/src/main/java/tv/orbit/classic/Takeovers.kt +++ b/android/app/src/main/java/tv/orbit/classic/Takeovers.kt @@ -48,7 +48,7 @@ internal class Takeover(val channel: Int, val key: String, val name: String, val } internal val TOONZ_LATE = Takeover(605, "toonz.late", "ToonZ Late", Color(0xFFFF7AC6), 22, 5, ToonZLateShows, TakeoverHost.Blaze, "Grown-up cartoons till 5am", kidsSafe = false) -internal val NITE_OWL = Takeover(611, "junior.niteowl", "Nite Owl", Color(0xFFFFC23D), 21, 6, NiteOwlShows, TakeoverHost.NiteOwl, "Classic sitcoms till dawn", kidsSafe = false) +internal val NITE_OWL = Takeover(611, "junior.niteowl", "Nite Owl", Color(0xFFFFC23D), 21, 6, NiteOwlShows, TakeoverHost.NiteOwl, "Classic and comfort sitcoms till dawn", kidsSafe = false) internal val TOTS_DREAMTIME = Takeover(TOTS_NUMBER, "tots.dreamtime", "Tots Dreamtime", Color(0xFFC9B8FF), 19, 6, TotsWindDown, TakeoverHost.NightCap, "Bedtime shows with Luna", kidsSafe = true, byTheClock = true) internal val TERRA_STARLIGHT = Takeover(201, "terra.starlight", "Terra Starlight", Color(0xFF6EDCAA), 22, 6, TerraStarlightShows, TakeoverHost.Drift, "Space and the night sky till dawn", kidsSafe = true)