diff --git a/core/src/main/java/com/github/kr328/clash/core/model/ConfigurationOverride.kt b/core/src/main/java/com/github/kr328/clash/core/model/ConfigurationOverride.kt index 7d3b222db..0675c3e5a 100644 --- a/core/src/main/java/com/github/kr328/clash/core/model/ConfigurationOverride.kt +++ b/core/src/main/java/com/github/kr328/clash/core/model/ConfigurationOverride.kt @@ -14,24 +14,27 @@ data class ConfigurationOverride( @SerialName("socks-port") var socksPort: Int? = null, - @SerialName("redir-port") - var redirectPort: Int? = null, - - @SerialName("tproxy-port") - var tproxyPort: Int? = null, - @SerialName("mixed-port") var mixedPort: Int? = null, @SerialName("authentication") var authentication: List? = null, + @SerialName("skip-auth-prefixes") + var skipAuthPrefixes: List? = null, + @SerialName("allow-lan") var allowLan: Boolean? = null, @SerialName("bind-address") var bindAddress: String? = null, + @SerialName("lan-allowed-ips") + var lanAllowedIps: List? = null, + + @SerialName("lan-disallowed-ips") + var lanDisallowedIps: List? = null, + @SerialName("mode") var mode: TunnelState.Mode? = null, diff --git a/design/src/main/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt b/design/src/main/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt index e35944ca4..2548466f7 100644 --- a/design/src/main/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt +++ b/design/src/main/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt @@ -88,22 +88,6 @@ class OverrideSettingsDesign( empty = R.string.disabled, ) - editableText( - value = configuration::redirectPort, - adapter = NullableTextAdapter.Port, - title = R.string.redirect_port, - placeholder = R.string.dont_modify, - empty = R.string.disabled, - ) - - editableText( - value = configuration::tproxyPort, - adapter = NullableTextAdapter.Port, - title = R.string.tproxy_port, - placeholder = R.string.dont_modify, - empty = R.string.disabled, - ) - editableText( value = configuration::mixedPort, adapter = NullableTextAdapter.Port, @@ -119,18 +103,18 @@ class OverrideSettingsDesign( placeholder = R.string.dont_modify, ) - selectableList( - value = configuration::allowLan, - values = booleanValues, - valuesText = booleanValuesText, - title = R.string.allow_lan, + editableTextList( + value = configuration::skipAuthPrefixes, + adapter = TextAdapter.String, + title = R.string.skip_auth_prefixes, + placeholder = R.string.dont_modify, ) selectableList( - value = configuration::ipv6, + value = configuration::allowLan, values = booleanValues, valuesText = booleanValuesText, - title = R.string.ipv6, + title = R.string.allow_lan, ) editableText( @@ -141,6 +125,20 @@ class OverrideSettingsDesign( empty = R.string.default_ ) + editableTextList( + value = configuration::lanAllowedIps, + adapter = TextAdapter.String, + title = R.string.lan_allowed_ips, + placeholder = R.string.dont_modify, + ) + + editableTextList( + value = configuration::lanDisallowedIps, + adapter = TextAdapter.String, + title = R.string.lan_disallowed_ips, + placeholder = R.string.dont_modify, + ) + editableText( value = configuration::externalController, adapter = NullableTextAdapter.String, @@ -217,6 +215,13 @@ class OverrideSettingsDesign( title = R.string.log_level, ) + selectableList( + value = configuration::ipv6, + values = booleanValues, + valuesText = booleanValuesText, + title = R.string.ipv6, + ) + editableTextMap( value = configuration::hosts, keyAdapter = TextAdapter.String, diff --git a/design/src/main/res/values-ja-rJP/strings.xml b/design/src/main/res/values-ja-rJP/strings.xml index 102066fb1..6213608e3 100644 --- a/design/src/main/res/values-ja-rJP/strings.xml +++ b/design/src/main/res/values-ja-rJP/strings.xml @@ -107,12 +107,10 @@ Prefer h3 HTTPポート SOCKSポート - リダイレクトポート 複合ポート - TProxyポート 認証 LANからの接続を許可 - リスニングアドレス + バインドアドレス モード ログレベル IPv6 diff --git a/design/src/main/res/values-ko-rKR/strings.xml b/design/src/main/res/values-ko-rKR/strings.xml index dc852797f..60c0c2628 100644 --- a/design/src/main/res/values-ko-rKR/strings.xml +++ b/design/src/main/res/values-ko-rKR/strings.xml @@ -107,12 +107,10 @@ h3 선호 HTTP 포트 Socks 포트 - Redirect 포트 혼합 포트 - TProxy 포트 인증 LAN 허용 - 수신 주소 + 바인드 주소 모드 로그 레벨 IPv6 diff --git a/design/src/main/res/values-ru/strings.xml b/design/src/main/res/values-ru/strings.xml index 753a0f1d0..8e4848458 100644 --- a/design/src/main/res/values-ru/strings.xml +++ b/design/src/main/res/values-ru/strings.xml @@ -132,12 +132,10 @@ Предпочитать HTTP/3 Порт HTTP Порт Socks - Порт перенаправления Смешанный порт - Порт TProxy Аутентификация Разрешить LAN - Задать адрес + привязать адрес Режим Уровень логов IPv6 diff --git a/design/src/main/res/values-vi/strings.xml b/design/src/main/res/values-vi/strings.xml index ea361405b..f0ae40c11 100644 --- a/design/src/main/res/values-vi/strings.xml +++ b/design/src/main/res/values-vi/strings.xml @@ -44,7 +44,7 @@ Thời gian tự động cập nhật Tự động cập nhật (Phút) Điều hướng - Địa chỉ ràng buộc + địa chỉ liên kết Chặn lặp Chặn kết nối lặp lại Duyệt qua tệp cấu hình và nhà cung cấp @@ -181,7 +181,6 @@ Proxy Không có nhóm nào được hiển thị Vừa xong - Cổng Redirect Cài đặt lại Đổi tên Đặt lại @@ -219,7 +218,6 @@ Chạm để kết nối Clash Meta là một phần mềm miễn phí và chúng tôi KHÔNG cung cấp bất kỳ dịch vụ trả phí nào cho nó Chỉ chấp nhận cấu hình Clash bao gồm Proxy và Quy tắc - Cổng TProxy Không thể khởi động thành phần VPN Không có sẵn Cập nhật diff --git a/design/src/main/res/values-zh-rHK/strings.xml b/design/src/main/res/values-zh-rHK/strings.xml index 51d62c131..003f3188d 100644 --- a/design/src/main/res/values-zh-rHK/strings.xml +++ b/design/src/main/res/values-zh-rHK/strings.xml @@ -44,7 +44,6 @@ 無效的 URL Logcat 日誌 - 模式 名稱 網絡 新配置 @@ -106,8 +105,17 @@ HTTP 端口 Socks 端口 複合端口 - 允許來自局域網的連接 - 監聽地址 + 代理端口認證 + 免認證前綴 + 允許來自私有網絡的連接 + 綁定地址 + 允許連接的私有網絡 IP 段 + 不允許連接的私有網絡 IP 段 + 外部控制器 + 外部控制器 TLS + 外部控制器允許來源清單 + 外部控制器允許私有網絡地址 + 模式 日誌級別 IPv6 Hosts @@ -157,11 +165,8 @@ 系統代理 為 VpnService 附加 HTTP 代理 不修改 - Redirect 端口 - TProxy 端口 重置 使用 Hosts - 認證 域名 Fallback 置空 從剪切板導入 diff --git a/design/src/main/res/values-zh-rTW/strings.xml b/design/src/main/res/values-zh-rTW/strings.xml index 91c69fa7b..44ea5986d 100644 --- a/design/src/main/res/values-zh-rTW/strings.xml +++ b/design/src/main/res/values-zh-rTW/strings.xml @@ -44,7 +44,6 @@ 無效 URL Logcat 日誌 - 模式 名稱 網路 新設定檔 @@ -106,8 +105,17 @@ HTTP 埠 Socks 埠 Mixed 埠 - 允許來自區域網路的連線 - 監聽位址 + 代理埠認證 + 免認證前綴 + 允許來自區域網路的連接 + 綁定位址 + 允許連接的區域網路 IP 段 + 不允許連接的區域網路 IP 段 + 外部控制器 + 外部控制器 TLS + 外部控制器允許來源清單 + 外部控制器允許專用網路位址 + 模式 日誌層次 IPv6 Hosts @@ -157,11 +165,8 @@ 作業系統 Proxy 為 VpnService 附加 HTTP Proxy 不修改 - Redirect 埠 - TProxy 埠 重設 使用 Hosts - 認證 域名 Fallback 置空 從剪貼簿匯入 diff --git a/design/src/main/res/values-zh/strings.xml b/design/src/main/res/values-zh/strings.xml index d1eb2b75b..b00b45af8 100644 --- a/design/src/main/res/values-zh/strings.xml +++ b/design/src/main/res/values-zh/strings.xml @@ -46,7 +46,6 @@ 无效的 URL Logcat 日志 - 模式 名称 网络 新配置 @@ -109,8 +108,17 @@ HTTP 端口 Socks 端口 复合端口 + 代理端口认证 + 免认证前缀 允许来自局域网的连接 - 监听地址 + 绑定地址 + 允许连接的局域网 IP 段 + 不允许连接的局域网 IP 段 + 外部控制器 + 外部控制器 TLS + 外部控制器允许来源列表 + 外部控制器允许私有网络地址 + 模式 日志级别 IPv6 Hosts @@ -163,11 +171,8 @@ 系统代理 为 VpnService 附加 HTTP 代理 不修改 - Redirect 端口 - TProxy 端口 重置 使用 Hosts - 认证 域名 Fallback 置空 从剪切板导入 diff --git a/design/src/main/res/values/strings.xml b/design/src/main/res/values/strings.xml index 9681f9f73..166651f85 100644 --- a/design/src/main/res/values/strings.xml +++ b/design/src/main/res/values/strings.xml @@ -139,20 +139,21 @@ Prefer h3 HTTP Port Socks Port - Redirect Port Mixed Port - TProxy Port - Authentication + Proxy Ports Authentication + Skip Auth Prefixes Allow LAN Bind Address - Mode - Log Level - IPv6 + Lan Allowed IPs + Lan Disallowed IPs External Controller External Controller TLS External Controller Allow Origins External Controller Allow Private Network Secret + Mode + Log Level + IPv6 Hosts New Value