From 7877cb49f049b69173e94d235a25e4016ff5101f Mon Sep 17 00:00:00 2001 From: heaven Date: Tue, 16 Jun 2026 16:21:40 +0300 Subject: [PATCH] =?UTF-8?q?feat(ui):=20clearer=20=D0=A1=D0=B0=D0=B9=D1=82?= =?UTF-8?q?=D1=8B=20mode=20toggle=20(=C2=AB=D0=A1=D0=B0=D0=B9=D1=82=D1=8B?= =?UTF-8?q?=20=D0=B8=D0=B7=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0:=20?= =?UTF-8?q?=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20=D0=BF=D1=80=D0=BE=D0=BA=D1=81?= =?UTF-8?q?=D0=B8/=D0=BD=D0=B0=D0=BF=D1=80=D1=8F=D0=BC=D1=83=D1=8E=C2=BB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drops misleading «Всё»; explainer states the rest, with a note that the per-app filter applies. --- .../main/java/chat/vojo/proxy/ui/SitesScreen.kt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/chat/vojo/proxy/ui/SitesScreen.kt b/app/src/main/java/chat/vojo/proxy/ui/SitesScreen.kt index 36939ad..56488b3 100644 --- a/app/src/main/java/chat/vojo/proxy/ui/SitesScreen.kt +++ b/app/src/main/java/chat/vojo/proxy/ui/SitesScreen.kt @@ -110,15 +110,22 @@ fun SitesScreen( } Spacer(Modifier.height(12.dp)) + SectionLabel("Сайты из списка") + Spacer(Modifier.height(6.dp)) ModeToggle(routingMode, onSetMode) Spacer(Modifier.height(6.dp)) Text( when (routingMode) { - RoutingMode.PROXY_ALL -> "Сайты из списка идут напрямую, остальной трафик — через прокси." - RoutingMode.DIRECT_ALL -> "Сайты из списка идут через прокси, остальной трафик — напрямую." + RoutingMode.PROXY_ALL -> "Остальной трафик идёт через прокси." + RoutingMode.DIRECT_ALL -> "Остальной трафик идёт напрямую." }, color = Vojo.faint, fontSize = 12.sp, ) + Spacer(Modifier.height(2.dp)) + Text( + "С учётом фильтра из вкладки «Приложения».", + color = Vojo.faint, fontSize = 11.sp, + ) Spacer(Modifier.height(12.dp)) // Manual suffix domain (example.com covers subdomains). @@ -274,8 +281,10 @@ private fun ModeToggle(mode: RoutingMode, onSet: (RoutingMode) -> Unit) { Row( Modifier.fillMaxWidth().clip(RoundedCornerShape(12.dp)).background(Vojo.bgPanel).border(1.dp, Vojo.divider, RoundedCornerShape(12.dp)).padding(3.dp), ) { - ModePill("Всё через прокси", mode == RoutingMode.PROXY_ALL, Modifier.weight(1f)) { onSet(RoutingMode.PROXY_ALL) } - ModePill("Всё напрямую", mode == RoutingMode.DIRECT_ALL, Modifier.weight(1f)) { onSet(RoutingMode.DIRECT_ALL) } + // The toggle states what the LISTED sites do: «через прокси» = list proxied, rest direct + // (DIRECT_ALL); «напрямую» = list bypasses the proxy, rest proxied (PROXY_ALL). + ModePill("через прокси", mode == RoutingMode.DIRECT_ALL, Modifier.weight(1f)) { onSet(RoutingMode.DIRECT_ALL) } + ModePill("напрямую", mode == RoutingMode.PROXY_ALL, Modifier.weight(1f)) { onSet(RoutingMode.PROXY_ALL) } } }