From 1a2c4cc9a1c544ff9d78b79a962aa55dc269f64f Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Thu, 19 Sep 2024 09:09:04 +0800 Subject: [PATCH] Adding pre-proxy setting to group --- .../com/v2ray/ang/dto/SubscriptionItem.kt | 2 + .../com/v2ray/ang/ui/SubEditActivity.kt | 6 ++ .../src/main/res/layout/activity_sub_edit.xml | 61 +++++++++++++++---- .../app/src/main/res/values-ar/strings.xml | 3 + .../app/src/main/res/values-bn/strings.xml | 3 + .../app/src/main/res/values-fa/strings.xml | 3 + .../app/src/main/res/values-ru/strings.xml | 3 + .../app/src/main/res/values-vi/strings.xml | 3 + .../src/main/res/values-zh-rCN/strings.xml | 3 + .../src/main/res/values-zh-rTW/strings.xml | 3 + V2rayNG/app/src/main/res/values/strings.xml | 3 + 11 files changed, 82 insertions(+), 11 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/SubscriptionItem.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/SubscriptionItem.kt index 056dff6e..b2a3a9a3 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/SubscriptionItem.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/SubscriptionItem.kt @@ -8,5 +8,7 @@ data class SubscriptionItem( var lastUpdated: Long = -1, var autoUpdate: Boolean = false, val updateInterval: Int? = null, + var prevProfile: String? = null, + var nextProfile: String? = null, ) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubEditActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubEditActivity.kt index d9546f34..81e7bc22 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubEditActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubEditActivity.kt @@ -47,6 +47,8 @@ class SubEditActivity : BaseActivity() { binding.etUrl.text = Utils.getEditable(subItem.url) binding.chkEnable.isChecked = subItem.enabled binding.autoUpdateCheck.isChecked = subItem.autoUpdate + binding.etPreProfile.text = Utils.getEditable(subItem.prevProfile) + binding.etNextProfile.text = Utils.getEditable(subItem.nextProfile) return true } @@ -57,6 +59,8 @@ class SubEditActivity : BaseActivity() { binding.etRemarks.text = null binding.etUrl.text = null binding.chkEnable.isChecked = true + binding.etPreProfile.text = null + binding.etNextProfile.text = null return true } @@ -78,6 +82,8 @@ class SubEditActivity : BaseActivity() { subItem.url = binding.etUrl.text.toString() subItem.enabled = binding.chkEnable.isChecked subItem.autoUpdate = binding.autoUpdateCheck.isChecked + subItem.prevProfile = binding.etPreProfile.text.toString() + subItem.nextProfile = binding.etNextProfile.text.toString() if (TextUtils.isEmpty(subItem.remarks)) { toast(R.string.sub_setting_remarks) diff --git a/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml b/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml index ee304989..899e30a6 100644 --- a/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml +++ b/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml @@ -47,6 +47,32 @@ + + + + + + + + + - + android:text="@string/sub_setting_pre_profile" /> + android:layout_height="@dimen/edit_height" + android:inputType="text" + android:hint="@string/sub_setting_pre_profile_tip" /> + + + + + + عنوان URL اختياري تفعيل التحديث تفعيل التحديث التلقائي + Previous proxy remarks + Next proxy remarks + The remarks exists and is unique تحديث الاشتراك (أول خطوة) Tcping لجميع الإعدادات اختبر جميع الإعدادات (3) diff --git a/V2rayNG/app/src/main/res/values-bn/strings.xml b/V2rayNG/app/src/main/res/values-bn/strings.xml index ea85d329..db79075f 100644 --- a/V2rayNG/app/src/main/res/values-bn/strings.xml +++ b/V2rayNG/app/src/main/res/values-bn/strings.xml @@ -234,6 +234,9 @@ ঐচ্ছিক URL আপডেট সক্রিয় করুন স্বয়ংক্রিয় আপডেট সক্রিয় করুন + Previous proxy remarks + Next proxy remarks + The remarks exists and is unique সাবস্ক্রিপশন আপডেট সব কনফিগারেশন TCPing সব কনফিগারেশন প্রকৃত বিলম্ব diff --git a/V2rayNG/app/src/main/res/values-fa/strings.xml b/V2rayNG/app/src/main/res/values-fa/strings.xml index 01d859dd..da8d52ff 100644 --- a/V2rayNG/app/src/main/res/values-fa/strings.xml +++ b/V2rayNG/app/src/main/res/values-fa/strings.xml @@ -232,6 +232,9 @@ نشانی اینترنتی اختیاری فعال کردن به‌روزرسانی فعال سازی به‌روزرسانی خودکار + Previous proxy remarks + Next proxy remarks + The remarks exists and is unique به‌روزرسانی اشتراک Tcping همه کانفیگ تاخیر واقعی همه کانفیگ diff --git a/V2rayNG/app/src/main/res/values-ru/strings.xml b/V2rayNG/app/src/main/res/values-ru/strings.xml index b862e53b..c2d258a7 100644 --- a/V2rayNG/app/src/main/res/values-ru/strings.xml +++ b/V2rayNG/app/src/main/res/values-ru/strings.xml @@ -236,6 +236,9 @@ URL (необязательно) Использовать обновление Использовать автоматическое обновление + Previous proxy remarks + Next proxy remarks + The remarks exists and is unique Обновить подписку группы Проверка профилей группы Время отклика профилей группы diff --git a/V2rayNG/app/src/main/res/values-vi/strings.xml b/V2rayNG/app/src/main/res/values-vi/strings.xml index 62c7362d..4df0766f 100644 --- a/V2rayNG/app/src/main/res/values-vi/strings.xml +++ b/V2rayNG/app/src/main/res/values-vi/strings.xml @@ -235,6 +235,9 @@ URL gói đăng ký Sử dụng gói đăng ký này Bật tự động cập nhật + Previous proxy remarks + Next proxy remarks + The remarks exists and is unique Cập nhật các gói đăng ký Ping tất cả máy chủ Kiểm tra HTTP tất cả máy chủ diff --git a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml index 6c36130b..4eaa1312 100644 --- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml @@ -233,6 +233,9 @@ 可选地址(url) 启用更新 启用自动更新 + 前置代理别名 + 落地代理別名 + 请确保别名存在并唯一 更新当前组订阅 测试当前组配置Tcping 测试当前组配置真连接 diff --git a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml index b28dd3aa..fa53135f 100644 --- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml @@ -234,6 +234,9 @@ Optional URL 啟用更新 啟用自動更新 + 前置代理别名 + 落地代理別名 + 请确保别名存在并唯一 更新目前群組訂閱 偵測目前群組配置 Tcping 偵測目前群組配置真延遲 diff --git a/V2rayNG/app/src/main/res/values/strings.xml b/V2rayNG/app/src/main/res/values/strings.xml index 4727bf1d..c9a090a3 100644 --- a/V2rayNG/app/src/main/res/values/strings.xml +++ b/V2rayNG/app/src/main/res/values/strings.xml @@ -239,6 +239,9 @@ Optional URL Enable update Enable automatic update + Previous proxy remarks + Next proxy remarks + The remarks exists and is unique Update current group subscription Tcping current group configuration Real delay current group configuration