Skip to content

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.

Keep the maker under the name, and open each tab at the top

jesse-agent-2328ed00833bbf9
diff --git a/app/src/main/java/app/tellyscope/ui/DeviceTabs.kt b/app/src/main/java/app/tellyscope/ui/DeviceTabs.kt
index 8318b15..9d1eb3c 100644
--- a/app/src/main/java/app/tellyscope/ui/DeviceTabs.kt
+++ b/app/src/main/java/app/tellyscope/ui/DeviceTabs.kt
@@ -138,10 +138,15 @@ fun DeviceTabsScreen(
var heroHeight by remember { mutableIntStateOf(0) }
val collapse by remember { derivedStateOf { collapsedFraction(list.firstVisibleItemIndex, list.firstVisibleItemScrollOffset, heroHeight) } }
val barTitle by remember { derivedStateOf { titleAlpha(collapse) > 0f } }
+ // The tabs share one list, so each opens at the top with its hero, not where the last one was left.
// "See changes" lands on Tweaks scrolled to Recent changes, the list's third item, after the hero.
var toChanges by remember { mutableStateOf(false) }
- LaunchedEffect(tab, toChanges) {
- if (tab == TvTab.Tweaks && toChanges) { list.scrollToItem(2); toChanges = false }
+ var shown by rememberSaveable { mutableStateOf(tab) }
+ LaunchedEffect(tab) {
+ if (tab == shown) return@LaunchedEffect
+ shown = tab
+ list.scrollToItem(if (tab == TvTab.Tweaks && toChanges) 2 else 0)
+ toChanges = false
}
Scaffold(
diff --git a/app/src/main/java/app/tellyscope/ui/TvHeader.kt b/app/src/main/java/app/tellyscope/ui/TvHeader.kt
index ac20524..8a31115 100644
--- a/app/src/main/java/app/tellyscope/ui/TvHeader.kt
+++ b/app/src/main/java/app/tellyscope/ui/TvHeader.kt
@@ -93,11 +93,8 @@ fun TvHero(state: UiState, live: Snapshot?, actions: DeviceActions, chips: Boole
val device = state.selected ?: return
val c = MaterialTheme.colorScheme
Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(8.dp)) {
- Column(
- Modifier.fillMaxWidth().onSizeChanged { onHeight(it.height) },
- horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.spacedBy(8.dp),
- ) {
+ // No gap between the two parts: the maker line sits right under the name, as before the collapse.
+ Column(Modifier.fillMaxWidth().onSizeChanged { onHeight(it.height) }, horizontalAlignment = Alignment.CenterHorizontally) {
// Toward the top left, where the bar's small cookie and name take over.
Column(
Modifier.graphicsLayer {
diff --git a/app/src/test/java/app/tellyscope/ScreenshotTest.kt b/app/src/test/java/app/tellyscope/ScreenshotTest.kt
index 284a4c8..0d7b730 100644
--- a/app/src/test/java/app/tellyscope/ScreenshotTest.kt
+++ b/app/src/test/java/app/tellyscope/ScreenshotTest.kt
@@ -284,6 +284,19 @@ class ScreenshotTest {
// At rest the bar holds only ⋮; the hero's pill says how the TV is doing instead.
compose.onNodeWithText("Connected").assertDoesNotExist()
}
+ // The tabs share one list: a tab opened after another was scrolled starts at the top, hero unfolded.
+ @Config(qualifiers = "w411dp-h640dp-xxhdpi")
+ @Test fun tabSwitchOpensAtTop() {
+ compose.mainClock.autoAdvance = false
+ compose.setContent { TellyscopeTheme(dynamic = false) { DeviceTabsScreen(md3State(), DeviceActions(), startTab = TvTab.Apps) } }
+ compose.mainClock.advanceTimeBy(1_000)
+ compose.onNode(hasScrollAction()).performScrollToIndex(1)
+ compose.mainClock.advanceTimeBy(1_000)
+ compose.onAllNodesWithText("Connected").onFirst().assertExists()
+ compose.onNodeWithText("Files").performClick()
+ compose.mainClock.advanceTimeBy(1_000)
+ compose.onNodeWithText("Connected").assertDoesNotExist()
+ }
@Test fun md3_apps() { shot("64_md3_apps") { DeviceTabsScreen(md3State(), DeviceActions(), startTab = TvTab.Apps) } }
@Test fun md3_apps_dark() { shot("64_md3_apps", dark = true) { DeviceTabsScreen(md3State(), DeviceActions(), startTab = TvTab.Apps) } }
@Test fun md3_files() { shot("65_md3_files") { DeviceTabsScreen(md3State(), DeviceActions(), startTab = TvTab.Files) } }