Logos and idents: swoosh fitted to each name, ToonZ without the starburst, Signature without the half laurel, Heroes strings only, a night mark for the late takeovers (1.0 RC3-5, build 47)
Paul, 14 November 2026. 24 channels shared one fixed-length swoosh; each now runs the length of its name (18 idents rebuilt from their own frames, each keeping its sound). ToonZ's starburst covered the N and flickered: gone. Signature's half laurel looked unfinished: gone, from the ident and the guide logo, and its name re-set so the E isn't cut off. Heroes: no jingle, just the heroic strings building to the hero on the rooftop. The takeovers' half-cut C becomes a glowing gold moon with Nite Owl perched in it (asleep for Tots Dreamtime). Tools in channel-designs/revisions/sweep-fit. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -3,7 +3,7 @@ plugins {
|
||||
id("org.jetbrains.kotlin.plugin.compose")
|
||||
}
|
||||
/** The release's build number: versionCode is this x 10 plus the edition's channel. */
|
||||
val ORBIT_BUILD = 46
|
||||
val ORBIT_BUILD = 47
|
||||
android {
|
||||
namespace = "tv.orbit.classic"
|
||||
compileSdk = 36
|
||||
|
||||
@@ -71,15 +71,36 @@ internal fun takeoverOf(channel: Int, entry: ScheduleEntry, zone: ZoneId = ZoneI
|
||||
/** Hidden from the profile watching: a grown-up takeover, for Kids. */
|
||||
internal fun kidsAsleep(takeover: Takeover?) = takeover != null && !takeover.kidsSafe && Profiles.kids
|
||||
|
||||
/** A takeover's mark: Orbit's moon swoosh and its name in its colour, as the channels' own marks are drawn. */
|
||||
/**
|
||||
* A takeover's mark (Paul, 14 November 2026: the thin arc read as a half-cut C; "something similar" to a glowing moon with
|
||||
* an owl perched in it): a big gold crescent, Orbit's own crescent shape, softly glowing, Nite Owl perched in its curve and
|
||||
* a few stars beside him; then the takeover's name in its colour.
|
||||
*/
|
||||
@Composable
|
||||
internal fun TakeoverMark(t: Takeover, modifier: Modifier = Modifier, height: Dp = 26.dp, textSize: TextUnit = 16.sp) {
|
||||
Row(modifier, verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) {
|
||||
Canvas(Modifier.size(height * .8f)) { drawArc(Color.White, 100f, 230f, false, Offset(size.width * .1f, size.height * .1f), Size(size.width * .8f, size.height * .8f), style = Stroke(size.minDimension * .09f)) }
|
||||
Row(modifier, verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(height * .1f)) {
|
||||
Canvas(Modifier.size(height)) { drawNightMark(sleepy = t.host == TakeoverHost.NightCap) }
|
||||
Text(t.name.uppercase(), color = t.colour, fontFamily = Anton, fontSize = textSize, maxLines = 1)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The night mark itself, in a square: a full gold crescent with its glow, a few stars, and Nite Owl perched in its curve.
|
||||
* For Tots Dreamtime ([sleepy]) the owl is asleep and the moon glows softer, the calmer bedtime version.
|
||||
*/
|
||||
internal fun DrawScope.drawNightMark(sleepy: Boolean = false) {
|
||||
val h = size.height
|
||||
val disc = androidx.compose.ui.graphics.Path().apply { addOval(androidx.compose.ui.geometry.Rect(Offset(h * .5f, h * .5f), h * .47f)) }
|
||||
val bite = androidx.compose.ui.graphics.Path().apply { addOval(androidx.compose.ui.geometry.Rect(Offset(h * .7f, h * .37f), h * .4f)) }
|
||||
val moon = androidx.compose.ui.graphics.Path().apply { op(disc, bite, androidx.compose.ui.graphics.PathOperation.Difference) }
|
||||
drawCircle(androidx.compose.ui.graphics.Brush.radialGradient(listOf(Color(if (sleepy) 0x2EFFC23D else 0x4DFFC23D), Color(0x00FFC23D)), Offset(h * .45f, h * .55f), h * .5f), h * .5f, Offset(h * .45f, h * .55f))
|
||||
drawPath(moon, androidx.compose.ui.graphics.Brush.linearGradient(listOf(Color(0xFFFFF4C2), Color(0xFFFFCF4A), Color(0xFFF0A422)), Offset(0f, 0f), Offset(h * .6f, h)))
|
||||
for ((x, y, r) in listOf(Triple(.66f, .16f, .03f), Triple(.84f, .3f, .022f), Triple(.76f, .07f, .018f), Triple(.92f, .14f, .016f)))
|
||||
drawCircle(Color(0xFFFFE9A8), h * r, Offset(h * x, h * y))
|
||||
// Perched on the crescent's inner curve, low down, as on a branch.
|
||||
drawNiteOwl(Offset(h * .6f, h * .58f), h * .2f, shut = sleepy)
|
||||
}
|
||||
|
||||
/** Nite Owl, to the late-night model sheet (design/arcade/late-night/nite-owl.svg): indigo, ear tufts, half-closed lids, a small beak. */
|
||||
internal fun DrawScope.drawNiteOwl(c: Offset, r: Float, shut: Boolean = false,
|
||||
/** Lids lowered over the eyes, 0 to 1: a slow blink. */
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 5.7 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user