From ec5f7245bf6816367bb19855c486677f3aa09201 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:20:21 +0800 Subject: [PATCH 1/6] up 1.8.7 --- V2rayNG/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/V2rayNG/app/build.gradle b/V2rayNG/app/build.gradle index 92e03a81..8fb4a59c 100644 --- a/V2rayNG/app/build.gradle +++ b/V2rayNG/app/build.gradle @@ -17,8 +17,8 @@ android { minSdkVersion 21 targetSdkVersion Integer.parseInt("$targetSdkVer") multiDexEnabled true - versionCode 518 - versionName "1.8.6" + versionCode 521 + versionName "1.8.7" } buildTypes { From 2341eceb65295be4eb8c5f66dd0b6b92979c96de Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:32:57 +0800 Subject: [PATCH 2/6] up 1.8.8 --- V2rayNG/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/V2rayNG/app/build.gradle b/V2rayNG/app/build.gradle index 8fb4a59c..8d301195 100644 --- a/V2rayNG/app/build.gradle +++ b/V2rayNG/app/build.gradle @@ -17,8 +17,8 @@ android { minSdkVersion 21 targetSdkVersion Integer.parseInt("$targetSdkVer") multiDexEnabled true - versionCode 521 - versionName "1.8.7" + versionCode 522 + versionName "1.8.8" } buildTypes { From 0672af98f8cfff74b321a6b403ed95b358770ac5 Mon Sep 17 00:00:00 2001 From: ibrahem Qasim Date: Thu, 28 Sep 2023 00:23:40 +0300 Subject: [PATCH 3/6] Update strings.xml --- V2rayNG/app/src/main/res/values-ar/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/V2rayNG/app/src/main/res/values-ar/strings.xml b/V2rayNG/app/src/main/res/values-ar/strings.xml index 427e5b4d..19483991 100644 --- a/V2rayNG/app/src/main/res/values-ar/strings.xml +++ b/V2rayNG/app/src/main/res/values-ar/strings.xml @@ -147,19 +147,19 @@ نسخ مسح إعادة تشغيل الخدمة - حذف كل التكوين - حذف التكوين المكرر - حذف التكوين غير الصالح (اختبر أولا) + حذف الكل (قبل أول خطوة) + حذف المكررات (2) + حذف العناوين العاطلة (بعد الاختبار؛ 4) تصدير التكوينات غير المخصصة إلى الحافظة إعدادات مجموعة الاشتراك ملاحظات URL اختياري تمكين التحديث - تحديث الاشتراك + تحديث الاشتراك (1) Tcping كل التكوين - تأخير الحقيقي لكل التكوين + اختبر كل العناوين (3) ملفات الأصول الجغرافية - الترتيب بناءً على نتائج الاختبار + ترتيب العناوين حسب نتائج الاختبار (5) تصفية ملف التكوين جميع مجموعات الاشتراك حذف %d من التكوينات المكررة From bed0fd00bd79dac3a960b53c2c8e810fc5ce0b9b Mon Sep 17 00:00:00 2001 From: ibrahem Qasim Date: Thu, 28 Sep 2023 00:32:18 +0300 Subject: [PATCH 4/6] Update strings.xml update arabic string --- V2rayNG/app/src/main/res/values-ar/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/V2rayNG/app/src/main/res/values-ar/strings.xml b/V2rayNG/app/src/main/res/values-ar/strings.xml index 427e5b4d..db8f3451 100644 --- a/V2rayNG/app/src/main/res/values-ar/strings.xml +++ b/V2rayNG/app/src/main/res/values-ar/strings.xml @@ -192,9 +192,9 @@ تصدير إلى الحافظة - URL الوكيل أو IP - URL المباشر أو IP - URL المحظور أو IP + مسار وكيل أو IP + مسار مباشر أو IP + مسار محظور أو IP وكيل عالمي From 52416dd43de0af0dcdb0d48d04ae5394c5e5f0fe Mon Sep 17 00:00:00 2001 From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Date: Fri, 29 Sep 2023 19:59:06 -0400 Subject: [PATCH 5/6] Unified base activity for status bar icon color --- .../src/main/kotlin/com/v2ray/ang/ui/BaseActivity.kt | 12 ++++++++++++ .../main/kotlin/com/v2ray/ang/ui/LogcatActivity.kt | 7 +++---- .../src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt | 6 ------ .../kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt | 2 -- .../com/v2ray/ang/ui/RoutingSettingsActivity.kt | 1 - .../main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt | 10 ---------- .../main/kotlin/com/v2ray/ang/ui/ServerActivity.kt | 1 - .../com/v2ray/ang/ui/ServerCustomConfigActivity.kt | 1 - .../main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt | 2 -- .../main/kotlin/com/v2ray/ang/ui/SubEditActivity.kt | 1 - .../kotlin/com/v2ray/ang/ui/SubSettingActivity.kt | 2 -- .../kotlin/com/v2ray/ang/ui/UserAssetActivity.kt | 1 - 12 files changed, 15 insertions(+), 31 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseActivity.kt index 65a211f4..d079eb2f 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseActivity.kt @@ -2,13 +2,25 @@ package com.v2ray.ang.ui import android.content.Context import android.os.Build +import android.os.Bundle import android.view.MenuItem import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.WindowCompat import com.v2ray.ang.util.MyContextWrapper import com.v2ray.ang.util.Utils abstract class BaseActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + supportActionBar?.setDisplayHomeAsUpEnabled(true) + if (!Utils.getDarkModeStatus(this)) { + WindowCompat.getInsetsController(window, window.decorView).apply { + isAppearanceLightStatusBars = true + } + } + } + override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) { android.R.id.home -> { onBackPressed() diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/LogcatActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/LogcatActivity.kt index 08d76490..06bc3e90 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/LogcatActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/LogcatActivity.kt @@ -25,13 +25,12 @@ class LogcatActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - binding = ActivityLogcatBinding.inflate(layoutInflater) - val view = binding.root - setContentView(view) + binding = ActivityLogcatBinding.inflate(layoutInflater) + val view = binding.root + setContentView(view) title = getString(R.string.title_logcat) - supportActionBar?.setDisplayHomeAsUpEnabled(true) logcat(false) } diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt index adb6c50b..4151a3e1 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt @@ -25,7 +25,6 @@ import android.widget.Toast import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels import androidx.appcompat.app.AlertDialog -import androidx.core.view.WindowCompat import androidx.lifecycle.lifecycleScope import com.tencent.mmkv.MMKV import com.v2ray.ang.AppConfig.ANG_PACKAGE @@ -66,11 +65,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList setContentView(view) title = getString(R.string.title_server) setSupportActionBar(binding.toolbar) - if (!Utils.getDarkModeStatus(this)) { - WindowCompat.getInsetsController(window, window.decorView).apply { - isAppearanceLightStatusBars = true - } - } binding.fab.setOnClickListener { if (mainViewModel.isRunning.value == true) { diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt index eabed93d..d6b217e4 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt @@ -41,8 +41,6 @@ class PerAppProxyActivity : BaseActivity() { val view = binding.root setContentView(view) - supportActionBar?.setDisplayHomeAsUpEnabled(true) - val dividerItemDecoration = DividerItemDecoration(this, LinearLayoutManager.VERTICAL) binding.recyclerView.addItemDecoration(dividerItemDecoration) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsActivity.kt index 030e80ff..194c397e 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsActivity.kt @@ -21,7 +21,6 @@ class RoutingSettingsActivity : BaseActivity() { setContentView(view) title = getString(R.string.title_pref_routing_custom) - supportActionBar?.setDisplayHomeAsUpEnabled(true) val fragments = ArrayList() fragments.add(RoutingSettingsFragment().newInstance(AppConfig.PREF_V2RAY_ROUTING_AGENT)) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt index 33b7f685..086c39f2 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt @@ -31,16 +31,6 @@ class ScannerActivity : BaseActivity(){ if (settingsStorage?.decodeBool(AppConfig.PREF_START_SCAN_IMMEDIATE) == true) { launchScan() } - - supportActionBar?.setDisplayHomeAsUpEnabled(true) - } - - public override fun onResume() { - super.onResume() - } - - public override fun onPause() { - super.onPause() } private fun launchScan(){ diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt index 6ab4f3e1..2a8f03be 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt @@ -175,7 +175,6 @@ class ServerActivity : BaseActivity() { } else { clearServer() } - supportActionBar?.setDisplayHomeAsUpEnabled(true) } /** diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt index fabdccae..4cef6eda 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt @@ -49,7 +49,6 @@ class ServerCustomConfigActivity : BaseActivity() { } else { clearServer() } - supportActionBar?.setDisplayHomeAsUpEnabled(true) } /** diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt index 5284cc64..06569046 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt @@ -20,8 +20,6 @@ class SettingsActivity : BaseActivity() { title = getString(R.string.title_settings) - supportActionBar?.setDisplayHomeAsUpEnabled(true) - settingsViewModel.startListenPreferenceChange() } 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 5a5a8d44..124db66b 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 @@ -36,7 +36,6 @@ class SubEditActivity : BaseActivity() { } else { clearServer() } - supportActionBar?.setDisplayHomeAsUpEnabled(true) } /** diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubSettingActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubSettingActivity.kt index 853a3878..469af3be 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubSettingActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubSettingActivity.kt @@ -27,8 +27,6 @@ class SubSettingActivity : BaseActivity() { binding.recyclerView.setHasFixedSize(true) binding.recyclerView.layoutManager = LinearLayoutManager(this) binding.recyclerView.adapter = adapter - - supportActionBar?.setDisplayHomeAsUpEnabled(true) } override fun onResume() { diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UserAssetActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UserAssetActivity.kt index 7c1e3c18..edc4e10e 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UserAssetActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UserAssetActivity.kt @@ -49,7 +49,6 @@ class UserAssetActivity : BaseActivity() { val view = binding.root setContentView(view) title = getString(R.string.title_user_asset_setting) - supportActionBar?.setDisplayHomeAsUpEnabled(true) binding.recyclerView.setHasFixedSize(true) binding.recyclerView.layoutManager = LinearLayoutManager(this) From bde37e38a784ae6630b150d182f1d12ca44e24b1 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Sat, 30 Sep 2023 16:29:37 +0800 Subject: [PATCH 6/6] up 1.8.9 --- V2rayNG/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/V2rayNG/app/build.gradle b/V2rayNG/app/build.gradle index 8d301195..6243219a 100644 --- a/V2rayNG/app/build.gradle +++ b/V2rayNG/app/build.gradle @@ -17,8 +17,8 @@ android { minSdkVersion 21 targetSdkVersion Integer.parseInt("$targetSdkVer") multiDexEnabled true - versionCode 522 - versionName "1.8.8" + versionCode 523 + versionName "1.8.9" } buildTypes {