Use a dropdown for routing network (#5976)

This commit is contained in:
eliotcougar authored and GitHub committed 2026-07-31 09:56:59 +08:00
1 parent 3380a45475
commit 070abd78ea
10 files changed
+6 -12

No files matched your search

@@ -52,6 +52,8 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.util.UUID
private val ROUTING_NETWORK_OPTIONS = listOf("tcp", "udp", "tcp,udp")
class RoutingEditActivity : BaseComponentActivity() {
private val position by lazy { intent.getIntExtra("position", -1) }
@@ -130,6 +132,7 @@ fun RoutingEditScreen(
mutableStateOf(initial?.outboundTag ?: BUILTIN_OUTBOUND_TAGS.first())
}
var showDeleteConfirm by rememberSaveable { mutableStateOf(false) }
val selectedNetwork = network.ifBlank { "tcp,udp" }
val processPickerLauncher = rememberLauncherForActivityResult(
contract = ActivityResultContracts.StartActivityForResult()
@@ -273,10 +276,10 @@ fun RoutingEditScreen(
value = protocol,
onValueChange = { protocol = it }
)
FormTextField(
FormDropdownField(
label = stringResource(R.string.routing_settings_network),
placeholder = stringResource(R.string.routing_settings_network_tip),
value = network,
value = selectedNetwork,
options = ROUTING_NETWORK_OPTIONS,
onValueChange = { network = it }
)
FormDropdownField(
@@ -347,7 +347,6 @@
<string name="routing_settings_protocol">protocol</string>
<string name="routing_settings_protocol_tip">[http,tls,bittorrent]</string>
<string name="routing_settings_network">network</string>
<string name="routing_settings_network_tip">[udp|tcp]</string>
<string name="routing_settings_outbound_tag">outboundTag</string>
<string name="connection_test_pending">التحقق من الاتصال</string>
@@ -346,7 +346,6 @@
<string name="routing_settings_protocol">protocol</string>
<string name="routing_settings_protocol_tip">[http,tls,bittorrent]</string>
<string name="routing_settings_network">network</string>
<string name="routing_settings_network_tip">[udp|tcp]</string>
<string name="routing_settings_outbound_tag">outboundTag</string>
<string name="connection_test_pending">সংযোগ পরীক্ষা করুন</string>
@@ -352,7 +352,6 @@
<string name="routing_settings_protocol" translatable="false">protocol</string>
<string name="routing_settings_protocol_tip" translatable="false">[http,tls,bittorrent]</string>
<string name="routing_settings_network" translatable="false">network</string>"[udp|tcp]"
<string name="routing_settings_network_tip" translatable="false">[udp|tcp]</string>
<string name="routing_settings_outbound_tag" translatable="false">outboundTag</string>
<string name="connection_test_pending">منپیزن واجۊری کوݩ</string>
@@ -343,7 +343,6 @@
<string name="routing_settings_protocol">پورتکل</string>
<string name="routing_settings_protocol_tip">[http,tls,bittorrent]</string>
<string name="routing_settings_network">شبکه</string>
<string name="routing_settings_network_tip">[udp|tcp]</string>
<string name="routing_settings_outbound_tag">برچسب خروجی</string>
<string name="connection_test_pending">اتصال را بررسی کنید</string>
@@ -358,7 +358,6 @@
<string name="routing_settings_protocol">Протокол</string>
<string name="routing_settings_protocol_tip">[http,tls,bittorrent]</string>
<string name="routing_settings_network">Сеть</string>
<string name="routing_settings_network_tip">[udp|tcp]</string>
<string name="routing_settings_outbound_tag">Исходящее соединение</string>
<string name="connection_test_pending">Проверить соединение</string>
@@ -347,7 +347,6 @@
<string name="routing_settings_protocol">protocol</string>
<string name="routing_settings_protocol_tip">[http,tls,bittorrent]</string>
<string name="routing_settings_network">network</string>
<string name="routing_settings_network_tip">[udp|tcp]</string>
<string name="routing_settings_outbound_tag">outboundTag</string>
<string name="connection_test_pending">Kiểm tra kết nối</string>
@@ -360,7 +360,6 @@
<string name="routing_settings_protocol">protocol</string>
<string name="routing_settings_protocol_tip">[http,tls,bittorrent]</string>
<string name="routing_settings_network">network</string>
<string name="routing_settings_network_tip">[udp|tcp]</string>
<string name="routing_settings_outbound_tag">outboundTag</string>
<string name="connection_test_pending">"检查网络连接"</string>
@@ -358,7 +358,6 @@
<string name="routing_settings_protocol">protocol</string>
<string name="routing_settings_protocol_tip">[http,tls,bittorrent]</string>
<string name="routing_settings_network">network</string>
<string name="routing_settings_network_tip">[udp|tcp]</string>
<string name="routing_settings_outbound_tag">outboundTag</string>
<string name="connection_test_pending">"測試連線能力"</string>
@@ -366,7 +366,6 @@
<string name="routing_settings_protocol">protocol</string>
<string name="routing_settings_protocol_tip">[http,tls,bittorrent]</string>
<string name="routing_settings_network">network</string>
<string name="routing_settings_network_tip">[udp|tcp]</string>
<string name="routing_settings_outbound_tag_hint" translatable="false">proxy / direct / block / &lt;remarks&gt;</string>
<string name="routing_settings_outbound_tag">outboundTag</string>