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.

Advanced: tidy before review

jesse-agent-232aaccb283eee6
diff --git a/app/src/main/java/app/tellyscope/data/FakeDeviceSource.kt b/app/src/main/java/app/tellyscope/data/FakeDeviceSource.kt
index 4dfdb23..c60145f 100644
--- a/app/src/main/java/app/tellyscope/data/FakeDeviceSource.kt
+++ b/app/src/main/java/app/tellyscope/data/FakeDeviceSource.kt
@@ -177,10 +177,10 @@ class FakeDeviceSource(
procs = procs,
netBytesPerSec = rx + 200_000,
softwareMonth = YearMonth.of(2023, 5),
- // Four cores around the average, and the split adding up to it.
+ // Four cores around the average; apps and system add up to it, as on a real TV.
cores = listOf(6, -2, 4, -8).map { (cpu + it).coerceIn(0, 100) },
cpuApps = cpu * 2 / 3,
- cpuSystem = cpu - cpu * 2 / 3 - cpu / 15,
+ cpuSystem = cpu - cpu * 2 / 3,
cpuWaiting = cpu / 15,
chip = "Amlogic S905X4",
clockMhz = 1800,
diff --git a/app/src/main/java/app/tellyscope/ui/AdvancedScreen.kt b/app/src/main/java/app/tellyscope/ui/AdvancedScreen.kt
index f7aab1e..d6d942c 100644
--- a/app/src/main/java/app/tellyscope/ui/AdvancedScreen.kt
+++ b/app/src/main/java/app/tellyscope/ui/AdvancedScreen.kt
@@ -360,7 +360,7 @@ private fun Facts(device: Device, snap: Snapshot?, n: NetworkInfo?) {
Fact(Icons2.Android, stringResource(R.string.advanced_android), (device.android ?: device.lastKnown?.android)?.let { stringResource(R.string.tabs_android_version, it) } ?: dash, Modifier.weight(1f))
Fact(Icons2.Update, stringResource(R.string.advanced_updated), (snap?.softwareMonth ?: device.lastKnown?.softwareMonth)?.let(Copy::shortMonth) ?: dash, Modifier.weight(1f))
}
- val wifi = n?.iface?.let { it == "wifi" || it.startsWith("wlan") } ?: true
+ val wifi = n?.iface?.takeIf { it.isNotEmpty() }?.let { it == "wifi" || it.startsWith("wlan") } ?: true
Row {
Fact(
Icons2.Wifi,
@@ -483,7 +483,7 @@ private fun CpuCard(s: Snapshot, recent: List<Snapshot>, staleSince: Long?) {
Text(stringResource(R.string.advanced_percent, s.cpuPercent), style = MaterialTheme.typography.headlineMedium.copy(fontFeatureSettings = "tnum"))
chipLine(s)?.let { Text(it, style = MaterialTheme.typography.bodyMedium, color = c.onSurfaceVariant) }
}
- // Where the time went, adding up to the big number.
+ // Where the time went: apps and Android add up to the big number; waiting on storage is on top.
if (s.cpuApps != null) {
Column(horizontalAlignment = Alignment.End) {
listOf(R.string.advanced_split_apps to s.cpuApps, R.string.advanced_split_system to s.cpuSystem, R.string.advanced_split_waiting to s.cpuWaiting).forEach { (label, v) ->
@@ -566,7 +566,7 @@ private fun NetworkCard(s: Snapshot, recent: List<Snapshot>, staleSince: Long?,
SummaryCard(staleSince, s.at) {
Column {
Speeds(s, MaterialTheme.typography.headlineSmall, apart = false)
- val wifi = n?.iface?.let { it == "wifi" || it.startsWith("wlan") }
+ val wifi = n?.iface?.takeIf { it.isNotEmpty() }?.let { it == "wifi" || it.startsWith("wlan") }
when {
wifi == false -> stringResource(R.string.advanced_ethernet)
n?.ssid != null -> stringResource(R.string.advanced_wifi_on, n.ssid)
@@ -603,7 +603,7 @@ private fun Graph(area: List<Float>, line: List<Float>? = null, max: Float? = nu
Canvas(Modifier.fillMaxWidth().height(56.dp)) {
val top = max ?: ((area + line.orEmpty()).maxOrNull()?.takeIf { it > 0f } ?: 1f)
fun points(v: List<Float>) = v.mapIndexed { i, y ->
- Offset(size.width * (GRAPH_POINTS - v.size + i) / (GRAPH_POINTS - 1), size.height * (1f - (y / top).coerceIn(0f, 1f)))
+ Offset(size.width * (RECENT_READINGS - v.size + i) / (RECENT_READINGS - 1), size.height * (1f - (y / top).coerceIn(0f, 1f)))
}
val a = points(area)
if (a.size >= 2) {
@@ -624,9 +624,6 @@ private fun Graph(area: List<Float>, line: List<Float>? = null, max: Float? = nu
}
}
-/** Readings across a graph: a minute at one every 2 s. */
-private const val GRAPH_POINTS = 30
-
/** A rounded bar, red when nearly full; [fromEnd] grows it from the right, under a right-aligned number. */
@Composable
private fun Bar(frac: Float, modifier: Modifier, fromEnd: Boolean = false) {
diff --git a/app/src/main/java/app/tellyscope/ui/Copy.kt b/app/src/main/java/app/tellyscope/ui/Copy.kt
index 55bea2f..80c6767 100644
--- a/app/src/main/java/app/tellyscope/ui/Copy.kt
+++ b/app/src/main/java/app/tellyscope/ui/Copy.kt
@@ -335,17 +335,6 @@ object Copy {
}
}
- fun uptime(s: Long): UiText {
- val d = s / 86_400
- val h = (s % 86_400) / 3600
- val m = (s % 3600) / 60
- return when {
- d > 0 -> UiText(R.string.copy_uptime_days_hours, d, h)
- h > 0 -> UiText(R.string.copy_uptime_hours_minutes, h, m)
- else -> UiText(R.string.copy_uptime_minutes, m)
- }
- }
-
/** Uptime for people: the largest unit or two, spelled out. */
fun upFor(s: Long): UiText {
val d = UiText.plural(R.plurals.copy_days, (s / 86_400).toInt())
diff --git a/app/src/main/java/app/tellyscope/ui/TellyscopeViewModel.kt b/app/src/main/java/app/tellyscope/ui/TellyscopeViewModel.kt
index 0a34fd1..47e705f 100644
--- a/app/src/main/java/app/tellyscope/ui/TellyscopeViewModel.kt
+++ b/app/src/main/java/app/tellyscope/ui/TellyscopeViewModel.kt
@@ -112,6 +112,9 @@ data class ScanUi(
val offWifi get() = noLan && hits.isEmpty()
}
+/** Readings in [DeviceUi.recent] and across Advanced's graphs: a minute at one every 2 s. */
+const val RECENT_READINGS = 30
+
data class DeviceUi(
val snapshot: Snapshot? = null,
/** The last minute of readings, oldest first, for Advanced's graphs. */
@@ -356,9 +359,6 @@ data class Restart(val since: Long, val down: Boolean = false, val waitFrom: Lon
/** The newest messages a report's log keeps. */
private const val LOG_LINES = 200
-/** Readings in [DeviceUi.recent]: a minute at Advanced's one every 2 s. */
-private const val RECENT = 30
-
/** The gates book's key once the user said Don't show again on the Debloat gate. */
private const val DEBLOAT_GATE = "debloat"
@@ -773,7 +773,7 @@ class TellyscopeViewModel(
liveJob = viewModelScope.launch {
source.live(id).collect { snap ->
lastSnapshot[id] = snap
- _state.update { it.copy(device = it.device.copy(snapshot = snap, recent = (it.device.recent + snap).takeLast(RECENT))) }
+ _state.update { it.copy(device = it.device.copy(snapshot = snap, recent = (it.device.recent + snap).takeLast(RECENT_READINGS))) }
}
}
// One read of the app list per open: Apps and the TV's list both use it. The list
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index aff6469..3261f68 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -177,9 +177,6 @@
<item quantity="many">hace %1$d d</item>
<item quantity="other">hace %1$d d</item>
</plurals>
- <string name="copy_uptime_days_hours">%1$d d %2$d h</string>
- <string name="copy_uptime_hours_minutes">%1$d h %2$d min</string>
- <string name="copy_uptime_minutes">%1$d min</string>
<plurals name="copy_days">
<item quantity="one">%1$d día</item>
<item quantity="many">%1$d días</item>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 003b61f..c61e4f7 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -173,9 +173,6 @@
<item quantity="one">%1$d दिन पहले</item>
<item quantity="other">%1$d दिन पहले</item>
</plurals>
- <string name="copy_uptime_days_hours">%1$d दि %2$d घं</string>
- <string name="copy_uptime_hours_minutes">%1$d घं %2$d मि</string>
- <string name="copy_uptime_minutes">%1$d मि</string>
<plurals name="copy_days">
<item quantity="one">%1$d दिन</item>
<item quantity="other">%1$d दिन</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 982400b..035eb0a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -169,9 +169,6 @@
<plurals name="copy_days_ago">
<item quantity="other">%1$d 日前</item>
</plurals>
- <string name="copy_uptime_days_hours">%1$d日 %2$d時間</string>
- <string name="copy_uptime_hours_minutes">%1$d時間 %2$d分</string>
- <string name="copy_uptime_minutes">%1$d分</string>
<plurals name="copy_days">
<item quantity="other">%1$d 日</item>
</plurals>
@@ -763,7 +760,7 @@
<string name="advanced_cpu_share">CPU %1$.0f%%</string>
<string name="advanced_since_boot_short">起動から %1$s</string>
<string name="advanced_processes_n">プロセス · %1$d</string>
- <string name="advanced_connections_n">接続中 · %1$d</string>
+ <string name="advanced_connections_n">開いている接続 · %1$d</string>
<string name="advanced_established">確立</string>
<string name="advanced_connecting">接続中</string>
<string name="advanced_closing">終了中</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 821aab3..1b58979 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -181,9 +181,6 @@
<item quantity="many">%1$d дн. назад</item>
<item quantity="other">%1$d дн. назад</item>
</plurals>
- <string name="copy_uptime_days_hours">%1$d д %2$d ч</string>
- <string name="copy_uptime_hours_minutes">%1$d ч %2$d мин</string>
- <string name="copy_uptime_minutes">%1$d мин</string>
<plurals name="copy_days">
<item quantity="one">%1$d день</item>
<item quantity="few">%1$d дня</item>
@@ -869,7 +866,7 @@
<string name="advanced_not_running">Не запущено</string>
<string name="advanced_split_apps">Приложения</string>
<string name="advanced_split_system">Система</string>
- <string name="advanced_split_waiting">Ожидание памяти</string>
+ <string name="advanced_split_waiting">Ожидание накопителя</string>
<string name="advanced_core">Ядро %1$d</string>
<string name="advanced_ghz">%1$.1f ГГц</string>
<string name="advanced_in_use">Занято</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a8d6384..fc991f3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -169,9 +169,6 @@
<plurals name="copy_days_ago">
<item quantity="other">%1$d 天前</item>
</plurals>
- <string name="copy_uptime_days_hours">%1$d 天 %2$d 小时</string>
- <string name="copy_uptime_hours_minutes">%1$d 小时 %2$d 分钟</string>
- <string name="copy_uptime_minutes">%1$d 分钟</string>
<plurals name="copy_days">
<item quantity="other">%1$d 天</item>
</plurals>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6218b8d..e6ce088 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -219,9 +219,6 @@
</plurals>
<!-- Compact uptime: days, hours, minutes -->
- <string name="copy_uptime_days_hours">%1$dd %2$dh</string>
- <string name="copy_uptime_hours_minutes">%1$dh %2$dm</string>
- <string name="copy_uptime_minutes">%1$dm</string>
<plurals name="copy_days">
<item quantity="one">%1$d day</item>