Skip to content

docs: clarify DNS settings help text #1170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pawl wants to merge 4 commits into
base: master
Choose a base branch
from
Open

docs: clarify DNS settings help text #1170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
605f987
docs: clarify DNS settings help text
pawl Feb 19, 2026
7966b71
docs: improve Global DNS servers help text
pawl Feb 19, 2026
5bc743b
docs: revert endpoint resolution label to avoid breaking translations
pawl Feb 19, 2026
0effd0d
docs: simplify global DNS help text
pawl Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...ain/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/dns/DnsSettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import com.zaneschepke.wireguardautotunnel.ui.common.button.SurfaceRow
import com.zaneschepke.wireguardautotunnel.ui.common.button.SwitchWithDivider
import com.zaneschepke.wireguardautotunnel.ui.common.dropdown.LabelledDropdown
import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
import com.zaneschepke.wireguardautotunnel.ui.common.text.DescriptionText
import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
import com.zaneschepke.wireguardautotunnel.util.extensions.capitalize
import com.zaneschepke.wireguardautotunnel.viewmodel.DnsViewModel
Expand All @@ -53,6 +54,7 @@ fun DnsSettingsScreen(viewModel: DnsViewModel = koinViewModel()) {
GroupLabel(stringResource(R.string.endpoint), Modifier.padding(horizontal = 16.dp))
LabelledDropdown(
title = stringResource(R.string.dns_protocol),
description = { DescriptionText(stringResource(R.string.dns_endpoint_section_description)) },
leading = { Icon(Icons.Outlined.Dns, contentDescription = null) },
currentValue = dnsUiState.dnsSettings.dnsProtocol,
onSelected = { selected -> selected?.let { viewModel.setDnsProtocol(it) } },
Expand Down Expand Up @@ -82,6 +84,7 @@ fun DnsSettingsScreen(viewModel: DnsViewModel = koinViewModel()) {
Icon(ImageVector.vectorResource(R.drawable.host), contentDescription = null)
},
title = stringResource(R.string.global_dns_servers),
description = { DescriptionText(stringResource(R.string.global_dns_description)) },
trailing = { modifier ->
SwitchWithDivider(
checked = dnsUiState.dnsSettings.isGlobalTunnelDnsEnabled,
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,8 @@
<string name="http_bind_address">HTTP bind address</string>
<string name="defaults_to_template">(defaults to %1$s)</string>
<string name="dns_settings">DNS settings</string>
<string name="dns_endpoint_section_description">Only used to resolve the VPN server address before connecting. Does not affect DNS used once tunnel is active.</string>
<string name="global_dns_description">Enable to override each tunnel\'s DNS. Tap to set IPs once enabled.</string>
<string name="locked_down">Locked down</string>
<string name="dns_provider">DNS provider</string>
<string name="dns_protocol">DNS protocol</string>
Expand Down