Debloat your Android TV, install apps, browse and transfer files on it, all from your phone. Just 3 MB, no tracking, no root, no PC.
Remote: a sheet over the TV's page that never scrolls
jesse-agent-23239cb1bd21750
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex a8e7aa7..2e45a7b 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -13,6 +13,10 @@ until this file has a section for its version.## Unreleased- **Fixed:** Reset TV's buttons sit above the navigation bar, not under it. [#207](../../pull/207)+- **Improved:** The Remote opens as a sheet over your TV and never scrolls. [#198](../../pull/198)+ - Screen off and Restart TV sit beside the handle; the header shows the TV's state.+ - Dock apps get equal, well-spaced slots, so a tap can't hit the wrong app.+ - On short phones and while typing, the D-pad shrinks to fit.## 0.12.0 — 2026-10-28diff --git a/app/src/main/java/app/tellyscope/MainActivity.kt b/app/src/main/java/app/tellyscope/MainActivity.ktindex 55c974f..ece1448 100644--- a/app/src/main/java/app/tellyscope/MainActivity.kt+++ b/app/src/main/java/app/tellyscope/MainActivity.kt@@ -285,25 +285,6 @@ fun TellyscopeApp(vm: TellyscopeViewModel) {onConnect = { rejoinId = selected.id; rejoinSince = System.currentTimeMillis(); vm.reconnect(selected.id) },onBack = back,)- } else if (remote) {- BackHandler { remote = false }- DisposableEffect(Unit) { onDispose { vm.closeRemote() } }- RemoteScreen(- state = state,- snackbar = snackbar,- actions = RemoteActions(- press = vm::press,- type = vm::type,- reboot = vm::reboot,- back = { remote = false },- retryRestart = vm::retryRestart,- stopWaiting = vm::stopWaiting,- launch = vm::launch,- setDock = vm::setDock,- screenOff = vm::setScreenOff,- screenOffTipSeen = vm::screenOffTipSeen,- ),- )} else if (advanced) {BackHandler { advanced = false }DisposableEffect(Unit) {@@ -428,6 +409,26 @@ fun TellyscopeApp(vm: TellyscopeViewModel) {access = accessActions(vm) { access = false },),)+ // A sheet over the TV's page, so the page stays where it was underneath; Back or a drag closes it.+ if (remote) {+ DisposableEffect(Unit) { onDispose { vm.closeRemote() } }+ RemoteScreen(+ state = state,+ snackbar = snackbar,+ actions = RemoteActions(+ press = vm::press,+ type = vm::type,+ reboot = vm::reboot,+ back = { remote = false },+ retryRestart = vm::retryRestart,+ stopWaiting = vm::stopWaiting,+ launch = vm::launch,+ setDock = vm::setDock,+ screenOff = vm::setScreenOff,+ screenOffTipSeen = vm::screenOffTipSeen,+ ),+ )+ }}}diff --git a/app/src/main/java/app/tellyscope/ui/Copy.kt b/app/src/main/java/app/tellyscope/ui/Copy.ktindex cec2f17..f0f0360 100644--- a/app/src/main/java/app/tellyscope/ui/Copy.kt+++ b/app/src/main/java/app/tellyscope/ui/Copy.kt@@ -475,7 +475,7 @@ object Copy {const val UPDATES_OPENED = "Opened the update screen on the TV. Look at the TV to check for updates."const val REBOOT_REFUSED = "The TV said no to restarting. Use its own remote or power button instead."const val REBOOT_IGNORED = "The TV didn't restart. Use its own remote or power button instead."- const val REMOTE_OFFLINE = "The TV is offline. The remote works again once it reconnects."+ const val REMOTE_OFFLINE_WAKE = "works again once it reconnects"const val TYPE_HINT = "Select a text box on the TV, like a search box, then type here."const val BACKSPACE = "Delete the last letter you typed on the TV"const val SCREEN_OFF = "Screen off"@@ -517,7 +517,6 @@ object Copy {// Dockconst val ADD_TO_DOCK = "Add to dock"- const val DOCK_ADD = "Add"const val DOCK_EMPTY = "Dock up to four TV apps, one tap to open."const val DOCK_PICK_TITLE = "Add an app to the dock"const val DOCK_PICK_HINT = "Tap an app to add it."diff --git a/app/src/main/java/app/tellyscope/ui/DeviceScreen.kt b/app/src/main/java/app/tellyscope/ui/DeviceScreen.ktindex 7c9e8dd..262bb50 100644--- a/app/src/main/java/app/tellyscope/ui/DeviceScreen.kt+++ b/app/src/main/java/app/tellyscope/ui/DeviceScreen.kt@@ -351,7 +351,7 @@ internal fun EmptyLine(q: String) {}@Composable-fun AppIcon(app: AppInfo, modifier: Modifier = Modifier) {+fun AppIcon(app: AppInfo, modifier: Modifier = Modifier, word: Boolean = false) {val image = remember(app.icon) {// A 192 px icon is tens of KB; anything far bigger is a TV sending something odd.app.icon?.takeIf { it.size <= 256 * 1024 }?.let { BitmapFactory.decodeByteArray(it, 0, it.size)?.asImageBitmap() }@@ -363,7 +363,9 @@ fun AppIcon(app: AppInfo, modifier: Modifier = Modifier) {val bg = app.iconColor?.let { Color(it) } ?: MaterialTheme.colorScheme.secondaryContainerval fg = app.iconAccent?.let { Color(it) } ?: if (app.iconColor != null) Color.White else MaterialTheme.colorScheme.onSecondaryContainerBox(modifier.size(40.dp).clip(MaterialTheme.shapes.medium).background(bg), contentAlignment = Alignment.Center) {- Text(app.label.take(1).uppercase(), color = fg, style = MaterialTheme.typography.titleMedium)+ // A tile with no name under it shows the name's first word, so two "P" apps aren't twins.+ if (word) Text(app.label.substringBefore(' '), color = fg, style = MaterialTheme.typography.labelSmall, maxLines = 1, overflow = TextOverflow.Clip, modifier = Modifier.padding(horizontal = 2.dp))+ else Text(app.label.take(1).uppercase(), color = fg, style = MaterialTheme.typography.titleMedium)}}diff --git a/app/src/main/java/app/tellyscope/ui/RemoteScreen.kt b/app/src/main/java/app/tellyscope/ui/RemoteScreen.ktindex c7a1a0a..34d5e22 100644--- a/app/src/main/java/app/tellyscope/ui/RemoteScreen.kt+++ b/app/src/main/java/app/tellyscope/ui/RemoteScreen.kt@@ -2,8 +2,6 @@package app.tellyscope.ui-import android.view.WindowManager-import androidx.activity.compose.LocalActivityimport androidx.compose.animation.core.animateFloatAsStateimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickable@@ -23,7 +21,6 @@ import androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.height-import androidx.compose.foundation.layout.imePaddingimport androidx.compose.foundation.layout.offsetimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.size@@ -31,16 +28,12 @@ import androidx.compose.foundation.layout.widthimport androidx.compose.foundation.layout.ExperimentalLayoutApiimport androidx.compose.foundation.layout.WindowInsetsimport androidx.compose.foundation.layout.isImeVisible-import androidx.compose.foundation.layout.navigationBars-import androidx.compose.foundation.layout.windowInsetsPaddingimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.items-import androidx.compose.foundation.rememberScrollStateimport androidx.compose.foundation.shape.CircleShapeimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.text.KeyboardActionsimport androidx.compose.foundation.text.KeyboardOptions-import androidx.compose.foundation.verticalScrollimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.automirrored.filled.ArrowBackimport androidx.compose.material.icons.automirrored.filled.Send@@ -50,7 +43,6 @@ import androidx.compose.material.icons.filled.KeyboardArrowDownimport androidx.compose.material.icons.filled.KeyboardArrowLeftimport androidx.compose.material.icons.filled.KeyboardArrowRightimport androidx.compose.material.icons.filled.KeyboardArrowUp-import androidx.compose.material.icons.filled.MoreVertimport androidx.compose.material.icons.outlined.Homeimport androidx.compose.material3.AlertDialogimport androidx.compose.material3.Button@@ -72,7 +64,6 @@ import androidx.compose.material3.MaterialThemeimport androidx.compose.material3.ModalBottomSheetimport androidx.compose.material3.OutlinedTextFieldimport androidx.compose.material3.PlainTooltip-import androidx.compose.material3.Scaffoldimport androidx.compose.material3.SnackbarHostimport androidx.compose.material3.SnackbarHostStateimport androidx.compose.material3.Surface@@ -81,13 +72,11 @@ import androidx.compose.material3.TextButtonimport androidx.compose.material3.TooltipAnchorPositionimport androidx.compose.material3.TooltipBoximport androidx.compose.material3.TooltipDefaults-import androidx.compose.material3.TopAppBarimport androidx.compose.material3.rememberTooltipStateimport androidx.compose.material3.rippleimport androidx.compose.material3.toShapeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.CompositionLocalProvider-import androidx.compose.runtime.DisposableEffectimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValueimport androidx.compose.runtime.key@@ -130,6 +119,7 @@ import androidx.compose.ui.text.input.ImeActionimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.Dpimport androidx.compose.ui.unit.IntOffset+import androidx.compose.ui.unit.coerceInimport androidx.compose.ui.unit.dpimport androidx.compose.ui.zIndeximport androidx.compose.ui.graphics.drawscope.Stroke@@ -143,6 +133,16 @@ import kotlin.math.absimport kotlin.math.roundToIntimport kotlinx.coroutines.delayimport kotlinx.coroutines.launch+import androidx.compose.foundation.layout.fillMaxHeight+import androidx.compose.material3.BottomSheetDefaults+import androidx.compose.material3.FilledIconButton+import androidx.compose.material3.FilledTonalIconButton+import androidx.compose.material3.rememberModalBottomSheetState+import androidx.compose.ui.text.SpanStyle+import androidx.compose.ui.text.buildAnnotatedString+import androidx.compose.ui.text.font.FontWeight+import androidx.compose.ui.text.withStyle+import app.tellyscope.data.Devicedata class RemoteActions(/** Suspends until the TV answers, so a held key never queues up presses. False when it didn't take the key. */@@ -188,6 +188,15 @@ internal suspend fun repeatWhileHeld(}}+/** Below this the D-pad's arrows get too small to hit; the hint under the text field goes first. */+private val DPAD_MIN = 176.dp+private val DPAD_MAX = 272.dp++/**+ * The remote, as a sheet over the TV's page with the ⋮ sheet's header. It never scrolls, which would+ * fight the drag that closes it: the D-pad takes the height that's left, so a short phone, large text+ * or the keyboard shrink it instead of pushing the dock off-screen.+ */@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)@Composablefun RemoteScreen(@@ -201,17 +210,9 @@ fun RemoteScreen(val screenOff = device.id in state.screenOff// Android 14 moved the call that turns the picture off out of the shell's reach.val screenControl = (device.android?.substringBefore('.')?.toIntOrNull() ?: 0) < 14 || screenOff- // The keyboard shrinks this screen instead of panning the window, which jumped on every keystroke.- val window = LocalActivity.current?.window- DisposableEffect(window) {- if (window == null) return@DisposableEffect onDispose {}- val before = window.attributes.softInputMode- window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)- onDispose { window.setSoftInputMode(before) }- }var confirmReboot by rememberSaveable { mutableStateOf(false) }if (confirmReboot) RebootDialog(onRestart = { confirmReboot = false; actions.reboot() }, onDismiss = { confirmReboot = false })- // Hide keeps a restart in the top bar; the dialog comes back when the wait moves on, or on a tap there.+ // Hide keeps a restart in the header; the dialog comes back when the wait moves on, or on a tap there.val stage = restart?.let { "${it.since}/${it.waitFrom}/${it.phase(state.clock())}" }var hidden by rememberSaveable { mutableStateOf<String?>(null) }if (restart != null && hidden != stage) {@@ -222,94 +223,135 @@ fun RemoteScreen(onStop = actions.stopWaiting,)}+ // Set once the D-pad hits its floor, and cleared once there's room for the hint again.+ var tight by remember { mutableStateOf(false) }+ // While typing, the keyboard needs the room: volume, the hint and the dock step aside for the D-pad.+ val typing = WindowInsets.isImeVisible+ val rowGap = if (tight || typing) 12.dp else 20.dp- Scaffold(- snackbarHost = { SnackbarHost(snackbar) },- topBar = {- TopAppBar(- title = {- when {- restart != null && hidden == stage -> RestartStatus(late = restart.phase(state.clock()) != Restart.Phase.Waiting, onClick = { hidden = null })- // In place of the title, so the keys below never move.- screenOff -> ScreenOffStatus()- else -> Text("Remote")- }- },- navigationIcon = {- // A chevron, not an arrow, so it can't be mistaken for the TV's Back key.- IconButton(onClick = actions.back) { Icon(Icons.Default.KeyboardArrowDown, contentDescription = "Back to the TV's page") }- },- actions = { RemoteMenu(screenControl, screenOff, live, showTip = state.screenOffTip, actions, onRestart = { confirmReboot = true }) },- )- },- // Pinned under the keys, out of a thumb's way; the keyboard covers it while typing.- bottomBar = { if (!WindowInsets.isImeVisible) DockBand(state.device.dock, state.device.apps, name(device), live, actions) },- ) { pad ->- Column(- Modifier.fillMaxSize().padding(pad).imePadding().verticalScroll(rememberScrollState()).padding(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 32.dp),- horizontalAlignment = Alignment.CenterHorizontally,- verticalArrangement = Arrangement.spacedBy(20.dp),- ) {- if (restart == null && device.state != DeviceState.Online) Text(- Copy.REMOTE_OFFLINE,- style = MaterialTheme.typography.bodyMedium,- color = MaterialTheme.colorScheme.onSurfaceVariant,- )- CompositionLocalProvider(LocalKeyHaptics provides state.keyHaptics) { Column(- Modifier.alpha(if (live) 1f else 0.38f),+ ModalBottomSheet(+ onDismissRequest = actions.back,+ sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),+ dragHandle = { HandleRow(screenControl, screenOff, live, showTip = state.screenOffTip, actions, onRestart = { confirmReboot = true }) },+ ) {+ Box(Modifier.fillMaxSize()) {+ Column(+ Modifier.fillMaxSize().padding(start = 16.dp, end = 16.dp, bottom = 16.dp),horizontalAlignment = Alignment.CenterHorizontally,- verticalArrangement = Arrangement.spacedBy(20.dp),) {- DPad(live, actions.press)- Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {- RoundKey(RemoteKey.BACK, "Back", live, actions.press, Modifier.align(Alignment.CenterStart)) { Icon(Icons.AutoMirrored.Filled.ArrowBack, null) }- RoundKey(RemoteKey.HOME, "Home", live, actions.press, size = 80.dp) { Icon(Icons.Outlined.Home, null, Modifier.size(32.dp)) }- RoundKey(RemoteKey.MENU, "Menu", live, actions.press, Modifier.align(Alignment.CenterEnd)) { Icon(Icons.Default.Menu, null) }- }- Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(16.dp), verticalAlignment = Alignment.CenterVertically) {- RoundKey(RemoteKey.MUTE, "Mute or unmute", live, actions.press) { Icon(RemoteIcons.VolumeOff, null) }- // One split pill: two halves of the same key, so the gap stays narrow.- Row(Modifier.weight(1f), horizontalArrangement = Arrangement.spacedBy(4.dp)) {- val (outer, inner) = 32.dp to 4.dp- KeySurface(- RemoteKey.VOLUME_DOWN, "Volume down", live, actions.press, RoundedCornerShape(outer, inner, inner, outer),- MaterialTheme.colorScheme.secondaryContainer, Modifier.weight(1f).height(64.dp),- ) { Icon(RemoteIcons.VolumeDown, null) }- KeySurface(- RemoteKey.VOLUME_UP, "Volume up", live, actions.press, RoundedCornerShape(inner, outer, outer, inner),- MaterialTheme.colorScheme.secondaryContainer, Modifier.weight(1f).height(64.dp),- ) { Icon(RemoteIcons.VolumeUp, null) }+ RemoteHeader(state, device, restart, screenOff, onRestartTap = { hidden = null })+ CompositionLocalProvider(LocalKeyHaptics provides state.keyHaptics) { Column(+ Modifier.weight(1f).alpha(if (live) 1f else 0.38f),+ horizontalAlignment = Alignment.CenterHorizontally,+ ) {+ BoxWithConstraints(Modifier.weight(1f).fillMaxWidth().padding(vertical = 12.dp), contentAlignment = Alignment.Center) {+ val room = minOf(maxWidth, maxHeight)+ val short = room < DPAD_MIN+ val hintFits = room >= DPAD_MIN + 24.dp+ LaunchedEffect(short, hintFits) { if (short) tight = true else if (hintFits) tight = false }+ DPad(live, actions.press, room.coerceIn(DPAD_MIN, DPAD_MAX))}+ Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {+ RoundKey(RemoteKey.BACK, "Back", live, actions.press, Modifier.align(Alignment.CenterStart)) { Icon(Icons.AutoMirrored.Filled.ArrowBack, null) }+ RoundKey(RemoteKey.HOME, "Home", live, actions.press, size = 80.dp) { Icon(Icons.Outlined.Home, null, Modifier.size(32.dp)) }+ RoundKey(RemoteKey.MENU, "Menu", live, actions.press, Modifier.align(Alignment.CenterEnd)) { Icon(Icons.Default.Menu, null) }+ }+ if (!typing) {+ Spacer(Modifier.height(rowGap))+ Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(16.dp), verticalAlignment = Alignment.CenterVertically) {+ RoundKey(RemoteKey.MUTE, "Mute or unmute", live, actions.press) { Icon(RemoteIcons.VolumeOff, null) }+ // One split pill: two halves of the same key, so the gap stays narrow.+ Row(Modifier.weight(1f), horizontalArrangement = Arrangement.spacedBy(4.dp)) {+ val (outer, inner) = 32.dp to 4.dp+ KeySurface(+ RemoteKey.VOLUME_DOWN, "Volume down", live, actions.press, RoundedCornerShape(outer, inner, inner, outer),+ MaterialTheme.colorScheme.secondaryContainer, Modifier.weight(1f).height(64.dp),+ ) { Icon(RemoteIcons.VolumeDown, null) }+ KeySurface(+ RemoteKey.VOLUME_UP, "Volume up", live, actions.press, RoundedCornerShape(inner, outer, outer, inner),+ MaterialTheme.colorScheme.secondaryContainer, Modifier.weight(1f).height(64.dp),+ ) { Icon(RemoteIcons.VolumeUp, null) }+ }+ }+ }+ // Twice the usual gap, so a thumb aiming at a volume key doesn't land in the text box.+ Spacer(Modifier.height(if (typing) rowGap else 24.dp))+ Keyboard(live, actions.type, actions.press, hint = !tight && !typing)+ } }+ // Under the keys, out of a thumb's way.+ if (!typing) {+ Spacer(Modifier.height(if (tight) 8.dp else 16.dp))+ DockBand(state.device.dock, state.device.apps, name(device), live, actions)}- // Twice the usual gap, so a thumb aiming at a volume key doesn't land in the text box.- Box(Modifier.padding(top = 20.dp)) { Keyboard(live, actions.type, actions.press) }- } }+ }+ SnackbarHost(snackbar, Modifier.align(Alignment.BottomCenter))}}}-/** The four arrows around a big OK, shaped like the remote in the user's other hand. */+/** The ⋮ sheet's header: the TV, and a second line for its state, a screen that's off or a restart. */@Composable-private fun DPad(enabled: Boolean, press: suspend (RemoteKey) -> Boolean) {- Surface(Modifier.size(272.dp), shape = CircleShape, color = MaterialTheme.colorScheme.surfaceContainerHigh) {+private fun RemoteHeader(state: UiState, device: Device, restart: Restart?, screenOff: Boolean, onRestartTap: () -> Unit) {+ val c = MaterialTheme.colorScheme+ Row(Modifier.fillMaxWidth().padding(start = 4.dp, bottom = 4.dp), verticalAlignment = Alignment.CenterVertically) {+ Cookie(device, 48.dp)+ Spacer(Modifier.width(16.dp))+ Column {+ Text(name(device), style = MaterialTheme.typography.titleLarge, maxLines = 1, overflow = TextOverflow.Ellipsis)+ when {+ restart != null -> RestartStatus(late = restart.phase(state.clock()) != Restart.Phase.Waiting, onClick = onRestartTap)+ screenOff -> StateLine(Copy.SCREEN_OFF, Copy.SCREEN_OFF_WAKE)+ device.state != DeviceState.Online -> StateLine(Copy.state(device.state), Copy.REMOTE_OFFLINE_WAKE)+ else -> {+ val health = state.device.snapshot?.let { Copy.health(it, heaviest(it, state.device.apps)).text }+ val line = listOf(makerLine(device), health.orEmpty()).filter { it.isNotEmpty() }.joinToString(" · ")+ if (line.isNotEmpty()) Text(line, style = MaterialTheme.typography.bodyMedium, color = c.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis)+ }+ }+ }+ }+}++/** "**Screen off** · tap any key to wake": the state, then what to do about it. */+@Composable+private fun StateLine(what: String, then: String) {+ Text(+ buildAnnotatedString {+ withStyle(SpanStyle(fontWeight = FontWeight.Medium, color = MaterialTheme.colorScheme.onSurface)) { append(what) }+ append(" · $then")+ },+ style = MaterialTheme.typography.bodyMedium,+ color = MaterialTheme.colorScheme.onSurfaceVariant,+ maxLines = 1,+ overflow = TextOverflow.Ellipsis,+ )+}++/** The four arrows around a big OK, shaped like the remote in the user's other hand; [size] across. */+@Composable+private fun DPad(enabled: Boolean, press: suspend (RemoteKey) -> Boolean, size: Dp = DPAD_MAX) {+ // Every part keeps its share of the full-size pad, so a smaller pad is the same pad, scaled.+ val scale = size / DPAD_MAX+ Surface(Modifier.size(size), shape = CircleShape, color = MaterialTheme.colorScheme.surfaceContainerHigh) {Box {- val arrow = Modifier.size(80.dp)+ val arrow = Modifier.size(80.dp * scale)+ val glyph = Modifier.size(40.dp * scale)val tint = MaterialTheme.colorScheme.onSurfaceKeySurface(RemoteKey.UP, "Up", enabled, press, CircleShape, Color.Transparent, arrow.align(Alignment.TopCenter)) {- Icon(Icons.Default.KeyboardArrowUp, null, Modifier.size(40.dp), tint = tint)+ Icon(Icons.Default.KeyboardArrowUp, null, glyph, tint = tint)}KeySurface(RemoteKey.DOWN, "Down", enabled, press, CircleShape, Color.Transparent, arrow.align(Alignment.BottomCenter)) {- Icon(Icons.Default.KeyboardArrowDown, null, Modifier.size(40.dp), tint = tint)+ Icon(Icons.Default.KeyboardArrowDown, null, glyph, tint = tint)}KeySurface(RemoteKey.LEFT, "Left", enabled, press, CircleShape, Color.Transparent, arrow.align(Alignment.CenterStart)) {- Icon(Icons.Default.KeyboardArrowLeft, null, Modifier.size(40.dp), tint = tint)+ Icon(Icons.Default.KeyboardArrowLeft, null, glyph, tint = tint)}KeySurface(RemoteKey.RIGHT, "Right", enabled, press, CircleShape, Color.Transparent, arrow.align(Alignment.CenterEnd)) {- Icon(Icons.Default.KeyboardArrowRight, null, Modifier.size(40.dp), tint = tint)+ Icon(Icons.Default.KeyboardArrowRight, null, glyph, tint = tint)}KeySurface(RemoteKey.OK, "OK", enabled, press, CircleShape, MaterialTheme.colorScheme.primary,- Modifier.size(112.dp).align(Alignment.Center),+ Modifier.size(112.dp * scale).align(Alignment.Center),) {}}}@@ -379,9 +421,10 @@ private fun KeySurface(}}+/** [hint] off on a screen too short for it; an error still shows. */@Composable@OptIn(ExperimentalMaterial3Api::class)-private fun Keyboard(enabled: Boolean, type: (String) -> String?, press: suspend (RemoteKey) -> Boolean) {+private fun Keyboard(enabled: Boolean, type: (String) -> String?, press: suspend (RemoteKey) -> Boolean, hint: Boolean = true) {var text by rememberSaveable { mutableStateOf("") }var error by rememberSaveable { mutableStateOf<String?>(null) }fun send() {@@ -393,7 +436,7 @@ private fun Keyboard(enabled: Boolean, type: (String) -> String?, press: suspendonValueChange = { text = it; error = null },enabled = enabled,label = { Text("Type on the TV") },- supportingText = { Text(error ?: Copy.TYPE_HINT) },+ supportingText = if (error != null || hint) ({ Text(error ?: Copy.TYPE_HINT) }) else null,isError = error != null,singleLine = true,keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send),@@ -495,11 +538,13 @@ private fun StatusShape(icon: ImageVector, container: Color, content: Color) {}}-/** Screen off (or on again) and Restart, behind ⋮. Explains Screen off on the first visit. */+/**+ * The sheet's drag handle, with Screen off (or on again) and Restart beside it, so the TV's name+ * keeps the header's full width. Explains Screen off on the first visit.+ */@OptIn(ExperimentalMaterial3Api::class)@Composable-private fun RemoteMenu(screenControl: Boolean, off: Boolean, live: Boolean, showTip: Boolean, actions: RemoteActions, onRestart: () -> Unit) {- var open by remember { mutableStateOf(false) }+private fun HandleRow(screenControl: Boolean, off: Boolean, live: Boolean, showTip: Boolean, actions: RemoteActions, onRestart: () -> Unit) {val tip = rememberTooltipState(isPersistent = true)LaunchedEffect(showTip, screenControl) {if (showTip && screenControl) {@@ -507,78 +552,53 @@ private fun RemoteMenu(screenControl: Boolean, off: Boolean, live: Boolean, showactions.screenOffTipSeen()}}- Box {- TooltipBox(- positionProvider = TooltipDefaults.rememberTooltipPositionProvider(TooltipAnchorPosition.Below),- tooltip = {- PlainTooltip {- Column(Modifier.padding(vertical = 4.dp)) {- Text(Copy.SCREEN_OFF, style = MaterialTheme.typography.labelLarge)- Text(Copy.SCREEN_OFF_TIP)+ Box(Modifier.fillMaxWidth().padding(end = 12.dp)) {+ BottomSheetDefaults.DragHandle(Modifier.align(Alignment.Center))+ Row(Modifier.align(Alignment.CenterEnd).padding(top = 8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {+ if (screenControl) TooltipBox(+ positionProvider = TooltipDefaults.rememberTooltipPositionProvider(TooltipAnchorPosition.Below),+ tooltip = {+ PlainTooltip {+ Column(Modifier.padding(vertical = 4.dp)) {+ Text(Copy.SCREEN_OFF, style = MaterialTheme.typography.labelLarge)+ Text(Copy.SCREEN_OFF_TIP)+ }}- }- },- state = tip,- enableUserInput = false,- ) {- IconButton(onClick = { open = true }) { Icon(Icons.Default.MoreVert, contentDescription = "More options") }- }- // One block, like the dock's menu and the TV menu's groups.- DropdownMenu(open, onDismissRequest = { open = false }, shape = MaterialTheme.shapes.large) {- MenuBlock {- if (screenControl) DropdownMenuItem(- text = { Text(if (off) Copy.SCREEN_ON else Copy.SCREEN_OFF) },- leadingIcon = { Icon(RemoteIcons.TvOff, null) },- enabled = live,- onClick = { open = false; actions.screenOff(!off) },- )- DropdownMenuItem(- text = { Text(Copy.REMOTE_RESTART) },- leadingIcon = { Icon(RemoteIcons.RestartAlt, null) },- enabled = live,- onClick = { open = false; onRestart() },- )+ },+ state = tip,+ enableUserInput = false,+ ) {+ // Filled while the picture is off: the one thing to press to get it back.+ if (off) FilledIconButton(onClick = { actions.screenOff(false) }, enabled = live) { Icon(RemoteIcons.Tv, contentDescription = Copy.SCREEN_ON) }+ else FilledTonalIconButton(onClick = { actions.screenOff(true) }, enabled = live) { Icon(RemoteIcons.TvOff, contentDescription = Copy.SCREEN_OFF) }}+ FilledTonalIconButton(onClick = onRestart, enabled = live) { Icon(RemoteIcons.RestartAlt, contentDescription = Copy.REMOTE_RESTART) }}}}-@Composable-private fun ScreenOffStatus() {- Row(verticalAlignment = Alignment.CenterVertically) {- Text(Copy.SCREEN_OFF, style = MaterialTheme.typography.titleMedium)- Text(- " \u00b7 ${Copy.SCREEN_OFF_WAKE}",- style = MaterialTheme.typography.bodyMedium,- color = MaterialTheme.colorScheme.onSurfaceVariant,- maxLines = 1,- overflow = TextOverflow.Ellipsis,- )- }-}--/** The top bar's title while a hidden restart runs, overdue once [late]; a tap brings its dialog back. */+/** The header's second line while a restart runs, overdue once [late]; a tap brings its dialog back. */@OptIn(ExperimentalMaterial3ExpressiveApi::class)@Composableprivate fun RestartStatus(late: Boolean, onClick: () -> Unit) {Row(- Modifier.clip(MaterialTheme.shapes.small).clickable(onClickLabel = "Show the restart", onClick = onClick).padding(4.dp),+ Modifier.clip(MaterialTheme.shapes.small).clickable(onClickLabel = "Show the restart", onClick = onClick),verticalAlignment = Alignment.CenterVertically,- horizontalArrangement = Arrangement.spacedBy(8.dp),+ horizontalArrangement = Arrangement.spacedBy(4.dp),) {if (late) {- Icon(RemoteIcons.HourglassTop, contentDescription = null, tint = MaterialTheme.colorScheme.secondary, modifier = Modifier.size(28.dp))+ Icon(RemoteIcons.HourglassTop, contentDescription = null, tint = MaterialTheme.colorScheme.secondary, modifier = Modifier.size(18.dp))} else {- LoadingIndicator(Modifier.size(28.dp))+ LoadingIndicator(Modifier.size(18.dp))}- Text(if (late) Copy.RESTART_LATE_STATUS else Copy.RESTARTING_TITLE)- Icon(Icons.Default.KeyboardArrowRight, contentDescription = null, tint = MaterialTheme.colorScheme.onSurfaceVariant)+ Text(if (late) Copy.RESTART_LATE_STATUS else Copy.RESTARTING_TITLE, style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Medium)+ Icon(Icons.Default.KeyboardArrowRight, contentDescription = null, tint = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.size(18.dp))}}/**- * The bottom band: up to [Dock.MAX] apps in fixed slots from the left, with an Add tile in the next- * free one. A tap opens the app on the TV; a long press opens its menu, and moving while still+ * The strip under the keys: up to [Dock.MAX] apps, each centred in an equal share of it so a tap+ * can't land on the wrong one, with an Add tile in the next free slot. A tap opens the app on the TV; a long press opens its menu, and moving while still* holding drags it to another slot.*/@Composable@@ -595,13 +615,8 @@ private fun DockBand(dock: List<Docked>, apps: List<AppInfo>, tvName: String, enonDismiss = { picking = null },)}- Surface(color = MaterialTheme.colorScheme.surfaceContainer, shape = RoundedCornerShape(topStart = 28.dp, topEnd = 28.dp)) {- Box(- Modifier- .windowInsetsPadding(WindowInsets.navigationBars)- .padding(start = 16.dp, end = 16.dp, top = 12.dp, bottom = 8.dp)- .alpha(if (enabled) 1f else 0.38f),- ) {+ Surface(color = MaterialTheme.colorScheme.surfaceContainerHigh, shape = MaterialTheme.shapes.extraLarge) {+ Box(Modifier.padding(horizontal = 4.dp, vertical = 8.dp).alpha(if (enabled) 1f else 0.38f)) {DockRow(dock, apps, enabled, actions, onAdd = { picking = "" }, onSwap = { picking = it.packageName })}}@@ -613,7 +628,7 @@ private fun DockRow(dock: List<Docked>, apps: List<AppInfo>, enabled: Boolean, a// The app being dragged, and how far; the others make room for it as it goes.var lifted by remember { mutableStateOf<String?>(null) }var dragX by remember { mutableFloatStateOf(0f) }- BoxWithConstraints(Modifier.fillMaxWidth().height(80.dp)) {+ BoxWithConstraints(Modifier.fillMaxWidth().height(48.dp)) {val slot = constraints.maxWidth / Dock.MAX.toFloat()fun from() = dock.indexOfFirst { it.packageName == lifted }fun to() = (from() + (dragX / slot).roundToInt()).coerceIn(0, dock.lastIndex)@@ -625,7 +640,7 @@ private fun DockRow(dock: List<Docked>, apps: List<AppInfo>, enabled: Boolean, aCopy.DOCK_EMPTY,style = MaterialTheme.typography.bodyMedium,color = MaterialTheme.colorScheme.onSurfaceVariant,- modifier = Modifier.align(Alignment.CenterStart).padding(start = maxWidth / Dock.MAX + 8.dp, bottom = 16.dp),+ modifier = Modifier.align(Alignment.CenterStart).padding(start = maxWidth / Dock.MAX, end = 8.dp),)dock.forEachIndexed { i, app -> key(app.packageName) {val up = app.packageName == lifted@@ -688,7 +703,7 @@ private fun DockRow(dock: List<Docked>, apps: List<AppInfo>, enabled: Boolean, a}}-/** One docked app: its icon and name, lifted a size up while held. */+/** One docked app: its icon, centred in the whole slot it answers to, lifted a size up while held. Its name is for TalkBack and the menu. */@Composableprivate fun DockTile(app: AppInfo,@@ -709,9 +724,9 @@ private fun DockTile(val hold by rememberUpdatedState(onHold)val move by rememberUpdatedState(onDrag)val drop by rememberUpdatedState(onDrop)- Column(+ Box(Modifier- .fillMaxWidth()+ .fillMaxSize().graphicsLayer { scaleX = scale; scaleY = scale }.semantics {role = Role.Button@@ -743,37 +758,27 @@ private fun DockTile(}drop()}- }- .padding(top = 4.dp),- horizontalAlignment = Alignment.CenterHorizontally,- verticalArrangement = Arrangement.spacedBy(4.dp),+ },+ contentAlignment = Alignment.Center,) {- Box(Modifier.shadow(if (lifted) 6.dp else 0.dp, MaterialTheme.shapes.medium)) { AppIcon(app, Modifier.size(48.dp)) }- Text(- app.label,- style = MaterialTheme.typography.labelMedium,- maxLines = 1,- overflow = TextOverflow.Ellipsis,- modifier = Modifier.padding(horizontal = 4.dp),- )+ Box(Modifier.shadow(if (lifted) 6.dp else 0.dp, MaterialTheme.shapes.medium)) { AppIcon(app, word = true) }}}-/** The next free slot: a dashed outline the size of an app icon, with Add under it. */+/** The next free slot: a dashed outline the size of an app icon, centred in the whole slot. */@Composableprivate fun AddTile(enabled: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier) {val outline = MaterialTheme.colorScheme.outlineval shape = MaterialTheme.shapes.medium- Column(+ Box(modifier+ .fillMaxHeight().clickable(enabled = enabled, onClickLabel = Copy.ADD_TO_DOCK, role = Role.Button, onClick = onClick)- .semantics(mergeDescendants = true) { contentDescription = Copy.ADD_TO_DOCK }- .padding(top = 4.dp),- horizontalAlignment = Alignment.CenterHorizontally,- verticalArrangement = Arrangement.spacedBy(4.dp),+ .semantics(mergeDescendants = true) { contentDescription = Copy.ADD_TO_DOCK },+ contentAlignment = Alignment.Center,) {Box(- Modifier.size(48.dp).drawBehind {+ Modifier.size(40.dp).drawBehind {val corner = shape.topStart.toPx(size, this)drawRoundRect(outline,@@ -783,7 +788,6 @@ private fun AddTile(enabled: Boolean, onClick: () -> Unit, modifier: Modifier =},contentAlignment = Alignment.Center,) { Icon(Icons.Default.Add, contentDescription = null, tint = MaterialTheme.colorScheme.primary) }- Text(Copy.DOCK_ADD, style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.primary)}}@@ -836,6 +840,11 @@ private object RemoteIcons {"M3 19L3 7L4.46 7L16.46 19L3 19Z" +"M21 5L13.42 5L16.71 1.7L16 1L12 5L8 1L7.3 1.7L10.58 5L7.52 5L9.52 7L21 7L21 18.48L22.65 20.13C22.87 19.81 23 19.42 23 19L23 7C23 5.89 22.11 5 21 5Z",)+ val Tv = icon(+ "Tv",+ "M21 3L3 3C1.9 3 1 3.9 1 5L1 17C1 18.1 1.9 19 3 19L8 19L8 21L16 21L16 19L21 19C22.1 19 22.99 18.1 22.99 17L23 5C23 3.9 22.1 3 21 3Z" ++ "M21 17L3 17L3 5L21 5L21 17Z",+ )val Backspace = icon("Backspace","M22 3L7 3C6.31 3 5.77 3.35 5.41 3.88L0 12L5.41 20.11C5.77 20.64 6.31 21 7 21L22 21C23.1 21 24 20.1 24 19L24 5C24 3.9 23.1 3 22 3Z" +diff --git a/app/src/test/java/app/tellyscope/ScreenshotTest.kt b/app/src/test/java/app/tellyscope/ScreenshotTest.ktindex 2159992..9bcf42a 100644--- a/app/src/test/java/app/tellyscope/ScreenshotTest.kt+++ b/app/src/test/java/app/tellyscope/ScreenshotTest.kt@@ -21,6 +21,7 @@ import androidx.compose.ui.test.assertIsNotEnabledimport androidx.compose.ui.test.onNodeWithContentDescriptionimport androidx.compose.ui.test.onNodeWithTextimport androidx.compose.ui.test.onAllNodesWithText+import androidx.compose.ui.test.onAllNodesimport androidx.activity.OnBackPressedDispatcherimport androidx.activity.compose.LocalOnBackPressedDispatcherOwnerimport androidx.compose.ui.test.onFirst@@ -1081,9 +1082,9 @@ class ScreenshotTest {private fun remoteState(apps: List<Docked> = docked, restart: Restart? = null) =deviceState { copy(dock = apps) }.let { s -> restart?.let { s.copy(restarting = mapOf(s.selectedId!! to it)) } ?: s }- @Test fun remote() = shot("12_remote") { RemoteScreen(remoteState(), RemoteActions()) }+ @Test fun remote() = shot("12_remote", screen = true) { RemoteScreen(remoteState(), RemoteActions()) }- @Test fun remote_dark() = shot("12_remote", dark = true) { RemoteScreen(remoteState(), RemoteActions()) }+ @Test fun remote_dark() = shot("12_remote", dark = true, screen = true) { RemoteScreen(remoteState(), RemoteActions()) }@Test fun remoteKeysAreIconsWithSpokenNames() {compose.setContent { TellyscopeTheme(dynamic = false) { RemoteScreen(remoteState(), RemoteActions()) } }@@ -1095,35 +1096,41 @@ class ScreenshotTest {compose.onNodeWithText("OK").assertDoesNotExist()}- // Screen off (0.9): the title says how to wake it, so nothing below moves; ⋮ turns it back on.+ // Screen off (0.9): the header says how to wake it, so nothing below moves; the filled button turns it back on.private fun screenOffState() = remoteState().let { it.copy(screenOff = setOf(it.selectedId!!)) }- @Test fun remote_screenOff() = shot("13_remote_screen_off") { RemoteScreen(screenOffState(), RemoteActions()) }- @Test fun remote_screenOff_dark() = shot("13_remote_screen_off", dark = true) { RemoteScreen(screenOffState(), RemoteActions()) }+ @Test fun remote_screenOff() = shot("13_remote_screen_off", screen = true) { RemoteScreen(screenOffState(), RemoteActions()) }+ @Test fun remote_screenOff_dark() = shot("13_remote_screen_off", dark = true, screen = true) { RemoteScreen(screenOffState(), RemoteActions()) }@Test fun remote_screenOffTip() = shot("13_remote_screen_off_tip", screen = true) { RemoteScreen(remoteState().copy(screenOffTip = true), RemoteActions()) }@Test fun screenOffSaysWhatATapDoes() {var off by mutableStateOf(false)compose.setContent { TellyscopeTheme(dynamic = false) { RemoteScreen(if (off) screenOffState() else remoteState(), RemoteActions()) } }- compose.onNodeWithContentDescription("More options").performClick()- compose.onNodeWithText(Copy.SCREEN_OFF).assertExists()+ compose.onNodeWithContentDescription(Copy.SCREEN_OFF).assertExists()off = true- compose.onNodeWithText(Copy.SCREEN_ON).assertExists()+ compose.onNodeWithContentDescription(Copy.SCREEN_ON).assertExists()compose.onNodeWithText(Copy.SCREEN_OFF_WAKE, substring = true).assertExists()}@Test fun android14HasNoScreenOff() {val s = remoteState().let { st -> st.copy(devices = st.devices.map { if (it.id == st.selectedId) it.copy(android = "14") else it }) }compose.setContent { TellyscopeTheme(dynamic = false) { RemoteScreen(s, RemoteActions()) } }- compose.onNodeWithContentDescription("More options").performClick()- compose.onNodeWithText(Copy.SCREEN_OFF).assertDoesNotExist()- compose.onNodeWithText(Copy.REMOTE_RESTART).assertExists()+ compose.onNodeWithContentDescription(Copy.SCREEN_OFF).assertDoesNotExist()+ compose.onNodeWithContentDescription(Copy.REMOTE_RESTART).assertExists()}- @Test fun remote_menu() = shot("13_remote_menu", screen = true, before = { compose.onNodeWithContentDescription("More options").performClick() }) {- RemoteScreen(remoteState(), RemoteActions())+ /** The Remote never scrolls: on a short phone the D-pad shrinks and the dock stays on screen. */+ @Config(qualifiers = "w360dp-h640dp-xxhdpi")+ @Test fun remoteFitsAShortPhone() {+ val four = docked + listOf(Docked("org.jellyfin.androidtv", "Jellyfin"), Docked("com.spotify.tv.android", "Spotify"))+ compose.setContent { TellyscopeTheme(dynamic = false) { RemoteScreen(remoteState(apps = four), RemoteActions()) } }+ compose.onAllNodes(hasScrollAction()).assertCountEquals(0)+ listOf("OK", "Volume up", "Spotify").forEach { compose.onNodeWithContentDescription(it).assertIsDisplayed() }}- @Test fun remote_dockEmpty() = shot("12_remote_dock_empty") { RemoteScreen(remoteState(apps = emptyList()), RemoteActions()) }+ @Config(qualifiers = "w360dp-h640dp-xxhdpi")+ @Test fun remote_short() = shot("12_remote_short", screen = true) { RemoteScreen(remoteState(), RemoteActions()) }++ @Test fun remote_dockEmpty() = shot("12_remote_dock_empty", screen = true) { RemoteScreen(remoteState(apps = emptyList()), RemoteActions()) }/*** The apps' own icons, for the README's Remote shot only. Test resources, so they never reach the@@ -1135,7 +1142,7 @@ class ScreenshotTest {val four = docked + listOf(Docked("org.jellyfin.androidtv", "Jellyfin"), Docked("com.spotify.tv.android", "Spotify"))val spotify = AppInfo("com.spotify.tv.android", "Spotify", null, false, true, null, "", launchable = true)val state = deviceState { copy(dock = four, apps = (apps + spotify).map { a -> realIcon(a.packageName)?.let { a.copy(icon = it) } ?: a }) }- shot("12_remote_dock_full") { RemoteScreen(state, RemoteActions()) }+ shot("12_remote_dock_full", screen = true) { RemoteScreen(state, RemoteActions()) }// A full row has no Add tile.compose.onNodeWithContentDescription(Copy.ADD_TO_DOCK).assertDoesNotExist()}@@ -1164,9 +1171,9 @@ class ScreenshotTest {@Test fun tiles_apps_dark() = shot("13_tiles_apps", dark = true) { DeviceTabsScreen(tilesState(), DeviceActions(), startTab = TvTab.Apps) }- @Test fun tiles_dock() = shot("13_tiles_dock") { RemoteScreen(tilesState(), RemoteActions()) }+ @Test fun tiles_dock() = shot("13_tiles_dock", screen = true) { RemoteScreen(tilesState(), RemoteActions()) }- @Test fun tiles_dock_dark() = shot("13_tiles_dock", dark = true) { RemoteScreen(tilesState(), RemoteActions()) }+ @Test fun tiles_dock_dark() = shot("13_tiles_dock", dark = true, screen = true) { RemoteScreen(tilesState(), RemoteActions()) }@Test fun remote_dockPicker() = shot("12_remote_dock_picker", screen = true, before = { compose.onNodeWithContentDescription(Copy.ADD_TO_DOCK).performClick() }) {RemoteScreen(remoteState(), RemoteActions())