up 1.8.9

Unified base activity for status bar icon color

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 518
-        versionName "1.8.6"
+        versionCode 523
+        versionName "1.8.9"
     }
 
     buildTypes {
@@ -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'
 }

V2rayNG/app/src/main/AndroidManifest.xml

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

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

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseActivity.kt

@@ -2,13 +2,25 @@ package com.v2ray.ang.ui
 
 import android.content.Context
 import android.os.Build
+import android.os.Bundle
 import android.view.MenuItem
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowCompat
 import com.v2ray.ang.util.MyContextWrapper
 import com.v2ray.ang.util.Utils
 
 abstract class BaseActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        if (!Utils.getDarkModeStatus(this)) {
+            WindowCompat.getInsetsController(window, window.decorView).apply {
+                isAppearanceLightStatusBars = true
+            }
+        }
+    }
+
     override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
         android.R.id.home -> {
             onBackPressed()

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/LogcatActivity.kt

@@ -25,13 +25,12 @@ class LogcatActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-       binding = ActivityLogcatBinding.inflate(layoutInflater)
-       val view = binding.root
-       setContentView(view)
+        binding = ActivityLogcatBinding.inflate(layoutInflater)
+        val view = binding.root
+        setContentView(view)
 
         title = getString(R.string.title_logcat)
 
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
         logcat(false)
     }
 

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

@@ -131,11 +131,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
             }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt

@@ -41,8 +41,6 @@ class PerAppProxyActivity : BaseActivity() {
         val view = binding.root
         setContentView(view)
 
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-
         val dividerItemDecoration = DividerItemDecoration(this, LinearLayoutManager.VERTICAL)
         binding.recyclerView.addItemDecoration(dividerItemDecoration)
 

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsActivity.kt

@@ -21,7 +21,6 @@ class RoutingSettingsActivity : BaseActivity() {
         setContentView(view)
 
         title = getString(R.string.title_pref_routing_custom)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
         val fragments = ArrayList<Fragment>()
         fragments.add(RoutingSettingsFragment().newInstance(AppConfig.PREF_V2RAY_ROUTING_AGENT))

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt

@@ -31,16 +31,6 @@ class ScannerActivity : BaseActivity(){
         if (settingsStorage?.decodeBool(AppConfig.PREF_START_SCAN_IMMEDIATE) == true) {
             launchScan()
         }
-
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-    }
-
-    public override fun onResume() {
-        super.onResume()
-    }
-
-    public override fun onPause() {
-        super.onPause()
     }
 
     private fun launchScan(){

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt

@@ -175,7 +175,6 @@ class ServerActivity : BaseActivity() {
         } else {
             clearServer()
         }
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }
 
     /**

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) {
@@ -45,7 +49,6 @@ class ServerCustomConfigActivity : BaseActivity() {
         } else {
             clearServer()
         }
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }
 
     /**

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt

@@ -20,8 +20,6 @@ class SettingsActivity : BaseActivity() {
 
         title = getString(R.string.title_settings)
 
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-
         settingsViewModel.startListenPreferenceChange()
     }
 

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubEditActivity.kt

@@ -36,7 +36,6 @@ class SubEditActivity : BaseActivity() {
         } else {
             clearServer()
         }
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }
 
     /**

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubSettingActivity.kt

@@ -27,8 +27,6 @@ class SubSettingActivity : BaseActivity() {
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
         binding.recyclerView.adapter = adapter
-
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }
 
     override fun onResume() {

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UserAssetActivity.kt

@@ -49,7 +49,6 @@ class UserAssetActivity : BaseActivity() {
         val view = binding.root
         setContentView(view)
         title = getString(R.string.title_user_asset_setting)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)

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 {

V2rayNG/app/src/main/res/drawable-night/ic_action_done.xml

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

V2rayNG/app/src/main/res/drawable-night/ic_edit_24dp.xml

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

V2rayNG/app/src/main/res/drawable-night/ic_fab_check.xml

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

V2rayNG/app/src/main/res/drawable-night/ic_image_photo.xml

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

V2rayNG/app/src/main/res/drawable-night/ic_info_24dp.xml

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

V2rayNG/app/src/main/res/drawable/ic_action_done.xml

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

V2rayNG/app/src/main/res/drawable/ic_add_24dp.xml

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

V2rayNG/app/src/main/res/drawable/ic_cloud_download_24dp.xml

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

V2rayNG/app/src/main/res/drawable/ic_copy.xml

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

V2rayNG/app/src/main/res/drawable/ic_fab_check.xml

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

V2rayNG/app/src/main/res/drawable/ic_feedback_24dp.xml

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

V2rayNG/app/src/main/res/drawable/ic_file_24dp.xml

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

V2rayNG/app/src/main/res/drawable/ic_image_photo.xml

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

V2rayNG/app/src/main/res/drawable/ic_logcat_24dp.xml

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

V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_24.xml

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

V2rayNG/app/src/main/res/drawable/ic_qu_scan_24dp.xml

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

V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml

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

V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml

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

V2rayNG/app/src/main/res/drawable/ic_rounded_corner_grey.xml

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

V2rayNG/app/src/main/res/drawable/ic_save_24dp.xml

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

V2rayNG/app/src/main/res/drawable/ic_scan_24dp.xml

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

V2rayNG/app/src/main/res/drawable/ic_select_all_24dp.xml

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

V2rayNG/app/src/main/res/drawable/ic_settings_24dp.xml

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

V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml

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

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

V2rayNG/app/src/main/res/layout/activity_main.xml

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

V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml

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

V2rayNG/app/src/main/res/layout/fragment_routing_settings.xml

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

V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml

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

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

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

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

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

V2rayNG/app/src/main/res/layout/nav_header.xml

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

V2rayNG/app/src/main/res/layout/nav_toolbar.xml

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

V2rayNG/app/src/main/res/layout/nav_view.xml

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

V2rayNG/app/src/main/res/layout/widget_switch.xml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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