Added user asset file settings in the drawer menu

V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt

@@ -800,13 +800,13 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         // Handle navigation view item clicks here.
         when (item.itemId) {
             R.id.sub_setting -> requestSubSettingActivity.launch(Intent(this, SubSettingActivity::class.java))
+            R.id.per_app_proxy_settings -> startActivity(Intent(this, PerAppProxyActivity::class.java))
+            R.id.routing_setting -> requestSubSettingActivity.launch(Intent(this, RoutingSettingActivity::class.java))
+            R.id.user_asset_setting -> startActivity(Intent(this, UserAssetActivity::class.java))
             R.id.settings -> startActivity(
                 Intent(this, SettingsActivity::class.java)
                     .putExtra("isRunning", mainViewModel.isRunning.value == true)
             )
-
-            R.id.per_app_proxy_settings -> startActivity(Intent(this, PerAppProxyActivity::class.java))
-            R.id.routing_setting -> requestSubSettingActivity.launch(Intent(this, RoutingSettingActivity::class.java))
             R.id.promotion -> Utils.openUri(this, "${Utils.decode(AppConfig.PromotionUrl)}?t=${System.currentTimeMillis()}")
             R.id.logcat -> startActivity(Intent(this, LogcatActivity::class.java))
             R.id.about -> startActivity(Intent(this, AboutActivity::class.java))

V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt

@@ -90,7 +90,6 @@ class RoutingSettingActivity : BaseActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
         R.id.add_rule -> startActivity(Intent(this, RoutingEditActivity::class.java)).let { true }
-        R.id.user_asset_setting -> startActivity(Intent(this, UserAssetActivity::class.java)).let { true }
         R.id.import_predefined_rulesets -> importPredefined().let { true }
         R.id.import_rulesets_from_clipboard -> importFromClipboard().let { true }
         R.id.import_rulesets_from_qrcode -> requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA).let { true }

V2rayNG/app/src/main/res/menu/menu_drawer.xml

@@ -16,6 +16,10 @@
             android:id="@+id/routing_setting"
             android:icon="@drawable/ic_routing_24dp"
             android:title="@string/routing_settings_title" />
+        <item
+            android:id="@+id/user_asset_setting"
+            android:icon="@drawable/ic_file_24dp"
+            android:title="@string/title_user_asset_setting" />
         <item
             android:id="@+id/settings"
             android:icon="@drawable/ic_settings_24dp"

V2rayNG/app/src/main/res/menu/menu_routing_setting.xml

@@ -6,10 +6,6 @@
         android:icon="@drawable/ic_add_24dp"
         android:title="@string/routing_settings_add_rule"
         app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/user_asset_setting"
-        android:icon="@drawable/ic_file_24dp"
-        android:title="@string/title_user_asset_setting" />
     <item
         android:id="@+id/import_predefined_rulesets"
         android:title="@string/routing_settings_import_predefined_rulesets"

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

@@ -268,7 +268,7 @@
     <string name="title_sub_update">تحديث الاشتراك (أول خطوة)</string>
     <string name="title_ping_all_server">Tcping لجميع الإعدادات</string>
     <string name="title_real_ping_all_server"> اختبر جميع الإعدادات (3)</string>
-    <string name="title_user_asset_setting">ملفات أصول جغرافية</string>
+    <string name="title_user_asset_setting">Asset files</string>
     <string name="title_sort_by_test_results">الفرز حسب نتائج الاختبار (5)</string>
     <string name="title_filter_config">تصفية ملف التكوين</string>
     <string name="filter_config_all">جميع مجموعات الاشتراك</string>

V2rayNG/app/src/main/res/values-bn/strings.xml

@@ -268,7 +268,7 @@
     <string name="title_sub_update">সাবস্ক্রিপশন আপডেট</string>
     <string name="title_ping_all_server">সব কনফিগারেশন TCPing</string>
     <string name="title_real_ping_all_server">সব কনফিগারেশন প্রকৃত বিলম্ব</string>
-    <string name="title_user_asset_setting">জিও অ্যাসেট ফাইলগুলি</string>
+    <string name="title_user_asset_setting">Asset files</string>
     <string name="title_sort_by_test_results">টেস্ট ফলাফল দ্বারা সাজানো</string>
     <string name="title_filter_config">কনফিগারেশন ফাইল ফিল্টার করুন</string>
     <string name="filter_config_all">সব সাবস্ক্রিপশন গ্রুপ</string>

V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml

@@ -268,7 +268,7 @@
     <string name="title_sub_update">ورۊ کردن اشتراک جرگه سکویی</string>
     <string name="title_ping_all_server">Tcping کانفیگا جرگه سکویی</string>
     <string name="title_real_ping_all_server">تئخیر واقعی کانفیگا جرگه سکویی</string>
-    <string name="title_user_asset_setting">فایلا دارایی جوقرافیایی</string>
+    <string name="title_user_asset_setting">Asset files</string>
     <string name="title_sort_by_test_results">ترتیب و ری نتیجیل آزمایش</string>
     <string name="title_filter_config">فیلتر کردن کانفیگا</string>
     <string name="filter_config_all">پوی جرگیل</string>

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

@@ -265,7 +265,7 @@
     <string name="title_sub_update">به‌روزرسانی گروه فعلی اشتراک</string>
     <string name="title_ping_all_server">TCPING کانفیگ های گروه فعلی</string>
     <string name="title_real_ping_all_server">تاخیر واقعی کانفیگ های گروه فعلی</string>
-    <string name="title_user_asset_setting">فایل ‌های دارایی جغرافیا</string>
+    <string name="title_user_asset_setting">Asset files</string>
     <string name="title_sort_by_test_results">مرتب‌ سازی بر اساس نتایج آزمایش</string>
     <string name="title_filter_config">فیلتر کردن کانفیگ‌ها</string>
     <string name="filter_config_all">همه گروه‌های اشتراک</string>

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

@@ -267,7 +267,7 @@
     <string name="title_sub_update">Обновить подписку группы</string>
     <string name="title_ping_all_server">Проверка профилей группы</string>
     <string name="title_real_ping_all_server">Время отклика профилей группы</string>
-    <string name="title_user_asset_setting">Файлы георесурсов</string>
+    <string name="title_user_asset_setting">Asset files</string>
     <string name="title_sort_by_test_results">Сортировка по результатам теста</string>
     <string name="title_filter_config">Фильтр групп</string>
     <string name="filter_config_all">Все группы</string>

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

@@ -268,7 +268,7 @@
     <string name="title_sub_update">Cập nhật các gói đăng ký</string>
     <string name="title_ping_all_server">Ping tất cả máy chủ</string>
     <string name="title_real_ping_all_server">Kiểm tra HTTP tất cả máy chủ</string>
-    <string name="title_user_asset_setting">Tệp Geo Asset</string>
+    <string name="title_user_asset_setting">Asset files</string>
     <string name="title_sort_by_test_results">Sắp xếp lại theo lần kiểm tra cuối cùng</string>
     <string name="title_filter_config">Lọc cấu hình theo các gói đăng ký</string>
     <string name="filter_config_all">Hiển thị tất cả các gói đăng ký</string>

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

@@ -265,7 +265,7 @@
     <string name="title_sub_update">更新当前组订阅</string>
     <string name="title_ping_all_server">测试当前组配置 Tcping</string>
     <string name="title_real_ping_all_server">测试当前组配置真连接</string>
-    <string name="title_user_asset_setting">Geo 资源文件</string>
+    <string name="title_user_asset_setting">资源文件</string>
     <string name="title_sort_by_test_results">按测试结果排序</string>
     <string name="title_filter_config">过滤配置文件</string>
     <string name="filter_config_all">所有分组</string>

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

@@ -266,7 +266,7 @@
     <string name="title_sub_update">更新目前群組訂閱</string>
     <string name="title_ping_all_server">偵測目前群組設定 Tcping</string>
     <string name="title_real_ping_all_server">偵測目前群組設定真延遲</string>
-    <string name="title_user_asset_setting">Geo 資源檔案</string>
+    <string name="title_user_asset_setting">資源檔案</string>
     <string name="title_sort_by_test_results">依偵測結果排序</string>
     <string name="title_filter_config">過濾設定</string>
     <string name="filter_config_all">所有分組</string>

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

@@ -269,7 +269,7 @@
     <string name="title_sub_update">Update current group subscription</string>
     <string name="title_ping_all_server">Tcping current group configuration</string>
     <string name="title_real_ping_all_server">Real delay current group configuration</string>
-    <string name="title_user_asset_setting">Geo asset files</string>
+    <string name="title_user_asset_setting">Asset files</string>
     <string name="title_sort_by_test_results">Sorting by test results</string>
     <string name="title_filter_config">Filter configuration file</string>
     <string name="filter_config_all">All groups</string>