From 41a8f94f65259fc2ad0edd7eecb765b23e52568d Mon Sep 17 00:00:00 2001 From: kalarina Date: Wed, 14 Oct 2026 10:55:35 +0000 Subject: [PATCH] Update server list button and privacy policy links on Home --- .../cc/skysparkle/sparkledns/MainActivity.kt | 89 +++++++++++++++++-- app/src/main/res/values-de/strings.xml | 3 + app/src/main/res/values-ja/strings.xml | 3 + app/src/main/res/values-lt/strings.xml | 3 + app/src/main/res/values-ru/strings.xml | 3 + app/src/main/res/values-zh/strings.xml | 3 + app/src/main/res/values/strings.xml | 3 + 7 files changed, 102 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt b/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt index 27f498c..f7f7ee3 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt @@ -53,7 +53,9 @@ import androidx.compose.material3.Button import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField @@ -63,6 +65,7 @@ import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.material3.darkColorScheme import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -121,6 +124,10 @@ fun HomeScreen(modifier: Modifier = Modifier) { val stats = rememberLiveStats() var selected by remember { mutableStateOf(prefs.providerId) } + val servers by ServerList.servers.collectAsState() + var syncing by remember { mutableStateOf(false) } + var syncResult by remember { mutableStateOf(null) } + var shownSync by remember { mutableStateOf(null) } var customUrl by remember { mutableStateOf(prefs.customUrl) } var customBootstrap by remember { mutableStateOf(prefs.customBootstrap) } var customHttp3 by remember { mutableStateOf(prefs.customHttp3) } @@ -140,7 +147,7 @@ fun HomeScreen(modifier: Modifier = Modifier) { val isCustom = selected == Providers.CUSTOM_ID val customValid = customUrl.trim().toHttpUrlOrNull()?.isHttps == true val canConnect = !isCustom || customValid - val selectedProvider = remember(selected, customUrl, customBootstrap, customHttp3) { prefs.resolve() } + val selectedProvider = remember(selected, customUrl, customBootstrap, customHttp3, servers) { prefs.resolve() } val customName = stringResource(R.string.custom) fun nameOf(p: DohProvider) = if (p.id == Providers.CUSTOM_ID) customName else p.name val shownProvider = active ?: selectedProvider @@ -181,6 +188,30 @@ fun HomeScreen(modifier: Modifier = Modifier) { testResult = null } + // A server removed from the list falls back to the default one + LaunchedEffect(servers) { + if (selected != Providers.CUSTOM_ID && servers.none { it.id == selected }) select(Providers.default.id) + } + + val syncOk = stringResource(R.string.servers_updated) + val syncFail = stringResource(R.string.servers_update_failed) + fun syncServers() { + syncing = true + syncResult = null + scope.launch { + val result = withContext(Dispatchers.IO) { + runCatching { ServerList.sync(context) } + .fold( + onSuccess = { TestResult(true, syncOk) }, + onFailure = { TestResult(false, syncFail.format(it.message ?: it.javaClass.simpleName)) }, + ) + } + shownSync = result + syncResult = result + syncing = false + } + } + fun runTest() { val provider = prefs.resolve() testing = true @@ -223,13 +254,44 @@ fun HomeScreen(modifier: Modifier = Modifier) { onSwitch = { sendAction(context, DohVpnService.ACTION_START) }, ) - SectionHeader(stringResource(R.string.servers)) + SectionHeader(stringResource(R.string.servers)) { + if (syncing) { + Box(Modifier.size(48.dp), contentAlignment = Alignment.Center) { + CircularProgressIndicator(Modifier.size(20.dp), strokeWidth = 2.dp) + } + } else { + IconButton(onClick = ::syncServers) { + Icon( + painterResource(R.drawable.ic_refresh), + contentDescription = stringResource(R.string.servers_update), + modifier = Modifier.size(20.dp), + ) + } + } + } + + AnimatedVisibility(visible = syncResult != null, enter = Motion.expandIn, exit = Motion.collapseOut) { + shownSync?.let { result -> + HintCard( + text = result.text, + icon = if (result.ok) R.drawable.ic_check else R.drawable.ic_alert, + tint = if (result.ok) CachedColor else MaterialTheme.colorScheme.error, + onDismiss = { syncResult = null }, + ) + } + } Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(vertical = 6.dp)) { - Providers.list.forEachIndexed { index, p -> + servers.forEachIndexed { index, p -> if (index > 0) RowDivider() - ProviderRow(p.name, hostOf(p.url), p.http3, selected == p.id) { select(p.id) } + ProviderRow( + title = p.name, + subtitle = hostOf(p.url), + http3 = p.http3, + selected = selected == p.id, + onPolicy = p.policy?.let { url -> { openUrl(context, url) } }, + ) { select(p.id) } } RowDivider() ProviderRow( @@ -506,7 +568,14 @@ private fun CrashCard(report: String, onCopy: () -> Unit, onDismiss: () -> Unit) } @Composable -private fun ProviderRow(title: String, subtitle: String, http3: Boolean, selected: Boolean, onClick: () -> Unit) { +private fun ProviderRow( + title: String, + subtitle: String, + http3: Boolean, + selected: Boolean, + onPolicy: (() -> Unit)? = null, + onClick: () -> Unit, +) { val highlight by animateColorAsState( if (selected) MaterialTheme.colorScheme.primary.copy(alpha = 0.08f) else Color.Transparent, animationSpec = Motion.color, @@ -536,6 +605,16 @@ private fun ProviderRow(title: String, subtitle: String, http3: Boolean, selecte Spacer(Modifier.width(8.dp)) Pill("HTTP/3", MaterialTheme.colorScheme.primary) } + if (onPolicy != null) { + IconButton(onClick = onPolicy, modifier = Modifier.size(40.dp)) { + Icon( + painterResource(R.drawable.ic_privacy), + contentDescription = stringResource(R.string.about_privacy_policy), + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.size(18.dp), + ) + } + } } } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 13b4e1d..c057e33 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -94,4 +94,7 @@ Einstellungen Nichts passt zum Filter Blockierung + Serverliste aktualisieren + Serverliste aktualisiert + Serverliste konnte nicht aktualisiert werden: %1$s diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3d2004f..534af01 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -94,4 +94,7 @@ 設定 フィルターに一致するものはありません ブロック + サーバーリストを更新 + サーバーリストを更新しました + サーバーリストを更新できませんでした: %1$s diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index f524b0f..c7013dc 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -94,4 +94,7 @@ Nustatymai Filtro neatitinka niekas Blokavimas + Atnaujinti serverių sąrašą + Serverių sąrašas atnaujintas + Nepavyko atnaujinti serverių sąrašo: %1$s diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 49ce8f5..d052f45 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -94,4 +94,7 @@ Настройки Ничего не найдено Блокировка + Обновить список серверов + Список серверов обновлён + Не удалось обновить список серверов: %1$s diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index b38fbd7..f5f88d7 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -94,4 +94,7 @@ 设置 没有符合筛选条件的内容 屏蔽 + 更新服务器列表 + 服务器列表已更新 + 无法更新服务器列表:%1$s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7c03fc3..dcd9622 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -95,4 +95,7 @@ Settings Nothing matches the filter Blocking + Update server list + Server list updated + Couldn\'t update the server list: %1$s