Skip to content

Commit 72a8636

Browse files
2dustAnGgIt886
2dust
authored and
AnGgIt886
committed
Adding pre-proxy setting to group
1 parent d93adf9 commit 72a8636

File tree

14 files changed

+90
-2
lines changed

14 files changed

+90
-2
lines changed

‎app/src/main/kotlin/com/neko/v2ray/dto/SubscriptionItem.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ data class SubscriptionItem(
88
var lastUpdated: Long = -1,
99
var autoUpdate: Boolean = false,
1010
val updateInterval: Int? = null,
11+
var prevProfile: String? = null,
12+
var nextProfile: String? = null,
1113
)
1214

‎app/src/main/kotlin/com/neko/v2ray/ui/SubEditActivity.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ class SubEditActivity : BaseActivity() {
101101
binding.etUrl.text = Utils.getEditable(subItem.url)
102102
binding.chkEnable.isChecked = subItem.enabled
103103
binding.autoUpdateCheck.isChecked = subItem.autoUpdate
104+
binding.etPreProfile.text = Utils.getEditable(subItem.prevProfile)
105+
binding.etNextProfile.text = Utils.getEditable(subItem.nextProfile)
104106
return true
105107
}
106108

@@ -111,6 +113,8 @@ class SubEditActivity : BaseActivity() {
111113
binding.etRemarks.text = null
112114
binding.etUrl.text = null
113115
binding.chkEnable.isChecked = true
116+
binding.etPreProfile.text = null
117+
binding.etNextProfile.text = null
114118
return true
115119
}
116120

@@ -132,6 +136,8 @@ class SubEditActivity : BaseActivity() {
132136
subItem.url = binding.etUrl.text.toString()
133137
subItem.enabled = binding.chkEnable.isChecked
134138
subItem.autoUpdate = binding.autoUpdateCheck.isChecked
139+
subItem.prevProfile = binding.etPreProfile.text.toString()
140+
subItem.nextProfile = binding.etNextProfile.text.toString()
135141

136142
if (TextUtils.isEmpty(subItem.remarks)) {
137143
toast(R.string.sub_setting_remarks)

‎app/src/main/res/layout/activity_sub_edit.xml

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,30 @@
293293
android:inputType="text" />
294294
</com.google.android.material.textfield.TextInputLayout>
295295
</LinearLayout>
296+
<LinearLayout
297+
android:orientation="vertical"
298+
android:layout_width="match_parent"
299+
android:layout_height="wrap_content"
300+
android:layout_marginTop="8.0dip"
301+
android:layout_marginBottom="8.0dip">
302+
<com.google.android.material.textfield.TextInputLayout
303+
android:layout_width="match_parent"
304+
android:layout_height="wrap_content"
305+
android:hint="@string/sub_setting_url"
306+
style="@style/Outline_TextInputLayout">
307+
<com.google.android.material.textfield.TextInputEditText
308+
android:gravity="top"
309+
android:id="@+id/et_url"
310+
android:scrollbars="vertical"
311+
android:layout_width="match_parent"
312+
android:layout_height="wrap_content"
313+
android:layout_marginTop="10.0dip"
314+
android:maxLines="10"
315+
android:minLines="2"
316+
android:inputType="textMultiLine"
317+
tools:ignore="TextFields" />
318+
</com.google.android.material.textfield.TextInputLayout>
319+
</LinearLayout>
296320
<LinearLayout
297321
android:orientation="horizontal"
298322
android:layout_width="match_parent"
@@ -329,6 +353,29 @@
329353
android:paddingStart="2.0dip"
330354
android:paddingEnd="6.0dip" />
331355
</LinearLayout>
356+
<LinearLayout
357+
android:orientation="vertical"
358+
android:layout_width="match_parent"
359+
android:layout_height="wrap_content"
360+
android:layout_marginTop="8.0dip"
361+
android:layout_marginBottom="8.0dip">
362+
<com.google.android.material.textfield.TextInputLayout
363+
android:layout_width="match_parent"
364+
android:layout_height="wrap_content"
365+
android:hint="@string/sub_setting_pre_profile"
366+
style="@style/Outline_TextInputLayout">
367+
<com.google.android.material.textfield.TextInputEditText
368+
android:gravity="top"
369+
android:id="@+id/et_pre_profile"
370+
android:scrollbars="vertical"
371+
android:layout_width="match_parent"
372+
android:layout_height="wrap_content"
373+
android:layout_marginTop="10.0dip"
374+
android:maxLines="10"
375+
android:minLines="5"
376+
android:inputType="textMultiLine" />
377+
</com.google.android.material.textfield.TextInputLayout>
378+
</LinearLayout>
332379
<LinearLayout
333380
android:orientation="vertical"
334381
android:layout_width="match_parent"
@@ -338,11 +385,11 @@
338385
<com.google.android.material.textfield.TextInputLayout
339386
android:layout_width="match_parent"
340387
android:layout_height="wrap_content"
341-
android:hint="@string/sub_setting_url"
388+
android:hint="@string/sub_setting_next_profile"
342389
style="@style/Outline_TextInputLayout">
343390
<com.google.android.material.textfield.TextInputEditText
344391
android:gravity="top"
345-
android:id="@+id/et_url"
392+
android:id="@+id/et_next_profile"
346393
android:scrollbars="vertical"
347394
android:layout_width="match_parent"
348395
android:layout_height="wrap_content"

‎app/src/main/res/values-ar/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@
221221
<string name="sub_setting_url">عنوان URL اختياري</string>
222222
<string name="sub_setting_enable">تمكين التحديث</string>
223223
<string name="sub_auto_update">تمكين التحديث التلقائي</string>
224+
<string name="sub_setting_pre_profile">تصريحات الوكالة السابقة</string>
225+
<string name="sub_setting_next_profile">تصريحات الوكيل التالية</string>
226+
<string name="sub_setting_pre_profile_tip">الملاحظات موجودة وهي فريدة من نوعها</string>
224227
<string name="title_sub_update">تحديث الاشتراك</string>
225228
<string name="title_ping_all_server">Tcping كل التكوين</string>
226229
<string name="title_real_ping_all_server">تأخير حقيقي كل التكوين</string>

‎app/src/main/res/values-fa/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,9 @@
223223
<string name="sub_setting_url">URL اختیاری</string>
224224
<string name="sub_setting_enable">فعال کردن آپدیت</string>
225225
<string name="sub_auto_update">فعال کردن به روز رسانی خودکار</string>
226+
<string name="sub_setting_pre_profile">اظهارات نیابتی قبلی</string>
227+
<string name="sub_setting_next_profile">اظهارات پروکسی بعدی</string>
228+
<string name="sub_setting_pre_profile_tip">اظهارات وجود دارد و منحصر به فرد است</string>
226229
<string name="title_sub_update">تحديث اشتراك المجموعة الحالية</string>
227230
<string name="title_ping_all_server">تكوين المجموعة الحالية Tcping</string>
228231
<string name="title_real_ping_all_server">تأخير حقيقي لتكوين المجموعة الحالية</string>

‎app/src/main/res/values-in/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@
221221
<string name="sub_setting_url">URL Opsi</string>
222222
<string name="sub_setting_enable">Aktifkan pembaruan</string>
223223
<string name="sub_auto_update">Aktifkan pembaruan otomatis</string>
224+
<string name="sub_setting_pre_profile">Pernyataan proksi sebelumnya</string>
225+
<string name="sub_setting_next_profile">Keterangan proxy berikutnya</string>
226+
<string name="sub_setting_pre_profile_tip">Komentar tersebut ada dan unik</string>
224227
<string name="title_sub_update">Perbarui langganan grup saat ini</string>
225228
<string name="title_ping_all_server">Tcping config grup saat ini</string>
226229
<string name="title_real_ping_all_server">Real delay config grup saat ini</string>

‎app/src/main/res/values-ja/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@
221221
<string name="sub_setting_url">オプションの URL</string>
222222
<string name="sub_setting_enable">アップデートを有効にする</string>
223223
<string name="sub_auto_update">自動更新を有効にする</string>
224+
<string name="sub_setting_pre_profile">以前の代理人の発言</string>
225+
<string name="sub_setting_next_profile">次回の代理発言</string>
226+
<string name="sub_setting_pre_profile_tip">発言は存在し、ユニークである</string>
224227
<string name="title_sub_update">現在のグループ サブスクリプションを更新</string>
225228
<string name="title_ping_all_server">現在のグループ構成を TCP 処理</string>
226229
<string name="title_real_ping_all_server">現在のグループ構成を実際に遅延</string>

‎app/src/main/res/values-jw/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@
221221
<string name="sub_setting_url">URL Pilihan</string>
222222
<string name="sub_setting_enable">Aktifake nganyari</string>
223223
<string name="sub_auto_update">Aktifake nganyari otomatis</string>
224+
<string name="sub_setting_pre_profile">Komentar proxy sadurunge</string>
225+
<string name="sub_setting_next_profile">Komentar proxy sabanjure</string>
226+
<string name="sub_setting_pre_profile_tip">Ukara kasebut ana lan unik</string>
224227
<string name="title_sub_update">Update langganan grup saiki</string>
225228
<string name="title_ping_all_server">Tcping config grup saiki</string>
226229
<string name="title_real_ping_all_server">Real delay config grup saiki</string>

‎app/src/main/res/values-ru/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@
221221
<string name="sub_setting_url">Необязательный URL-адрес</string>
222222
<string name="sub_setting_enable">Включить обновление</string>
223223
<string name="sub_auto_update">Включить автоматическое обновление</string>
224+
<string name="sub_setting_pre_profile">Предыдущие замечания доверенности</string>
225+
<string name="sub_setting_next_profile">Следующие замечания доверенного лица</string>
226+
<string name="sub_setting_pre_profile_tip">Замечание существует и является уникальным</string>
224227
<string name="title_sub_update">Обновить подписку на текущую группу</string>
225228
<string name="title_ping_all_server">Tcping текущей конфигурации группы</string>
226229
<string name="title_real_ping_all_server">Реальная задержка текущей конфигурации группы</string>

‎app/src/main/res/values-su/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@
221221
<string name="sub_setting_url">URL pilihan</string>
222222
<string name="sub_setting_enable">Aktipkeun apdet</string>
223223
<string name="sub_auto_update">Aktipkeun apdet otomatis</string>
224+
<string name="sub_setting_pre_profile">Ucapan proxy saméméhna</string>
225+
<string name="sub_setting_next_profile">Catetan proxy salajengna</string>
226+
<string name="sub_setting_pre_profile_tip">Koméntar aya sareng unik</string>
224227
<string name="title_sub_update">Apdet langganan grup ayeuna</string>
225228
<string name="title_ping_all_server">Tcping konfigurasi grup ayeuna</string>
226229
<string name="title_real_ping_all_server">Konfigurasi grup ayeuna reureuh nyata</string>

‎app/src/main/res/values-vi/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@
221221
<string name="sub_setting_url">URL tùy chọn</string>
222222
<string name="sub_setting_enable">Bật cập nhật</string>
223223
<string name="sub_auto_update">Bật cập nhật tự động</string>
224+
<string name="sub_setting_pre_profile">Nhận xét ủy quyền trước đó</string>
225+
<string name="sub_setting_next_profile">Nhận xét của đại diện tiếp theo</string>
226+
<string name="sub_setting_pre_profile_tip">Nhận xét tồn tại và là duy nhất</string>
224227
<string name="title_sub_update">Cập nhật đăng ký nhóm hiện tại</string>
225228
<string name="title_ping_all_server">Cấu hình nhóm hiện tại của TCP</string>
226229
<string name="title_real_ping_all_server">Cấu hình nhóm hiện tại trễ thực</string>

‎app/src/main/res/values-zh-rCN/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@
221221
<string name="sub_setting_url">可选网址</string>
222222
<string name="sub_setting_enable">启用更新</string>
223223
<string name="sub_auto_update">启用自动更新</string>
224+
<string name="sub_setting_pre_profile">先前的代理意见</string>
225+
<string name="sub_setting_next_profile">下一个代理备注</string>
226+
<string name="sub_setting_pre_profile_tip">该评论存在且独特</string>
224227
<string name="title_sub_update">更新当前组订阅</string>
225228
<string name="title_ping_all_server">测试当前组配置Tcping</string>
226229
<string name="title_real_ping_all_server">测试当前组配置真连接</string>

‎app/src/main/res/values-zh-rTW/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@
221221
<string name="sub_setting_url">可選網址</string>
222222
<string name="sub_setting_enable">啟用更新</string>
223223
<string name="sub_auto_update">啟用自動更新</string>
224+
<string name="sub_setting_pre_profile">之前的代理備註</string>
225+
<string name="sub_setting_next_profile">接下來的代理備註</string>
226+
<string name="sub_setting_pre_profile_tip">備註存在且唯一</string>
224227
<string name="title_sub_update">更新目前群組訂閱</string>
225228
<string name="title_ping_all_server">偵測目前群組配置 Tcping</string>
226229
<string name="title_real_ping_all_server">偵測目前群組配置真延遲</string>

‎app/src/main/res/values/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,9 @@
223223
<string name="sub_setting_url">Optional URL</string>
224224
<string name="sub_setting_enable">Enable update</string>
225225
<string name="sub_auto_update">Enable automatic update</string>
226+
<string name="sub_setting_pre_profile">Previous proxy remarks</string>
227+
<string name="sub_setting_next_profile">Next proxy remarks</string>
228+
<string name="sub_setting_pre_profile_tip">The remarks exists and is unique</string>
226229
<string name="title_sub_update">Update current group subscription</string>
227230
<string name="title_ping_all_server">Tcping current group configuration</string>
228231
<string name="title_real_ping_all_server">Real delay current group configuration</string>

0 commit comments

Comments
 (0)