diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 5a4c9301..8c350f4c 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 = 290 - versionName = "0.110.7-arcade1" + versionCode = 291 + versionName = "0.110.8-arcade1" } 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/java/tv/orbit/classic/arcade/ArcadeInput.kt b/android/app/src/main/java/tv/orbit/classic/arcade/ArcadeInput.kt index 18b32f0b..72def164 100644 --- a/android/app/src/main/java/tv/orbit/classic/arcade/ArcadeInput.kt +++ b/android/app/src/main/java/tv/orbit/classic/arcade/ArcadeInput.kt @@ -1,6 +1,8 @@ package tv.orbit.classic.arcade import android.view.KeyEvent +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.key.onPreviewKeyEvent /** The remote, as the Arcade sees it. */ internal enum class ArcadeKey { Up, Down, Left, Right, Ok, Back, Menu, PlayPause, Other } @@ -17,6 +19,23 @@ internal fun arcadeKey(keyCode: Int): ArcadeKey = when (keyCode) { else -> ArcadeKey.Other } +/** Back, from the remote, a keyboard or a pad's B. */ +internal fun isBackKey(keyCode: Int) = arcadeKey(keyCode) == ArcadeKey.Back + +/** A Back acts on its press (the first "down"); its repeats and its release are swallowed with it. */ +internal fun backPressActs(down: Boolean, repeatCount: Int) = down && repeatCount == 0 + +/** + * Back caught in a screen's own key handler (8 November 2026, found on the TV). On Android TV, Compose uses a Back press + * to move focus out of whatever has it, so a BackHandler alone never heard Back while a game held the focus: Orbi-Raiders + * didn't pause. Screens that hold the focus catch Back here; their BackHandler stays for when nothing is focused. + */ +internal fun Modifier.onBackKey(enabled: Boolean = true, action: () -> Unit): Modifier = onPreviewKeyEvent { e -> + val n = e.nativeKeyEvent + if (!enabled || !isBackKey(n.keyCode)) false + else { if (backPressActs(n.action == KeyEvent.ACTION_DOWN, n.repeatCount)) action(); true } +} + /** What a key means in play: Back (and play/pause) always pause, never leave. */ internal fun pausesGame(key: ArcadeKey) = key == ArcadeKey.Back || key == ArcadeKey.PlayPause diff --git a/android/app/src/main/java/tv/orbit/classic/arcade/hive/BumbleHiveScreen.kt b/android/app/src/main/java/tv/orbit/classic/arcade/hive/BumbleHiveScreen.kt index 9c8a3ee0..e8712401 100644 --- a/android/app/src/main/java/tv/orbit/classic/arcade/hive/BumbleHiveScreen.kt +++ b/android/app/src/main/java/tv/orbit/classic/arcade/hive/BumbleHiveScreen.kt @@ -40,6 +40,7 @@ import tv.orbit.classic.arcade.KeyFooter import tv.orbit.classic.arcade.PauseWhenHidden import tv.orbit.classic.arcade.RunEnd import tv.orbit.classic.arcade.rememberRun +import tv.orbit.classic.arcade.onBackKey import java.io.File import java.util.concurrent.atomic.AtomicBoolean @@ -176,6 +177,11 @@ internal fun BumbleHiveScreen(play: ArcadePlay) { Box(Modifier.fillMaxSize().background(ArcadeColours.Night).focusRequester(focus).focusable().onPreviewKeyEvent { e -> if (overlay) return@onPreviewKeyEvent false val n = e.nativeKeyEvent + // Back, caught here: on the TV, Compose spends a Back moving focus, so the BackHandler alone never heard it. + if (tv.orbit.classic.arcade.isBackKey(n.keyCode)) { + if (tv.orbit.classic.arcade.backPressActs(n.action == KeyEvent.ACTION_DOWN, n.repeatCount)) { sim.action(HiveKey.Back); sync() } + return@onPreviewKeyEvent true + } val k = hiveKey(n.keyCode) ?: return@onPreviewKeyEvent false sim.key(k, n.action == KeyEvent.ACTION_DOWN, n.repeatCount > 0) sync() @@ -216,7 +222,7 @@ private fun HiveResultCard(sim: HiveSim, onAct: (() -> Unit) -> Unit) { LaunchedEffect(Unit) { runCatching { first.requestFocus() } } BackHandler { onAct { sim.toLevels() } } val won = sim.screen == HiveScreen.Win - Box(Modifier.fillMaxSize().background(ArcadeColours.Night.copy(alpha = .6f)), contentAlignment = Alignment.Center) { + Box(Modifier.fillMaxSize().onBackKey { onAct { sim.toLevels() } }.background(ArcadeColours.Night.copy(alpha = .6f)), contentAlignment = Alignment.Center) { Column(Modifier.width(420.dp).background(ArcadeColours.PanelDeep, RoundedCornerShape(14.dp)).border(1.dp, ArcadeColours.Line, RoundedCornerShape(14.dp)).padding(20.dp), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(6.dp)) { Text("BUMBLEHIVE · LEVEL ${sim.level}${if (sim.mode == HiveMode.Hard) " · HARD" else ""}", color = ArcadeColours.Muted, fontSize = 13.sp, letterSpacing = 3.sp) diff --git a/android/app/src/main/java/tv/orbit/classic/arcade/raiders/OrbiRaidersScreen.kt b/android/app/src/main/java/tv/orbit/classic/arcade/raiders/OrbiRaidersScreen.kt index d5ffeacb..572d7cce 100644 --- a/android/app/src/main/java/tv/orbit/classic/arcade/raiders/OrbiRaidersScreen.kt +++ b/android/app/src/main/java/tv/orbit/classic/arcade/raiders/OrbiRaidersScreen.kt @@ -46,6 +46,7 @@ import tv.orbit.classic.arcade.KeyFooter import tv.orbit.classic.arcade.PauseWhenHidden import tv.orbit.classic.arcade.arcadeKey import tv.orbit.classic.arcade.pausesGame +import tv.orbit.classic.arcade.onBackKey import tv.orbit.classic.drawOrbChaser import tv.orbit.classic.drawOrbMascot import kotlin.math.abs @@ -165,6 +166,11 @@ internal fun OrbiRaidersScreen(play: ArcadePlay) { Stage.Play, Stage.Result -> { Box(Modifier.fillMaxSize().focusRequester(playFocus).focusable().onPreviewKeyEvent { e -> if (stage != Stage.Play || paused) return@onPreviewKeyEvent false + // Back pauses, caught here: on the TV, Compose spends a Back moving focus, so the BackHandler never heard it. + if (tv.orbit.classic.arcade.isBackKey(e.nativeKeyEvent.keyCode)) { + if (tv.orbit.classic.arcade.backPressActs(e.nativeKeyEvent.action == KeyEvent.ACTION_DOWN, e.nativeKeyEvent.repeatCount)) pause() + return@onPreviewKeyEvent true + } val n = e.nativeKeyEvent val key = arcadeKey(n.keyCode) val down = n.action == KeyEvent.ACTION_DOWN @@ -193,7 +199,7 @@ private fun TitleScreen(chosen: Pilot, best: Int, bestWave: Int, difficulty: Str // On opening, and again when How to Play closes. LaunchedEffect(refocus) { if (refocus) runCatching { cards.getValue(chosen).requestFocus() } } BackHandler(onBack = onBack) - Box(Modifier.fillMaxSize().background(ArcadeColours.Night)) { + Box(Modifier.fillMaxSize().onBackKey(action = onBack).background(ArcadeColours.Night)) { StarField() Column(Modifier.fillMaxSize().padding(start = 48.dp, end = 48.dp, top = 22.dp, bottom = 12.dp)) { Row(Modifier.fillMaxWidth().height(150.dp), verticalAlignment = Alignment.CenterVertically) { @@ -427,7 +433,7 @@ private fun ResultCard(sim: RaidersSim, bestBefore: Int, onNext: () -> Unit, onR val cleared = !sim.over val newRecord = sim.score > bestBefore && sim.score > 0 val calm = Motion.reduce - Box(Modifier.fillMaxSize().background(ArcadeColours.Night.copy(alpha = .82f)), contentAlignment = Alignment.Center) { + Box(Modifier.fillMaxSize().onBackKey(action = onBack).background(ArcadeColours.Night.copy(alpha = .82f)), contentAlignment = Alignment.Center) { Row(verticalAlignment = Alignment.CenterVertically) { if (newRecord) Cheer(OrbCharacter.Blaze, calm, 0f) Column(Modifier.width(520.dp).background(ArcadeColours.PanelDeep, RoundedCornerShape(14.dp)).border(1.dp, ArcadeColours.Line, RoundedCornerShape(14.dp)).padding(20.dp), diff --git a/android/app/src/test/java/tv/orbit/classic/arcade/ArcadeInputTest.kt b/android/app/src/test/java/tv/orbit/classic/arcade/ArcadeInputTest.kt index c14cdcff..313ecdbd 100644 --- a/android/app/src/test/java/tv/orbit/classic/arcade/ArcadeInputTest.kt +++ b/android/app/src/test/java/tv/orbit/classic/arcade/ArcadeInputTest.kt @@ -52,4 +52,14 @@ class ArcadeInputTest { assertFalse(shouldPauseOnHide(wasShown = true, shown = false, alive = false)) assertFalse(shouldPauseOnHide(wasShown = true, shown = true, alive = true)) } + + // Found on the TV (8 November 2026): Back during Orbi-Raiders didn't pause. The games now catch Back themselves. + @Test fun backIsCaughtOncePerPressFromTheRemoteKeyboardAndPad() { + for (code in listOf(KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_ESCAPE, KeyEvent.KEYCODE_BUTTON_B)) assertTrue(isBackKey(code)) + for (code in listOf(KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_MENU, KeyEvent.KEYCODE_DPAD_UP)) assertFalse(isBackKey(code)) + // The press acts; a held Back's repeats and the release don't (so a pause isn't undone, nor a menu left twice). + assertTrue(backPressActs(down = true, repeatCount = 0)) + assertFalse(backPressActs(down = true, repeatCount = 1)) + assertFalse(backPressActs(down = false, repeatCount = 0)) + } } diff --git a/android/app/src/test/java/tv/orbit/classic/arcade/hive/HiveSimTest.kt b/android/app/src/test/java/tv/orbit/classic/arcade/hive/HiveSimTest.kt index ec2bfaac..55a8e8f0 100644 --- a/android/app/src/test/java/tv/orbit/classic/arcade/hive/HiveSimTest.kt +++ b/android/app/src/test/java/tv/orbit/classic/arcade/hive/HiveSimTest.kt @@ -195,6 +195,22 @@ class HiveSimTest { s.resume(); s.action(HiveKey.Back); s.toLevels(); s.action(HiveKey.Back); assertEquals(HiveScreen.Title, s.screen) } + @Test fun backDoesWhatGameJsDidOnEveryScreen() { + val legacy = LegacyHiveSave.parse("""{"unlocked":5}""")!! + val host = Host(); val s = sim(HiveSaveData(), host, legacy) + // The Household question: Back leaves, unanswered. + assertEquals(HiveScreen.Household, s.screen); s.action(HiveKey.Back); assertEquals(1, host.left); assertEquals(HiveScreen.Household, s.screen) + s.act(s.buttons.first { it.act == HiveAct.Fresh }) + for (from in listOf(HiveAct.Levels, HiveAct.Help, HiveAct.Daily)) { + s.act(s.buttons.first { it.act == from }); s.action(HiveKey.Back); assertEquals("$from", HiveScreen.Title, s.screen) + } + // In play: Back pauses; in the pause it resumes; a result goes to Level Select; the title leaves. + s.startLevel(1); s.action(HiveKey.Back); assertEquals(HiveScreen.Pause, s.screen) + s.action(HiveKey.Back); assertEquals(HiveScreen.Play, s.screen) + winNow(s); s.action(HiveKey.Back); assertEquals(HiveScreen.Levels, s.screen) + s.action(HiveKey.Back); s.action(HiveKey.Back); assertEquals(2, host.left) + } + @Test fun levelSelectOpensOnTheFurthestLevelAndLockedOnesDontStart() { val save = HiveSaveData().also { it.normal.unlocked = 48 } val host = Host(); val s = sim(save, host)