diff --git a/V2rayNG/app/build.gradle b/V2rayNG/app/build.gradle index 8c6e0934..92e03a81 100644 --- a/V2rayNG/app/build.gradle +++ b/V2rayNG/app/build.gradle @@ -8,8 +8,8 @@ android { buildToolsVersion "$buildToolsVer" compileOptions { - targetCompatibility = "8" - sourceCompatibility = "8" + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } defaultConfig { @@ -17,8 +17,8 @@ android { minSdkVersion 21 targetSdkVersion Integer.parseInt("$targetSdkVer") multiDexEnabled true - versionCode 516 - versionName "1.8.5" + versionCode 518 + versionName "1.8.6" } buildTypes { @@ -36,20 +36,20 @@ android { } } - flavorDimensions "versions" - - productFlavors { - dev { - applicationIdSuffix = ".dev" - versionNameSuffix = "-dev" - } - pre_release { - applicationIdSuffix = ".pre" - versionNameSuffix = "-pre-release" - } - prod { - } - } +// flavorDimensions "versions" +// +// productFlavors { +// dev { +// applicationIdSuffix = ".dev" +// versionNameSuffix = "-dev" +// } +// pre_release { +// applicationIdSuffix = ".pre" +// versionNameSuffix = "-pre-release" +// } +// prod { +// } +// } sourceSets { main { @@ -101,16 +101,16 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.8.0' + implementation 'com.google.android.material:material:1.9.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.preference:preference-ktx:1.2.0' implementation 'androidx.recyclerview:recyclerview:1.3.0' - implementation 'androidx.fragment:fragment-ktx:1.5.6' + implementation 'androidx.fragment:fragment-ktx:1.5.7' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01' // Androidx ktx - implementation 'androidx.activity:activity-ktx:1.7.0' + implementation 'androidx.activity:activity-ktx:1.7.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' @@ -127,9 +127,9 @@ dependencies { implementation 'com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar' implementation 'com.github.jorgecastilloprz:fabprogresscircle:1.01@aar' implementation 'me.drakeet.support:toastcompat:1.1.0' - implementation 'com.blacksquircle.ui:editorkit:2.1.1' - implementation 'com.blacksquircle.ui:language-base:2.1.1' - implementation 'com.blacksquircle.ui:language-json:2.1.1' + implementation 'com.blacksquircle.ui:editorkit:2.8.0' + implementation 'com.blacksquircle.ui:language-base:2.8.0' + implementation 'com.blacksquircle.ui:language-json:2.8.0' implementation 'io.github.g00fy2.quickie:quickie-bundled:1.6.0' implementation 'com.google.zxing:core:3.5.1' } \ No newline at end of file diff --git a/V2rayNG/app/src/main/AndroidManifest.xml b/V2rayNG/app/src/main/AndroidManifest.xml index daa511a3..b2d5aede 100644 --- a/V2rayNG/app/src/main/AndroidManifest.xml +++ b/V2rayNG/app/src/main/AndroidManifest.xml @@ -9,6 +9,8 @@ android:largeScreens="true" android:xlargeScreens="true"/> + + diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt index 826bf24f..42856ecf 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt @@ -38,12 +38,18 @@ class WidgetProvider : AppWidgetProvider() { }) remoteViews.setOnClickPendingIntent(R.id.layout_switch, pendingIntent) if (isRunning) { + if (!Utils.getDarkModeStatus(context)) { + remoteViews.setInt(R.id.image_switch, "setImageResource", R.drawable.ic_stat_name) + } remoteViews.setInt( R.id.layout_switch, "setBackgroundResource", - R.drawable.ic_rounded_corner_theme + R.drawable.ic_rounded_corner_active ) } else { + if (!Utils.getDarkModeStatus(context)) { + remoteViews.setInt(R.id.image_switch, "setImageResource", R.drawable.ic_stat_name_black) + } remoteViews.setInt( R.id.layout_switch, "setBackgroundResource", 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 7160055c..adb6c50b 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,6 +25,7 @@ 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 @@ -65,6 +66,11 @@ 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) { @@ -131,11 +137,17 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList mainViewModel.isRunning.observe(this) { isRunning -> adapter.isRunning = isRunning if (isRunning) { - binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.colorSelected)) + if (!Utils.getDarkModeStatus(this)) { + binding.fab.setImageResource(R.drawable.ic_stat_name) + } + binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_orange)) setTestState(getString(R.string.connection_connected)) binding.layoutTest.isFocusable = true } else { - binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.colorUnselected)) + if (!Utils.getDarkModeStatus(this)) { + binding.fab.setImageResource(R.drawable.ic_stat_name) + } + binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_grey)) setTestState(getString(R.string.connection_not_connected)) binding.layoutTest.isFocusable = false } 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 c8138915..fabdccae 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 @@ -6,6 +6,7 @@ import android.view.Menu import android.view.MenuItem import android.widget.Toast import androidx.appcompat.app.AlertDialog +import com.blacksquircle.ui.editorkit.utils.EditorTheme import com.blacksquircle.ui.language.json.JsonLanguage import com.google.gson.* import com.tencent.mmkv.MMKV @@ -38,6 +39,9 @@ class ServerCustomConfigActivity : BaseActivity() { setContentView(view) title = getString(R.string.title_server) + if (!Utils.getDarkModeStatus(this)) { + binding.editor.colorScheme = EditorTheme.INTELLIJ_LIGHT + } binding.editor.language = JsonLanguage() val config = MmkvManager.decodeServerConfig(editGuid) if (config != null) { diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt index 69a92210..33aa5933 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt @@ -9,7 +9,7 @@ import android.content.ClipData import android.content.Intent import android.content.pm.PackageManager import android.content.res.Configuration.UI_MODE_NIGHT_MASK -import android.content.res.Configuration.UI_MODE_NIGHT_YES +import android.content.res.Configuration.UI_MODE_NIGHT_NO import android.net.Uri import android.os.Build import android.os.LocaleList @@ -178,7 +178,7 @@ object Utils { //CIDR if (addr.indexOf("/") > 0) { val arr = addr.split("/") - if (arr.count() == 2 && Integer.parseInt(arr[1]) > 0) { + if (arr.count() == 2 && Integer.parseInt(arr[1]) > -1) { addr = arr[0] } } @@ -356,7 +356,7 @@ object Utils { fun getDarkModeStatus(context: Context): Boolean { val mode = context.resources.configuration.uiMode and UI_MODE_NIGHT_MASK - return mode == UI_MODE_NIGHT_YES + return mode != UI_MODE_NIGHT_NO } fun getIpv6Address(address: String): String { diff --git a/V2rayNG/app/src/main/res/drawable-hdpi/ic_stat_name_black.png b/V2rayNG/app/src/main/res/drawable-hdpi/ic_stat_name_black.png new file mode 100644 index 00000000..5361ddf6 Binary files /dev/null and b/V2rayNG/app/src/main/res/drawable-hdpi/ic_stat_name_black.png differ diff --git a/V2rayNG/app/src/main/res/drawable-hdpi/ic_stat_name_grey.png b/V2rayNG/app/src/main/res/drawable-hdpi/ic_stat_name_grey.png new file mode 100644 index 00000000..79dc8154 Binary files /dev/null and b/V2rayNG/app/src/main/res/drawable-hdpi/ic_stat_name_grey.png differ diff --git a/V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_black.png b/V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_black.png new file mode 100644 index 00000000..01dc4ef9 Binary files /dev/null and b/V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_black.png differ diff --git a/V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_grey.png b/V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_grey.png new file mode 100644 index 00000000..43703233 Binary files /dev/null and b/V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_grey.png differ diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_action_done.xml b/V2rayNG/app/src/main/res/drawable-night/ic_action_done.xml new file mode 100644 index 00000000..33a117f6 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable-night/ic_action_done.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_add_white_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_add_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_add_white_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_add_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_attach_money_white_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_attach_money_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_attach_money_white_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_attach_money_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_cloud_download_white_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_cloud_download_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_cloud_download_white_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_cloud_download_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_copy_white.xml b/V2rayNG/app/src/main/res/drawable-night/ic_copy.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_copy_white.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_copy.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_delete_white_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_delete_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_delete_white_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_delete_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_description_white_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_description_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_description_white_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_description_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_edit_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_edit_24dp.xml new file mode 100644 index 00000000..35a774a5 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable-night/ic_edit_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_fab_check.xml b/V2rayNG/app/src/main/res/drawable-night/ic_fab_check.xml new file mode 100644 index 00000000..54f825f8 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable-night/ic_fab_check.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_feedback_white_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_feedback_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_feedback_white_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_feedback_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_file_white_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_file_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_file_white_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_file_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_image_photo.xml b/V2rayNG/app/src/main/res/drawable-night/ic_image_photo.xml new file mode 100644 index 00000000..c701a63f --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable-night/ic_image_photo.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_info_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_info_24dp.xml new file mode 100644 index 00000000..f7b49e8e --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable-night/ic_info_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_logcat_white_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_logcat_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_logcat_white_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_logcat_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_white_24.xml b/V2rayNG/app/src/main/res/drawable-night/ic_outline_filter_alt_24.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_white_24.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_outline_filter_alt_24.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_switch_black_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_qu_switch_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_qu_switch_black_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_qu_switch_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_save_white_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_save_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_save_white_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_save_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_scan_black_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_scan_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_scan_black_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_scan_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_select_all_white_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_select_all_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_select_all_white_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_select_all_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_settings_white_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_settings_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_settings_white_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_settings_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_share_white_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_share_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_share_white_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_share_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_subscriptions_white_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_subscriptions_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_subscriptions_white_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_subscriptions_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_whatshot_white_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_whatshot_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_whatshot_white_24dp.xml rename to V2rayNG/app/src/main/res/drawable-night/ic_whatshot_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable-night/nav_header_bg.png b/V2rayNG/app/src/main/res/drawable-night/nav_header_bg.png new file mode 100644 index 00000000..82cb00af Binary files /dev/null and b/V2rayNG/app/src/main/res/drawable-night/nav_header_bg.png differ diff --git a/V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_black.png b/V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_black.png new file mode 100644 index 00000000..00207a53 Binary files /dev/null and b/V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_black.png differ diff --git a/V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_grey.png b/V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_grey.png new file mode 100644 index 00000000..def2c8a7 Binary files /dev/null and b/V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_grey.png differ diff --git a/V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_black.png b/V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_black.png new file mode 100644 index 00000000..516f0893 Binary files /dev/null and b/V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_black.png differ diff --git a/V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_grey.png b/V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_grey.png new file mode 100644 index 00000000..01f688ab Binary files /dev/null and b/V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_grey.png differ diff --git a/V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_black.png b/V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_black.png new file mode 100644 index 00000000..a18be25c Binary files /dev/null and b/V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_black.png differ diff --git a/V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_grey.png b/V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_grey.png new file mode 100644 index 00000000..b1478e07 Binary files /dev/null and b/V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_grey.png differ diff --git a/V2rayNG/app/src/main/res/drawable/ic_action_done.xml b/V2rayNG/app/src/main/res/drawable/ic_action_done.xml index 33a117f6..5635bead 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_action_done.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_action_done.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/V2rayNG/app/src/main/res/drawable/ic_add_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_add_24dp.xml new file mode 100644 index 00000000..0258249c --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_add_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_attach_money_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_attach_money_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_attach_money_black_24dp.xml rename to V2rayNG/app/src/main/res/drawable/ic_attach_money_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_cloud_download_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_cloud_download_24dp.xml new file mode 100644 index 00000000..aebcd40a --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_cloud_download_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_copy.xml b/V2rayNG/app/src/main/res/drawable/ic_copy.xml new file mode 100644 index 00000000..8a894a3b --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_copy.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_delete_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_delete_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_delete_black_24dp.xml rename to V2rayNG/app/src/main/res/drawable/ic_delete_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_description_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_description_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_description_black_24dp.xml rename to V2rayNG/app/src/main/res/drawable/ic_description_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_edit_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_edit_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_edit_black_24dp.xml rename to V2rayNG/app/src/main/res/drawable/ic_edit_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_fab_check.xml b/V2rayNG/app/src/main/res/drawable/ic_fab_check.xml index 54f825f8..6c1b1677 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_fab_check.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_fab_check.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/V2rayNG/app/src/main/res/drawable/ic_feedback_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_feedback_24dp.xml new file mode 100644 index 00000000..29f9baab --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_feedback_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_file_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_file_24dp.xml new file mode 100644 index 00000000..7fcdda2d --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_file_24dp.xml @@ -0,0 +1,34 @@ + + + + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_image_photo.xml b/V2rayNG/app/src/main/res/drawable/ic_image_photo.xml index c701a63f..913d9d8b 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_image_photo.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_image_photo.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/V2rayNG/app/src/main/res/drawable/ic_info_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_info_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_info_black_24dp.xml rename to V2rayNG/app/src/main/res/drawable/ic_info_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_logcat_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_logcat_24dp.xml new file mode 100644 index 00000000..a07a0f90 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_logcat_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_24.xml b/V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_24.xml new file mode 100644 index 00000000..d574422c --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_scan_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_qu_scan_24dp.xml new file mode 100644 index 00000000..ae86efb1 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_qu_scan_24dp.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_settings_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_qu_settings_24dp.xml similarity index 99% rename from V2rayNG/app/src/main/res/drawable/ic_qu_settings_black_24dp.xml rename to V2rayNG/app/src/main/res/drawable/ic_qu_settings_24dp.xml index 063171a3..d8b29fc4 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_qu_settings_black_24dp.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_qu_settings_24dp.xml @@ -4,10 +4,10 @@ android:viewportHeight="1024" android:viewportWidth="1024"> diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml new file mode 100644 index 00000000..73d5e641 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_theme.xml b/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml similarity index 82% rename from V2rayNG/app/src/main/res/drawable/ic_rounded_corner_theme.xml rename to V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml index 0463d8bf..e486ba48 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_theme.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_grey.xml b/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_grey.xml index 50af166d..066b5720 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_grey.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_grey.xml @@ -1,6 +1,6 @@ - + diff --git a/V2rayNG/app/src/main/res/drawable/ic_save_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_save_24dp.xml new file mode 100644 index 00000000..a561d632 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_save_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_scan_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_scan_24dp.xml similarity index 86% rename from V2rayNG/app/src/main/res/drawable/ic_qu_scan_black_24dp.xml rename to V2rayNG/app/src/main/res/drawable/ic_scan_24dp.xml index e0b32bf4..5068d6e5 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_qu_scan_black_24dp.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_scan_24dp.xml @@ -5,14 +5,14 @@ android:viewportHeight="48"> diff --git a/V2rayNG/app/src/main/res/drawable/ic_select_all_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_select_all_24dp.xml new file mode 100644 index 00000000..966290fb --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_select_all_24dp.xml @@ -0,0 +1,10 @@ + + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_settings_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_settings_24dp.xml new file mode 100644 index 00000000..ace746c4 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_settings_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_share_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_share_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_share_black_24dp.xml rename to V2rayNG/app/src/main/res/drawable/ic_share_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml b/V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml index a62b720b..1ce21f0a 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/drawable/ic_subscriptions_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_subscriptions_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_subscriptions_black_24dp.xml rename to V2rayNG/app/src/main/res/drawable/ic_subscriptions_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_whatshot_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_whatshot_24dp.xml similarity index 100% rename from V2rayNG/app/src/main/res/drawable/ic_whatshot_black_24dp.xml rename to V2rayNG/app/src/main/res/drawable/ic_whatshot_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/nav_header_bg.png b/V2rayNG/app/src/main/res/drawable/nav_header_bg.png index 82cb00af..fd79d42d 100644 Binary files a/V2rayNG/app/src/main/res/drawable/nav_header_bg.png and b/V2rayNG/app/src/main/res/drawable/nav_header_bg.png differ diff --git a/V2rayNG/app/src/main/res/font/montserrat_thin.ttf b/V2rayNG/app/src/main/res/font/montserrat_thin.ttf new file mode 100644 index 00000000..4c5c8f7e Binary files /dev/null and b/V2rayNG/app/src/main/res/font/montserrat_thin.ttf differ diff --git a/V2rayNG/app/src/main/res/layout/activity_logcat.xml b/V2rayNG/app/src/main/res/layout/activity_logcat.xml index 06916be1..954fa77a 100644 --- a/V2rayNG/app/src/main/res/layout/activity_logcat.xml +++ b/V2rayNG/app/src/main/res/layout/activity_logcat.xml @@ -3,7 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="10dp" + android:paddingStart="10dp" + android:paddingEnd="10dp" tools:context=".ui.MainActivity"> + android:layout_height="wrap_content"> + android:textColor="@color/colorText" /> @@ -106,6 +105,7 @@ android:layout_height="match_parent" android:layout_gravity="start" app:headerLayout="@layout/nav_header" + app:itemIconTint="@color/colorAccent" app:menu="@menu/menu_drawer" > + android:textColor="@color/color_secondary" /> + android:textColor="@color/color_secondary" /> diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml b/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml index 268f7690..45f9cd94 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:text="@string/summary_pref_promotion" android:textAppearance="@style/TextAppearance.AppCompat.Tooltip" - android:textColor="@color/fab_orange_dark" /> + android:textColor="@color/color_secondary" /> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml index acae822a..2dc83fb9 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml @@ -19,7 +19,8 @@ android:clickable="true" android:focusable="true" android:nextFocusRight="@+id/layout_share" - android:background="?android:attr/selectableItemBackground" + android:background="@color/colorPrimary" + android:foreground="?android:attr/selectableItemBackground" android:layout_width="match_parent" android:layout_height="@dimen/server_height" android:layout_gravity="center" @@ -28,7 +29,7 @@ @@ -38,7 +39,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" - android:paddingStart="5dp"> + android:paddingStart="9dp"> @@ -121,7 +122,7 @@ @@ -140,7 +141,7 @@ @@ -159,7 +160,7 @@ @@ -178,7 +179,7 @@ android:layout_height="wrap_content" android:lines="1" android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:textColor="@color/fab_orange_dark" + android:textColor="@color/color_fab_orange" android:textSize="10sp" /> diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml b/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml index 568a4e82..d51f47db 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml @@ -18,7 +18,8 @@ android:id="@+id/info_container" android:clickable="true" android:focusable="true" - android:background="?android:attr/selectableItemBackground" + android:background="@color/colorPrimary" + android:foreground="?android:attr/selectableItemBackground" android:nextFocusRight="@+id/layout_edit" android:layout_width="match_parent" android:layout_height="@dimen/server_height" @@ -28,7 +29,7 @@ @@ -37,7 +38,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:paddingStart="5dp" + android:paddingStart="9dp" android:orientation="vertical"> @@ -98,7 +99,7 @@ diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml b/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml index 54651771..7121c5fe 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml @@ -16,6 +16,8 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center" + android:background="@color/colorPrimary" + android:foreground="?android:attr/selectableItemBackground" android:padding="@dimen/nav_header_vertical_spacing"> diff --git a/V2rayNG/app/src/main/res/layout/nav_header.xml b/V2rayNG/app/src/main/res/layout/nav_header.xml index 2f5d3ed6..92f790ed 100644 --- a/V2rayNG/app/src/main/res/layout/nav_header.xml +++ b/V2rayNG/app/src/main/res/layout/nav_header.xml @@ -14,12 +14,13 @@ + android:textAppearance="@style/TextAppearance.AppCompat.Display1" + android:textColor="@color/colorText" /> diff --git a/V2rayNG/app/src/main/res/layout/nav_toolbar.xml b/V2rayNG/app/src/main/res/layout/nav_toolbar.xml deleted file mode 100644 index 262787df..00000000 --- a/V2rayNG/app/src/main/res/layout/nav_toolbar.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/layout/nav_view.xml b/V2rayNG/app/src/main/res/layout/nav_view.xml deleted file mode 100644 index 34fd03a3..00000000 --- a/V2rayNG/app/src/main/res/layout/nav_view.xml +++ /dev/null @@ -1,9 +0,0 @@ - - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/layout/widget_switch.xml b/V2rayNG/app/src/main/res/layout/widget_switch.xml index 81d26fa6..84d65952 100644 --- a/V2rayNG/app/src/main/res/layout/widget_switch.xml +++ b/V2rayNG/app/src/main/res/layout/widget_switch.xml @@ -8,6 +8,7 @@ android:orientation="vertical"> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/menu/menu_bypass_list.xml b/V2rayNG/app/src/main/res/menu/menu_bypass_list.xml index a7824754..32400e98 100644 --- a/V2rayNG/app/src/main/res/menu/menu_bypass_list.xml +++ b/V2rayNG/app/src/main/res/menu/menu_bypass_list.xml @@ -3,31 +3,31 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/V2rayNG/app/src/main/res/menu/menu_drawer.xml b/V2rayNG/app/src/main/res/menu/menu_drawer.xml index 42b81633..7a7efbf7 100644 --- a/V2rayNG/app/src/main/res/menu/menu_drawer.xml +++ b/V2rayNG/app/src/main/res/menu/menu_drawer.xml @@ -7,30 +7,30 @@ android:id="@+id/group_main"> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/menu/menu_main.xml b/V2rayNG/app/src/main/res/menu/menu_main.xml index 14ea10e8..b771b294 100644 --- a/V2rayNG/app/src/main/res/menu/menu_main.xml +++ b/V2rayNG/app/src/main/res/menu/menu_main.xml @@ -2,7 +2,7 @@ @@ -61,7 +61,7 @@ diff --git a/V2rayNG/app/src/main/res/menu/menu_scanner.xml b/V2rayNG/app/src/main/res/menu/menu_scanner.xml index 37701804..216ad347 100644 --- a/V2rayNG/app/src/main/res/menu/menu_scanner.xml +++ b/V2rayNG/app/src/main/res/menu/menu_scanner.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> + + v2rayNG + التبديل + التبديل + أول استخدام لهذه الميزة، يرجى استخدام التطبيق لإضافة خادم + افتح درج التنقل + أغلق درج التنقل + نجحت عملية ترحيل البيانات! + فشلت عملية ترحيل البيانات! + + توقف + غير قادر على الحصول على الإذن + اضغط للمزيد + بدء الخدمات + توقف الخدمات + نجح بدء الخدمات + فشل بدء الخدمات + + ملف التكوين + إضافة تكوين + حفظ التكوين + حذف التكوين + استيراد التكوين من QRcode + استيراد التكوين من الحافظة + الكتابة يدويا [Vmess] + الكتابة يدويا [VLESS] + الكتابة يدويا [Shadowsocks] + الكتابة يدويا [Socks] + الكتابة يدويا [Trojan] + تكوين مخصص + استيراد التكوين المخصص من الحافظة + استيراد التكوين المخصص من ملف محلي + استيراد التكوين المخصص من URL + استيراد التكوين المخصص من مسح URL + تأكيد الحذف؟ + ملاحظات + العنوان + المنفذ + المعرف + alterId + الأمان + الشبكة + النقل + نوع الرأس + وضع gRPC + طلب الاستضافة (host/ws host/h2 host)/QUIC security + المسار (ws path/h2 path)/QUIC key/kcp seed/gRPC serviceName + TLS + Fingerprint + Alpn + allowInsecure + SNI + العنوان + المنفذ + كلمة المرور + الأمان + كلمة المرور (اختياري) + المستخدم (اختياري) + التشفير + التدفق + مفتاح عام + ShortId + SpiderX + نجاح + فشل + لا يوجد شيء + بروتوكول غير صحيح + فشل التشفير + اختر ملف التكوين + الرجاء تثبيت مدير الملفات. + تخصيص التكوين + تكوين غير صالح + المحتوى + لا توجد بيانات في الحافظة + URL غير صالح + تأكد من أن منافذ الدخول متسقة مع الإعدادات + تكوين غير صحيح + الاستضافة (SNI) (اختياري) + فشل نسخ الملف، يرجى استخدام مدير الملفات + إضافة ملفات + تحميل الملفات + + جار التحميل + بحث + تحديد الكل + أدخل الكلمات الرئيسية + وضع التجاوز + تحديد التطبيق الوكيل تلقائيا + جار تحميل المحتوى + تصدير إلى الحافظة + استيراد من الحافظة + + الإعدادات + إعدادات متقدمة + إعدادات VPN + وكيل لكل تطبيق + عام: التطبيق المحدد هو الوكيل، الاتصال غير المحدد مباشر؛ \nوضع التجاوز: التطبيق المحدد متصل مباشرة، الوكيل غير المحدد. \nالخيار لتحديد التطبيق الوكيل تلقائيا في القائمة + تمكين Mux + التمكين قد يسرع الشبكة والتبديل بين الشبكات قد يكون فلاش + تمكين عرض السرعة + عرض السرعة الحالية في الإشعار.\nسيتغير رمز الإشعار استنادًا إلى الاستخدام. + تمكين Sniffing + محاولة استخلاص النطاق من الحزمة (الافتراضي هو التشغيل) + تمكين DNS المحلي + DNS يتم معالجتها بواسطة وحدة DNS الأساسية (موصى بها، إذا كانت بحاجة إلى توجيه تجاوز الشبكة المحلية والعنوان الرئيسي) + تمكين DNS الوهمي + DNS المحلي يعود بعنوان IP وهمي (أسرع، ولكن قد لا يعمل لبعض التطبيقات) + تفضيل IPv6 + تفضيل عنوان IPv6 والمسارات + التوجيه + استراتيجية النطاق + قواعد محددة مسبقا + قواعد مخصصة + DNS عن بُعد (اختياري) + DNS + DNS VPN (IPv4/v6 فقط) + DNS المحلي (اختياري) + DNS + السماح بالاتصالات من الشبكة المحلية + يمكن للأجهزة الأخرى الاتصال بالوكيل عبر عنوان IP الخاص بك من خلال socks/http، فقط تمكين في الشبكة الموثوقة لتجنب الاتصال غير المصرح به + السماح بالاتصالات من الشبكة المحلية، تأكد من أنك في شبكة موثوقة + allowInsecure + عند استخدام TLS، الافتراضي هو allowInsecure + منفذ الوكيل SOCKS5 + منفذ الوكيل SOCKS5 + منفذ الوكيل HTTP + منفذ الوكيل HTTP + منفذ DNS المحلي + منفذ DNS المحلي + تأكيد حذف ملف التكوين + هل يتطلب حذف ملف التكوين تأكيدًا ثانيًا من المستخدم + بدء المسح فورا + افتح الكاميرا للمسح فورا عند بدء التشغيل، وإلا يمكنك اختيار المسح الضوئي للرمز أو اختيار صورة في شريط الأدوات + الملاحظات + إرسال ملاحظات عن التحسينات أو الأخطاء إلى GitHub + الانضمام إلى مجموعة Telegram + لم يتم العثور على تطبيق Telegram + ترقية + ترقية، انقر للحصول على التفاصيل (يمكن إزالة التبرع) + مستوى السجل + الوضع + انقر علي للمزيد من المساعدة + اللغة + إعدادات واجهة المستخدم + Logcat + نسخ + مسح + إعادة تشغيل الخدمة + حذف كل التكوين + حذف التكوين المكرر + حذف التكوين غير الصالح (اختبر أولا) + تصدير التكوينات غير المخصصة إلى الحافظة + إعدادات مجموعة الاشتراك + ملاحظات + URL اختياري + تمكين التحديث + تحديث الاشتراك + Tcping كل التكوين + تأخير الحقيقي لكل التكوين + ملفات الأصول الجغرافية + الترتيب بناءً على نتائج الاختبار + تصفية ملف التكوين + جميع مجموعات الاشتراك + حذف %d من التكوينات المكررة + بدء الخدمة + تأكيد + إعدادات التوجيه + مفصولة بفواصل (،)، تذكر الحفظ + حفظ + مسح + مسح واستبدال + مسح وإضافة + تعيين قواعد التوجيه الافتراضية + فحص الاتصال + جارٍ الفحص... + نجاح: استغرق الاتصال HTTP %dms + فشل في اكتشاف الاتصال بالإنترنت: %s + الإنترنت غير متوفر + رمز الخطأ: #%d + متصل، اضغط لفحص الاتصال + غير متصل + تم استيراد الاشتراك بنجاح + فشل استيراد الاشتراك + + QRcode + تصدير إلى الحافظة + تصدير التكوين الكامل إلى الحافظة + + + QRcode + تصدير إلى الحافظة + + + URL الوكيل أو IP + URL المباشر أو IP + URL المحظور أو IP + + + وكيل عالمي + تجاوز عنوان الشبكة المحلية ثم الوكيل + تجاوز عنوان البر الرئيسي ثم الوكيل + تجاوز عنوان الشبكة المحلية والبر الرئيسي ثم الوكيل + مباشر عالمي + + + VPN + الوكيل فقط + + diff --git a/V2rayNG/app/src/main/res/values-night/colors.xml b/V2rayNG/app/src/main/res/values-night/colors.xml index a1beb1c3..536b0884 100644 --- a/V2rayNG/app/src/main/res/values-night/colors.xml +++ b/V2rayNG/app/src/main/res/values-night/colors.xml @@ -1,6 +1,14 @@ - #12976F - #252525 - #CCCCCC + #424242 + #646464 + #BDBDBD + #FFFFFF + #222222 + + #222222 + #000000 + #FFFFFF + #000000 + #FFFFFF diff --git a/V2rayNG/app/src/main/res/values-night/styles.xml b/V2rayNG/app/src/main/res/values-night/styles.xml index 0db2387c..ae6a211e 100644 --- a/V2rayNG/app/src/main/res/values-night/styles.xml +++ b/V2rayNG/app/src/main/res/values-night/styles.xml @@ -2,14 +2,15 @@ \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/values-vi/strings.xml b/V2rayNG/app/src/main/res/values-vi/strings.xml index 1fbd3d1b..65184899 100644 --- a/V2rayNG/app/src/main/res/values-vi/strings.xml +++ b/V2rayNG/app/src/main/res/values-vi/strings.xml @@ -146,8 +146,8 @@ Hiển thị thông báo xác nhận xoá cấu hình Hiển thị thông báo xác nhận xoá cấu hình khi bạn xoá một cấu hình. - Start scanning immediately - Open the camera to scan immediately at startup, otherwise you can choose to scan the code or select a photo in the toolbar + Bắt đầu quét mã QR ngay lập tức + Mở camera để quét QR ngay khi khởi động, nếu không bạn có thể chọn quét mã hoặc chọn ảnh trên thanh công cụ. Phản hồi lỗi Phản hồi cải tiến hoặc lỗi lên GitHub @@ -161,14 +161,14 @@ Chế độ kết nối Nhấn vào đây nếu bạn cần trợ giúp! Ngôn ngữ - UI settings + Cài đặt UI Nhật ký hoạt động Sao chép nhật ký Xoá nhật ký Kết nối lại v2rayNG Xoá tất cả cấu hình - Delete duplicate config + Xoá cấu hình trùng lặp Xoá cấu hình lỗi (Kiểm tra trước) Xuất và sao chép tất cả cấu hình Các gói đăng ký @@ -182,7 +182,7 @@ Sắp xếp lại theo lần kiểm tra cuối cùng Lọc cấu hình theo các gói đăng ký Hiển thị tất cả các gói đăng ký - Delete %d duplicate configurations + Xoá %d cấu hình trùng lặp Bắt đầu v2rayNG Xác nhận @@ -204,6 +204,9 @@ Đã kết nối, hãy nhấn vào đây để kiểm tra kết nối mạng! Chưa kết nối, hãy chọn một cấu hình để kết nối! + Đăng ký đã nhập thành công + Nhập đăng ký không thành công + Xuất ra mã QR (Chụp màn hình để lưu) Sao chép cấu hình này diff --git a/V2rayNG/app/src/main/res/values/arrays.xml b/V2rayNG/app/src/main/res/values/arrays.xml index 387a4349..48fe13f5 100644 --- a/V2rayNG/app/src/main/res/values/arrays.xml +++ b/V2rayNG/app/src/main/res/values/arrays.xml @@ -165,6 +165,7 @@ Tiếng Việt Русский فارسی + عربي @@ -176,5 +177,6 @@ vi ru fa + ar diff --git a/V2rayNG/app/src/main/res/values/colors.xml b/V2rayNG/app/src/main/res/values/colors.xml index f65428fb..bba872d5 100644 --- a/V2rayNG/app/src/main/res/values/colors.xml +++ b/V2rayNG/app/src/main/res/values/colors.xml @@ -2,17 +2,17 @@ #009966 #FF0099 - #247BA0 - #009966 - #999999 - #CFD8DC - #212121 + #f97910 - - - #2B2B2B - #161616 - #D81B60 + #CDCDCD + #9C9C9C + #727272 + #000000 + #FFFFFF + + #FFFFFF + #000000 + #000000 #FFFFFF #000000 diff --git a/V2rayNG/app/src/main/res/values/styles.xml b/V2rayNG/app/src/main/res/values/styles.xml index 20e87b89..b53ee512 100644 --- a/V2rayNG/app/src/main/res/values/styles.xml +++ b/V2rayNG/app/src/main/res/values/styles.xml @@ -1,6 +1,6 @@ - - -