diff --git a/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt index 7aa9e78..8a937a7 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt @@ -50,7 +50,6 @@ import androidx.compose.ui.unit.dp private const val PRIVACY_POLICY = "https://skysparkle.cc/privacy?lang=en" private const val SOURCE_CODE = "https://git.skysparkle.cc/kalarina/Sparkledns" -private const val APP_LICENSE = "GPL-3.0-or-later" private const val APACHE_2 = "Apache License 2.0" private const val APACHE_2_URL = "https://www.apache.org/licenses/LICENSE-2.0" @@ -149,7 +148,6 @@ private fun AboutContent(modifier: Modifier, onOpenLicenses: () -> Unit) { InfoRow(stringResource(R.string.about_version), BuildConfig.VERSION_NAME) InfoRow(stringResource(R.string.about_protocol), "DNS-over-HTTPS (RFC 8484)") InfoRow("HTTP/3", http3) - InfoRow(stringResource(R.string.about_license), APP_LICENSE) } } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/AppsScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/AppsScreen.kt index 9646b1f..5ef55f5 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/AppsScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/AppsScreen.kt @@ -92,6 +92,9 @@ fun AppsScreen(modifier: Modifier = Modifier) { var search by rememberSaveable { mutableStateOf("") } var collapsed by remember { mutableStateOf(setOf(AppGroup.SYSTEM)) } val pending = active != null && excluded != activeExcluded + var showAppsHint by remember { mutableStateOf(!prefs.isHintDismissed(HINT_APPS)) } + // Closing the "reconnect" card hides it until the selection changes again + var pendingDismissedFor by remember { mutableStateOf?>(null) } // Uninstalled apps may still be in the saved set; count only the ones on the device val excludedCount = apps?.count { it.packageName in excluded } ?: excluded.size val searching = search.isNotBlank() @@ -122,8 +125,21 @@ fun AppsScreen(modifier: Modifier = Modifier) { ) { item { Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { - HintCard(stringResource(R.string.apps_hint), icon = R.drawable.ic_tab_info) - AnimatedVisibility(visible = pending, enter = Motion.expandIn, exit = Motion.collapseOut) { + AnimatedVisibility(visible = showAppsHint, enter = Motion.expandIn, exit = Motion.collapseOut) { + HintCard( + stringResource(R.string.apps_hint), + icon = R.drawable.ic_tab_info, + onDismiss = { + showAppsHint = false + prefs.dismissHint(HINT_APPS) + }, + ) + } + AnimatedVisibility( + visible = pending && excluded != pendingDismissedFor, + enter = Motion.expandIn, + exit = Motion.collapseOut, + ) { HintCard( text = stringResource(R.string.apps_pending), icon = R.drawable.ic_refresh, @@ -133,6 +149,7 @@ fun AppsScreen(modifier: Modifier = Modifier) { Text(stringResource(R.string.reconnect)) } }, + onDismiss = { pendingDismissedFor = excluded }, ) } } @@ -345,3 +362,5 @@ private fun Drawable.toImageBitmap(size: Int): ImageBitmap { draw(canvas) return bitmap.asImageBitmap() } + +private const val HINT_APPS = "apps" diff --git a/app/src/main/java/cc/skysparkle/sparkledns/BlocklistScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/BlocklistScreen.kt index b59b6ea..4119411 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/BlocklistScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/BlocklistScreen.kt @@ -62,6 +62,8 @@ private val Presets = listOf( fun BlocklistScreen(modifier: Modifier = Modifier) { val context = LocalContext.current val scope = rememberCoroutineScope() + val prefs = remember { Prefs(context) } + var showNote by remember { mutableStateOf(!prefs.isHintDismissed(HINT_BLOCKLIST)) } val enabled by Blocklist.enabled.collectAsState() val total by Blocklist.total.collectAsState() @@ -124,7 +126,16 @@ fun BlocklistScreen(modifier: Modifier = Modifier) { } } - HintCard(stringResource(R.string.bl_note), icon = R.drawable.ic_tab_info) + AnimatedVisibility(visible = showNote, enter = Motion.expandIn, exit = Motion.collapseOut) { + HintCard( + stringResource(R.string.bl_note), + icon = R.drawable.ic_tab_info, + onDismiss = { + showNote = false + prefs.dismissHint(HINT_BLOCKLIST) + }, + ) + } SectionHeader(stringResource(R.string.bl_my), icon = R.drawable.ic_tab_block) diff --git a/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt b/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt index 9625129..27f498c 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/MainActivity.kt @@ -308,13 +308,19 @@ fun HomeScreen(modifier: Modifier = Modifier) { 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 = { testResult = null }, ) } } val lastHost = remember { arrayOf("") } privateDnsHost?.let { lastHost[0] = it } - AnimatedVisibility(visible = privateDnsHost != null, enter = Motion.expandIn, exit = Motion.collapseOut) { + var dismissedDnsHost by remember { mutableStateOf(prefs.dismissedPrivateDns) } + AnimatedVisibility( + visible = privateDnsHost != null && privateDnsHost != dismissedDnsHost, + enter = Motion.expandIn, + exit = Motion.collapseOut, + ) { HintCard( text = stringResource(R.string.hint, lastHost[0]), icon = R.drawable.ic_alert, @@ -322,6 +328,10 @@ fun HomeScreen(modifier: Modifier = Modifier) { action = { TextButton(onClick = { openNetworkSettings(context) }) { Text(stringResource(R.string.open_settings)) } }, + onDismiss = { + dismissedDnsHost = lastHost[0] + prefs.dismissedPrivateDns = lastHost[0] + }, ) } } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Prefs.kt b/app/src/main/java/cc/skysparkle/sparkledns/Prefs.kt index ecc6fc7..5a8abe4 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/Prefs.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/Prefs.kt @@ -25,6 +25,20 @@ class Prefs(context: Context) { get() = sp.getStringSet(KEY_EXCLUDED, null)?.toSet() ?: emptySet() set(value) = sp.edit().putStringSet(KEY_EXCLUDED, value).apply() + // Hint cards the user closed with the X + fun isHintDismissed(key: String): Boolean = + sp.getStringSet(KEY_HINTS, null)?.contains(key) == true + + fun dismissHint(key: String) { + val current = sp.getStringSet(KEY_HINTS, null)?.toSet() ?: emptySet() + sp.edit().putStringSet(KEY_HINTS, current + key).apply() + } + + // The Private DNS warning stays closed until the hostname changes + var dismissedPrivateDns: String + get() = sp.getString(KEY_PRIVATE_DNS, null) ?: "" + set(value) = sp.edit().putString(KEY_PRIVATE_DNS, value).apply() + fun resolve(): DohProvider = if (providerId == Providers.CUSTOM_ID) { DohProvider(Providers.CUSTOM_ID, "Custom", customUrl.trim(), parseIps(customBootstrap), customHttp3) @@ -38,5 +52,7 @@ class Prefs(context: Context) { const val KEY_BOOTSTRAP = "custom_bootstrap" const val KEY_HTTP3 = "custom_http3" const val KEY_EXCLUDED = "excluded_apps" + const val KEY_HINTS = "dismissed_hints" + const val KEY_PRIVATE_DNS = "dismissed_private_dns" } } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Ui.kt b/app/src/main/java/cc/skysparkle/sparkledns/Ui.kt index 8d45320..1a14fd2 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/Ui.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/Ui.kt @@ -22,6 +22,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -35,6 +36,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color 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 @@ -112,13 +114,23 @@ fun HintCard( @DrawableRes icon: Int = R.drawable.ic_tab_info, tint: Color = MaterialTheme.colorScheme.onSurfaceVariant, action: (@Composable () -> Unit)? = null, + onDismiss: (() -> Unit)? = null, ) { Card( modifier = Modifier.fillMaxWidth(), colors = CardDefaults.cardColors(containerColor = tint.copy(alpha = 0.10f)), ) { Row( - modifier = Modifier.padding(start = 14.dp, end = if (action != null) 6.dp else 14.dp, top = 12.dp, bottom = 12.dp), + modifier = Modifier.padding( + start = 14.dp, + end = when { + onDismiss != null -> 4.dp + action != null -> 6.dp + else -> 14.dp + }, + top = if (onDismiss != null) 6.dp else 12.dp, + bottom = if (onDismiss != null) 6.dp else 12.dp, + ), verticalAlignment = Alignment.CenterVertically, ) { Icon(painterResource(icon), contentDescription = null, tint = tint, modifier = Modifier.size(20.dp)) @@ -130,6 +142,16 @@ fun HintCard( modifier = Modifier.weight(1f), ) action?.invoke() + if (onDismiss != null) { + IconButton(onClick = onDismiss, modifier = Modifier.size(40.dp)) { + Icon( + painterResource(R.drawable.ic_close), + contentDescription = stringResource(R.string.dismiss), + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.size(18.dp), + ) + } + } } } } diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml new file mode 100644 index 0000000..e6fed10 --- /dev/null +++ b/app/src/main/res/drawable/ic_close.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 24cc00c..49ce8f5 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -94,5 +94,4 @@ Настройки Ничего не найдено Блокировка - Лицензия diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 315cf62..7c03fc3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -95,5 +95,4 @@ Settings Nothing matches the filter Blocking - License