katekate/v2rayNG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/update_sub

Browse Source
This commit is contained in:
Hadi Norouzi
2023-09-12 22:28:15 +03:30
parent 71f2f590a7 ed26120581
commit dbe78d0aa5
101 changed files with 551 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
V2rayNG/app/build.gradle
View File

@@ -8,8 +8,8 @@ android {
buildToolsVersion "$buildToolsVer"
compileOptions {
targetCompatibility = "8"
sourceCompatibility = "8"
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
defaultConfig {
@@ -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'

2
V2rayNG/app/src/main/AndroidManifest.xml
View File

@@ -9,6 +9,8 @@
android:largeScreens="true"
android:xlargeScreens="true"/>
<uses-sdk android:minSdkVersion="21" tools:overrideLibrary="com.blacksquircle.ui.editorkit"/>
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.software.leanback" android:required="false" />

8
V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt
View File

@@ -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",

16
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt
View File

@@ -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
}

4
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
View File

@@ -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) {

6
V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
View File

@@ -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 {

BIN
V2rayNG/app/src/main/res/drawable-hdpi/ic_stat_name_black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 526 B

BIN
V2rayNG/app/src/main/res/drawable-hdpi/ic_stat_name_grey.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 651 B

BIN
V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 386 B

BIN
V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_grey.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 476 B

9
V2rayNG/app/src/main/res/drawable-night/ic_action_done.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
</vector>

0
V2rayNG/app/src/main/res/drawable/ic_add_white_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_add_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_attach_money_white_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_attach_money_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_cloud_download_white_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_cloud_download_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_copy_white.xml → V2rayNG/app/src/main/res/drawable-night/ic_copy.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_delete_white_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_delete_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_description_white_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_description_24dp.xml
View File

9
V2rayNG/app/src/main/res/drawable-night/ic_edit_24dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
</vector>

9
V2rayNG/app/src/main/res/drawable-night/ic_fab_check.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFF"
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
</vector>

0
V2rayNG/app/src/main/res/drawable/ic_feedback_white_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_feedback_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_file_white_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_file_24dp.xml
View File

9
V2rayNG/app/src/main/res/drawable-night/ic_image_photo.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#fff"
android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
</vector>

9
V2rayNG/app/src/main/res/drawable-night/ic_info_24dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,15h-2v-6h2v6zm0,-8h-2V7h2v2z" />
</vector>

0
V2rayNG/app/src/main/res/drawable/ic_logcat_white_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_logcat_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_white_24.xml → V2rayNG/app/src/main/res/drawable-night/ic_outline_filter_alt_24.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_qu_switch_black_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_qu_switch_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_save_white_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_save_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_scan_black_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_scan_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_select_all_white_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_select_all_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_settings_white_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_settings_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_share_white_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_share_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_subscriptions_white_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_subscriptions_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_whatshot_white_24dp.xml → V2rayNG/app/src/main/res/drawable-night/ic_whatshot_24dp.xml
View File

BIN
V2rayNG/app/src/main/res/drawable-night/nav_header_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 679 B

BIN
V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_grey.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 855 B

BIN
V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 984 B

BIN
V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_grey.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_grey.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

2
V2rayNG/app/src/main/res/drawable/ic_action_done.xml
View File

@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:fillColor="#FF000000"
android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
</vector>

9
V2rayNG/app/src/main/res/drawable/ic_add_24dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
</vector>

0
V2rayNG/app/src/main/res/drawable/ic_attach_money_black_24dp.xml → V2rayNG/app/src/main/res/drawable/ic_attach_money_24dp.xml
View File

9
V2rayNG/app/src/main/res/drawable/ic_cloud_download_24dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z" />
</vector>

9
V2rayNG/app/src/main/res/drawable/ic_copy.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
</vector>

0
V2rayNG/app/src/main/res/drawable/ic_delete_black_24dp.xml → V2rayNG/app/src/main/res/drawable/ic_delete_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_description_black_24dp.xml → V2rayNG/app/src/main/res/drawable/ic_description_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_edit_black_24dp.xml → V2rayNG/app/src/main/res/drawable/ic_edit_24dp.xml
View File

2
V2rayNG/app/src/main/res/drawable/ic_fab_check.xml
View File

@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFF"
android:fillColor="#000"
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
</vector>

9
V2rayNG/app/src/main/res/drawable/ic_feedback_24dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM13,14h-2v-2h2v2zM13,10h-2L11,6h2v4z"/>
</vector>

34
V2rayNG/app/src/main/res/drawable/ic_file_24dp.xml Normal file
View File

@@ -0,0 +1,34 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M11,23h8a3,3 0,0 0,3 -3V8L15,1H7A3,3 0,0 0,4 4V9"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#000"
android:strokeLineCap="round"/>
<path
android:pathData="M15,5a3,3 0,0 0,3 3h4L15,1Z"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#000"
android:strokeLineCap="round"/>
<path
android:pathData="M2,17L10,17"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#000"
android:strokeLineCap="round"/>
<path
android:pathData="M6,13L6,21"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#000"
android:strokeLineCap="round"/>
</vector>

2
V2rayNG/app/src/main/res/drawable/ic_image_photo.xml
View File

@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#fff"
android:fillColor="#000"
android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
</vector>

0
V2rayNG/app/src/main/res/drawable/ic_info_black_24dp.xml → V2rayNG/app/src/main/res/drawable/ic_info_24dp.xml
View File

9
V2rayNG/app/src/main/res/drawable/ic_logcat_24dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
</vector>

5
V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_24.xml Normal file
View File

@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M7,6h10l-5.01,6.3L7,6zM4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z"/>
</vector>

19
V2rayNG/app/src/main/res/drawable/ic_qu_scan_24dp.xml Normal file
View File

@@ -0,0 +1,19 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:fillColor="@color/colorBg"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0Z" />
<path
android:fillColor="@color/colorText"
android:pathData="M24,21.8 C25.7673,21.8,27.2,23.2327,27.2,25 C27.2,26.7673,25.7673,28.2,24,28.2
C22.2327,28.2,20.8,26.7673,20.8,25 C20.8,23.2327,22.2327,21.8,24,21.8 Z" />
<path
android:fillColor="@color/colorText"
android:pathData="M21,15 L19.17,17 L16,17 A2,2,0,0,0,14,19 L14,31 A2,2,0,0,0,16,33 L32,33
A2,2,0,0,0,34,31 L34,19 A2,2,0,0,0,32,17 L28.83,17 L27,15 Z M24,30
A5,5,0,1,1,29,25 A5,5,0,0,1,24,30 Z" />
</vector>

4
V2rayNG/app/src/main/res/drawable/ic_qu_settings_black_24dp.xml → V2rayNG/app/src/main/res/drawable/ic_qu_settings_24dp.xml
View File

File diff suppressed because one or more lines are too long

18
V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/ic_shortcut_background"
android:left="2dp"
android:top="2dp"
android:right="2dp"
android:bottom="2dp" />
<item
android:drawable="@drawable/ic_stat_name_black"
android:left="12dp"
android:top="12dp"
android:right="12dp"
android:bottom="12dp" />
</layer-list>

2
V2rayNG/app/src/main/res/drawable/ic_rounded_corner_theme.xml → V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#009963"/>
<solid android:color="@color/color_fab_orange"/>
<corners android:radius="20dp"/>
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
</shape>

2
V2rayNG/app/src/main/res/drawable/ic_rounded_corner_grey.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorUnselected"/>
<solid android:color="@color/color_switch_fab_grey"/>
<corners android:radius="20dp"/>
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
</shape>

9
V2rayNG/app/src/main/res/drawable/ic_save_24dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
</vector>

6
V2rayNG/app/src/main/res/drawable/ic_qu_scan_black_24dp.xml → V2rayNG/app/src/main/res/drawable/ic_scan_24dp.xml
View File

@@ -5,14 +5,14 @@
android:viewportHeight="48">
<path
android:fillColor="#999999"
android:fillColor="#050505"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0Z" />
<path
android:fillColor="#ffffff"
android:fillColor="#FFFFFF"
android:pathData="M24,21.8 C25.7673,21.8,27.2,23.2327,27.2,25 C27.2,26.7673,25.7673,28.2,24,28.2
C22.2327,28.2,20.8,26.7673,20.8,25 C20.8,23.2327,22.2327,21.8,24,21.8 Z" />
<path
android:fillColor="#ffffff"
android:fillColor="#FFFFFF"
android:pathData="M21,15 L19.17,17 L16,17 A2,2,0,0,0,14,19 L14,31 A2,2,0,0,0,16,33 L32,33
A2,2,0,0,0,34,31 L34,19 A2,2,0,0,0,32,17 L28.83,17 L27,15 Z M24,30
A5,5,0,1,1,29,25 A5,5,0,0,1,24,30 Z" />

10
V2rayNG/app/src/main/res/drawable/ic_select_all_24dp.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0"
android:width="24dp">
<path
android:fillColor="#000000"
android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z" />
</vector>

9
V2rayNG/app/src/main/res/drawable/ic_settings_24dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
</vector>

0
V2rayNG/app/src/main/res/drawable/ic_share_black_24dp.xml → V2rayNG/app/src/main/res/drawable/ic_share_24dp.xml
View File

2
V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml
View File

@@ -2,6 +2,6 @@
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/colorUnselected" />
<solid android:color="@color/colorBg" />
<size android:width="44dp" android:height="44dp" />
</shape>

0
V2rayNG/app/src/main/res/drawable/ic_subscriptions_black_24dp.xml → V2rayNG/app/src/main/res/drawable/ic_subscriptions_24dp.xml
View File

0
V2rayNG/app/src/main/res/drawable/ic_whatshot_black_24dp.xml → V2rayNG/app/src/main/res/drawable/ic_whatshot_24dp.xml
View File

BIN
V2rayNG/app/src/main/res/drawable/nav_header_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
V2rayNG/app/src/main/res/font/montserrat_thin.ttf Normal file
View File

Binary file not shown.

3
V2rayNG/app/src/main/res/layout/activity_logcat.xml
View File

@@ -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">
<ProgressBar

6
V2rayNG/app/src/main/res/layout/activity_main.xml
View File

@@ -13,8 +13,7 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
android:layout_height="wrap_content">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
@@ -65,7 +64,7 @@
android:paddingStart="16dp"
android:text="@string/connection_test_pending"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorWhite" />
android:textColor="@color/colorText" />
</LinearLayout>
</LinearLayout>
@@ -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" >
<LinearLayout

2
V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml
View File

@@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:text="@string/server_lab_need_inbound"
android:textAppearance="@style/TextAppearance.AppCompat.Tooltip"
android:textColor="@color/fab_orange_dark" />
android:textColor="@color/color_secondary" />
</LinearLayout>
<LinearLayout

2
V2rayNG/app/src/main/res/layout/fragment_routing_settings.xml
View File

@@ -19,7 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/routing_settings_tips"
android:textColor="@color/fab_orange_dark" />
android:textColor="@color/color_secondary" />
<EditText
android:id="@+id/et_routing_content"

3
V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
View File

@@ -3,7 +3,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:background="@color/colorPrimary"
android:foreground="?android:attr/selectableItemBackground"
android:clickable="true"
android:focusable="true">

2
V2rayNG/app/src/main/res/layout/item_recycler_footer.xml
View File

@@ -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" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

17
V2rayNG/app/src/main/res/layout/item_recycler_main.xml
View File

@@ -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 @@
<LinearLayout
android:id="@+id/layout_indicator"
android:layout_width="10dp"
android:layout_width="6dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="vertical" />
@@ -38,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:paddingStart="5dp">
android:paddingStart="9dp">
<TextView
android:id="@+id/tv_name"
@@ -84,7 +85,7 @@
android:layout_weight="1"
android:lines="1"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorSubscription"
android:textColor="@color/color_secondary"
android:textSize="10sp"
tools:text="Sub" />
@@ -121,7 +122,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="@dimen/png_height"
android:src="@drawable/ic_share_black_24dp"
android:src="@drawable/ic_share_24dp"
app:tint="?attr/colorMainText" />
</LinearLayout>
@@ -140,7 +141,7 @@
<ImageView
android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height"
android:src="@drawable/ic_edit_black_24dp"
android:src="@drawable/ic_edit_24dp"
app:tint="?attr/colorMainText" />
</LinearLayout>
@@ -159,7 +160,7 @@
<ImageView
android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height"
android:src="@drawable/ic_delete_black_24dp"
android:src="@drawable/ic_delete_24dp"
app:tint="?attr/colorMainText" />
</LinearLayout>
@@ -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" />
</LinearLayout>

11
V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
View File

@@ -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 @@
<LinearLayout
android:id="@+id/chk_enable"
android:layout_width="10dp"
android:layout_width="6dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="vertical" />
@@ -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">
<TextView
@@ -78,7 +79,7 @@
<ImageView
android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height"
android:src="@drawable/ic_share_black_24dp"
android:src="@drawable/ic_share_24dp"
app:tint="?attr/colorMainText"/>
</LinearLayout>
@@ -98,7 +99,7 @@
<ImageView
android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height"
android:src="@drawable/ic_edit_black_24dp"
android:src="@drawable/ic_edit_24dp"
app:tint="?attr/colorMainText" />
</LinearLayout>

4
V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml
View File

@@ -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">
<LinearLayout
@@ -52,7 +54,7 @@
<ImageView
android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height"
android:src="@drawable/ic_delete_black_24dp"
android:src="@drawable/ic_delete_24dp"
app:tint="?attr/colorMainText" />
</LinearLayout>
</LinearLayout>

7
V2rayNG/app/src/main/res/layout/nav_header.xml
View File

@@ -14,12 +14,13 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_gravity="center"
android:fontFamily="@font/montserrat_thin"
android:gravity="center"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="@string/app_name"
android:textColor="@color/white"
android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
android:textAppearance="@style/TextAppearance.AppCompat.Display1"
android:textColor="@color/colorText" />
</LinearLayout>

13
V2rayNG/app/src/main/res/layout/nav_toolbar.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_scrollFlags="scroll|enterAlways" />
</com.google.android.material.appbar.AppBarLayout>

9
V2rayNG/app/src/main/res/layout/nav_view.xml
View File

@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.navigation.NavigationView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/nav_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
app:headerLayout="@layout/nav_header"
app:menu="@menu/menu_drawer" />

1
V2rayNG/app/src/main/res/layout/widget_switch.xml
View File

@@ -8,6 +8,7 @@
android:orientation="vertical">
<ImageView
android:id="@+id/image_switch"
android:layout_width="40dp"
android:layout_height="40dp"
android:padding="10dp"

2
V2rayNG/app/src/main/res/menu/action_server.xml
View File

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/del_config"
android:icon="@drawable/ic_delete_white_24dp"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/menu_item_del_config"
app:showAsAction="always" />
<item

4
V2rayNG/app/src/main/res/menu/action_sub_setting.xml
View File

@@ -3,12 +3,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/add_config"
android:icon="@drawable/ic_add_white_24dp"
android:icon="@drawable/ic_add_24dp"
android:title="@string/menu_item_add_config"
app:showAsAction="always" />
<item
android:id="@+id/del_config"
android:icon="@drawable/ic_delete_white_24dp"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/menu_item_del_config"
app:showAsAction="always" />
<item

4
V2rayNG/app/src/main/res/menu/menu_asset.xml
View File

@@ -3,12 +3,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/add_file"
android:icon="@drawable/ic_add_white_24dp"
android:icon="@drawable/ic_add_24dp"
android:title="@string/menu_item_add_file"
app:showAsAction="ifRoom" />
<item
android:id="@+id/download_file"
android:icon="@drawable/ic_cloud_download_white_24dp"
android:icon="@drawable/ic_cloud_download_24dp"
android:title="@string/menu_item_download_file"
app:showAsAction="always" />
</menu>

10
V2rayNG/app/src/main/res/menu/menu_bypass_list.xml
View File

@@ -3,31 +3,31 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/search_view"
android:icon="@drawable/ic_description_white_24dp"
android:icon="@drawable/ic_description_24dp"
android:title="@string/menu_item_search"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="always" />
<item
android:id="@+id/select_all"
android:icon="@drawable/ic_select_all_white_24dp"
android:icon="@drawable/ic_select_all_24dp"
android:title="@string/menu_item_select_all"
app:showAsAction="withText" />
<item
android:id="@+id/select_proxy_app"
android:icon="@drawable/ic_description_white_24dp"
android:icon="@drawable/ic_description_24dp"
android:title="@string/menu_item_select_proxy_app"
app:showAsAction="withText" />
<item
android:id="@+id/import_proxy_app"
android:icon="@drawable/ic_description_white_24dp"
android:icon="@drawable/ic_description_24dp"
android:title="@string/menu_item_import_proxy_app"
app:showAsAction="withText" />
<item
android:id="@+id/export_proxy_app"
android:icon="@drawable/ic_description_white_24dp"
android:icon="@drawable/ic_description_24dp"
android:title="@string/menu_item_export_proxy_app"
app:showAsAction="withText" />

12
V2rayNG/app/src/main/res/menu/menu_drawer.xml
View File

@@ -7,30 +7,30 @@
android:id="@+id/group_main">
<item
android:id="@+id/sub_setting"
android:icon="@drawable/ic_subscriptions_white_24dp"
android:icon="@drawable/ic_subscriptions_24dp"
android:title="@string/title_sub_setting" />
<item
android:id="@+id/settings"
android:icon="@drawable/ic_settings_white_24dp"
android:icon="@drawable/ic_settings_24dp"
android:title="@string/title_settings" />
<item
android:id="@+id/user_asset_setting"
android:icon="@drawable/ic_file_white_24dp"
android:icon="@drawable/ic_file_24dp"
android:title="@string/title_user_asset_setting" />
</group>
<group android:id="@+id/group_id2">
<item
android:id="@+id/promotion"
android:icon="@drawable/ic_whatshot_white_24dp"
android:icon="@drawable/ic_whatshot_24dp"
android:title="@string/title_pref_promotion" />
<item
android:id="@+id/logcat"
android:icon="@drawable/ic_logcat_white_24dp"
android:icon="@drawable/ic_logcat_24dp"
android:title="@string/title_logcat" />
<item
android:id="@+id/feedback"
android:icon="@drawable/ic_feedback_white_24dp"
android:icon="@drawable/ic_feedback_24dp"
android:title="@string/title_pref_feedback" />
<!-- place holder for version text at the bottom -->
<item

4
V2rayNG/app/src/main/res/menu/menu_logcat.xml
View File

@@ -3,12 +3,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/clear_all"
android:icon="@drawable/ic_delete_white_24dp"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/logcat_clear"
app:showAsAction="always" />
<item
android:id="@+id/copy_all"
android:icon="@drawable/ic_copy_white"
android:icon="@drawable/ic_copy"
android:title="@string/logcat_copy"
app:showAsAction="always" />
</menu>

12
V2rayNG/app/src/main/res/menu/menu_main.xml
View File

@@ -2,7 +2,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:icon="@drawable/ic_add_white_24dp"
android:icon="@drawable/ic_add_24dp"
android:title="@string/menu_item_add_config"
app:showAsAction="ifRoom">
<menu>
@@ -61,7 +61,7 @@
</item>
<item
android:id="@+id/filter_config"
android:icon="@drawable/ic_outline_filter_alt_white_24"
android:icon="@drawable/ic_outline_filter_alt_24"
android:title="@string/title_filter_config"
app:showAsAction="ifRoom" />
<item
@@ -70,22 +70,22 @@
app:showAsAction="never" />
<item
android:id="@+id/del_all_config"
android:icon="@drawable/ic_delete_white_24dp"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/title_del_all_config"
app:showAsAction="never" />
<item
android:id="@+id/del_duplicate_config"
android:icon="@drawable/ic_delete_white_24dp"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/title_del_duplicate_config"
app:showAsAction="never" />
<item
android:id="@+id/del_invalid_config"
android:icon="@drawable/ic_delete_white_24dp"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/title_del_invalid_config"
app:showAsAction="never" />
<item
android:id="@+id/export_all"
android:icon="@drawable/ic_share_white_24dp"
android:icon="@drawable/ic_share_24dp"
android:title="@string/title_export_all"
app:showAsAction="never" />
<item

2
V2rayNG/app/src/main/res/menu/menu_routing.xml
View File

@@ -9,7 +9,7 @@
<item
android:id="@+id/del_routing"
android:icon="@drawable/ic_delete_white_24dp"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/routing_settings_delete"
app:showAsAction="never" />

2
V2rayNG/app/src/main/res/menu/menu_scanner.xml
View File

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/scan_code"
android:icon="@drawable/ic_scan_black_24dp"
android:icon="@drawable/ic_scan_24dp"
android:title=""
app:showAsAction="always" />
<item

210
V2rayNG/app/src/main/res/values-ar/strings.xml Normal file
View File

@@ -0,0 +1,210 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<string name="app_name" translatable="false">v2rayNG</string>
<string name="app_widget_name">التبديل</string>
<string name="app_tile_name">التبديل</string>
<string name="app_tile_first_use">أول استخدام لهذه الميزة، يرجى استخدام التطبيق لإضافة خادم</string>
<string name="navigation_drawer_open">افتح درج التنقل</string>
<string name="navigation_drawer_close">أغلق درج التنقل</string>
<string name="migration_success">نجحت عملية ترحيل البيانات!</string>
<string name="migration_fail">فشلت عملية ترحيل البيانات!</string>
<!-- Notifications -->
<string name="notification_action_stop_v2ray">توقف</string>
<string name="toast_permission_denied">غير قادر على الحصول على الإذن</string>
<string name="notification_action_more">اضغط للمزيد</string>
<string name="toast_services_start">بدء الخدمات</string>
<string name="toast_services_stop">توقف الخدمات</string>
<string name="toast_services_success">نجح بدء الخدمات</string>
<string name="toast_services_failure">فشل بدء الخدمات</string>
<!--ServerActivity-->
<string name="title_server">ملف التكوين</string>
<string name="menu_item_add_config">إضافة تكوين</string>
<string name="menu_item_save_config">حفظ التكوين</string>
<string name="menu_item_del_config">حذف التكوين</string>
<string name="menu_item_import_config_qrcode">استيراد التكوين من QRcode</string>
<string name="menu_item_import_config_clipboard">استيراد التكوين من الحافظة</string>
<string name="menu_item_import_config_manually_vmess">الكتابة يدويا [Vmess]</string>
<string name="menu_item_import_config_manually_vless">الكتابة يدويا [VLESS]</string>
<string name="menu_item_import_config_manually_ss">الكتابة يدويا [Shadowsocks]</string>
<string name="menu_item_import_config_manually_socks">الكتابة يدويا [Socks]</string>
<string name="menu_item_import_config_manually_trojan">الكتابة يدويا [Trojan]</string>
<string name="menu_item_import_config_custom">تكوين مخصص</string>
<string name="menu_item_import_config_custom_clipboard">استيراد التكوين المخصص من الحافظة</string>
<string name="menu_item_import_config_custom_local">استيراد التكوين المخصص من ملف محلي</string>
<string name="menu_item_import_config_custom_url">استيراد التكوين المخصص من URL</string>
<string name="menu_item_import_config_custom_url_scan">استيراد التكوين المخصص من مسح URL</string>
<string name="del_config_comfirm">تأكيد الحذف؟</string>
<string name="server_lab_remarks">ملاحظات</string>
<string name="server_lab_address">العنوان</string>
<string name="server_lab_port">المنفذ</string>
<string name="server_lab_id">المعرف</string>
<string name="server_lab_alterid">alterId</string>
<string name="server_lab_security">الأمان</string>
<string name="server_lab_network">الشبكة</string>
<string name="server_lab_more_function">النقل</string>
<string name="server_lab_head_type">نوع الرأس</string>
<string name="server_lab_mode_type">وضع gRPC</string>
<string name="server_lab_request_host">طلب الاستضافة (host/ws host/h2 host)/QUIC security</string>
<string name="server_lab_path">المسار (ws path/h2 path)/QUIC key/kcp seed/gRPC serviceName</string>
<string name="server_lab_stream_security">TLS</string>
<string name="server_lab_stream_fingerprint" translatable="false">Fingerprint</string>
<string name="server_lab_stream_alpn" translatable="false">Alpn</string>
<string name="server_lab_allow_insecure">allowInsecure</string>
<string name="server_lab_sni">SNI</string>
<string name="server_lab_address3">العنوان</string>
<string name="server_lab_port3">المنفذ</string>
<string name="server_lab_id3">كلمة المرور</string>
<string name="server_lab_security3">الأمان</string>
<string name="server_lab_id4">كلمة المرور (اختياري)</string>
<string name="server_lab_security4">المستخدم (اختياري)</string>
<string name="server_lab_encryption">التشفير</string>
<string name="server_lab_flow">التدفق</string>
<string name="server_lab_public_key" translatable="false">مفتاح عام</string>
<string name="server_lab_short_id" translatable="false">ShortId</string>
<string name="server_lab_spider_x" translatable="false">SpiderX</string>
<string name="toast_success">نجاح</string>
<string name="toast_failure">فشل</string>
<string name="toast_none_data">لا يوجد شيء</string>
<string name="toast_incorrect_protocol">بروتوكول غير صحيح</string>
<string name="toast_decoding_failed">فشل التشفير</string>
<string name="title_file_chooser">اختر ملف التكوين</string>
<string name="toast_require_file_manager">الرجاء تثبيت مدير الملفات.</string>
<string name="server_customize_config">تخصيص التكوين</string>
<string name="toast_config_file_invalid">تكوين غير صالح</string>
<string name="server_lab_content">المحتوى</string>
<string name="toast_none_data_clipboard">لا توجد بيانات في الحافظة</string>
<string name="toast_invalid_url">URL غير صالح</string>
<string name="server_lab_need_inbound">تأكد من أن منافذ الدخول متسقة مع الإعدادات</string>
<string name="toast_malformed_josn">تكوين غير صحيح</string>
<string name="server_lab_request_host6">الاستضافة (SNI) (اختياري)</string>
<string name="toast_asset_copy_failed">فشل نسخ الملف، يرجى استخدام مدير الملفات</string>
<string name="menu_item_add_file">إضافة ملفات</string>
<string name="menu_item_download_file">تحميل الملفات</string>
<!-- PerAppProxyActivity -->
<string name="msg_dialog_progress">جار التحميل</string>
<string name="menu_item_search">بحث</string>
<string name="menu_item_select_all">تحديد الكل</string>
<string name="msg_enter_keywords">أدخل الكلمات الرئيسية</string>
<string name="switch_bypass_apps_mode">وضع التجاوز</string>
<string name="menu_item_select_proxy_app">تحديد التطبيق الوكيل تلقائيا</string>
<string name="msg_downloading_content">جار تحميل المحتوى</string>
<string name="menu_item_export_proxy_app">تصدير إلى الحافظة</string>
<string name="menu_item_import_proxy_app">استيراد من الحافظة</string>
<!-- Preferences -->
<string name="title_settings">الإعدادات</string>
<string name="title_advanced">إعدادات متقدمة</string>
<string name="title_vpn_settings">إعدادات VPN</string>
<string name="title_pref_per_app_proxy">وكيل لكل تطبيق</string>
<string name="summary_pref_per_app_proxy">عام: التطبيق المحدد هو الوكيل، الاتصال غير المحدد مباشر؛ \nوضع التجاوز: التطبيق المحدد متصل مباشرة، الوكيل غير المحدد. \nالخيار لتحديد التطبيق الوكيل تلقائيا في القائمة</string>
<string name="title_pref_mux_enabled">تمكين Mux</string>
<string name="summary_pref_mux_enabled">التمكين قد يسرع الشبكة والتبديل بين الشبكات قد يكون فلاش</string>
<string name="title_pref_speed_enabled">تمكين عرض السرعة</string>
<string name="summary_pref_speed_enabled">عرض السرعة الحالية في الإشعار.\nسيتغير رمز الإشعار استنادًا إلى الاستخدام.</string>
<string name="title_pref_sniffing_enabled">تمكين Sniffing</string>
<string name="summary_pref_sniffing_enabled">محاولة استخلاص النطاق من الحزمة (الافتراضي هو التشغيل)</string>
<string name="title_pref_local_dns_enabled">تمكين DNS المحلي</string>
<string name="summary_pref_local_dns_enabled">DNS يتم معالجتها بواسطة وحدة DNS الأساسية (موصى بها، إذا كانت بحاجة إلى توجيه تجاوز الشبكة المحلية والعنوان الرئيسي)</string>
<string name="title_pref_fake_dns_enabled">تمكين DNS الوهمي</string>
<string name="summary_pref_fake_dns_enabled">DNS المحلي يعود بعنوان IP وهمي (أسرع، ولكن قد لا يعمل لبعض التطبيقات)</string>
<string name="title_pref_prefer_ipv6">تفضيل IPv6</string>
<string name="summary_pref_prefer_ipv6">تفضيل عنوان IPv6 والمسارات</string>
<string name="title_pref_routing">التوجيه</string>
<string name="title_pref_routing_domain_strategy">استراتيجية النطاق</string>
<string name="title_pref_routing_mode">قواعد محددة مسبقا</string>
<string name="title_pref_routing_custom">قواعد مخصصة</string>
<string name="title_pref_remote_dns">DNS عن بُعد (اختياري)</string>
<string name="summary_pref_remote_dns">DNS</string>
<string name="title_pref_vpn_dns">DNS VPN (IPv4/v6 فقط)</string>
<string name="title_pref_domestic_dns">DNS المحلي (اختياري)</string>
<string name="summary_pref_domestic_dns">DNS</string>
<string name="title_pref_proxy_sharing_enabled">السماح بالاتصالات من الشبكة المحلية</string>
<string name="summary_pref_proxy_sharing_enabled">يمكن للأجهزة الأخرى الاتصال بالوكيل عبر عنوان IP الخاص بك من خلال socks/http، فقط تمكين في الشبكة الموثوقة لتجنب الاتصال غير المصرح به</string>
<string name="toast_warning_pref_proxysharing_short">السماح بالاتصالات من الشبكة المحلية، تأكد من أنك في شبكة موثوقة</string>
<string name="title_pref_allow_insecure">allowInsecure</string>
<string name="summary_pref_allow_insecure">عند استخدام TLS، الافتراضي هو allowInsecure</string>
<string name="title_pref_socks_port">منفذ الوكيل SOCKS5</string>
<string name="summary_pref_socks_port">منفذ الوكيل SOCKS5</string>
<string name="title_pref_http_port">منفذ الوكيل HTTP</string>
<string name="summary_pref_http_port">منفذ الوكيل HTTP</string>
<string name="title_pref_local_dns_port">منفذ DNS المحلي</string>
<string name="summary_pref_local_dns_port">منفذ DNS المحلي</string>
<string name="title_pref_confirm_remove">تأكيد حذف ملف التكوين</string>
<string name="summary_pref_confirm_remove">هل يتطلب حذف ملف التكوين تأكيدًا ثانيًا من المستخدم</string>
<string name="title_pref_start_scan_immediate">بدء المسح فورا</string>
<string name="summary_pref_start_scan_immediate">افتح الكاميرا للمسح فورا عند بدء التشغيل، وإلا يمكنك اختيار المسح الضوئي للرمز أو اختيار صورة في شريط الأدوات</string>
<string name="title_pref_feedback">الملاحظات</string>
<string name="summary_pref_feedback">إرسال ملاحظات عن التحسينات أو الأخطاء إلى GitHub</string>
<string name="summary_pref_tg_group">الانضمام إلى مجموعة Telegram</string>
<string name="toast_tg_app_not_found">لم يتم العثور على تطبيق Telegram</string>
<string name="title_pref_promotion">ترقية</string>
<string name="summary_pref_promotion">ترقية، انقر للحصول على التفاصيل (يمكن إزالة التبرع)</string>
<string name="title_core_loglevel">مستوى السجل</string>
<string name="title_mode">الوضع</string>
<string name="title_mode_help">انقر علي للمزيد من المساعدة</string>
<string name="title_language">اللغة</string>
<string name="title_ui_settings">إعدادات واجهة المستخدم</string>
<string name="title_logcat">Logcat</string>
<string name="logcat_copy">نسخ</string>
<string name="logcat_clear">مسح</string>
<string name="title_service_restart">إعادة تشغيل الخدمة</string>
<string name="title_del_all_config">حذف كل التكوين</string>
<string name="title_del_duplicate_config">حذف التكوين المكرر</string>
<string name="title_del_invalid_config">حذف التكوين غير الصالح (اختبر أولا)</string>
<string name="title_export_all">تصدير التكوينات غير المخصصة إلى الحافظة</string>
<string name="title_sub_setting">إعدادات مجموعة الاشتراك</string>
<string name="sub_setting_remarks">ملاحظات</string>
<string name="sub_setting_url">URL اختياري</string>
<string name="sub_setting_enable">تمكين التحديث</string>
<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_sort_by_test_results">الترتيب بناءً على نتائج الاختبار</string>
<string name="title_filter_config">تصفية ملف التكوين</string>
<string name="filter_config_all">جميع مجموعات الاشتراك</string>
<string name="title_del_duplicate_config_count">حذف %d من التكوينات المكررة</string>
<string name="tasker_start_service">بدء الخدمة</string>
<string name="tasker_setting_confirm">تأكيد</string>
<string name="routing_settings_title">إعدادات التوجيه</string>
<string name="routing_settings_tips">مفصولة بفواصل (،)، تذكر الحفظ</string>
<string name="routing_settings_save">حفظ</string>
<string name="routing_settings_delete">مسح</string>
<string name="routing_settings_scan_replace">مسح واستبدال</string>
<string name="routing_settings_scan_append">مسح وإضافة</string>
<string name="routing_settings_default_rules">تعيين قواعد التوجيه الافتراضية</string>
<string name="connection_test_pending">فحص الاتصال</string>
<string name="connection_test_testing">جارٍ الفحص...</string>
<string name="connection_test_available">نجاح: استغرق الاتصال HTTP %dms</string>
<string name="connection_test_error">فشل في اكتشاف الاتصال بالإنترنت: %s</string>
<string name="connection_test_fail">الإنترنت غير متوفر</string>
<string name="connection_test_error_status_code">رمز الخطأ: #%d</string>
<string name="connection_connected">متصل، اضغط لفحص الاتصال</string>
<string name="connection_not_connected">غير متصل</string>
<string name="import_subscription_success">تم استيراد الاشتراك بنجاح</string>
<string name="import_subscription_failure">فشل استيراد الاشتراك</string>
<string-array name="share_method">
<item>QRcode</item>
<item>تصدير إلى الحافظة</item>
<item>تصدير التكوين الكامل إلى الحافظة</item>
</string-array>
<string-array name="share_sub_method">
<item>QRcode</item>
<item>تصدير إلى الحافظة</item>
</string-array>
<string-array name="routing_tag">
<item>URL الوكيل أو IP</item>
<item>URL المباشر أو IP</item>
<item>URL المحظور أو IP</item>
</string-array>
<string-array name="routing_mode">
<item>وكيل عالمي</item>
<item>تجاوز عنوان الشبكة المحلية ثم الوكيل</item>
<item>تجاوز عنوان البر الرئيسي ثم الوكيل</item>
<item>تجاوز عنوان الشبكة المحلية والبر الرئيسي ثم الوكيل</item>
<item>مباشر عالمي</item>
</string-array>
<string-array name="mode_entries">
<item>VPN</item>
<item>الوكيل فقط</item>
</string-array>
</resources>

14
V2rayNG/app/src/main/res/values-night/colors.xml
View File

@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorAccent">#12976F</color>
<color name="colorBg">#252525</color>
<color name="colorText">#CCCCCC</color>
<color name="color_switch_fab_grey">#424242</color>
<color name="color_fab_grey">#646464</color>
<color name="color_secondary">#BDBDBD</color>
<color name="colorSelected">#FFFFFF</color>
<color name="colorUnselected">#222222</color>
<color name="colorPrimary">#222222</color>
<color name="colorPrimaryDark">#000000</color>
<color name="colorAccent">#FFFFFF</color>
<color name="colorBg">#000000</color>
<color name="colorText">#FFFFFF</color>
</resources>

7
V2rayNG/app/src/main/res/values-night/styles.xml
View File

@@ -2,14 +2,15 @@
<resources>
<style name="AppThemeDayNight" parent="Theme.AppCompat.DayNight.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="colorMainBg">@color/colorBg</item>
<item name="colorMainText">@color/colorText</item>
<item name="android:statusBarColor">@color/colorPrimary</item>
<item name="android:navigationBarColor">@color/colorPrimary</item>
<item name="android:statusBarColor">@color/colorBg</item>
<item name="android:navigationBarColor">@color/colorBg</item>
<item name="colorControlNormal">@color/colorAccent</item>
<item name="android:windowBackground">@color/colorBg</item>
</style>
</resources>

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

@@ -146,8 +146,8 @@
<string name="title_pref_confirm_remove">Hiển thị thông báo xác nhận xoá cấu hình</string>
<string name="summary_pref_confirm_remove">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.</string>
<string name="title_pref_start_scan_immediate">Start scanning immediately</string>
<string name="summary_pref_start_scan_immediate">Open the camera to scan immediately at startup, otherwise you can choose to scan the code or select a photo in the toolbar</string>
<string name="title_pref_start_scan_immediate">Bắt đầu quét mã QR ngay lập tức</string>
<string name="summary_pref_start_scan_immediate">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ụ.</string>
<string name="title_pref_feedback">Phản hồi lỗi</string>
<string name="summary_pref_feedback">Phản hồi cải tiến hoặc lỗi lên GitHub</string>
@@ -161,14 +161,14 @@
<string name="title_mode">Chế độ kết nối</string>
<string name="title_mode_help">Nhấn vào đây nếu bạn cần trợ giúp!</string>
<string name="title_language">Ngôn ngữ</string>
<string name="title_ui_settings">UI settings</string>
<string name="title_ui_settings">Cài đặt UI</string>
<string name="title_logcat">Nhật ký hoạt động</string>
<string name="logcat_copy">Sao chép nhật ký</string>
<string name="logcat_clear">Xoá nhật ký</string>
<string name="title_service_restart">Kết nối lại v2rayNG</string>
<string name="title_del_all_config">Xoá tất cả cấu hình</string>
<string name="title_del_duplicate_config">Delete duplicate config</string>
<string name="title_del_duplicate_config">Xoá cấu hình trùng lặp</string>
<string name="title_del_invalid_config">Xoá cấu hình lỗi (Kiểm tra trước)</string>
<string name="title_export_all">Xuất và sao chép tất cả cấu hình</string>
<string name="title_sub_setting">Các gói đăng ký</string>
@@ -182,7 +182,7 @@
<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>
<string name="title_del_duplicate_config_count">Delete %d duplicate configurations</string>
<string name="title_del_duplicate_config_count">Xoá %d cấu hình trùng lặp</string>
<string name="tasker_start_service">Bắt đầu v2rayNG</string>
<string name="tasker_setting_confirm">Xác nhận</string>
@@ -204,6 +204,9 @@
<string name="connection_connected">Đã kết nối, hãy nhấn vào đây để kiểm tra kết nối mạng!</string>
<string name="connection_not_connected">Chưa kết nối, hãy chọn một cấu hình để kết nối!</string>
<string name="import_subscription_success">Đăng ký đã nhập thành công</string>
<string name="import_subscription_failure">Nhập đăng ký không thành công</string>
<string-array name="share_method">
<item>Xuất ra mã QR (Chụp màn hình để lưu)</item>
<item>Sao chép cấu hình này</item>

2
V2rayNG/app/src/main/res/values/arrays.xml
View File

@@ -165,6 +165,7 @@
<item>Tiếng Việt</item>
<item>Русский</item>
<item>فارسی</item>
<item>عربي</item>
</string-array>
@@ -176,5 +177,6 @@
<item>vi</item>
<item>ru</item>
<item>fa</item>
<item>ar</item>
</string-array>
</resources>

20
V2rayNG/app/src/main/res/values/colors.xml
View File

@@ -2,17 +2,17 @@
<resources>
<color name="colorPing">#009966</color>
<color name="colorPingRed">#FF0099</color>
<color name="colorSubscription">#247BA0</color>
<color name="colorSelected">#009966</color>
<color name="colorUnselected">#999999</color>
<color name="colorWhite">#CFD8DC</color>
<color name="colorBlack">#212121</color>
<color name="color_fab_orange">#f97910</color>
<!-- <color name="colorPrimary">#008577</color>-->
<!-- <color name="colorPrimaryDark">#00574B</color>-->
<color name="colorPrimary">#2B2B2B</color>
<color name="colorPrimaryDark">#161616</color>
<color name="colorAccent">#D81B60</color>
<color name="color_switch_fab_grey">#CDCDCD</color>
<color name="color_fab_grey">#9C9C9C</color>
<color name="color_secondary">#727272</color>
<color name="colorSelected">#000000</color>
<color name="colorUnselected">#FFFFFF</color>
<color name="colorPrimary">#FFFFFF</color>
<color name="colorPrimaryDark">#000000</color>
<color name="colorAccent">#000000</color>
<color name="colorBg">#FFFFFF</color>
<color name="colorText">#000000</color>
</resources>

8
V2rayNG/app/src/main/res/values/styles.xml
View File

@@ -1,6 +1,6 @@
<resources>
<style name="AppThemeDayNight" parent="Theme.AppCompat.DayNight.DarkActionBar">
<style name="AppThemeDayNight" parent="Theme.AppCompat.DayNight">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
@@ -8,6 +8,7 @@
<item name="colorMainText">@color/colorText</item>
<item name="android:statusBarColor">@color/colorPrimary</item>
<item name="android:navigationBarColor">@color/colorPrimary</item>
<item name="colorControlNormal">@color/colorAccent</item>
</style>
<style name="AppThemeDayNight.NoActionBar" parent="AppThemeDayNight">
@@ -34,9 +35,4 @@
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowIsTranslucent">true</item>
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
</resources>

6
V2rayNG/app/src/main/res/xml/shortcuts.xml
View File

@@ -2,7 +2,7 @@
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
<shortcut
android:enabled="true"
android:icon="@drawable/ic_qu_switch_black_24dp"
android:icon="@drawable/ic_qu_switch_24dp"
android:shortcutDisabledMessage="@string/app_widget_name"
android:shortcutId="shortcuts_switch"
android:shortcutLongLabel="@string/app_widget_name"
@@ -16,7 +16,7 @@
</shortcut>
<shortcut
android:enabled="true"
android:icon="@drawable/ic_qu_scan_black_24dp"
android:icon="@drawable/ic_qu_scan_24dp"
android:shortcutDisabledMessage="@string/menu_item_import_config_qrcode"
android:shortcutId="shortcuts_scan"
android:shortcutLongLabel="@string/menu_item_import_config_qrcode"
@@ -30,7 +30,7 @@
</shortcut>
<shortcut
android:enabled="true"
android:icon="@drawable/ic_qu_settings_black_24dp"
android:icon="@drawable/ic_qu_settings_24dp"
android:shortcutDisabledMessage="@string/title_settings"
android:shortcutId="shortcuts_settings"
android:shortcutLongLabel="@string/title_settings"

Some files were not shown because too many files have changed in this diff Show More