From 509c0b9a866f22e1e5b0ef6f1df6abb746a64a8c Mon Sep 17 00:00:00 2001 From: kalarina Date: Sat, 31 Oct 2026 11:31:49 +0200 Subject: [PATCH] Remove leftovers of the old Monitor screen --- .../java/cc/skysparkle/sparkledns/Motion.kt | 3 - .../java/cc/skysparkle/sparkledns/QueryLog.kt | 31 ------ .../main/java/cc/skysparkle/sparkledns/Ui.kt | 101 ------------------ 3 files changed, 135 deletions(-) diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Motion.kt b/app/src/main/java/cc/skysparkle/sparkledns/Motion.kt index 1a20a7b..cf89c3d 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/Motion.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/Motion.kt @@ -1,6 +1,5 @@ package cc.skysparkle.sparkledns -import androidx.compose.animation.SizeTransform import androidx.compose.animation.core.CubicBezierEasing import androidx.compose.animation.core.FiniteAnimationSpec import androidx.compose.animation.core.tween @@ -25,6 +24,4 @@ object Motion { val expandIn = fadeIn(enterFade) + expandVertically(size) val collapseOut = fadeOut(exitFade) + shrinkVertically(size) - - fun sizeTransform() = SizeTransform(clip = false) { _, _ -> size } } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/QueryLog.kt b/app/src/main/java/cc/skysparkle/sparkledns/QueryLog.kt index 715109d..f803ba9 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/QueryLog.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/QueryLog.kt @@ -16,14 +16,6 @@ class QueryEntry( val latencyMs: Int, ) -data class QueryStats( - val total: Long, - val cached: Long, - val blocked: Long, - val failed: Long, - val avgLatencyMs: Int, -) - // In-memory only: nothing is written to disk or sent anywhere. StatsStore keeps hourly // numbers without domains for the charts. object QueryLog { @@ -31,12 +23,6 @@ object QueryLog { private val entries = ArrayDeque() private var nextId = 0L - private var total = 0L - private var cached = 0L - private var blocked = 0L - private var failed = 0L - private var latencySum = 0L - private var latencyCount = 0L private val version = MutableStateFlow(0L) // Fires right away, then at most once a second while queries keep coming: a busy log refreshes @@ -53,13 +39,6 @@ object QueryLog { entries.addLast( QueryEntry(nextId++, System.currentTimeMillis(), question.name.ifEmpty { "." }, question.type, status, latencyMs) ) - total++ - when (status) { - QueryStatus.OK -> { latencySum += latencyMs; latencyCount++ } - QueryStatus.CACHED -> cached++ - QueryStatus.BLOCKED -> blocked++ - QueryStatus.FAILED -> failed++ - } version.value++ } // Hourly numbers for the charts; outside the lock above, as it takes a lock of its own @@ -71,19 +50,9 @@ object QueryLog { @Synchronized fun snapshot(): List = List(entries.size) { entries[entries.size - 1 - it] } - @Synchronized - fun stats() = QueryStats( - total = total, - cached = cached, - blocked = blocked, - failed = failed, - avgLatencyMs = if (latencyCount == 0L) 0 else (latencySum / latencyCount).toInt(), - ) - @Synchronized fun clear() { entries.clear() - total = 0; cached = 0; blocked = 0; failed = 0; latencySum = 0; latencyCount = 0 version.value++ } } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Ui.kt b/app/src/main/java/cc/skysparkle/sparkledns/Ui.kt index 2773e40..192074a 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/Ui.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/Ui.kt @@ -2,12 +2,6 @@ package cc.skysparkle.sparkledns import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import androidx.compose.animation.AnimatedContent -import androidx.compose.animation.fadeIn -import androidx.compose.animation.fadeOut -import androidx.compose.animation.slideInVertically -import androidx.compose.animation.slideOutVertically -import androidx.compose.animation.togetherWith import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -32,10 +26,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember import androidx.compose.runtime.rememberUpdatedState -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -44,7 +35,6 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @@ -71,52 +61,6 @@ fun IconBadge(@DrawableRes icon: Int, tint: Color = MaterialTheme.colorScheme.pr } } -@Composable -fun SectionHeader( - title: String, - @DrawableRes icon: Int? = null, - modifier: Modifier = Modifier, - action: (@Composable () -> Unit)? = null, -) { - Row( - modifier = modifier - .fillMaxWidth() - .heightIn(min = 40.dp) - .padding(top = 8.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - if (icon != null) { - Icon( - painterResource(icon), - contentDescription = null, - tint = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier.size(18.dp), - ) - Spacer(Modifier.width(8.dp)) - } - Text( - title, - style = MaterialTheme.typography.titleSmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier.weight(1f), - ) - action?.invoke() - } -} - -@Composable -fun Pill(text: String, color: Color) { - Text( - text, - style = MaterialTheme.typography.labelMedium, - color = color, - modifier = Modifier - .clip(RoundedCornerShape(50)) - .background(color.copy(alpha = 0.14f)) - .padding(horizontal = 10.dp, vertical = 3.dp), - ) -} - @Composable fun HintCard( text: String, @@ -165,41 +109,6 @@ fun HintCard( } } -@Composable -fun StatColumn(value: String, label: String, modifier: Modifier = Modifier) { - Column(modifier, horizontalAlignment = Alignment.CenterHorizontally) { - // Numbers roll up when they change - AnimatedContent( - targetState = value, - transitionSpec = { - (slideInVertically(Motion.slide) { it / 2 } + fadeIn(Motion.enterFade)) togetherWith - (slideOutVertically(Motion.slide) { -it / 2 } + fadeOut(Motion.exitFade)) using - Motion.sizeTransform() - }, - label = "stat", - ) { shown -> - Text(shown, style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.SemiBold, maxLines = 1) - } - Text( - label, - style = MaterialTheme.typography.labelSmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - textAlign = TextAlign.Center, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - ) - } -} - -@Composable -fun StatDivider() { - Box( - Modifier - .size(width = 1.dp, height = 32.dp) - .background(MaterialTheme.colorScheme.outlineVariant) - ) -} - // Runs [onChange] when the query log changes, at most once a second and only while the screen // is started: nothing runs while the app sits in the background @Composable @@ -213,13 +122,6 @@ fun OnQueryLogChange(onChange: () -> Unit) { } } -@Composable -fun rememberLiveStats(): QueryStats { - var stats by remember { mutableStateOf(QueryLog.stats()) } - OnQueryLogChange { stats = QueryLog.stats() } - return stats -} - // Called from composition only, i.e. on the main thread; rebuilt when the locale changes private var countFormat: Pair? = null @@ -230,9 +132,6 @@ fun formatCount(value: Long): String { return format.format(value) } -fun cachePercent(stats: QueryStats): String = - "${if (stats.total == 0L) 0 else stats.cached * 100 / stats.total}%" - // Rows of one visual group share a background; only the outer corners are rounded fun groupedShape(first: Boolean, last: Boolean, radius: Dp = 16.dp) = RoundedCornerShape( topStart = if (first) radius else 0.dp,