diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 1ffe5876..9b9646a4 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -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 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 28e92d00..3759b934 100644 --- a/android/app/src/main/java/tv/orbit/classic/Takeovers.kt +++ b/android/app/src/main/java/tv/orbit/classic/Takeovers.kt @@ -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. */ diff --git a/android/app/src/main/res/drawable-nodpi/orbit_signature_epg.webp b/android/app/src/main/res/drawable-nodpi/orbit_signature_epg.webp index fd05a398..76f6b2ff 100644 Binary files a/android/app/src/main/res/drawable-nodpi/orbit_signature_epg.webp and b/android/app/src/main/res/drawable-nodpi/orbit_signature_epg.webp differ diff --git a/android/app/src/main/res/raw/ident_101.mp4 b/android/app/src/main/res/raw/ident_101.mp4 index 6cc1471b..1c52b2d6 100644 Binary files a/android/app/src/main/res/raw/ident_101.mp4 and b/android/app/src/main/res/raw/ident_101.mp4 differ diff --git a/android/app/src/main/res/raw/ident_102.mp4 b/android/app/src/main/res/raw/ident_102.mp4 index 6a133072..3402f49d 100644 Binary files a/android/app/src/main/res/raw/ident_102.mp4 and b/android/app/src/main/res/raw/ident_102.mp4 differ diff --git a/android/app/src/main/res/raw/ident_103.mp4 b/android/app/src/main/res/raw/ident_103.mp4 index 515429d7..7ed72136 100644 Binary files a/android/app/src/main/res/raw/ident_103.mp4 and b/android/app/src/main/res/raw/ident_103.mp4 differ diff --git a/android/app/src/main/res/raw/ident_104.mp4 b/android/app/src/main/res/raw/ident_104.mp4 index 5db733b9..3551da18 100644 Binary files a/android/app/src/main/res/raw/ident_104.mp4 and b/android/app/src/main/res/raw/ident_104.mp4 differ diff --git a/android/app/src/main/res/raw/ident_106.mp4 b/android/app/src/main/res/raw/ident_106.mp4 index 24e0e6ba..ea7e73e3 100644 Binary files a/android/app/src/main/res/raw/ident_106.mp4 and b/android/app/src/main/res/raw/ident_106.mp4 differ diff --git a/android/app/src/main/res/raw/ident_107.mp4 b/android/app/src/main/res/raw/ident_107.mp4 index b3bf578a..df758e65 100644 Binary files a/android/app/src/main/res/raw/ident_107.mp4 and b/android/app/src/main/res/raw/ident_107.mp4 differ diff --git a/android/app/src/main/res/raw/ident_109.mp4 b/android/app/src/main/res/raw/ident_109.mp4 index bc98f0b2..d5e33fe4 100644 Binary files a/android/app/src/main/res/raw/ident_109.mp4 and b/android/app/src/main/res/raw/ident_109.mp4 differ diff --git a/android/app/src/main/res/raw/ident_202.mp4 b/android/app/src/main/res/raw/ident_202.mp4 index 2fe57162..ee0aeb4e 100644 Binary files a/android/app/src/main/res/raw/ident_202.mp4 and b/android/app/src/main/res/raw/ident_202.mp4 differ diff --git a/android/app/src/main/res/raw/ident_204.mp4 b/android/app/src/main/res/raw/ident_204.mp4 index a3a2b55b..975aed0d 100644 Binary files a/android/app/src/main/res/raw/ident_204.mp4 and b/android/app/src/main/res/raw/ident_204.mp4 differ diff --git a/android/app/src/main/res/raw/ident_301.mp4 b/android/app/src/main/res/raw/ident_301.mp4 index 92d180a3..2e2a508c 100644 Binary files a/android/app/src/main/res/raw/ident_301.mp4 and b/android/app/src/main/res/raw/ident_301.mp4 differ diff --git a/android/app/src/main/res/raw/ident_302.mp4 b/android/app/src/main/res/raw/ident_302.mp4 index e83075e5..e0cbe202 100644 Binary files a/android/app/src/main/res/raw/ident_302.mp4 and b/android/app/src/main/res/raw/ident_302.mp4 differ diff --git a/android/app/src/main/res/raw/ident_303.mp4 b/android/app/src/main/res/raw/ident_303.mp4 index 35082144..f37120da 100644 Binary files a/android/app/src/main/res/raw/ident_303.mp4 and b/android/app/src/main/res/raw/ident_303.mp4 differ diff --git a/android/app/src/main/res/raw/ident_304.mp4 b/android/app/src/main/res/raw/ident_304.mp4 index e02f8a4f..6177e470 100644 Binary files a/android/app/src/main/res/raw/ident_304.mp4 and b/android/app/src/main/res/raw/ident_304.mp4 differ diff --git a/android/app/src/main/res/raw/ident_305.mp4 b/android/app/src/main/res/raw/ident_305.mp4 index 87207734..30e28ab2 100644 Binary files a/android/app/src/main/res/raw/ident_305.mp4 and b/android/app/src/main/res/raw/ident_305.mp4 differ diff --git a/android/app/src/main/res/raw/ident_307.mp4 b/android/app/src/main/res/raw/ident_307.mp4 index 6a9b1def..ec540d3f 100644 Binary files a/android/app/src/main/res/raw/ident_307.mp4 and b/android/app/src/main/res/raw/ident_307.mp4 differ diff --git a/android/app/src/main/res/raw/ident_601.mp4 b/android/app/src/main/res/raw/ident_601.mp4 index 6fb3995e..2b23a179 100644 Binary files a/android/app/src/main/res/raw/ident_601.mp4 and b/android/app/src/main/res/raw/ident_601.mp4 differ diff --git a/android/app/src/main/res/raw/ident_602.mp4 b/android/app/src/main/res/raw/ident_602.mp4 index 6b8f5d02..6c7f17f3 100644 Binary files a/android/app/src/main/res/raw/ident_602.mp4 and b/android/app/src/main/res/raw/ident_602.mp4 differ diff --git a/android/app/src/main/res/raw/ident_605.mp4 b/android/app/src/main/res/raw/ident_605.mp4 index c63a4f00..6ef7a75b 100644 Binary files a/android/app/src/main/res/raw/ident_605.mp4 and b/android/app/src/main/res/raw/ident_605.mp4 differ diff --git a/android/app/src/main/res/raw/ident_612.mp4 b/android/app/src/main/res/raw/ident_612.mp4 index d928193c..3b63aec2 100644 Binary files a/android/app/src/main/res/raw/ident_612.mp4 and b/android/app/src/main/res/raw/ident_612.mp4 differ