diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b48af39..455d3ec 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,8 +13,8 @@ android { targetSdk = 36 // Single source of truth: the About screen reads these through BuildConfig. // Kept as plain literals so F-Droid can detect new versions. Code = major * 10000 + minor * 100 + patch. - versionCode = 10101 - versionName = "1.1.1" + versionCode = 10102 + versionName = "1.1.2" } buildTypes { @@ -49,6 +49,21 @@ android { includeInBundle = false } + packaging { + resources { + // Library files the app never reads: Kotlin metadata for reflection, the coroutines debug + // agent, version markers for tooling and OkHttp's public suffix list, which only cookies use + excludes += listOf( + "/META-INF/*.version", + "/META-INF/*.kotlin_module", + "/kotlin/**", + "/kotlin-tooling-metadata.json", + "/DebugProbesKt.bin", + "/okhttp3/internal/publicsuffix/**", + ) + } + } + testOptions { // android.util.Log and friends are no-ops in JVM unit tests unitTests.isReturnDefaultValues = true @@ -69,4 +84,4 @@ dependencies { debugImplementation("com.squareup.leakcanary:leakcanary-android:2.14") testImplementation("junit:junit:4.13.2") -} +} \ No newline at end of file diff --git a/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt index f14977a..ef0997b 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt @@ -40,6 +40,7 @@ import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment @@ -126,7 +127,7 @@ private fun AboutContent(modifier: Modifier, onOpenLicenses: () -> Unit) { verticalArrangement = Arrangement.spacedBy(12.dp), ) { Image( - painterResource(R.drawable.app_logo), + remember { AppLogo.get(context) }, contentDescription = null, modifier = Modifier .size(104.dp) diff --git a/app/src/main/java/cc/skysparkle/sparkledns/ActivityScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/ActivityScreen.kt index b43ad68..acdb0ae 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/ActivityScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/ActivityScreen.kt @@ -5,9 +5,7 @@ import android.content.ClipboardManager import android.widget.Toast import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import androidx.compose.foundation.Canvas import androidx.compose.foundation.background -import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -15,32 +13,39 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue +import androidx.compose.runtime.structuralEqualityPolicy import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawWithCache import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Size import androidx.compose.ui.graphics.Color @@ -54,12 +59,12 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext import java.text.SimpleDateFormat import java.util.Date import java.util.Locale +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext private enum class ActivityFilter(@StringRes val label: Int) { ALL(R.string.mon_all), @@ -68,11 +73,6 @@ private enum class ActivityFilter(@StringRes val label: Int) { ERRORS(R.string.mon_errors), } -private enum class Period(val hours: Int, @StringRes val label: Int) { - DAY(24, R.string.period_24h), - WEEK(24 * 7, R.string.period_7d), -} - private val TimeFormat = SimpleDateFormat("HH:mm:ss", Locale.ROOT) // Colors of the company slices, then the rest @@ -88,12 +88,11 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) { val custom by Blocklist.custom.collectAsStateWithLifecycle() val customSet = remember(custom) { custom.toHashSet() } - var period by rememberSaveable { mutableStateOf(Period.DAY) } + var period by rememberSaveable { mutableStateOf(StatsPeriod.DAY) } var entries by remember { mutableStateOf(QueryLog.snapshot()) } var summary by remember { mutableStateOf(StatsStore.summary(period.hours)) } var filter by rememberSaveable { mutableStateOf(ActivityFilter.ALL) } var search by rememberSaveable { mutableStateOf("") } - var filterMenu by remember { mutableStateOf(false) } OnQueryLogChange { entries = QueryLog.snapshot() @@ -102,18 +101,23 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) { val statsVersion by StatsStore.version.collectAsStateWithLifecycle() LaunchedEffect(period, statsVersion) { summary = StatsStore.summary(period.hours) } - val visible = remember(entries, filter, search) { - val term = search.trim() - entries.filter { e -> - val matchesFilter = when (filter) { - ActivityFilter.ALL -> true - ActivityFilter.BLOCKED -> e.status == QueryStatus.BLOCKED - ActivityFilter.CACHED -> e.status == QueryStatus.CACHED - ActivityFilter.ERRORS -> e.status == QueryStatus.FAILED + // Filtered again only when the log, the filter or the search changes, and the list below is + // updated only when the result differs: new entries that the filter hides change nothing + val visible by remember { + derivedStateOf(structuralEqualityPolicy()) { + val term = search.trim() + entries.filter { e -> + val matchesFilter = when (filter) { + ActivityFilter.ALL -> true + ActivityFilter.BLOCKED -> e.status == QueryStatus.BLOCKED + ActivityFilter.CACHED -> e.status == QueryStatus.CACHED + ActivityFilter.ERRORS -> e.status == QueryStatus.FAILED + } + matchesFilter && (term.isEmpty() || e.domain.contains(term, ignoreCase = true)) } - matchesFilter && (term.isEmpty() || e.domain.contains(term, ignoreCase = true)) } } + val canClear by remember { derivedStateOf { entries.isNotEmpty() } } fun toggleBlock(domain: String, unblock: Boolean) { scope.launch { @@ -145,112 +149,27 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) { .setPrimaryClip(ClipData.newPlainText("domain", domain)) } - LazyColumn( - modifier = modifier, - contentPadding = PaddingValues(start = 20.dp, end = 20.dp, top = 16.dp, bottom = bottomPadding), - ) { - item(key = "header") { - Row( - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 44.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - ScreenTitle(stringResource(R.string.tab_activity), Modifier.weight(1f)) - PeriodChip(stringResource(period.label)) { - period = if (period == Period.DAY) Period.WEEK else Period.DAY - } - } - } - - item(key = "stats") { - Row( - modifier = Modifier - .fillMaxWidth() - .padding(top = 20.dp, start = 4.dp, end = 4.dp), - horizontalArrangement = Arrangement.spacedBy(6.dp), - ) { - StatBlock(formatCompact(summary.total), stringResource(R.string.stat_requests), Modifier.weight(1f)) - StatBlock(formatCompact(summary.blocked), stringResource(R.string.mon_blocked), Modifier.weight(1f)) - StatBlock(stringResource(R.string.mon_ms, summary.avgLatencyMs), stringResource(R.string.stat_avg), Modifier.weight(1f)) - val cache = if (summary.total == 0L) 0 else summary.cached * 100 / summary.total - StatBlock("$cache%", stringResource(R.string.mon_cached), Modifier.weight(1f)) - } - } - - item(key = "companies") { - CompanyCard(summary, Modifier.padding(top = 20.dp)) - } + val wide = windowWidth() >= WideLayoutWidth + val side = sidePadding(windowWidth(), if (wide) MaxWideContentWidth else MaxContentWidth) + val clear = { + QueryLog.clear() + entries = emptyList() + } + // The log rows, shared by the one- and two-column layouts + val log: LazyListScope.() -> Unit = { item(key = "recent") { - Row( - modifier = Modifier - .fillMaxWidth() - .padding(top = 24.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - Text( - stringResource(R.string.recent_title), - color = Palette.Fg, - fontSize = 17.sp, - fontWeight = FontWeight.ExtraBold, - modifier = Modifier.weight(1f), - ) - IconButton( - onClick = { - QueryLog.clear() - entries = emptyList() - }, - enabled = entries.isNotEmpty(), - ) { - Icon( - painterResource(R.drawable.ic_delete_sweep), - contentDescription = stringResource(R.string.mon_clear), - tint = Palette.Fg2, - modifier = Modifier.size(20.dp), - ) - } - } + RecentHeader(canClear, clear, Modifier.padding(top = if (wide) 0.dp else 24.dp)) } - item(key = "search") { - SearchField( - value = search, - onValueChange = { search = it }, - placeholder = stringResource(R.string.mon_search), + LogSearch( + search = search, + onSearch = { search = it }, + filter = filter, + onFilter = { filter = it }, modifier = Modifier.padding(top = 6.dp, bottom = 4.dp), - trailing = { - Box { - IconButton(onClick = { filterMenu = true }) { - Icon( - painterResource(R.drawable.ic_filter), - contentDescription = stringResource(R.string.filter), - tint = if (filter == ActivityFilter.ALL) Palette.Fg2 else Palette.Accent, - modifier = Modifier.size(18.dp), - ) - } - DropdownMenu(expanded = filterMenu, onDismissRequest = { filterMenu = false }) { - ActivityFilter.entries.forEach { option -> - DropdownMenuItem( - text = { - Text( - stringResource(option.label), - color = if (option == filter) Palette.Accent else Palette.Fg, - fontWeight = if (option == filter) FontWeight.Bold else FontWeight.Normal, - ) - }, - onClick = { - filter = option - filterMenu = false - }, - ) - } - } - } - }, ) } - if (visible.isEmpty()) { item(key = "empty") { EmptyState( @@ -259,7 +178,6 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) { ) } } - itemsIndexed(visible, key = { _, entry -> entry.id }, contentType = { _, _ -> "query" }) { index, entry -> val blockedByMe = entry.domain in customSet QueryRow( @@ -273,24 +191,148 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) { ) } } + + if (wide) { + Row( + modifier = modifier.padding(horizontal = side), + horizontalArrangement = Arrangement.spacedBy(24.dp), + ) { + Column( + Modifier + .weight(1f) + .fillMaxHeight() + .verticalScroll(rememberScrollState()) + .padding(top = 16.dp, bottom = bottomPadding), + ) { + ActivityHeader(period) { period = it } + ActivityStats(summary, Modifier.padding(top = 20.dp)) + CompanyCard(summary, Modifier.padding(top = 20.dp)) + } + LazyColumn( + modifier = Modifier + .weight(1f) + .fillMaxHeight(), + contentPadding = PaddingValues(top = 16.dp, bottom = bottomPadding), + content = log, + ) + } + } else { + LazyColumn( + modifier = modifier, + contentPadding = PaddingValues(start = side, end = side, top = 16.dp, bottom = bottomPadding), + ) { + item(key = "header") { ActivityHeader(period) { period = it } } + item(key = "stats") { ActivityStats(summary, Modifier.padding(top = 20.dp)) } + item(key = "companies") { CompanyCard(summary, Modifier.padding(top = 20.dp)) } + log() + } + } } @Composable -private fun PeriodChip(text: String, onClick: () -> Unit) { +private fun ActivityHeader(period: StatsPeriod, onPeriod: (StatsPeriod) -> Unit) { Row( modifier = Modifier - .clip(RoundedCornerShape(18.dp)) - .border(1.dp, Palette.Track, RoundedCornerShape(18.dp)) - .clickable(onClick = onClick) - .padding(start = 14.dp, end = 10.dp, top = 8.dp, bottom = 8.dp), + .fillMaxWidth() + .heightIn(min = 44.dp), verticalAlignment = Alignment.CenterVertically, ) { - Text(text, color = Palette.Fg, fontSize = 12.sp, fontWeight = FontWeight.Bold) - Spacer(Modifier.width(4.dp)) - Icon(painterResource(R.drawable.ic_expand), contentDescription = null, tint = Palette.Fg2, modifier = Modifier.size(14.dp)) + ScreenTitle(stringResource(R.string.tab_activity), Modifier.weight(1f)) + PeriodChip(period, onPeriod) } } +@Composable +private fun ActivityStats(summary: StatsSummary, modifier: Modifier = Modifier) { + Row( + modifier = modifier + .fillMaxWidth() + .padding(horizontal = 4.dp), + horizontalArrangement = Arrangement.spacedBy(6.dp), + ) { + StatBlock(formatCompact(summary.total), stringResource(R.string.stat_requests), Modifier.weight(1f)) + StatBlock(formatCompact(summary.blocked), stringResource(R.string.mon_blocked), Modifier.weight(1f)) + StatBlock(stringResource(R.string.mon_ms, summary.avgLatencyMs), stringResource(R.string.stat_avg), Modifier.weight(1f)) + val cache = if (summary.total == 0L) 0 else summary.cached * 100 / summary.total + StatBlock("$cache%", stringResource(R.string.mon_cached), Modifier.weight(1f)) + } +} + +@Composable +private fun RecentHeader(canClear: Boolean, onClear: () -> Unit, modifier: Modifier = Modifier) { + Row( + modifier = modifier + .fillMaxWidth() + .heightIn(min = 44.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + stringResource(R.string.recent_title), + color = Palette.Fg, + fontSize = 17.sp, + fontWeight = FontWeight.ExtraBold, + modifier = Modifier.weight(1f), + ) + IconButton(onClick = onClear, enabled = canClear) { + Icon( + painterResource(R.drawable.ic_delete_sweep), + contentDescription = stringResource(R.string.mon_clear), + tint = Palette.Fg2, + modifier = Modifier.size(20.dp), + ) + } + } +} + +@Composable +private fun LogSearch( + search: String, + onSearch: (String) -> Unit, + filter: ActivityFilter, + onFilter: (ActivityFilter) -> Unit, + modifier: Modifier = Modifier, +) { + var menu by remember { mutableStateOf(false) } + SearchField( + value = search, + onValueChange = onSearch, + placeholder = stringResource(R.string.mon_search), + modifier = modifier, + trailing = { + Box { + IconButton(onClick = { menu = true }) { + Icon( + painterResource(R.drawable.ic_filter), + contentDescription = stringResource(R.string.filter), + tint = if (filter == ActivityFilter.ALL) Palette.Fg2 else Palette.Accent, + modifier = Modifier.size(18.dp), + ) + } + DropdownMenu(expanded = menu, onDismissRequest = { menu = false }) { + ActivityFilter.entries.forEach { option -> + DropdownMenuItem( + text = { + Text( + stringResource(option.label), + color = if (option == filter) Palette.Accent else Palette.Fg, + fontWeight = if (option == filter) FontWeight.Bold else FontWeight.Normal, + ) + }, + onClick = { + onFilter(option) + menu = false + }, + ) + } + } + } + }, + ) +} + +// Below this many requests the shares say more about chance than about habits +private const val MIN_COMPANY_REQUESTS = 50L + @Composable private fun CompanyCard(summary: StatsSummary, modifier: Modifier = Modifier) { val other = stringResource(R.string.companies_other) @@ -305,12 +347,19 @@ private fun CompanyCard(summary: StatsSummary, modifier: Modifier = Modifier) { Text(stringResource(R.string.companies_title), color = Palette.Fg, fontSize = 15.sp, fontWeight = FontWeight.Bold) Text(stringResource(R.string.companies_desc), color = Palette.Fg2, fontSize = 12.sp, lineHeight = 17.sp) Spacer(Modifier.size(10.dp)) - if (summary.total == 0L) { + if (summary.total < MIN_COMPANY_REQUESTS) { Text( - stringResource(R.string.no_data), + stringResource(R.string.companies_wait, summary.total, MIN_COMPANY_REQUESTS), color = Palette.Fg3, fontSize = 13.sp, - modifier = Modifier.padding(vertical = 12.dp), + ) + LinearProgressIndicator( + progress = { summary.total.toFloat() / MIN_COMPANY_REQUESTS }, + modifier = Modifier + .fillMaxWidth() + .padding(top = 10.dp, bottom = 4.dp), + color = Palette.Accent, + trackColor = Palette.Track, ) } else { Row(verticalAlignment = Alignment.CenterVertically) { @@ -334,12 +383,7 @@ private fun CompanyCard(summary: StatsSummary, modifier: Modifier = Modifier) { overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f), ) - Text( - String.format(Locale.getDefault(), "%.1f%%", slice.share * 100f), - color = Palette.Fg, - fontSize = 12.sp, - fontWeight = FontWeight.Bold, - ) + Text(percentLabel(slice.share), color = Palette.Fg, fontSize = 12.sp, fontWeight = FontWeight.Bold) } } } @@ -348,7 +392,13 @@ private fun CompanyCard(summary: StatsSummary, modifier: Modifier = Modifier) { } } -// The four companies with most requests, then everything else +// Whole percents; a sliver above zero shows as "<1%" rather than "0%" +private fun percentLabel(share: Float): String { + val percent = share * 100f + return if (percent < 1f) "<1%" else "${Math.round(percent)}%" +} + +// The four companies with most requests, then everything else; empty slices are left out private fun companySlices(summary: StatsSummary, otherLabel: String): List { if (summary.total == 0L) return emptyList() val top = Company.entries @@ -360,26 +410,32 @@ private fun companySlices(summary: StatsSummary, otherLabel: String): List= 0.005f) slices + Slice(otherLabel, rest, OtherColor) else slices } @Composable private fun Donut(slices: List, modifier: Modifier = Modifier) { - Canvas(modifier) { - val stroke = 14.dp.toPx() - val diameter = size.minDimension - stroke - val topLeft = Offset((size.width - diameter) / 2f, (size.height - diameter) / 2f) - val arcSize = Size(diameter, diameter) - drawArc(OtherColor, 0f, 360f, useCenter = false, topLeft = topLeft, size = arcSize, style = Stroke(width = stroke)) - var start = -90f - slices.forEach { slice -> - val sweep = slice.share * 360f - if (sweep > 0f) { - drawArc(slice.color, start, sweep, useCenter = false, topLeft = topLeft, size = arcSize, style = Stroke(width = stroke)) + // The ring's geometry is worked out when the size changes, not every frame + Spacer( + modifier.drawWithCache { + val width = 14.dp.toPx() + val stroke = Stroke(width = width) + val diameter = size.minDimension - width + val topLeft = Offset((size.width - diameter) / 2f, (size.height - diameter) / 2f) + val arcSize = Size(diameter, diameter) + onDrawBehind { + drawArc(OtherColor, 0f, 360f, useCenter = false, topLeft = topLeft, size = arcSize, style = stroke) + var start = -90f + slices.forEach { slice -> + val sweep = slice.share * 360f + if (sweep > 0f) { + drawArc(slice.color, start, sweep, useCenter = false, topLeft = topLeft, size = arcSize, style = stroke) + } + start += sweep + } } - start += sweep } - } + ) } @Composable diff --git a/app/src/main/java/cc/skysparkle/sparkledns/AppShell.kt b/app/src/main/java/cc/skysparkle/sparkledns/AppShell.kt index 7acdacb..4080102 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/AppShell.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/AppShell.kt @@ -39,6 +39,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color @@ -59,6 +60,8 @@ private enum class Screen(@StringRes val label: Int, @DrawableRes val icon: Int, ABOUT(R.string.tab_about, R.drawable.ic_tab_info, false), } +private val Tabs = Screen.entries.filter { it.isTab } + @Composable fun AppShell() { var tab by rememberSaveable { mutableStateOf(Screen.HOME) } @@ -101,6 +104,7 @@ fun AppShell() { Screen.HOME -> HomeScreen( bottomPadding = tabBottom, onOpenBlocklist = { page = Screen.BLOCKLIST }, + onOpenServers = { tab = Screen.SETTINGS }, modifier = modifier, ) Screen.ACTIVITY -> ActivityScreen(bottomPadding = tabBottom, modifier = modifier) @@ -160,30 +164,34 @@ private fun NavPill(current: Screen, onSelect: (Screen) -> Unit, modifier: Modif .selectableGroup(), horizontalArrangement = Arrangement.spacedBy(4.dp), ) { - Screen.entries.filter { it.isTab }.forEach { item -> - val selected = item == current - val background by animateColorAsState( - if (selected) Palette.AccentSoft else Color.Transparent, - animationSpec = Motion.color, - label = "navBackground", - ) - val tint by animateColorAsState( - if (selected) Palette.Accent else Palette.NavIcon, - animationSpec = Motion.color, - label = "navTint", - ) - val label = stringResource(item.label) - Box( - modifier = Modifier - .size(width = 58.dp, height = 44.dp) - .clip(RoundedCornerShape(22.dp)) - .background(background) - .selectable(selected = selected, onClick = { onSelect(item) }, role = Role.Tab) - .semantics { contentDescription = label }, - contentAlignment = Alignment.Center, - ) { - Icon(painterResource(item.icon), contentDescription = null, tint = tint, modifier = Modifier.size(22.dp)) - } - } + Tabs.forEach { item -> NavItem(item, selected = item == current, onSelect = onSelect) } + } +} + +// One tab of the panel. Its own composable, so a color animation recomposes only the tabs that +// change instead of the whole panel; the background is read only when drawing. +@Composable +private fun NavItem(item: Screen, selected: Boolean, onSelect: (Screen) -> Unit) { + val background by animateColorAsState( + if (selected) Palette.AccentSoft else Color.Transparent, + animationSpec = Motion.color, + label = "navBackground", + ) + val tint by animateColorAsState( + if (selected) Palette.Accent else Palette.NavIcon, + animationSpec = Motion.color, + label = "navTint", + ) + val label = stringResource(item.label) + Box( + modifier = Modifier + .size(width = 58.dp, height = 44.dp) + .clip(RoundedCornerShape(22.dp)) + .drawBehind { drawRect(background) } + .selectable(selected = selected, onClick = { onSelect(item) }, role = Role.Tab) + .semantics { contentDescription = label }, + contentAlignment = Alignment.Center, + ) { + Icon(painterResource(item.icon), contentDescription = null, tint = tint, modifier = Modifier.size(22.dp)) } } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/AppsScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/AppsScreen.kt index 3433443..f923249 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/AppsScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/AppsScreen.kt @@ -33,7 +33,6 @@ import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField -import androidx.compose.material3.Switch import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.material3.TriStateCheckbox @@ -338,7 +337,7 @@ private fun AppRow(modifier: Modifier, app: AppItem, enabled: Boolean, last: Boo ) } Spacer(Modifier.width(12.dp)) - Switch(checked = enabled, onCheckedChange = null, colors = appSwitchColors()) + AppSwitch(checked = enabled, onCheckedChange = null) } } } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Blocklist.kt b/app/src/main/java/cc/skysparkle/sparkledns/Blocklist.kt index 89e7cca..9a13cda 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/Blocklist.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/Blocklist.kt @@ -66,9 +66,16 @@ object Blocklist { private var customHashes = LongArray(0) private var loaded = false + // False until the saved lists have been read at start-up + private val _ready = MutableStateFlow(false) + val ready: StateFlow = _ready + fun isBlocked(name: String): Boolean = _enabled.value && isBlockedIn(name, listHashes, customHashes) - fun reload(context: Context) = synchronized(lock) { load(BlocklistStore(context)) } + // Reads the saved lists unless something did already, such as the background update job + fun ensureLoaded(context: Context) { + synchronized(lock) { ensureLoaded(BlocklistStore(context)) } + } fun setEnabled(context: Context, value: Boolean) { BlocklistStore(context).enabled = value @@ -212,6 +219,7 @@ object Blocklist { customHashes = LongArray(custom.size) { DomainHash.of(custom[it]) }.sortUnique() reloadListHashes(store) loaded = true + _ready.value = true } private fun reloadListHashes(store: BlocklistStore) { @@ -226,20 +234,28 @@ object Blocklist { } } -// True when the name or one of its parent domains is in either sorted hash set +// True when the name or one of its parent domains is in either sorted hash set. Runs for every +// query, so trailing dots are skipped by index rather than trimmed off a copy of the name. internal fun isBlockedIn(name: String, lists: LongArray, custom: LongArray): Boolean { if (lists.isEmpty() && custom.isEmpty()) return false - val domain = name.trimEnd('.') + val end = nameEnd(name) var start = 0 while (true) { - val hash = DomainHash.of(domain, start) + val hash = DomainHash.of(name, start, end) if (lists.binarySearch(hash) >= 0 || custom.binarySearch(hash) >= 0) return true - val dot = domain.indexOf('.', start) - if (dot < 0) return false + val dot = name.indexOf('.', start) + if (dot < 0 || dot >= end) return false start = dot + 1 } } +// Length of the name without trailing dots +internal fun nameEnd(name: String): Int { + var end = name.length + while (end > 0 && name[end - 1] == '.') end-- + return end +} + // Number of distinct entries in both sorted sets; the custom set is small internal fun unionSize(lists: LongArray, custom: LongArray): Int = lists.size + custom.count { lists.binarySearch(it) < 0 } @@ -282,10 +298,10 @@ internal object DomainHash { private const val FNV_OFFSET = -3750763034362895579L // 0xcbf29ce484222325 private const val FNV_PRIME = 1099511628211L - // FNV-1a over the domain starting at [start], so parent domains are hashed without substrings - fun of(s: String, start: Int = 0): Long { + // FNV-1a over the characters from [start] to [end], so parent domains are hashed without substrings + fun of(s: String, start: Int = 0, end: Int = s.length): Long { var h = FNV_OFFSET - for (i in start until s.length) { + for (i in start until end) { h = h xor s[i].code.toLong() h *= FNV_PRIME } @@ -316,8 +332,12 @@ private fun LongArray.sortUnique(): LongArray { } private class BlocklistStore(context: Context) { - private val dir = File(context.filesDir, "blocklist").apply { mkdirs() } - private val sp = context.getSharedPreferences("blocklist", Context.MODE_PRIVATE) + private val appContext = context.applicationContext + + // Created on first use: switching blocking on or off, which happens on the main thread, + // touches only the settings + private val dir by lazy { File(appContext.filesDir, "blocklist").apply { mkdirs() } } + private val sp = appContext.getSharedPreferences("blocklist", Context.MODE_PRIVATE) var enabled: Boolean get() = sp.getBoolean("enabled", true) @@ -340,7 +360,7 @@ private class BlocklistStore(context: Context) { val array = JSONArray(raw) (0 until array.length()).map { val o = array.getJSONObject(it) - RemoteList(o.getString("url"), o.getInt("count"), o.getLong("updated"), o.optBoolean("enabled", true)) + RemoteList(o.getString("url"), o.getInt("count"), o.getLong("updated"), o.getBoolean("enabled")) } }.getOrDefault(emptyList()) } @@ -357,7 +377,6 @@ private class BlocklistStore(context: Context) { fun loadListHashes(url: String): LongArray { val file = binFile(url) - if (!file.exists()) migrateText(url)?.let { return it } if (!file.exists()) return LongArray(0) return runCatching { FileInputStream(file).use { stream -> @@ -371,7 +390,6 @@ private class BlocklistStore(context: Context) { fun deleteListFile(url: String) { binFile(url).delete() - textFile(url).delete() sp.edit().remove(etagKey(url)).remove(modifiedKey(url)).apply() } @@ -420,16 +438,6 @@ private class BlocklistStore(context: Context) { } } - // Lists saved by older versions as plain text are converted once - private fun migrateText(url: String): LongArray? { - val text = textFile(url) - if (!text.exists()) return null - val result = text.readLines().map { DomainHash.of(it) }.toLongArray().sortUnique() - runCatching { write(url, result) } - text.delete() - return result - } - private fun etagKey(url: String) = "etag_${hash(url)}" private fun modifiedKey(url: String) = "modified_${hash(url)}" @@ -437,7 +445,6 @@ private class BlocklistStore(context: Context) { if (value == null) remove(key) else putString(key, value) private fun binFile(url: String) = File(dir, "list_${hash(url)}.bin") - private fun textFile(url: String) = File(dir, "list_${hash(url)}.txt") private fun hash(url: String) = MessageDigest.getInstance("SHA-256").digest(url.toByteArray()) .take(8).joinToString("") { "%02x".format(it) } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/BlocklistScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/BlocklistScreen.kt index 7ac8360..76dbefa 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/BlocklistScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/BlocklistScreen.kt @@ -75,8 +75,11 @@ private class Preset(val name: String, val url: String, @StringRes val descripti private const val HAGEZI_HOME = "https://github.com/hagezi/dns-blocklists" +// Offered on Home when no list is switched on +internal const val HAGEZI_PRO_URL = "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/pro.txt" + private val Presets = listOf( - Preset("HaGeZi Pro", "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/pro.txt", R.string.preset_pro_desc), + Preset("HaGeZi Pro", HAGEZI_PRO_URL, R.string.preset_pro_desc), Preset("HaGeZi Pro++", "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/pro.plus.txt", R.string.preset_proplus_desc), Preset("HaGeZi TIF", "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/tif.txt", R.string.preset_tif_desc), ) @@ -89,6 +92,7 @@ fun BlocklistScreen(bottomPadding: Dp, onBack: () -> Unit, modifier: Modifier = val context = LocalContext.current val scope = rememberCoroutineScope() val prefs = remember { Prefs(context) } + val side = sidePadding(windowWidth()) val enabled by Blocklist.enabled.collectAsStateWithLifecycle() val custom by Blocklist.custom.collectAsStateWithLifecycle() @@ -96,8 +100,7 @@ fun BlocklistScreen(bottomPadding: Dp, onBack: () -> Unit, modifier: Modifier = // Downloads live in Blocklist, so they keep running and stay visible when the page is closed val busy by Blocklist.busy.collectAsStateWithLifecycle() val error by Blocklist.error.collectAsStateWithLifecycle() - val lastError = remember { arrayOf("") } // kept while the card animates out - error?.let { lastError[0] = it } + val shownError = rememberLast(error).orEmpty() var search by rememberSaveable { mutableStateOf("") } var domainsOpen by rememberSaveable { mutableStateOf(false) } @@ -129,7 +132,7 @@ fun BlocklistScreen(bottomPadding: Dp, onBack: () -> Unit, modifier: Modifier = LazyColumn( modifier = modifier, - contentPadding = PaddingValues(start = 20.dp, end = 20.dp, bottom = bottomPadding), + contentPadding = PaddingValues(start = side, end = side, bottom = bottomPadding), ) { item(key = "header") { PageHeader( @@ -163,7 +166,7 @@ fun BlocklistScreen(bottomPadding: Dp, onBack: () -> Unit, modifier: Modifier = AnimatedVisibility(visible = error != null, enter = Motion.expandIn, exit = Motion.collapseOut) { Box(Modifier.padding(top = 12.dp)) { HintCard( - stringResource(R.string.bl_download_failed, lastError[0]), + stringResource(R.string.bl_download_failed, shownError), icon = R.drawable.ic_alert, tint = Palette.Blocked, ) @@ -430,16 +433,7 @@ private fun BlocklistCard( overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f), ) - if (onDelete != null) { - IconButton(onClick = onDelete) { - Icon( - painterResource(R.drawable.ic_delete), - contentDescription = stringResource(R.string.delete), - tint = Palette.Fg3, - modifier = Modifier.size(20.dp), - ) - } - } + if (onDelete != null) DeleteButton(onDelete) AppSwitch(checked = checked, onCheckedChange = onCheckedChange, enabled = switchEnabled) } Text( @@ -547,7 +541,7 @@ private fun DomainRow(domain: String, shape: Shape, onDelete: () -> Unit, modifi .clip(shape) .background(Palette.Card) ) { - HorizontalDivider(modifier = Modifier.padding(horizontal = 16.dp), color = Palette.Line) + ListDivider() Row( modifier = Modifier.padding(start = 16.dp, end = 4.dp), verticalAlignment = Alignment.CenterVertically, @@ -560,18 +554,23 @@ private fun DomainRow(domain: String, shape: Shape, onDelete: () -> Unit, modifi overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f), ) - IconButton(onClick = onDelete) { - Icon( - painterResource(R.drawable.ic_delete), - contentDescription = stringResource(R.string.delete), - tint = Palette.Fg3, - modifier = Modifier.size(20.dp), - ) - } + DeleteButton(onDelete) } } } +@Composable +private fun DeleteButton(onClick: () -> Unit) { + IconButton(onClick = onClick) { + Icon( + painterResource(R.drawable.ic_delete), + contentDescription = stringResource(R.string.delete), + tint = Palette.Fg3, + modifier = Modifier.size(20.dp), + ) + } +} + @Composable private fun AddListDialog(busy: Boolean, onAdd: (String) -> Boolean, onDismiss: () -> Unit) { var url by rememberSaveable { mutableStateOf("") } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Companies.kt b/app/src/main/java/cc/skysparkle/sparkledns/Companies.kt index c56d6ad..716ac59 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/Companies.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/Companies.kt @@ -1,5 +1,7 @@ package cc.skysparkle.sparkledns +import java.util.TreeMap + // The position of each company is saved in StatsStore: add new ones at the end only enum class Company(val label: String) { GOOGLE("Google"), @@ -17,8 +19,16 @@ enum class Company(val label: String) { // Tells which big company a domain belongs to, for the Company dominance card. // Matches the domain and every parent of it against a small built-in table. object Companies { - private val bySuffix = HashMap().apply { - fun add(company: Company, vararg domains: String) = domains.forEach { put(it, company) } + private const val GOOGLE_PREFIX = "google." + + // Hashes of the domains, sorted, with the company of each at the same index: this runs for + // every query, and parent domains are looked up by hash without copying the name + private val hashes: LongArray + private val owners: Array + + init { + val table = TreeMap() + fun add(company: Company, vararg domains: String) = domains.forEach { table[DomainHash.of(it)] = company } add( Company.GOOGLE, @@ -62,17 +72,24 @@ object Companies { add(Company.YANDEX, "yandex.ru", "yandex.net", "yandex.com", "ya.ru", "yastatic.net", "yandex.by", "yandex.kz") add(Company.SAMSUNG, "samsung.com", "samsungapps.com", "samsungcloud.com", "samsungqbe.com", "samsungosp.com") add(Company.XIAOMI, "xiaomi.com", "xiaomi.net", "mi.com", "miui.com", "mi-img.com") + + hashes = table.keys.toLongArray() + owners = table.values.toTypedArray() } fun of(name: String): Company? { - var domain = name.lowercase().trimEnd('.') - while (domain.isNotEmpty()) { - bySuffix[domain]?.let { return it } + // Names from the tunnel are lowercase already; anything else is lowercased once + val domain = if (name.any { it.isUpperCase() }) name.lowercase() else name + val end = nameEnd(domain) + var start = 0 + while (start < end) { + val index = hashes.binarySearch(DomainHash.of(domain, start, end)) + if (index >= 0) return owners[index] // Google's country sites: google.de, google.co.uk, google.com.br - if (domain.startsWith("google.") && domain.length - "google.".length <= 6) return Company.GOOGLE - val dot = domain.indexOf('.') - if (dot < 0) return null - domain = domain.substring(dot + 1) + if (end - start - GOOGLE_PREFIX.length in 1..6 && domain.startsWith(GOOGLE_PREFIX, start)) return Company.GOOGLE + val dot = domain.indexOf('.', start) + if (dot < 0 || dot >= end) return null + start = dot + 1 } return null } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/CrashLog.kt b/app/src/main/java/cc/skysparkle/sparkledns/CrashLog.kt index dfd5e30..2104bd8 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/CrashLog.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/CrashLog.kt @@ -5,6 +5,8 @@ import android.content.Context import android.os.Build import android.os.Process import android.os.StrictMode +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow import java.io.File import java.io.PrintWriter import java.io.StringWriter @@ -17,22 +19,23 @@ class SparkleApp : Application() { Thread({ // Reads what the first screen needs before it asks, so its first frame does not wait on storage Prefs(this).providerId - CrashLog.preload(this) + CrashLog.load(this) StatsStore.init(this) - // Older versions cached a server list downloaded from the repository - File(filesDir, "servers.txt").delete() AutoUpdate.apply(this) // Lists can hold millions of entries; loading them should not take CPU from the first frames Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND) - runCatching { Blocklist.reload(this) } + runCatching { Blocklist.ensureLoaded(this) } }, "startup-load").start() } // The VPN keeps the process running long after the screens are gone; decoded app icons - // (up to 10 MB) can be rendered again the next time the Apps tab opens + // (up to 10 MB) and the logo can be rendered again the next time they are shown override fun onTrimMemory(level: Int) { super.onTrimMemory(level) - if (level >= TRIM_MEMORY_UI_HIDDEN) clearAppIconCache() + if (level >= TRIM_MEMORY_UI_HIDDEN) { + clearAppIconCache() + AppLogo.clear() + } } // Debug builds only: logs disk and network access on the main thread, leaked closeables and the like @@ -46,13 +49,18 @@ class SparkleApp : Application() { object CrashLog { private const val FILE_NAME = "last_crash.txt" + // Null when there is no report, and until the startup thread has read it + private val _report = MutableStateFlow(null) + val report: StateFlow = _report + fun install(context: Context) { - val file = File(context.filesDir, FILE_NAME) + val appContext = context.applicationContext val previous = Thread.getDefaultUncaughtExceptionHandler() Thread.setDefaultUncaughtExceptionHandler { thread, error -> runCatching { val trace = StringWriter().also { error.printStackTrace(PrintWriter(it)) }.toString() - file.writeText( + // Looked up only now: install() runs on the main thread at start-up + File(appContext.filesDir, FILE_NAME).writeText( "Thread: ${thread.name}\n" + "Android ${Build.VERSION.RELEASE} (API ${Build.VERSION.SDK_INT}), " + "${Build.MANUFACTURER} ${Build.MODEL}\n\n$trace" @@ -62,24 +70,14 @@ object CrashLog { } } - @Volatile - private var preloaded = false - - @Volatile - private var report: String? = null - - fun preload(context: Context) { - report = load(context) - preloaded = true + // Runs on the startup thread, so the main thread never reads the file + fun load(context: Context) { + _report.value = runCatching { File(context.filesDir, FILE_NAME).takeIf { it.exists() }?.readText() }.getOrNull() } - fun read(context: Context): String? = if (preloaded) report else load(context) - fun clear(context: Context) { - report = null - File(context.filesDir, FILE_NAME).delete() + _report.value = null + val appContext = context.applicationContext + Thread({ File(appContext.filesDir, FILE_NAME).delete() }, "crash-clear").start() } - - private fun load(context: Context): String? = - runCatching { File(context.filesDir, FILE_NAME).takeIf { it.exists() }?.readText() }.getOrNull() } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/DnsCache.kt b/app/src/main/java/cc/skysparkle/sparkledns/DnsCache.kt index 2a5ec7f..3812f4b 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/DnsCache.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/DnsCache.kt @@ -10,7 +10,7 @@ class DnsCache( private class Entry( val response: ByteArray, - val ttlOffsets: IntArray, + // Offset and value of each TTL field, one pair after another val ttls: IntArray, val storedAt: Long, val expiresAt: Long, @@ -35,7 +35,12 @@ class DnsCache( out[0] = query[0] out[1] = query[1] val elapsed = ((now - entry.storedAt) / 1000).toInt() - entry.ttlOffsets.forEachIndexed { i, off -> put32(out, off, maxOf(entry.ttls[i] - elapsed, 0)) } + val ttls = entry.ttls + var i = 0 + while (i < ttls.size) { + put32(out, ttls[i], maxOf(ttls[i + 1] - elapsed, 0)) + i += 2 + } return out } @@ -45,26 +50,32 @@ class DnsCache( val rcode = response[3].toInt() and 0x0F if (rcode != 0 && rcode != 3) return // only NOERROR and NXDOMAIN - val records = parseTtls(response) ?: return - val minTtl = if (records.first.isEmpty()) NO_RECORDS_TTL else records.second.min() + val ttls = parseTtls(response) ?: return + var minTtl = if (ttls.isEmpty()) NO_RECORDS_TTL else Int.MAX_VALUE + var i = 1 + while (i < ttls.size) { + minTtl = minOf(minTtl, ttls[i]) + i += 2 + } val ttl = minOf(minTtl, MAX_TTL) if (ttl <= 0) return val now = clock() - val entry = Entry(response.copyOf(), records.first, records.second, now, now + ttl * 1000L) + val entry = Entry(response.copyOf(), ttls, now, now + ttl * 1000L) synchronized(map) { map[key] = entry } } - // Offsets and values of every TTL field except the EDNS OPT pseudo-record - private fun parseTtls(msg: ByteArray): Pair? { + // Offset and value of every TTL field except the EDNS OPT pseudo-record, as pairs in one array + private fun parseTtls(msg: ByteArray): IntArray? { var pos = 12 repeat(u16(msg, 4)) { pos = skipName(msg, pos) ?: return null pos += 4 } val total = u16(msg, 6) + u16(msg, 8) + u16(msg, 10) - val offsets = ArrayList(total) - val values = ArrayList(total) + // The counts come from the server; the array grows only if a message really has that many + var ttls = IntArray(2 * minOf(total, 16)) + var n = 0 repeat(total) { pos = skipName(msg, pos) ?: return null if (pos + 10 > msg.size) return null @@ -72,13 +83,14 @@ class DnsCache( val ttlOffset = pos + 4 val rdLength = u16(msg, pos + 8) if (type != TYPE_OPT) { - offsets += ttlOffset - values += minOf(u32(msg, ttlOffset), Int.MAX_VALUE.toLong()).toInt() + if (n == ttls.size) ttls = ttls.copyOf(n * 2) + ttls[n++] = ttlOffset + ttls[n++] = minOf(u32(msg, ttlOffset), Int.MAX_VALUE.toLong()).toInt() } pos += 10 + rdLength if (pos > msg.size) return null } - return offsets.toIntArray() to values.toIntArray() + return if (n == ttls.size) ttls else ttls.copyOf(n) } private fun keyOf(query: ByteArray): String? { diff --git a/app/src/main/java/cc/skysparkle/sparkledns/DohVpnService.kt b/app/src/main/java/cc/skysparkle/sparkledns/DohVpnService.kt index 0142092..b865526 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/DohVpnService.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/DohVpnService.kt @@ -124,7 +124,14 @@ class DohVpnService : VpnService() { stopSelf() return } - session = Session(tun, DohClient(this, provider), ::onSessionFailed).also { it.start() } + val next = try { + Session(tun, DohClient(this, provider), ::onSessionFailed) + } catch (e: IOException) { + // A tunnel nobody reads would swallow every DNS lookup on the device + runCatching { tun.close() } + throw e + } + session = next.also { it.start() } runCatching { previous?.stop() } _active.value = provider @@ -210,6 +217,10 @@ private class Session( private val pool = Executors.newFixedThreadPool(WORKERS) private val cache = DnsCache() private val output = FileOutputStream(tun.fileDescriptor) + + // stop() closes the write end, which wakes the reader at once. Otherwise the reader would have + // to wake up on a timer to notice that the session ended, also while the device sleeps. + private val wakeup = ParcelFileDescriptor.createPipe() private val reader = Thread(::readLoop, "tun-reader") fun start() = reader.start() @@ -217,6 +228,7 @@ private class Session( fun stop() { if (!alive.getAndSet(false)) return pool.shutdownNow() + runCatching { wakeup[1].close() } runCatching { tun.close() } closer.execute { try { @@ -230,43 +242,58 @@ private class Session( private fun readLoop() { val input = FileInputStream(tun.fileDescriptor) val buf = ByteArray(MTU) - val pollFd = StructPollfd().apply { + val tunFd = StructPollfd().apply { fd = tun.fileDescriptor events = OsConstants.POLLIN.toShort() } + val wakeupFd = StructPollfd().apply { + fd = wakeup[0].fileDescriptor + events = OsConstants.POLLIN.toShort() + } + val fds = arrayOf(tunFd, wakeupFd) var badPackets = 0 - while (alive.get()) { - val n = try { - if (Os.poll(arrayOf(pollFd), 500) <= 0) continue - input.read(buf) - } catch (e: ErrnoException) { - if (e.errno == OsConstants.EINTR) continue - readerFailed(e) - return - } catch (e: IOException) { - readerFailed(e) - return - } - if (n < 0) { - readerFailed(null) - return - } - try { - Packet.parseDnsQuery(buf, n)?.let(::dispatch) - badPackets = 0 - } catch (e: RejectedExecutionException) { - readerFailed(e) - return - } catch (e: RuntimeException) { - // One packet the code cannot handle must not stop DNS for the whole device - Log.w(TAG, "Dropped a packet", e) - if (++badPackets >= MAX_BAD_PACKETS) { + try { + while (alive.get()) { + val n = try { + // Sleeps until a packet arrives or stop() closes the pipe + if (Os.poll(fds, -1) <= 0) continue + if (wakeupFd.revents.toInt() != 0) { + // Only stop() touches the pipe, so this ends the loop + readerFailed(null) + return + } + input.read(buf) + } catch (e: ErrnoException) { + if (e.errno == OsConstants.EINTR) continue + readerFailed(e) + return + } catch (e: IOException) { readerFailed(e) return } + if (n < 0) { + readerFailed(null) + return + } + try { + Packet.parseDnsQuery(buf, n)?.let(::dispatch) + badPackets = 0 + } catch (e: RejectedExecutionException) { + readerFailed(e) + return + } catch (e: RuntimeException) { + // One packet the code cannot handle must not stop DNS for the whole device + Log.w(TAG, "Dropped a packet", e) + if (++badPackets >= MAX_BAD_PACKETS) { + readerFailed(e) + return + } + } } + } finally { + runCatching { wakeup[0].close() } } } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/HomeScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/HomeScreen.kt index 98e4519..5cbf087 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/HomeScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/HomeScreen.kt @@ -25,11 +25,12 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size @@ -39,6 +40,8 @@ import androidx.compose.foundation.selection.toggleable import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button +import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -47,63 +50,96 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.draw.drawWithCache +import androidx.compose.ui.geometry.CornerRadius import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.Path import androidx.compose.ui.graphics.PathEffect import androidx.compose.ui.graphics.StrokeCap -import androidx.compose.ui.graphics.StrokeJoin -import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.TextLayoutResult import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.drawText import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.rememberTextMeasurer import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import kotlinx.coroutines.delay import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import java.text.SimpleDateFormat +import java.util.Calendar import java.util.Date import java.util.Locale +import java.util.TimeZone +import kotlin.math.ceil +import kotlin.math.roundToInt -private const val CHART_HOURS = 24 +private const val HOUR_MS = 3_600_000L + +// One bar of the chart: an hour, or a day in the 7-day view +private data class Bar(val total: Long, val blocked: Long) + +// Bars with the labels under them: the first hour of the day view, or every day of the week. +// A refresh that brings equal data leaves the chart alone. +private data class Chart(val period: StatsPeriod, val bars: List, val labels: List) + +private val ChartLabelStyle = TextStyle(color = Palette.Fg3, fontSize = 10.sp) + +// Where the three grip lines on the knob of the power switch sit, as fractions of its width +private val KnobLines = floatArrayOf(0.29f, 0.5f, 0.71f) @Composable -fun HomeScreen(bottomPadding: Dp, onOpenBlocklist: () -> Unit, modifier: Modifier = Modifier) { +fun HomeScreen( + bottomPadding: Dp, + onOpenBlocklist: () -> Unit, + onOpenServers: () -> Unit, + modifier: Modifier = Modifier, +) { val context = LocalContext.current val prefs = remember { Prefs(context) } + val haptics = LocalHapticFeedback.current + val scope = rememberCoroutineScope() val active by DohVpnService.active.collectAsStateWithLifecycle() val running = active != null val lists by Blocklist.lists.collectAsStateWithLifecycle() val total by Blocklist.total.collectAsStateWithLifecycle() val blocking by Blocklist.enabled.collectAsStateWithLifecycle() + val listsReady by Blocklist.ready.collectAsStateWithLifecycle() + val download by Blocklist.busy.collectAsStateWithLifecycle() + val downloadError by Blocklist.error.collectAsStateWithLifecycle() - var summary by remember { mutableStateOf(StatsStore.summary(CHART_HOURS)) } - var points by remember { mutableStateOf(StatsStore.hourly(CHART_HOURS)) } + var period by rememberSaveable { mutableStateOf(StatsPeriod.DAY) } + var summary by remember { mutableStateOf(StatsStore.summary(period.hours)) } + var chartData by remember { mutableStateOf(buildChart(period)) } fun refreshStats() { - summary = StatsStore.summary(CHART_HOURS) - points = StatsStore.hourly(CHART_HOURS) + summary = StatsStore.summary(period.hours) + chartData = buildChart(period) } OnQueryLogChange { refreshStats() } val statsVersion by StatsStore.version.collectAsStateWithLifecycle() - LaunchedEffect(statsVersion) { refreshStats() } + LaunchedEffect(statsVersion, period) { refreshStats() } // The server is picked in Settings; this screen is composed anew each time it is shown val selected = remember { prefs.resolve() } @@ -111,21 +147,12 @@ fun HomeScreen(bottomPadding: Dp, onOpenBlocklist: () -> Unit, modifier: Modifie val shown = active ?: selected val usesHttp3 = shown.http3 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE - val crashReport = remember { CrashLog.read(context) } - var crashVisible by remember { mutableStateOf(crashReport != null) } + val crashReport by CrashLog.report.collectAsStateWithLifecycle() + val shownReport = rememberLast(crashReport).orEmpty() // kept while the card animates out // Strict Private DNS makes Android ignore the VPN's DNS server; followed while Home is visible val privateDnsHost by remember { privateDnsHosts(context) }.collectAsStateWithLifecycle(initialValue = null) - // Set by a tap until the VPN state changes or the attempt gives up, so a double tap neither - // starts two connections nor switches the VPN back on right after turning it off - var busy by remember { mutableStateOf(false) } - LaunchedEffect(active) { busy = false } - LaunchedEffect(busy) { - if (busy) { - delay(BUSY_TIMEOUT_MS) - busy = false - } - } + var busy by rememberVpnBusy(active) val vpnPermission = rememberLauncherForActivityResult( ActivityResultContracts.StartActivityForResult() @@ -148,6 +175,7 @@ fun HomeScreen(bottomPadding: Dp, onOpenBlocklist: () -> Unit, modifier: Modifie fun toggle() { if (busy) return busy = true + haptics.performHapticFeedback(if (running) HapticFeedbackType.ToggleOff else HapticFeedbackType.ToggleOn) if (running) { sendAction(context, DohVpnService.ACTION_STOP) return @@ -158,65 +186,50 @@ fun HomeScreen(bottomPadding: Dp, onOpenBlocklist: () -> Unit, modifier: Modifie else connectVpn() } - val glow by animateFloatAsState(if (running) 1f else 0f, tween(600), label = "glow") - - Column( - modifier = modifier - .verticalScroll(rememberScrollState()) - .drawBehind { - // Soft light behind the logo while protected - if (glow > 0f) { - drawCircle( - brush = Brush.radialGradient( - colors = listOf(Palette.Accent.copy(alpha = 0.22f * glow), Color.Transparent), - center = Offset(size.width / 2f, 0f), - radius = size.width * 0.65f, - ), - radius = size.width * 0.65f, - center = Offset(size.width / 2f, 0f), - ) - } - } - .padding(top = 16.dp, bottom = bottomPadding), - verticalArrangement = Arrangement.spacedBy(20.dp), - ) { - Image( - painterResource(R.drawable.app_logo), - contentDescription = null, - modifier = Modifier - .size(44.dp) - .align(Alignment.CenterHorizontally), - ) - - AnimatedVisibility(visible = crashVisible, enter = Motion.expandIn, exit = Motion.collapseOut) { - val report = crashReport.orEmpty() - Box(Modifier.padding(horizontal = 20.dp)) { - CrashCard( - report = report, - onCopy = { - context.getSystemService(ClipboardManager::class.java) - .setPrimaryClip(ClipData.newPlainText("SparkleDNS crash", report)) - }, - onDismiss = { CrashLog.clear(context); crashVisible = false }, - ) - } + // What the blocklist card offers: nothing, switching blocking back on, or a first list + val proList = lists.firstOrNull { it.url == HAGEZI_PRO_URL } + val offer = when { + !listsReady -> BlocklistOffer.NONE + !blocking -> BlocklistOffer.SWITCH_ON + total == 0 && lists.none { it.enabled } -> BlocklistOffer.FIRST_LIST + else -> BlocklistOffer.NONE + } + fun acceptOffer() { + when (offer) { + BlocklistOffer.SWITCH_ON -> Blocklist.setEnabled(context, true) + BlocklistOffer.FIRST_LIST -> + if (proList != null) scope.editBlocklist(context) { Blocklist.setListEnabled(context, HAGEZI_PRO_URL, true) } + else Blocklist.download(context, HAGEZI_PRO_URL) + BlocklistOffer.NONE -> Unit } + } + val glow by animateFloatAsState(if (running) 1f else 0f, tween(600), label = "glow") + val wide = windowWidth() >= WideLayoutWidth + val side = sidePadding(windowWidth(), if (wide) MaxWideContentWidth else MaxContentWidth) + // A tall screen gets a taller chart instead of empty space under the content + val chartHeight = if (wide) { + (windowHeight() - 420.dp).coerceIn(160.dp, 360.dp) + } else { + (windowHeight() - 700.dp).coerceIn(150.dp, 320.dp) + } + + val status: @Composable () -> Unit = { StatusCard( running = running, providerName = shown.displayName(context), http3 = usesHttp3, enabled = !busy && (running || canConnect), onToggle = ::toggle, - modifier = Modifier.padding(horizontal = 20.dp), + onOpenServers = onOpenServers, ) - - PrivateDnsWarning(privateDnsHost, prefs, Modifier.padding(horizontal = 20.dp)) - + PrivateDnsWarning(privateDnsHost, prefs) + } + val stats: @Composable () -> Unit = { Row( modifier = Modifier .fillMaxWidth() - .padding(horizontal = 24.dp), + .padding(horizontal = 4.dp), horizontalArrangement = Arrangement.spacedBy(8.dp), ) { StatBlock(formatCompact(summary.total), stringResource(R.string.stat_requests), Modifier.weight(1f)) @@ -228,63 +241,78 @@ fun HomeScreen(bottomPadding: Dp, onOpenBlocklist: () -> Unit, modifier: Modifie ) StatBlock(stringResource(R.string.mon_ms, summary.avgLatencyMs), stringResource(R.string.stat_avg), Modifier.weight(1f)) } + } + val chart: @Composable () -> Unit = { + ChartSection(chartData, period, chartHeight, onPeriod = { period = it }) + } + val blocklist: @Composable () -> Unit = { + BlocklistCard( + info = stringResource(R.string.home_lists_info, lists.count { it.enabled }, formatCount(total.toLong())), + offer = offer, + downloading = download == HAGEZI_PRO_URL, + error = if (offer == BlocklistOffer.FIRST_LIST) downloadError else null, + canAccept = download == null, + onAccept = ::acceptOffer, + onClick = onOpenBlocklist, + ) + } - Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { - Row( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 20.dp), - horizontalArrangement = Arrangement.spacedBy(14.dp, Alignment.End), - ) { - LegendItem(stringResource(R.string.stat_requests), Palette.Accent) - LegendItem(stringResource(R.string.mon_blocked), Palette.Muted) + Column( + modifier = modifier + .verticalScroll(rememberScrollState()) + .drawWithCache { + // Soft light behind the logo while protected. The gradient depends on the size only; + // the fade is applied as alpha when drawing. + val center = Offset(size.width / 2f, 0f) + val radius = size.width * 0.65f + val light = Brush.radialGradient( + colors = listOf(Palette.Accent.copy(alpha = 0.22f), Color.Transparent), + center = center, + radius = radius, + ) + onDrawBehind { + if (glow > 0f) drawCircle(brush = light, radius = radius, center = center, alpha = glow) + } } - TrafficChart( - points, - Modifier - .fillMaxWidth() - .height(150.dp), + .padding(start = side, end = side, top = 16.dp, bottom = bottomPadding), + verticalArrangement = Arrangement.spacedBy(20.dp), + ) { + Image( + remember { AppLogo.get(context) }, + contentDescription = null, + modifier = Modifier + .size(44.dp) + .align(Alignment.CenterHorizontally), + ) + + AnimatedVisibility(visible = crashReport != null, enter = Motion.expandIn, exit = Motion.collapseOut) { + CrashCard( + report = shownReport, + onCopy = { + context.getSystemService(ClipboardManager::class.java) + .setPrimaryClip(ClipData.newPlainText("SparkleDNS crash", shownReport)) + }, + onDismiss = { CrashLog.clear(context) }, ) - val startLabel = remember(points) { - val start = System.currentTimeMillis() - (CHART_HOURS - 1) * 3_600_000L - SimpleDateFormat("HH:00", Locale.getDefault()).format(Date(start)) - } - Row( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 20.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - Text(startLabel, color = Palette.Fg3, fontSize = 11.sp, modifier = Modifier.weight(1f)) - Text( - stringResource(R.string.period_24h), - color = Palette.Fg2, - fontSize = 12.sp, - fontWeight = FontWeight.Bold, - modifier = Modifier - .clip(RoundedCornerShape(16.dp)) - .background(Palette.Card) - .padding(horizontal = 12.dp, vertical = 6.dp), - ) - Text( - stringResource(R.string.chart_now), - color = Palette.Fg3, - fontSize = 11.sp, - textAlign = TextAlign.End, - modifier = Modifier.weight(1f), - ) - } } - BlocklistRow( - info = if (blocking) { - stringResource(R.string.home_lists_info, lists.count { it.enabled }, formatCount(total.toLong())) - } else { - stringResource(R.string.blocking_off) - }, - onClick = onOpenBlocklist, - modifier = Modifier.padding(horizontal = 20.dp), - ) + if (wide) { + Row(horizontalArrangement = Arrangement.spacedBy(24.dp)) { + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(20.dp)) { + status() + blocklist() + } + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(20.dp)) { + stats() + chart() + } + } + } else { + status() + stats() + chart() + blocklist() + } } } @@ -295,15 +323,15 @@ private fun StatusCard( http3: Boolean, enabled: Boolean, onToggle: () -> Unit, - modifier: Modifier = Modifier, + onOpenServers: () -> Unit, ) { Column( - modifier = modifier + modifier = Modifier .fillMaxWidth() .appCard() .padding(horizontal = 20.dp, vertical = 24.dp), horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.spacedBy(8.dp), + verticalArrangement = Arrangement.spacedBy(6.dp), ) { AnimatedContent( targetState = running, @@ -319,13 +347,21 @@ private fun StatusCard( textAlign = TextAlign.Center, ) } + // Tapping the server opens the server list in Settings val dot by animateColorAsState(if (running) Palette.Accent else Palette.Track, Motion.color, label = "dot") - Row(verticalAlignment = Alignment.CenterVertically) { + Row( + modifier = Modifier + .clip(RoundedCornerShape(12.dp)) + .clickable(onClickLabel = stringResource(R.string.change_server), onClick = onOpenServers) + .heightIn(min = 40.dp) + .padding(start = 10.dp, end = 4.dp), + verticalAlignment = Alignment.CenterVertically, + ) { Box( Modifier .size(7.dp) .clip(CircleShape) - .background(dot) + .drawBehind { drawRect(dot) } ) Spacer(Modifier.width(8.dp)) val via = stringResource(R.string.home_via, providerName) + if (http3) " · HTTP/3" else "" @@ -336,14 +372,18 @@ private fun StatusCard( maxLines = 2, overflow = TextOverflow.Ellipsis, textAlign = TextAlign.Center, + modifier = Modifier.weight(1f, fill = false), ) + Spacer(Modifier.width(2.dp)) + Chevron(Modifier.size(16.dp)) } - Spacer(Modifier.height(10.dp)) + Spacer(Modifier.height(8.dp)) PowerToggle(on = running, enabled = enabled, onToggle = onToggle) } } -// The big ON / OFF switch; the white knob slides across +// The big ON / OFF switch; the white knob slides across. The animated color and position are +// read only when drawing and placing, so the animation does not recompose the switch every frame. @Composable private fun PowerToggle(on: Boolean, enabled: Boolean, onToggle: () -> Unit) { val track by animateColorAsState(if (on) Palette.Accent else Palette.Track, Motion.color, label = "track") @@ -354,7 +394,7 @@ private fun PowerToggle(on: Boolean, enabled: Boolean, onToggle: () -> Unit) { .size(width = 120.dp, height = 50.dp) .graphicsLayer { alpha = if (enabled) 1f else 0.5f } .clip(RoundedCornerShape(25.dp)) - .background(track) + .drawBehind { drawRect(track) } .toggleable(value = on, enabled = enabled, role = Role.Switch, onValueChange = { onToggle() }) .semantics { contentDescription = description } .padding(5.dp), @@ -371,7 +411,7 @@ private fun PowerToggle(on: Boolean, enabled: Boolean, onToggle: () -> Unit) { ) Box( modifier = Modifier - .offset(x = knob) + .offset { IntOffset(knob.roundToPx(), 0) } .size(40.dp) .clip(CircleShape) .background(Color.White), @@ -379,7 +419,7 @@ private fun PowerToggle(on: Boolean, enabled: Boolean, onToggle: () -> Unit) { ) { Canvas(Modifier.size(14.dp)) { val stroke = 1.6.dp.toPx() - listOf(0.29f, 0.5f, 0.71f).forEach { fraction -> + KnobLines.forEach { fraction -> drawLine( color = Palette.Fg3, start = Offset(size.width * fraction, size.height * 0.21f), @@ -394,27 +434,25 @@ private fun PowerToggle(on: Boolean, enabled: Boolean, onToggle: () -> Unit) { } @Composable -private fun PrivateDnsWarning(privateDnsHost: String?, prefs: Prefs, modifier: Modifier = Modifier) { +private fun PrivateDnsWarning(privateDnsHost: String?, prefs: Prefs) { val context = LocalContext.current - val lastHost = remember { arrayOf("") } - privateDnsHost?.let { lastHost[0] = it } + val shownHost = rememberLast(privateDnsHost).orEmpty() var dismissedHost by remember { mutableStateOf(prefs.dismissedPrivateDns) } AnimatedVisibility( visible = privateDnsHost != null && privateDnsHost != dismissedHost, enter = Motion.expandIn, exit = Motion.collapseOut, - modifier = modifier, ) { HintCard( - text = stringResource(R.string.hint, lastHost[0]), + text = stringResource(R.string.hint, shownHost), icon = R.drawable.ic_alert, tint = WarningColor, action = { TextButton(onClick = { openNetworkSettings(context) }) { Text(stringResource(R.string.open_settings)) } }, onDismiss = { - dismissedHost = lastHost[0] - prefs.dismissedPrivateDns = lastHost[0] + dismissedHost = shownHost + prefs.dismissedPrivateDns = shownHost }, ) } @@ -428,12 +466,62 @@ fun StatBlock(value: String, label: String, modifier: Modifier = Modifier, value } } +@Composable +private fun ChartSection(chart: Chart, period: StatsPeriod, height: Dp, onPeriod: (StatsPeriod) -> Unit) { + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + PeriodChip(period, onPeriod) + Spacer(Modifier.weight(1f)) + LegendItem(stringResource(R.string.stat_requests), Palette.Accent) + Spacer(Modifier.width(14.dp)) + LegendItem(stringResource(R.string.mon_blocked), Palette.Blocked) + } + Box( + Modifier + .fillMaxWidth() + .height(height), + contentAlignment = Alignment.Center, + ) { + if (chart.bars.all { it.total == 0L }) { + Text( + stringResource(R.string.chart_empty), + color = Palette.Fg3, + fontSize = 13.sp, + lineHeight = 18.sp, + textAlign = TextAlign.Center, + modifier = Modifier.padding(horizontal = 24.dp), + ) + } else { + TrafficChart(chart.bars, Modifier.fillMaxWidth().height(height)) + } + } + // Hours: first hour on the left, now on the right. Days: a label under every bar. + Row(Modifier.fillMaxWidth()) { + if (chart.period == StatsPeriod.DAY) { + Text(chart.labels.firstOrNull().orEmpty(), color = Palette.Fg3, fontSize = 11.sp, modifier = Modifier.weight(1f)) + Text(stringResource(R.string.chart_now), color = Palette.Fg3, fontSize = 11.sp) + } else { + chart.labels.forEachIndexed { index, label -> + Text( + label, + color = if (index == chart.labels.lastIndex) Palette.Fg else Palette.Fg3, + fontSize = 11.sp, + maxLines = 1, + textAlign = TextAlign.Center, + modifier = Modifier.weight(1f), + ) + } + } + } + } +} + @Composable private fun LegendItem(label: String, color: Color) { Row(verticalAlignment = Alignment.CenterVertically) { Box( Modifier - .size(width = 12.dp, height = 3.dp) + .size(8.dp) .clip(RoundedCornerShape(2.dp)) .background(color) ) @@ -442,76 +530,89 @@ private fun LegendItem(label: String, color: Color) { } } -// Requests (accent line with a soft fill) and blocked queries (grey line) per hour +// One bar per hour or day: requests in the accent color with the blocked part at the bottom. +// Empty slots show a short stub, so a mostly empty day reads as empty instead of broken. @Composable -private fun TrafficChart(points: List, modifier: Modifier = Modifier) { +private fun TrafficChart(bars: List, modifier: Modifier = Modifier) { val measurer = rememberTextMeasurer() - val labelStyle = TextStyle(color = Palette.Fg3, fontSize = 10.sp) - Canvas(modifier) { - val n = points.size - if (n < 2) return@Canvas - val maxValue = niceCeiling(points.maxOf { it.total }.coerceAtLeast(1L)) - val inset = 6.dp.toPx() - val top = 14.dp.toPx() - val base = size.height - 8.dp.toPx() - val span = base - top - val step = (size.width - 2 * inset) / (n - 1) - fun x(index: Int) = inset + index * step - fun y(value: Long) = base - value.toFloat() / maxValue * span + // Scale, grid and grid labels are worked out when the bars or the size change, not every frame + Spacer( + modifier.drawWithCache { + val n = bars.size + if (n == 0) return@drawWithCache onDrawBehind {} + val maxValue = niceCeiling(bars.maxOf { it.total }.coerceAtLeast(1L)) + val top = 16.dp.toPx() + val base = size.height - 2.dp.toPx() + val span = base - top + val slot = size.width / n + val barWidth = (slot * if (n > 10) 0.62f else 0.5f).coerceAtLeast(2.dp.toPx()) + val radius = CornerRadius((barWidth / 2).coerceAtMost(4.dp.toPx())) + val stub = 2.dp.toPx() + val minBar = 4.dp.toPx() + val minBlocked = 2.dp.toPx() + val gridWidth = 1.dp.toPx() + val dash = PathEffect.dashPathEffect(floatArrayOf(3.dp.toPx(), 4.dp.toPx())) + fun height(value: Long) = value.toFloat() / maxValue * span - listOf(maxValue / 2, maxValue).forEach { value -> - val gridY = y(value) - drawLine( - color = Palette.Line, - start = Offset(0f, gridY), - end = Offset(size.width, gridY), - strokeWidth = 1.dp.toPx(), - pathEffect = PathEffect.dashPathEffect(floatArrayOf(3.dp.toPx(), 4.dp.toPx())), - ) - drawText( - textMeasurer = measurer, - text = formatCompact(value), - topLeft = Offset(20.dp.toPx(), gridY - 15.dp.toPx()), - style = labelStyle, - ) - } + val grid = listOf(maxValue / 2, maxValue).filter { it > 0 }.map { value -> + val y = base - height(value) + val labelTop = y - 14.dp.toPx() + // The same constraints drawText() would use for a label at this spot + val label = measurer.measure( + text = formatCompact(value), + style = ChartLabelStyle, + constraints = Constraints( + maxWidth = ceil(size.width).roundToInt().coerceAtLeast(0), + maxHeight = ceil(size.height - labelTop).roundToInt().coerceAtLeast(0), + ), + layoutDirection = layoutDirection, + density = this, + ) + GridLine(y, labelTop, label) + } - val line = Path() - val area = Path() - val blocked = Path() - points.forEachIndexed { index, point -> - val px = x(index) - if (index == 0) { - line.moveTo(px, y(point.total)) - area.moveTo(px, base) - area.lineTo(px, y(point.total)) - blocked.moveTo(px, y(point.blocked)) - } else { - line.lineTo(px, y(point.total)) - area.lineTo(px, y(point.total)) - blocked.lineTo(px, y(point.blocked)) + onDrawBehind { + grid.forEach { line -> + drawLine( + color = Palette.Line, + start = Offset(0f, line.y), + end = Offset(size.width, line.y), + strokeWidth = gridWidth, + pathEffect = dash, + ) + drawText(line.label, topLeft = Offset(0f, line.labelTop)) + } + + bars.forEachIndexed { index, bar -> + val x = index * slot + (slot - barWidth) / 2 + if (bar.total == 0L) { + drawRoundRect(Palette.Line, Offset(x, base - stub), Size(barWidth, stub), CornerRadius(stub / 2)) + return@forEachIndexed + } + val current = index == n - 1 + val h = height(bar.total).coerceAtLeast(minBar) + drawRoundRect( + if (current) Palette.Accent else Palette.Accent.copy(alpha = 0.6f), + Offset(x, base - h), + Size(barWidth, h), + radius, + ) + if (bar.blocked > 0) { + val hb = height(bar.blocked).coerceIn(minBlocked, h) + if (hb >= h - radius.x) { + drawRoundRect(Palette.Blocked, Offset(x, base - hb), Size(barWidth, hb), radius) + } else { + drawRect(Palette.Blocked, Offset(x, base - hb), Size(barWidth, hb)) + } + } + } } } - area.lineTo(x(n - 1), base) - area.close() - - drawPath(area, Palette.Accent.copy(alpha = 0.14f)) - drawPath( - blocked, - Palette.Muted, - style = Stroke(width = 1.6.dp.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round), - ) - drawPath( - line, - Palette.Accent, - style = Stroke(width = 2.4.dp.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round), - ) - val end = Offset(x(n - 1), y(points.last().total)) - drawCircle(Palette.Bg, radius = 5.dp.toPx(), center = end) - drawCircle(Palette.Accent, radius = 5.dp.toPx(), center = end, style = Stroke(width = 2.4.dp.toPx())) - } + ) } +private class GridLine(val y: Float, val labelTop: Float, val label: TextLayoutResult) + // 1, 2 or 5 times a power of ten, at least [value]: keeps the grid labels round private fun niceCeiling(value: Long): Long { var magnitude = 1L @@ -522,35 +623,127 @@ private fun niceCeiling(value: Long): Long { return 10 * magnitude } +// Date formats of the chart for the current locale and time zone. The chart is refreshed up to +// once a second, so they are kept rather than built anew each time. Main thread only. +private class ChartFormats(val locale: Locale, val zone: String) { + val hour = SimpleDateFormat("HH:00", locale) + val day = SimpleDateFormat("EEE", locale) +} + +private var chartFormats: ChartFormats? = null + +private fun chartFormats(): ChartFormats { + val locale = Locale.getDefault() + val zone = TimeZone.getDefault().id + return chartFormats?.takeIf { it.locale == locale && it.zone == zone } + ?: ChartFormats(locale, zone).also { chartFormats = it } +} + +// 24 hourly bars, or 7 bars for the calendar days of the last week (today last) +private fun buildChart(period: StatsPeriod, now: Long = System.currentTimeMillis()): Chart { + val hours = StatsStore.hourly(period.hours, now) + val firstHour = now / HOUR_MS - (hours.size - 1) + val formats = chartFormats() + if (period == StatsPeriod.DAY) { + // Only the first hour gets a label; the other end of the axis says "now" + val label = formats.hour.format(Date(firstHour * HOUR_MS)) + return Chart(period, hours.map { Bar(it.total, it.blocked) }, listOf(label)) + } + val calendar = Calendar.getInstance() + fun dayKey(time: Long): Int { + calendar.timeInMillis = time + return calendar.get(Calendar.YEAR) * 1000 + calendar.get(Calendar.DAY_OF_YEAR) + } + val dayStarts = (6 downTo 0).map { back -> + calendar.timeInMillis = now + calendar.add(Calendar.DAY_OF_YEAR, -back) + calendar.timeInMillis + } + val keys = dayStarts.map { dayKey(it) } + val totals = LongArray(7) + val blocked = LongArray(7) + hours.forEachIndexed { index, point -> + val day = keys.indexOf(dayKey((firstHour + index) * HOUR_MS)) + if (day >= 0) { + totals[day] += point.total + blocked[day] += point.blocked + } + } + return Chart(period, List(7) { Bar(totals[it], blocked[it]) }, dayStarts.map { formats.day.format(Date(it)) }) +} + +private enum class BlocklistOffer { NONE, SWITCH_ON, FIRST_LIST } + @Composable -private fun BlocklistRow(info: String, onClick: () -> Unit, modifier: Modifier = Modifier) { +private fun BlocklistCard( + info: String, + offer: BlocklistOffer, + downloading: Boolean, + error: String?, + canAccept: Boolean, + onAccept: () -> Unit, + onClick: () -> Unit, +) { + val subtitle = when { + error != null -> stringResource(R.string.bl_download_failed, error) + offer == BlocklistOffer.SWITCH_ON -> stringResource(R.string.blocklist_cta_master) + offer == BlocklistOffer.FIRST_LIST -> stringResource(R.string.blocklist_cta_lists) + else -> info + } Row( - modifier = modifier + modifier = Modifier .fillMaxWidth() .appCard() .clickable(onClick = onClick) .padding(16.dp), verticalAlignment = Alignment.CenterVertically, ) { + val idle = offer != BlocklistOffer.NONE Box( modifier = Modifier .size(40.dp) .clip(CircleShape) - .background(Palette.Accent), + .background(if (idle) Palette.Track else Palette.Accent), contentAlignment = Alignment.Center, ) { Icon( painterResource(R.drawable.ic_privacy), contentDescription = null, - tint = Palette.AccentInk, + tint = if (idle) Palette.Fg2 else Palette.AccentInk, modifier = Modifier.size(22.dp), ) } Spacer(Modifier.width(14.dp)) Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) { Text(stringResource(R.string.blocklist_title), color = Palette.Fg, fontSize = 15.sp, fontWeight = FontWeight.Bold) - Text(info, color = Palette.Fg2, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text( + subtitle, + color = if (error != null) Palette.Blocked else Palette.Fg2, + fontSize = 12.sp, + lineHeight = 16.sp, + maxLines = 3, + overflow = TextOverflow.Ellipsis, + ) + } + Spacer(Modifier.width(10.dp)) + if (offer == BlocklistOffer.NONE) { + Chevron() + } else { + Button( + onClick = onAccept, + enabled = canAccept && !downloading, + shape = RoundedCornerShape(14.dp), + contentPadding = PaddingValues(horizontal = 14.dp), + modifier = Modifier.heightIn(min = 40.dp), + ) { + if (downloading) { + CircularProgressIndicator(Modifier.size(16.dp), strokeWidth = 2.dp, color = Palette.Fg2) + Spacer(Modifier.width(8.dp)) + Text(stringResource(R.string.downloading), fontSize = 13.sp, maxLines = 1) + } else { + Text(stringResource(R.string.turn_on), fontWeight = FontWeight.Bold, fontSize = 13.sp, maxLines = 1) + } + } } - Chevron() } } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt b/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt index 8873b6e..f4dfedc 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt @@ -29,6 +29,10 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.Saver import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -38,6 +42,7 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.flow.distinctUntilChanged @@ -46,6 +51,7 @@ import kotlinx.coroutines.flow.flowOf class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + AppLogo.preload(this) enableEdgeToEdge() setContent { MaterialTheme(colorScheme = AppColors) { AppShell() } @@ -56,7 +62,22 @@ class MainActivity : ComponentActivity() { internal class TestResult(val ok: Boolean, val text: String) // How long a tap on Connect, Disconnect or Switch blocks further taps if the VPN state never changes -internal const val BUSY_TIMEOUT_MS = 5000L +private const val BUSY_TIMEOUT_MS = 5000L + +// Set by a tap until the VPN state changes or the attempt gives up, so a double tap neither +// starts two connections nor switches the VPN back on right after turning it off +@Composable +internal fun rememberVpnBusy(active: DohProvider?): MutableState { + val busy = remember { mutableStateOf(false) } + LaunchedEffect(active) { busy.value = false } + LaunchedEffect(busy.value) { + if (busy.value) { + delay(BUSY_TIMEOUT_MS) + busy.value = false + } + } + return busy +} // Keeps test results across rotation and process death internal val TestResultSaver = Saver( 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/Packet.kt b/app/src/main/java/cc/skysparkle/sparkledns/Packet.kt index 8ef18dc..d8a1512 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/Packet.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/Packet.kt @@ -3,9 +3,10 @@ package cc.skysparkle.sparkledns import java.io.ByteArrayOutputStream import kotlin.random.Random +// IPv4 addresses are kept as plain numbers, so parsing a query allocates only its payload class UdpPacket( - val srcIp: ByteArray, - val dstIp: ByteArray, + val srcIp: Int, + val dstIp: Int, val srcPort: Int, val dstPort: Int, val payload: ByteArray, @@ -29,8 +30,8 @@ object Packet { if (end <= ihl + 8) return null return UdpPacket( - srcIp = buf.copyOfRange(12, 16), - dstIp = buf.copyOfRange(16, 20), + srcIp = i32(buf, 12), + dstIp = i32(buf, 16), srcPort = u16(buf, ihl), dstPort = dstPort, payload = buf.copyOfRange(ihl + 8, end), @@ -47,8 +48,8 @@ object Packet { p[6] = 0x40 // don't fragment p[8] = 64 p[9] = 17 - query.dstIp.copyInto(p, 12) - query.srcIp.copyInto(p, 16) + put32(p, 12, query.dstIp) + put32(p, 16, query.srcIp) put16(p, 10, checksum(p, 0, 20, 0)) put16(p, 20, query.dstPort) @@ -123,7 +124,9 @@ object DnsMessage { fun question(msg: ByteArray): Question? { if (msg.size < 12 || u16(msg, 4) < 1) return null - val name = StringBuilder() + // Sized up front, so the builder does not grow: a valid name has at most 253 characters, + // and never more than the message has bytes after the header + val name = StringBuilder(minOf(msg.size - 12, 253)) var p = 12 while (true) { if (p >= msg.size) return null @@ -180,6 +183,8 @@ internal fun put32(b: ByteArray, off: Int, value: Int) { internal fun u32(b: ByteArray, off: Int): Long = ((u16(b, off).toLong()) shl 16) or u16(b, off + 2).toLong() +internal fun i32(b: ByteArray, off: Int): Int = (u16(b, off) shl 16) or u16(b, off + 2) + // Returns the offset right after a (possibly compressed) DNS name internal fun skipName(b: ByteArray, start: Int): Int? { var p = start diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt b/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt index e686d4b..4e179fd 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/Providers.kt @@ -24,6 +24,7 @@ object Providers { ), DohProvider( "quad9", "Quad9", "https://dns.quad9.net/dns-query", listOf("9.9.9.9", "149.112.112.112"), + http3 = true, policy = "https://quad9.net/service/privacy/", donate = "https://quad9.net/donate/", ), @@ -45,12 +46,10 @@ object Providers { ), ) - val list: List get() = builtIn - // The project's own server stays the default whatever order the list uses - val default: DohProvider get() = list.firstOrNull { it.id == DEFAULT_ID } ?: list.first() + val default: DohProvider = builtIn.firstOrNull { it.id == DEFAULT_ID } ?: builtIn.first() - fun byId(id: String): DohProvider = list.firstOrNull { it.id == id } ?: default + fun byId(id: String): DohProvider = builtIn.firstOrNull { it.id == id } ?: default } fun parseIps(raw: String): List = diff --git a/app/src/main/java/cc/skysparkle/sparkledns/QueryLog.kt b/app/src/main/java/cc/skysparkle/sparkledns/QueryLog.kt index 715109d..22ab97a 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,14 +23,12 @@ 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) + // The last snapshot, handed out again while the log has not changed + private var lastSnapshot: List = emptyList() + private var snapshotVersion = 0L + // Fires right away, then at most once a second while queries keep coming: a busy log refreshes // the screen no more often than the old one-second polling did, and an idle one not at all fun changes(): Flow = version.transform { @@ -48,42 +38,32 @@ object QueryLog { fun add(question: DnsMessage.Question?, status: QueryStatus, latencyMs: Int) { if (question == null) return + val time = System.currentTimeMillis() synchronized(this) { if (entries.size >= MAX_ENTRIES) entries.removeFirst() - 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++ - } + entries.addLast(QueryEntry(nextId++, time, question.name.ifEmpty { "." }, question.type, status, latencyMs)) version.value++ } // Hourly numbers for the charts; outside the lock above, as it takes a lock of its own - StatsStore.record(status, latencyMs, Companies.of(question.name)) + StatsStore.record(status, latencyMs, Companies.of(question.name), time) } // Newest first. Builds a real copy: on API 35+ List.reversed() resolves to a live JDK view, - // and on older devices that method does not exist at all + // and on older devices that method does not exist at all. While the log does not change the + // same list comes back, so a screen refreshed with it has nothing to update. @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(), - ) + fun snapshot(): List { + val current = version.value + if (snapshotVersion != current) { + lastSnapshot = List(entries.size) { entries[entries.size - 1 - it] } + snapshotVersion = current + } + return lastSnapshot + } @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/SettingsScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt index 9007e5c..0695df0 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt @@ -3,7 +3,6 @@ package cc.skysparkle.sparkledns import androidx.annotation.DrawableRes import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateColorAsState -import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -28,7 +27,6 @@ import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField 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 @@ -37,6 +35,7 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource @@ -51,7 +50,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import okhttp3.HttpUrl.Companion.toHttpUrlOrNull @@ -66,6 +64,7 @@ fun SettingsScreen( val context = LocalContext.current val prefs = remember { Prefs(context) } val scope = rememberCoroutineScope() + val side = sidePadding(windowWidth()) val active by DohVpnService.active.collectAsStateWithLifecycle() var selected by remember { mutableStateOf(prefs.providerId) } @@ -84,14 +83,7 @@ fun SettingsScreen( // Picking a server never touches a live connection; switching is an explicit action val pendingSwitch = active?.let { it != selectedProvider && canConnect } == true - var busy by remember { mutableStateOf(false) } - LaunchedEffect(active) { busy = false } - LaunchedEffect(busy) { - if (busy) { - delay(BUSY_TIMEOUT_MS) - busy = false - } - } + var busy by rememberVpnBusy(active) fun select(id: String) { selected = id @@ -114,14 +106,14 @@ fun SettingsScreen( Column( modifier = modifier .verticalScroll(rememberScrollState()) - .padding(start = 20.dp, end = 20.dp, top = 16.dp, bottom = bottomPadding), + .padding(start = side, end = side, top = 16.dp, bottom = bottomPadding), verticalArrangement = Arrangement.spacedBy(10.dp), ) { ScreenTitle(stringResource(R.string.tab_settings), Modifier.heightIn(min = 44.dp)) SectionLabel(stringResource(R.string.servers), Modifier.padding(top = 8.dp)) Column(Modifier.fillMaxWidth().appCard()) { - Providers.list.forEachIndexed { index, provider -> + Providers.builtIn.forEachIndexed { index, provider -> if (index > 0) ListDivider() ServerRow( title = provider.name, @@ -202,9 +194,8 @@ fun SettingsScreen( Text(stringResource(if (testing) R.string.testing else R.string.test), maxLines = 1) } - // Remembers the last name so the button keeps its label while it animates out - val lastSwitch = remember { arrayOf("") } - if (pendingSwitch) lastSwitch[0] = selectedProvider.displayName(context) + // The button keeps its label while it animates out + val switchName = rememberLast(if (pendingSwitch) selectedProvider.displayName(context) else null).orEmpty() AnimatedVisibility(visible = pendingSwitch, modifier = Modifier.weight(1f)) { Button( onClick = { @@ -222,7 +213,7 @@ fun SettingsScreen( Icon(painterResource(R.drawable.ic_swap), contentDescription = null, modifier = Modifier.size(18.dp)) Spacer(Modifier.width(8.dp)) Text( - stringResource(R.string.switch_to, lastSwitch[0]), + stringResource(R.string.switch_to, switchName), maxLines = 1, overflow = TextOverflow.Ellipsis, ) @@ -278,7 +269,8 @@ private fun ServerRow( Row( modifier = Modifier .fillMaxWidth() - .background(highlight) + // Read when drawing, so the fade does not recompose the row every frame + .drawBehind { drawRect(highlight) } .selectable(selected = selected, onClick = onClick, role = Role.RadioButton) .heightIn(min = 60.dp) .padding(start = 16.dp, end = 8.dp, top = 8.dp, bottom = 8.dp), @@ -295,26 +287,8 @@ private fun ServerRow( ) Text(subtitle, color = Palette.Fg3, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis) } - if (onDonate != null) { - IconButton(onClick = onDonate, modifier = Modifier.size(40.dp)) { - Icon( - painterResource(R.drawable.ic_donate), - contentDescription = stringResource(R.string.donate), - tint = Palette.Fg3, - modifier = Modifier.size(18.dp), - ) - } - } - if (onPolicy != null) { - IconButton(onClick = onPolicy, modifier = Modifier.size(40.dp)) { - Icon( - painterResource(R.drawable.ic_policy), - contentDescription = stringResource(R.string.about_privacy_policy), - tint = Palette.Fg3, - modifier = Modifier.size(18.dp), - ) - } - } + if (onDonate != null) LinkButton(R.drawable.ic_donate, stringResource(R.string.donate), onDonate) + if (onPolicy != null) LinkButton(R.drawable.ic_policy, stringResource(R.string.about_privacy_policy), onPolicy) Spacer(Modifier.width(4.dp)) if (selected) { Icon( @@ -330,6 +304,14 @@ private fun ServerRow( } } +// Small button next to a server that opens one of its pages +@Composable +private fun LinkButton(@DrawableRes icon: Int, description: String, onClick: () -> Unit) { + IconButton(onClick = onClick, modifier = Modifier.size(40.dp)) { + Icon(painterResource(icon), contentDescription = description, tint = Palette.Fg3, modifier = Modifier.size(18.dp)) + } +} + @Composable private fun NavRow(@DrawableRes icon: Int, title: String, subtitle: String, onClick: () -> Unit) { Row( diff --git a/app/src/main/java/cc/skysparkle/sparkledns/StatsStore.kt b/app/src/main/java/cc/skysparkle/sparkledns/StatsStore.kt index 1235ba1..c00fe95 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/StatsStore.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/StatsStore.kt @@ -4,12 +4,11 @@ import android.content.Context import android.util.Log import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import java.io.BufferedInputStream +import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream import java.io.DataInputStream import java.io.DataOutputStream import java.io.File -import java.io.FileInputStream import java.util.concurrent.Executors class StatsSummary( @@ -26,82 +25,147 @@ class HourPoint(val total: Long, val blocked: Long) // Hourly counters of the last 7 days for the charts. Only numbers are kept, never domains, // and they never leave the device. object StatsStore { - private const val HOURS = 24 * 7 private const val HOUR_MS = 3_600_000L - private const val FORMAT = 1 private const val FILE = "stats.bin" private const val SAVE_INTERVAL_MS = 60_000L - // Per hour: total, blocked, cached, latency sum and count, then one counter per company - private const val TOTAL = 0 - private const val BLOCKED = 1 - private const val CACHED = 2 - private const val LATENCY_SUM = 3 - private const val LATENCY_COUNT = 4 - private const val FIRST_COMPANY = 5 - private val FIELDS = FIRST_COMPANY + Company.entries.size - - // A ring of slots; each remembers which hour (since the epoch) it currently holds - private val hourIds = LongArray(HOURS) { -1L } - private val counters = Array(HOURS) { LongArray(FIELDS) } + private val counters = HourlyCounters() private var file: File? = null - // Bumped when the numbers change without a new query: loaded from disk or cleared + // Bumped when the numbers change without a new query: loaded from disk private val _version = MutableStateFlow(0) val version: StateFlow = _version private var lastSave = 0L private var dirty = false + // Counts every change, so summary() can hand out its last result while nothing changed + private var changes = 0L + private var lastSummary: StatsSummary? = null + private var summaryChanges = 0L + private var summaryHours = 0 + private var summaryHour = 0L + // Saves happen off the VPN threads, one at a time private val writer = Executors.newSingleThreadExecutor { Thread(it, "stats-writer").apply { isDaemon = true } } + // The file is read outside the lock, so neither the DNS threads nor the screens wait for + // storage. Queries counted before it was read are added to the saved numbers. fun init(context: Context) { val target = File(context.filesDir, FILE) + val saved = read(target) synchronized(this) { file = target - load(target) + if (saved != null) counters.merge(saved) + changes++ } _version.value++ } fun record(status: QueryStatus, latencyMs: Int, company: Company?, now: Long = System.currentTimeMillis()) { - val snapshot = synchronized(this) { - val row = row(now / HOUR_MS) - row[TOTAL]++ - when (status) { - QueryStatus.BLOCKED -> row[BLOCKED]++ - QueryStatus.CACHED -> row[CACHED]++ - QueryStatus.OK -> { - row[LATENCY_SUM] += latencyMs.toLong() - row[LATENCY_COUNT]++ - } - QueryStatus.FAILED -> Unit - } - if (company != null) row[FIRST_COMPANY + company.ordinal]++ + val save = synchronized(this) { + counters.record(status, latencyMs, company, now / HOUR_MS) + changes++ dirty = true if (file != null && now - lastSave >= SAVE_INTERVAL_MS) { lastSave = now - dirty = false - encode() + true } else { - null + false } } - snapshot?.let(::save) + // The writer thread encodes the numbers itself, so this DNS thread only hands the job over + if (save) writer.execute(::save) } - // Totals of the last [hours] hours, the current one included + // Totals of the last [hours] hours, the current one included. While nothing changed the same + // object comes back, so a screen refreshed with it has nothing to recompose. fun summary(hours: Int, now: Long = System.currentTimeMillis()): StatsSummary = synchronized(this) { val current = now / HOUR_MS + lastSummary?.takeIf { summaryChanges == changes && summaryHours == hours && summaryHour == current } + ?: counters.summary(hours, current).also { + lastSummary = it + summaryChanges = changes + summaryHours = hours + summaryHour = current + } + } + + // One point per hour, oldest first, ending with the current hour + fun hourly(hours: Int, now: Long = System.currentTimeMillis()): List = + synchronized(this) { counters.hourly(hours, now / HOUR_MS) } + + // Saves what is not on disk yet; called when the VPN stops + fun flush() { + val save = synchronized(this) { + if (file != null && dirty) { + lastSave = System.currentTimeMillis() + true + } else { + false + } + } + if (save) writer.execute(::save) + } + + // Runs on the writer thread + private fun save() { + val (target, bytes) = synchronized(this) { + val current = file ?: return + dirty = false + current to counters.encode() + } + try { + val tmp = File(target.parentFile, "$FILE.tmp") + tmp.writeBytes(bytes) + if (!tmp.renameTo(target)) tmp.delete() + } catch (e: Exception) { + Log.w("SparkleDNS", "Cannot save statistics", e) + } + } + + private fun read(source: File): HourlyCounters? { + if (!source.exists()) return null + return try { + HourlyCounters.decode(source.readBytes()) + } catch (e: Exception) { + Log.w("SparkleDNS", "Cannot read statistics", e) + null + } + } +} + +// The numbers behind StatsStore: a ring of hourly rows, each remembering which hour (since the +// epoch) it holds. Plain data without locks or Android; StatsStore takes care of both. +internal class HourlyCounters { + val hourIds = LongArray(HOURS) { -1L } + val rows = Array(HOURS) { LongArray(FIELDS) } + + fun record(status: QueryStatus, latencyMs: Int, company: Company?, hour: Long) { + val row = row(hour) + row[TOTAL]++ + when (status) { + QueryStatus.BLOCKED -> row[BLOCKED]++ + QueryStatus.CACHED -> row[CACHED]++ + QueryStatus.OK -> { + row[LATENCY_SUM] += latencyMs.toLong() + row[LATENCY_COUNT]++ + } + QueryStatus.FAILED -> Unit + } + if (company != null) row[FIRST_COMPANY + company.ordinal]++ + } + + // Totals of the last [hours] hours up to [currentHour] + fun summary(hours: Int, currentHour: Long): StatsSummary { val sums = LongArray(FIELDS) for (back in 0 until hours.coerceIn(1, HOURS)) { - val id = current - back + val id = currentHour - back val index = slot(id) if (hourIds[index] != id) continue - val row = counters[index] + val row = rows[index] for (field in 0 until FIELDS) sums[field] += row[field] } - StatsSummary( + return StatsSummary( total = sums[TOTAL], blocked = sums[BLOCKED], cached = sums[CACHED], @@ -110,41 +174,43 @@ object StatsStore { ) } - // One point per hour, oldest first, ending with the current hour - fun hourly(hours: Int, now: Long = System.currentTimeMillis()): List = synchronized(this) { + // One point per hour, oldest first, ending with [currentHour] + fun hourly(hours: Int, currentHour: Long): List { val count = hours.coerceIn(1, HOURS) - val current = now / HOUR_MS - List(count) { position -> - val id = current - (count - 1 - position) + return List(count) { position -> + val id = currentHour - (count - 1 - position) val index = slot(id) - if (hourIds[index] == id) HourPoint(counters[index][TOTAL], counters[index][BLOCKED]) else HourPoint(0, 0) + if (hourIds[index] == id) HourPoint(rows[index][TOTAL], rows[index][BLOCKED]) else HourPoint(0, 0) } } - fun clear() { - val snapshot = synchronized(this) { - hourIds.fill(-1L) - counters.forEach { it.fill(0L) } - dirty = false - lastSave = System.currentTimeMillis() - if (file != null) encode() else null - } - snapshot?.let(::save) - _version.value++ - } - - // Saves what is not on disk yet; called when the VPN stops - fun flush() { - val snapshot = synchronized(this) { - if (file != null && dirty) { - dirty = false - lastSave = System.currentTimeMillis() - encode() - } else { - null + // Saved hours are added to the ones counted since the start; a slot keeps the newer hour + fun merge(saved: HourlyCounters) { + for (index in 0 until HOURS) { + val id = saved.hourIds[index] + when { + id < 0 || id < hourIds[index] -> Unit + id == hourIds[index] -> for (field in 0 until FIELDS) rows[index][field] += saved.rows[index][field] + else -> { + hourIds[index] = id + saved.rows[index].copyInto(rows[index]) + } } } - snapshot?.let(::save) + } + + fun encode(): ByteArray { + val bytes = ByteArrayOutputStream(12 + HOURS * (FIELDS + 1) * 8) + DataOutputStream(bytes).use { out -> + out.writeInt(FORMAT) + out.writeInt(FIELDS) + out.writeInt(HOURS) + for (index in 0 until HOURS) { + out.writeLong(hourIds[index]) + rows[index].forEach { out.writeLong(it) } + } + } + return bytes.toByteArray() } private fun slot(id: Long): Int = (((id % HOURS) + HOURS) % HOURS).toInt() @@ -153,58 +219,41 @@ object StatsStore { val index = slot(id) if (hourIds[index] != id) { hourIds[index] = id - counters[index].fill(0L) + rows[index].fill(0L) } - return counters[index] + return rows[index] } - private fun encode(): ByteArray { - val bytes = ByteArrayOutputStream() - DataOutputStream(bytes).use { out -> - out.writeInt(FORMAT) - out.writeInt(FIELDS) - out.writeInt(HOURS) - for (index in 0 until HOURS) { - out.writeLong(hourIds[index]) - counters[index].forEach { out.writeLong(it) } - } - } - return bytes.toByteArray() - } + companion object { + const val HOURS = 24 * 7 + private const val FORMAT = 1 - private fun save(bytes: ByteArray) { - val target = file ?: return - writer.execute { - try { - val tmp = File(target.parentFile, "$FILE.tmp") - tmp.writeBytes(bytes) - if (!tmp.renameTo(target)) tmp.delete() - } catch (e: Exception) { - Log.w("SparkleDNS", "Cannot save statistics", e) - } - } - } + // Per hour: total, blocked, cached, latency sum and count, then one counter per company + private const val TOTAL = 0 + private const val BLOCKED = 1 + private const val CACHED = 2 + private const val LATENCY_SUM = 3 + private const val LATENCY_COUNT = 4 + const val FIRST_COMPANY = 5 + val FIELDS = FIRST_COMPANY + Company.entries.size - // Files from a version with fewer companies load fine: the new counters start at zero - private fun load(source: File) { - if (!source.exists()) return - try { - DataInputStream(BufferedInputStream(FileInputStream(source))).use { input -> - if (input.readInt() != FORMAT) return + // Files from a version with fewer companies load fine: the new counters start at zero. + // Null for a file of another format. + fun decode(bytes: ByteArray): HourlyCounters? { + DataInputStream(ByteArrayInputStream(bytes)).use { input -> + if (input.readInt() != FORMAT) return null val fields = input.readInt() - if (input.readInt() != HOURS || fields < FIRST_COMPANY) return + if (input.readInt() != HOURS || fields < FIRST_COMPANY) return null + val result = HourlyCounters() for (index in 0 until HOURS) { - hourIds[index] = input.readLong() + result.hourIds[index] = input.readLong() for (field in 0 until fields) { val value = input.readLong() - if (field < FIELDS) counters[index][field] = value + if (field < FIELDS) result.rows[index][field] = value } } + return result } - } catch (e: Exception) { - Log.w("SparkleDNS", "Cannot read statistics", e) - hourIds.fill(-1L) - counters.forEach { it.fill(0L) } } } } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Theme.kt b/app/src/main/java/cc/skysparkle/sparkledns/Theme.kt index cb4cb3d..d7ae0c6 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/Theme.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/Theme.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height @@ -14,6 +15,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.BasicTextField import androidx.compose.material3.HorizontalDivider @@ -29,11 +31,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight 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 @@ -44,7 +48,6 @@ object Palette { val CardHigh = Color(0xFF1E2026) val Line = Color(0xFF24262C) val Track = Color(0xFF3A3C44) - val Muted = Color(0xFF5B5F6B) val Fg = Color(0xFFF2F3F5) val Fg2 = Color(0xFF9A9DA6) val Fg3 = Color(0xFF7E828C) @@ -86,6 +89,24 @@ internal val AppColors = darkColorScheme( val CardShape = RoundedCornerShape(20.dp) +// On tablets content stays this wide and sits in the middle, so rows do not stretch across the screen +val MaxContentWidth = 560.dp + +// From this width Home and Activity show two columns side by side +val WideLayoutWidth = 840.dp +val MaxWideContentWidth = 1040.dp + +// Size of the app window in dp +@Composable +fun windowWidth(): Dp = LocalConfiguration.current.screenWidthDp.dp + +@Composable +fun windowHeight(): Dp = LocalConfiguration.current.screenHeightDp.dp + +// Side padding that keeps content at most [max] wide and at least [min] away from the edges +fun sidePadding(available: Dp, max: Dp = MaxContentWidth, min: Dp = 20.dp): Dp = + maxOf(min, (available - max) / 2) + fun Modifier.appCard(): Modifier = clip(CardShape).background(Palette.Card) @Composable @@ -105,7 +126,7 @@ fun AppSwitch( } @Composable -fun appSwitchColors() = SwitchDefaults.colors( +private fun appSwitchColors() = SwitchDefaults.colors( checkedThumbColor = Color.White, checkedTrackColor = Palette.Accent, checkedBorderColor = Palette.Accent, @@ -174,18 +195,27 @@ fun PageHeader( // A page with a back header around content that is not built for one @Composable fun SubPage(title: String, onBack: () -> Unit, modifier: Modifier = Modifier, content: @Composable BoxScope.() -> Unit) { - Column(modifier) { - PageHeader(title, onBack) - Box( + Box(modifier, contentAlignment = Alignment.TopCenter) { + Column( Modifier - .weight(1f) - .fillMaxSize() - .navigationBarsPadding(), - content = content, - ) + .fillMaxHeight() + .widthIn(max = MaxContentWidth + 32.dp) + .fillMaxWidth() + ) { + PageHeader(title, onBack) + Box( + Modifier + .weight(1f) + .fillMaxSize() + .navigationBarsPadding(), + content = content, + ) + } } } +private val SearchTextStyle = TextStyle(color = Palette.Fg, fontSize = 14.sp) + @Composable fun SearchField( value: String, @@ -219,7 +249,7 @@ fun SearchField( onValueChange = onValueChange, modifier = Modifier.fillMaxWidth(), singleLine = true, - textStyle = TextStyle(color = Palette.Fg, fontSize = 14.sp), + textStyle = SearchTextStyle, cursorBrush = SolidColor(Palette.Accent), ) } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Ui.kt b/app/src/main/java/cc/skysparkle/sparkledns/Ui.kt index 39b8224..92af818 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/Ui.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/Ui.kt @@ -1,13 +1,11 @@ package cc.skysparkle.sparkledns +import android.content.Context import androidx.annotation.DrawableRes -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.annotation.StringRes import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -29,21 +27,21 @@ 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 import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.ImageBitmap +import androidx.compose.ui.res.imageResource 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 import androidx.lifecycle.Lifecycle import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.repeatOnLifecycle @@ -53,6 +51,28 @@ import java.util.Locale val CachedColor = Color(0xFF7FD1AE) val WarningColor = Color(0xFFFFB86B) +// The 512 px logo, decoded once while the screens are in use. Home shows it each time the tab +// opens, and decoding it there would cost the main thread a frame. +object AppLogo { + @Volatile + private var bitmap: ImageBitmap? = null + + // Started with the activity, so the first frame of Home usually finds the logo decoded + fun preload(context: Context) { + if (bitmap != null) return + val appContext = context.applicationContext + Thread({ runCatching { get(appContext) } }, "logo-load").start() + } + + @Synchronized + fun get(context: Context): ImageBitmap = + bitmap ?: ImageBitmap.imageResource(context.resources, R.drawable.app_logo).also { bitmap = it } + + fun clear() { + bitmap = null + } +} + // Icon on a soft circle of its own color @Composable fun IconBadge(@DrawableRes icon: Int, tint: Color = MaterialTheme.colorScheme.primary, size: Dp = 40.dp) { @@ -67,52 +87,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, @@ -161,39 +135,14 @@ 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, - ) - } -} +private class Last(var value: T?) +// The last non-null value, so a card can keep showing its text while it animates out @Composable -fun StatDivider() { - Box( - Modifier - .size(width = 1.dp, height = 32.dp) - .background(MaterialTheme.colorScheme.outlineVariant) - ) +fun rememberLast(value: T?): T? { + val last = remember { Last(null) } + if (value != null) last.value = value + return last.value } // Runs [onChange] when the query log changes, at most once a second and only while the screen @@ -209,13 +158,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 @@ -226,9 +168,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, @@ -270,3 +209,27 @@ fun EmptyState(icon: Int, text: String) { ) } } + +enum class StatsPeriod(val hours: Int, @StringRes val label: Int) { + DAY(24, R.string.period_24h), + WEEK(24 * 7, R.string.period_7d), +} + +// Switches between the last 24 hours and the last 7 days +@Composable +fun PeriodChip(period: StatsPeriod, onChange: (StatsPeriod) -> Unit) { + val shape = RoundedCornerShape(18.dp) + Row( + modifier = Modifier + .clip(shape) + .border(1.dp, Palette.Track, shape) + .clickable { onChange(if (period == StatsPeriod.DAY) StatsPeriod.WEEK else StatsPeriod.DAY) } + .heightIn(min = 36.dp) + .padding(start = 14.dp, end = 10.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text(stringResource(period.label), color = Palette.Fg, fontSize = 12.sp, fontWeight = FontWeight.Bold) + Spacer(Modifier.width(4.dp)) + Icon(painterResource(R.drawable.ic_expand), contentDescription = null, tint = Palette.Fg2, modifier = Modifier.size(16.dp)) + } +} diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7f8a3c6..3bdcd99 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -96,14 +96,12 @@ 24 Stunden 7 Tage Aktive Listen: %1$d · Regeln: %2$s - Blockieren ist aus DNS-Blocklisten Aktivität Einstellungen Anteil der Konzerne Welcher Anteil deiner Anfragen an die größten Konzerne geht. Andere - Noch keine Daten Letzte Anfragen Filter Listen suchen @@ -126,4 +124,11 @@ Allgemein Apps ohne SparkleDNS Ausgewählte Apps nutzen das normale DNS des Netzwerks + Noch keine Daten. Nach dem Verbinden füllt sich das Diagramm Stunde für Stunde. + Daten werden gesammelt: %1$d von %2$d Anfragen + Keine Liste ist aktiv. Schalte HaGeZi Pro ein, um Werbung und Tracker zu blockieren. + Blockieren ist aus. Schalte es ein, um Werbung und Tracker zu filtern. + Einschalten + Wird geladen… + Server wechseln diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9bf4136..d32c850 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -96,14 +96,12 @@ 24 時間 7 日間 有効なリスト: %1$d · ルール: %2$s - ブロックはオフです DNS ブロックリスト アクティビティ 設定 企業の占有率 リクエストのうち大手企業に送られる割合です。 その他 - まだデータがありません 最近のアクティビティ フィルター リストを検索 @@ -126,4 +124,11 @@ 一般 SparkleDNS を使わないアプリ 選んだアプリはネットワークの通常の DNS を使います + まだデータがありません。接続すると 1 時間ごとにグラフが埋まっていきます。 + データ収集中: %2$d 件中 %1$d 件 + 有効なリストがありません。HaGeZi Pro をオンにして広告とトラッカーをブロックしましょう。 + ブロックはオフです。オンにすると広告とトラッカーをフィルタリングします。 + オンにする + ダウンロード中… + サーバーを変更 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 2cfd3b1..f62f963 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -96,14 +96,12 @@ 24 valandos 7 dienos Įjungta sąrašų: %1$d · taisyklių: %2$s - Blokavimas išjungtas DNS blokavimo sąrašai Veikla Nustatymai Įmonių dalis Kokia jūsų užklausų dalis tenka didžiausioms įmonėms. Kitos - Duomenų dar nėra Naujausios užklausos Filtras Ieškoti sąrašų @@ -126,4 +124,11 @@ Bendrieji Programėlės be SparkleDNS Pasirinktos programėlės naudoja įprastą tinklo DNS + Duomenų dar nėra. Prisijungus grafikas pildysis kas valandą. + Renkami duomenys: %1$d iš %2$d užklausų + Neįjungtas nė vienas sąrašas. Įjunkite HaGeZi Pro, kad blokuotumėte reklamas ir sekiklius. + Blokavimas išjungtas. Įjunkite jį, kad filtruotumėte reklamas ir sekiklius. + Įjungti + Atsisiunčiama… + Keisti serverį diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e459c47..a2976f5 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -96,14 +96,12 @@ 24 часа 7 дней Включено списков: %1$d · правил: %2$s - Блокировка выключена Блок-листы DNS Активность Настройки Доля компаний Какая часть ваших запросов уходит крупнейшим компаниям. Другие - Данных пока нет Последние запросы Фильтр Поиск списков @@ -126,4 +124,11 @@ Общие Приложения без SparkleDNS Выбранные приложения используют обычный DNS сети + Данных пока нет. После подключения график будет заполняться по часам. + Собираем данные: %1$d из %2$d запросов + Ни один список не включён. Включите HaGeZi Pro, чтобы блокировать рекламу и трекеры. + Блокировка выключена. Включите её, чтобы фильтровать рекламу и трекеры. + Включить + Загрузка… + Сменить сервер diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index b43ee77..e8d9b58 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -96,14 +96,12 @@ 24 小时 7 天 已启用列表:%1$d · 规则:%2$s - 屏蔽已关闭 DNS 屏蔽列表 活动 设置 公司占比 你的请求中发往大公司的比例。 其他 - 暂无数据 最近活动 筛选 搜索列表 @@ -126,4 +124,11 @@ 通用 不使用 SparkleDNS 的应用 选中的应用使用网络的常规 DNS + 暂无数据。连接后,图表会按小时逐步填充。 + 正在收集数据:%1$d / %2$d 个请求 + 没有启用任何列表。开启 HaGeZi Pro 以屏蔽广告和跟踪器。 + 屏蔽已关闭。开启后即可过滤广告和跟踪器。 + 开启 + 正在下载… + 更换服务器 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d7980d9..20e1686 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -97,14 +97,12 @@ 24 hours 7 days Lists on: %1$d · rules: %2$s - Blocking is off DNS Blocklist Activity Settings Company dominance Share of your requests that go to the biggest companies. Other - No data yet Recent activity Filter Search lists @@ -127,4 +125,11 @@ General Apps without SparkleDNS Picked apps use the regular DNS of the network + No data yet. Connect, and the chart fills in hour by hour. + Collecting data: %1$d of %2$d requests + No lists are on. Turn on HaGeZi Pro to block ads and trackers. + Blocking is off. Turn it on to filter ads and trackers. + Turn on + Downloading… + Change server diff --git a/app/src/test/java/cc/skysparkle/sparkledns/BlocklistMatchTest.kt b/app/src/test/java/cc/skysparkle/sparkledns/BlocklistMatchTest.kt index 21aadc6..4f669cd 100644 --- a/app/src/test/java/cc/skysparkle/sparkledns/BlocklistMatchTest.kt +++ b/app/src/test/java/cc/skysparkle/sparkledns/BlocklistMatchTest.kt @@ -24,6 +24,15 @@ class BlocklistMatchTest { assertFalse(isBlockedIn("ads.example.com", LongArray(0), LongArray(0))) } + @Test + fun skipsTrailingDots() { + val lists = set("example.com") + + assertTrue(isBlockedIn("www.example.com..", lists, LongArray(0))) + assertFalse(isBlockedIn("example.org.", lists, LongArray(0))) + assertFalse(isBlockedIn("...", lists, LongArray(0))) + } + @Test fun mergesSortedListsWithoutDuplicates() { val a = longArrayOf(-5, 1, 4, 9) diff --git a/app/src/test/java/cc/skysparkle/sparkledns/BlocklistParserTest.kt b/app/src/test/java/cc/skysparkle/sparkledns/BlocklistParserTest.kt index b6ebdb2..b11db85 100644 --- a/app/src/test/java/cc/skysparkle/sparkledns/BlocklistParserTest.kt +++ b/app/src/test/java/cc/skysparkle/sparkledns/BlocklistParserTest.kt @@ -49,5 +49,6 @@ class BlocklistParserTest { val name = "a.b.example.com" assertEquals(DomainHash.of("example.com"), DomainHash.of(name, name.indexOf("example"))) assertEquals(DomainHash.of(name), DomainHash.of(name, 0)) + assertEquals(DomainHash.of("b.example"), DomainHash.of(name, 2, name.indexOf(".com"))) } } diff --git a/app/src/test/java/cc/skysparkle/sparkledns/CompaniesTest.kt b/app/src/test/java/cc/skysparkle/sparkledns/CompaniesTest.kt new file mode 100644 index 0000000..13a9279 --- /dev/null +++ b/app/src/test/java/cc/skysparkle/sparkledns/CompaniesTest.kt @@ -0,0 +1,43 @@ +package cc.skysparkle.sparkledns + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class CompaniesTest { + + @Test + fun matchesDomainsAndTheirSubdomains() { + assertEquals(Company.GOOGLE, Companies.of("youtube.com")) + assertEquals(Company.GOOGLE, Companies.of("r3---sn-abc.googlevideo.com")) + assertEquals(Company.META, Companies.of("scontent.cdninstagram.com")) + assertEquals(Company.X, Companies.of("t.co")) + assertEquals(Company.MICROSOFT, Companies.of("api.github.com")) + } + + @Test + fun ignoresCaseAndTrailingDots() { + assertEquals(Company.APPLE, Companies.of("WWW.Apple.COM")) + assertEquals(Company.AMAZON, Companies.of("s3.amazonaws.com.")) + assertEquals(Company.AMAZON, Companies.of("s3.amazonaws.com..")) + } + + @Test + fun knowsGoogleCountrySites() { + assertEquals(Company.GOOGLE, Companies.of("google.de")) + assertEquals(Company.GOOGLE, Companies.of("www.google.co.uk")) + assertEquals(Company.GOOGLE, Companies.of("google.com.br")) + assertNull(Companies.of("google.example.org")) + assertNull(Companies.of("google.")) + } + + @Test + fun leavesOtherDomainsAlone() { + assertNull(Companies.of("example.com")) + assertNull(Companies.of("notyoutube.com")) + assertNull(Companies.of("youtube.com.example")) + assertNull(Companies.of("com")) + assertNull(Companies.of("")) + assertNull(Companies.of(".")) + } +} diff --git a/app/src/test/java/cc/skysparkle/sparkledns/HourlyCountersTest.kt b/app/src/test/java/cc/skysparkle/sparkledns/HourlyCountersTest.kt new file mode 100644 index 0000000..6c57c1e --- /dev/null +++ b/app/src/test/java/cc/skysparkle/sparkledns/HourlyCountersTest.kt @@ -0,0 +1,126 @@ +package cc.skysparkle.sparkledns + +import org.junit.Assert.assertArrayEquals +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test +import java.io.ByteArrayInputStream +import java.io.ByteArrayOutputStream +import java.io.DataInputStream +import java.io.DataOutputStream + +class HourlyCountersTest { + + private val hours = HourlyCounters.HOURS + + @Test + fun countsQueriesPerHour() { + val counters = HourlyCounters() + counters.record(QueryStatus.OK, 40, Company.GOOGLE, hour = 100) + counters.record(QueryStatus.OK, 20, null, hour = 100) + counters.record(QueryStatus.BLOCKED, 0, Company.META, hour = 100) + counters.record(QueryStatus.CACHED, 0, null, hour = 99) + counters.record(QueryStatus.FAILED, 5000, null, hour = 99) + + val day = counters.summary(24, currentHour = 100) + assertEquals(5L, day.total) + assertEquals(1L, day.blocked) + assertEquals(1L, day.cached) + assertEquals(30, day.avgLatencyMs) + assertEquals(1L, day.companies[Company.GOOGLE.ordinal]) + assertEquals(1L, day.companies[Company.META.ordinal]) + assertEquals(3L, counters.summary(1, currentHour = 100).total) + + val points = counters.hourly(3, currentHour = 100) + assertEquals(listOf(0L, 2L, 3L), points.map { it.total }) + assertEquals(listOf(0L, 0L, 1L), points.map { it.blocked }) + } + + @Test + fun aSlotStartsOverAWeekLater() { + val counters = HourlyCounters() + counters.record(QueryStatus.OK, 10, null, hour = 5) + counters.record(QueryStatus.OK, 10, null, hour = 5L + hours) + + assertEquals(1L, counters.summary(hours, currentHour = 5L + hours).total) + assertEquals(0L, counters.summary(1, currentHour = 5).total) + } + + @Test + fun savedNumbersReadBackUnchanged() { + val counters = HourlyCounters() + counters.record(QueryStatus.BLOCKED, 0, Company.XIAOMI, hour = 1000) + counters.record(QueryStatus.OK, 12, Company.APPLE, hour = 1001) + + val copy = requireNotNull(HourlyCounters.decode(counters.encode())) + + assertArrayEquals(counters.hourIds, copy.hourIds) + for (index in 0 until hours) assertArrayEquals(counters.rows[index], copy.rows[index]) + } + + @Test + fun writesFormatOne() { + val bytes = HourlyCounters().encode() + val input = DataInputStream(ByteArrayInputStream(bytes)) + + assertEquals(1, input.readInt()) + assertEquals(HourlyCounters.FIELDS, input.readInt()) + assertEquals(hours, input.readInt()) + assertEquals(-1L, input.readLong()) + assertEquals(12 + hours * (HourlyCounters.FIELDS + 1) * 8, bytes.size) + } + + @Test + fun readsFilesFromVersionsWithFewerCompanies() { + // A file from a version that knew two companies: field n of hour 7 holds n + 1 + val fields = HourlyCounters.FIRST_COMPANY + 2 + val bytes = ByteArrayOutputStream() + DataOutputStream(bytes).use { out -> + out.writeInt(1) + out.writeInt(fields) + out.writeInt(hours) + for (index in 0 until hours) { + out.writeLong(if (index == 7) 7L else -1L) + for (field in 0 until fields) out.writeLong(if (index == 7) field + 1L else 0L) + } + } + + val summary = requireNotNull(HourlyCounters.decode(bytes.toByteArray())).summary(1, currentHour = 7) + + assertEquals(1L, summary.total) + assertEquals(2L, summary.blocked) + assertEquals(3L, summary.cached) + assertEquals(0, summary.avgLatencyMs) // latency sum 4, count 5 + assertArrayEquals(longArrayOf(6, 7) + LongArray(Company.entries.size - 2), summary.companies) + } + + @Test + fun refusesOtherFormats() { + val bytes = HourlyCounters().encode() + bytes[3] = 2 + + assertNull(HourlyCounters.decode(bytes)) + } + + @Test + fun mergeKeepsWhatWasCountedBeforeTheFileWasRead() { + val saved = HourlyCounters() + saved.record(QueryStatus.OK, 10, null, hour = 50) + saved.record(QueryStatus.OK, 10, null, hour = 49) + + val live = HourlyCounters() + live.record(QueryStatus.BLOCKED, 0, null, hour = 50) + live.merge(saved) + + assertEquals(2L, live.summary(1, currentHour = 50).total) + assertEquals(1L, live.summary(1, currentHour = 50).blocked) + assertEquals(3L, live.summary(2, currentHour = 50).total) + + // A slot already holding a newer hour keeps it + val later = HourlyCounters() + later.record(QueryStatus.OK, 10, null, hour = 50L + hours) + later.merge(saved) + + assertEquals(1L, later.summary(1, currentHour = 50L + hours).total) + } +} diff --git a/app/src/test/java/cc/skysparkle/sparkledns/PacketTest.kt b/app/src/test/java/cc/skysparkle/sparkledns/PacketTest.kt index 222f47b..f9771b0 100644 --- a/app/src/test/java/cc/skysparkle/sparkledns/PacketTest.kt +++ b/app/src/test/java/cc/skysparkle/sparkledns/PacketTest.kt @@ -18,8 +18,8 @@ class PacketTest { val parsed = requireNotNull(Packet.parseDnsQuery(packet, packet.size)) assertArrayEquals(query, parsed.payload) - assertArrayEquals(client, parsed.srcIp) - assertArrayEquals(server, parsed.dstIp) + assertEquals(i32(client, 0), parsed.srcIp) + assertEquals(i32(server, 0), parsed.dstIp) assertEquals(40000, parsed.srcPort) assertEquals(53, parsed.dstPort) } diff --git a/app/src/test/java/cc/skysparkle/sparkledns/RefreshTest.kt b/app/src/test/java/cc/skysparkle/sparkledns/RefreshTest.kt new file mode 100644 index 0000000..9f3ffd8 --- /dev/null +++ b/app/src/test/java/cc/skysparkle/sparkledns/RefreshTest.kt @@ -0,0 +1,43 @@ +package cc.skysparkle.sparkledns + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotSame +import org.junit.Assert.assertSame +import org.junit.Test + +// The screens refresh once a second; a refresh that brings the same object has nothing to update +class RefreshTest { + + @Test + fun logSnapshotIsReusedUntilTheLogChanges() { + QueryLog.clear() + val empty = QueryLog.snapshot() + assertSame(empty, QueryLog.snapshot()) + + QueryLog.add(DnsMessage.Question("example.com", 1), QueryStatus.OK, 10) + QueryLog.add(DnsMessage.Question("example.org", 28), QueryStatus.CACHED, 0) + val filled = QueryLog.snapshot() + + assertNotSame(empty, filled) + assertEquals(listOf("example.org", "example.com"), filled.map { it.domain }) + assertSame(filled, QueryLog.snapshot()) + + QueryLog.clear() + assertEquals(0, QueryLog.snapshot().size) + } + + @Test + fun summaryIsReusedUntilSomethingChanges() { + val now = 1_000 * 3_600_000L + val first = StatsStore.summary(24, now) + assertSame(first, StatsStore.summary(24, now)) + assertNotSame(first, StatsStore.summary(24 * 7, now)) + + StatsStore.record(QueryStatus.OK, 5, null, now) + val after = StatsStore.summary(24, now) + + assertNotSame(first, after) + assertEquals(first.total + 1, after.total) + assertSame(after, StatsStore.summary(24, now)) + } +} diff --git a/fastlane/metadata/android/de-DE/changelogs/10101.txt b/fastlane/metadata/android/de-DE/changelogs/10101.txt index bb8ef51..d61f4ce 100644 --- a/fastlane/metadata/android/de-DE/changelogs/10101.txt +++ b/fastlane/metadata/android/de-DE/changelogs/10101.txt @@ -1,2 +1,6 @@ -• Neue gefüllte Symbole in der ganzen App (Material Symbols) -• Symbole in Menüs, Einstellungen und auf Schaltflächen \ No newline at end of file +• Neue gefüllte Symbole (Material Symbols) +• Balkendiagramm für 24 Stunden oder 7 Tage, höher auf großen Bildschirmen +• Tablets: Inhalt mittig, auf breiten Bildschirmen zweispaltig +• Anteile der Konzerne erscheinen, sobald genug Daten da sind +• HaGeZi Pro direkt auf dem Startbildschirm einschalten +• Tippe auf den Server, um ihn zu wechseln \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/10101.txt b/fastlane/metadata/android/en-US/changelogs/10101.txt index 723953f..9f9a2ea 100644 --- a/fastlane/metadata/android/en-US/changelogs/10101.txt +++ b/fastlane/metadata/android/en-US/changelogs/10101.txt @@ -1,2 +1,6 @@ -• New filled icons throughout the app (Material Symbols) -• Icons in menus, Settings and on buttons \ No newline at end of file +• New filled icons (Material Symbols) +• Bar chart for 24 hours or 7 days, taller on big screens +• Tablets: content stays centred, two columns on wide screens +• Company shares appear once there is enough data +• Turn on HaGeZi Pro right from Home +• Tap the server on Home to change it \ No newline at end of file diff --git a/fastlane/metadata/android/ja-JP/changelogs/10101.txt b/fastlane/metadata/android/ja-JP/changelogs/10101.txt index 289dd0f..0eb1498 100644 --- a/fastlane/metadata/android/ja-JP/changelogs/10101.txt +++ b/fastlane/metadata/android/ja-JP/changelogs/10101.txt @@ -1,2 +1,6 @@ -• アプリ全体のアイコンを塗りつぶしスタイルに一新(Material Symbols) -• メニュー、設定、ボタンにアイコンを追加 \ No newline at end of file +• 塗りつぶしの新しいアイコン(Material Symbols) +• 24 時間/7 日間の棒グラフ。大きな画面では高く表示 +• タブレット:コンテンツを中央に、広い画面では 2 列表示 +• 企業の占有率はデータが十分に集まってから表示 +• ホームから HaGeZi Pro をすぐにオン +• ホームのサーバーをタップして変更 \ No newline at end of file diff --git a/fastlane/metadata/android/lt/changelogs/10101.txt b/fastlane/metadata/android/lt/changelogs/10101.txt index cea8597..187262e 100644 --- a/fastlane/metadata/android/lt/changelogs/10101.txt +++ b/fastlane/metadata/android/lt/changelogs/10101.txt @@ -1,2 +1,6 @@ -• Naujos užpildytos piktogramos visoje programėlėje (Material Symbols) -• Piktogramos meniu, nustatymuose ir mygtukuose \ No newline at end of file +• Naujos užpildytos piktogramos (Material Symbols) +• Stulpelinė 24 valandų arba 7 dienų diagrama, aukštesnė dideliuose ekranuose +• Planšetės: turinys centre, plačiuose ekranuose – du stulpeliai +• Įmonių dalys rodomos, kai surenkama pakankamai duomenų +• HaGeZi Pro įjungiamas tiesiai pradžios ekrane +• Bakstelėkite serverį pradžios ekrane, kad jį pakeistumėte \ No newline at end of file diff --git a/fastlane/metadata/android/ru-RU/changelogs/10101.txt b/fastlane/metadata/android/ru-RU/changelogs/10101.txt index 6d1fd80..1b0d1c8 100644 --- a/fastlane/metadata/android/ru-RU/changelogs/10101.txt +++ b/fastlane/metadata/android/ru-RU/changelogs/10101.txt @@ -1,2 +1,6 @@ -• Новые залитые иконки во всём приложении (Material Symbols) -• Иконки в меню, настройках и на кнопках \ No newline at end of file +• Новые залитые иконки (Material Symbols) +• Столбиковый график за 24 часа или 7 дней, выше на больших экранах +• Планшеты: контент по центру, на широких экранах две колонки +• Доли компаний появляются, когда данных достаточно +• HaGeZi Pro включается прямо с главной +• Нажмите на сервер на главной, чтобы сменить его \ No newline at end of file diff --git a/fastlane/metadata/android/zh-CN/changelogs/10101.txt b/fastlane/metadata/android/zh-CN/changelogs/10101.txt index 5f46555..04be4a7 100644 --- a/fastlane/metadata/android/zh-CN/changelogs/10101.txt +++ b/fastlane/metadata/android/zh-CN/changelogs/10101.txt @@ -1,2 +1,6 @@ -• 全应用采用新的填充图标(Material Symbols) -• 菜单、设置和按钮新增图标 \ No newline at end of file +• 全新填充图标(Material Symbols) +• 24 小时或 7 天柱状图,大屏幕上更高 +• 平板:内容居中,宽屏显示两栏 +• 数据足够后才显示公司占比 +• 在首页直接开启 HaGeZi Pro +• 点按首页上的服务器即可更换 \ No newline at end of file diff --git a/scripts/baseline-profile.sh b/scripts/baseline-profile.sh deleted file mode 100755 index a3c54f1..0000000 --- a/scripts/baseline-profile.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/env bash -# Records which classes and methods the app uses on startup and in each tab, in the text format -# of app/src/main/baseline-prof.txt. Needs a rooted Android 13+ device or emulator (no Play Store). -# Usage: scripts/baseline-profile.sh -set -euo pipefail - -PKG=cc.skysparkle.sparkledns -ACT="$PKG/.MainActivity" -APK="$1" -OUT="$2" - -adb root >/dev/null 2>&1 && sleep 3 -adb wait-for-device -adb uninstall "$PKG" >/dev/null 2>&1 || true -adb install -g "$APK" >/dev/null -read -r W H < <(adb shell wm size | tr -d '\r' | awk -F'[ x]' '/Physical/ {print $3, $4}') - -tap_text() { - local xy - for _ in 1 2 3 4 5; do - adb shell uiautomator dump /sdcard/ui.xml >/dev/null 2>&1 || true - xy="$(adb shell cat /sdcard/ui.xml | python3 -c ' -import re, sys -xml, text = sys.stdin.read(), sys.argv[1] -for node in re.findall(r"]*>", xml): - # Compose merges a clickable row into one node: "System, 3 of 5" - if re.search(r"(text|content-desc)=\"%s(\"|, )" % re.escape(text), node): - x1, y1, x2, y2 = map(int, re.search(r"bounds=\"\[(\d+),(\d+)\]\[(\d+),(\d+)\]\"", node).groups()) - print((x1 + x2) // 2, (y1 + y2) // 2) - break -' "$1")" - if [[ -n "$xy" ]]; then - adb shell input tap $xy - return 0 - fi - # Lazy lists only show what is on screen; with "scroll", look further down - [[ "${2:-}" == scroll ]] && adb shell input swipe $((W / 2)) $((H * 2 / 3)) $((W / 2)) $((H / 3)) 300 - sleep 1 - done - echo "::warning::'$1' not found on screen" -} - -swipe() { - adb shell input swipe $((W / 2)) $((H * 3 / 4)) $((W / 2)) $((H / 4)) 200 - sleep 1 - adb shell input swipe $((W / 2)) $((H / 4)) $((W / 2)) $((H * 3 / 4)) 200 - sleep 1 -} - -for _ in 1 2 3; do - adb shell am force-stop "$PKG" - adb shell am start-activity -W -n "$ACT" >/dev/null - sleep 3 - swipe - tap_text "Monitor"; sleep 2 - tap_text "Apps"; sleep 3 - tap_text "System" scroll; sleep 2 - swipe - tap_text "Blocklist"; sleep 2 - swipe - tap_text "About"; sleep 2 - tap_text "Home"; sleep 2 - # Makes ART write the profile now instead of on its own schedule - adb shell "kill -10 \$(pidof $PKG)" - sleep 5 -done - -adb shell pm dump-profiles --dump-classes-and-methods "$PKG" -sleep 2 -adb pull "/data/misc/profman/$PKG-primary.prof.txt" "$OUT" >/dev/null -echo "Profile lines: $(wc -l < "$OUT")"