up 1.9.16

* Update DNS configs

* Update DNS in AppConfig

V2rayNG/app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
         applicationId = "com.v2ray.ang"
         minSdk = 21
         targetSdk = 35
-        versionCode = 611
-        versionName = "1.9.15"
+        versionCode = 612
+        versionName = "1.9.16"
         multiDexEnabled = true
         splits {
             abi {

V2rayNG/app/src/main/assets/custom_routing_black

@@ -116,8 +116,9 @@
       "domain:dns.google",
       "domain:adguard-dns.com",
       "domain:opendns.com",
+      "domain:umbrella.com",
       "domain:quad9.net",
-      "domain:dns.yandex.ru"
+      "domain:yandex.net"
     ]
   },
   {

V2rayNG/app/src/main/assets/custom_routing_white

@@ -63,14 +63,16 @@
       "140.207.198.6",
       "1.2.4.8",
       "210.2.4.8",
-      "117.50.11.11",
       "52.80.66.66",
+      "117.50.22.22",
       "2400:7fc0:849e:200::4",
       "2404:c2c0:85d8:901::4",
       "117.50.10.10",
       "52.80.52.52",
       "2400:7fc0:849e:200::8",
-      "2404:c2c0:85d8:901::8"
+      "2404:c2c0:85d8:901::8",
+      "117.50.60.30",
+      "52.80.60.30"
     ]
   },
   {

V2rayNG/app/src/main/kotlin/com/v2ray/ang/AppConfig.kt

@@ -161,15 +161,20 @@ object AppConfig {
     const val GOOGLEAPIS_COM_DOMAIN = "googleapis.com"
 
     // Android Private DNS constants
-    const val DNS_PUB_DOMAIN = "dns.pub"
+    const val DNS_DNSPOD_DOMAIN = "dot.pub"
     const val DNS_ALIDNS_DOMAIN = "dns.alidns.com"
-    const val DNS_ONE_ONE_DOMAIN = "one.one.one.one"
+    const val DNS_CLOUDFLARE_DOMAIN = "one.one.one.one"
     const val DNS_GOOGLE_DOMAIN = "dns.google"
+    const val DNS_QUAD9_DOMAIN = "dns.quad9.net"
+    const val DNS_YANDEX_DOMAIN = "common.dot.dns.yandex.net"
 
-    val DNS_PUB_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53")
+    
     val DNS_ALIDNS_ADDRESSES = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
-    val DNS_ONE_ONE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
+    val DNS_CLOUDFLARE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
+    val DNS_DNSPOD_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53")
     val DNS_GOOGLE_ADDRESSES = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
+    val DNS_QUAD9_ADDRESSES = arrayListOf("9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9")
+    val DNS_YANDEX_ADDRESSES = arrayListOf("77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff")
 
     const val DEFAULT_PORT = 443
     const val DEFAULT_SECURITY = "auto"

V2rayNG/app/src/main/kotlin/com/v2ray/ang/fmt/TrojanFmt.kt

@@ -22,9 +22,9 @@ object TrojanFmt : FmtBase() {
         config.password = uri.userInfo
 
         if (uri.rawQuery.isNullOrEmpty()) {
+            config.network = "tcp"
             config.security = AppConfig.TLS
             config.insecure = allowInsecure
-
         } else {
             val queryParam = getQueryParam(uri)
 
@@ -40,7 +40,7 @@ object TrojanFmt : FmtBase() {
             config.serviceName = queryParam["serviceName"]
             config.authority = queryParam["authority"]
 
-            config.security = queryParam["security"]
+            config.security = queryParam["security"] ?: AppConfig.TLS
             config.insecure = if (queryParam["allowInsecure"].isNullOrEmpty()) {
                 allowInsecure
             } else {

V2rayNG/app/src/main/kotlin/com/v2ray/ang/handler/V2rayConfigManager.kt

@@ -8,12 +8,16 @@ import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.AppConfig.DEFAULT_NETWORK
 import com.v2ray.ang.AppConfig.DNS_ALIDNS_ADDRESSES
 import com.v2ray.ang.AppConfig.DNS_ALIDNS_DOMAIN
+import com.v2ray.ang.AppConfig.DNS_CLOUDFLARE_ADDRESSES
+import com.v2ray.ang.AppConfig.DNS_CLOUDFLARE_DOMAIN
+import com.v2ray.ang.AppConfig.DNS_DNSPOD_ADDRESSES
+import com.v2ray.ang.AppConfig.DNS_DNSPOD_DOMAIN
 import com.v2ray.ang.AppConfig.DNS_GOOGLE_ADDRESSES
 import com.v2ray.ang.AppConfig.DNS_GOOGLE_DOMAIN
-import com.v2ray.ang.AppConfig.DNS_ONE_ONE_ADDRESSES
-import com.v2ray.ang.AppConfig.DNS_ONE_ONE_DOMAIN
-import com.v2ray.ang.AppConfig.DNS_PUB_ADDRESSES
-import com.v2ray.ang.AppConfig.DNS_PUB_DOMAIN
+import com.v2ray.ang.AppConfig.DNS_QUAD9_ADDRESSES
+import com.v2ray.ang.AppConfig.DNS_QUAD9_DOMAIN
+import com.v2ray.ang.AppConfig.DNS_YANDEX_ADDRESSES
+import com.v2ray.ang.AppConfig.DNS_YANDEX_DOMAIN
 import com.v2ray.ang.AppConfig.GEOIP_CN
 import com.v2ray.ang.AppConfig.GEOSITE_CN
 import com.v2ray.ang.AppConfig.GEOSITE_PRIVATE
@@ -57,7 +61,7 @@ object V2rayConfigManager {
             }
 
             val result = getV2rayNonCustomConfig(context, config)
-            Log.d(ANG_PACKAGE, result.content)
+            //Log.d(ANG_PACKAGE, result.content)
             result.guid = guid
             return result
         } catch (e: Exception) {
@@ -376,10 +380,12 @@ object V2rayConfigManager {
             hosts[GOOGLEAPIS_CN_DOMAIN] = GOOGLEAPIS_COM_DOMAIN
 
             // hardcode popular Android Private DNS rule to fix localhost DNS problem
-            hosts[DNS_PUB_DOMAIN] = DNS_PUB_ADDRESSES
             hosts[DNS_ALIDNS_DOMAIN] = DNS_ALIDNS_ADDRESSES
-            hosts[DNS_ONE_ONE_DOMAIN] = DNS_ONE_ONE_ADDRESSES
+            hosts[DNS_CLOUDFLARE_DOMAIN] = DNS_CLOUDFLARE_ADDRESSES
+            hosts[DNS_DNSPOD_DOMAIN] = DNS_DNSPOD_ADDRESSES
             hosts[DNS_GOOGLE_DOMAIN] = DNS_GOOGLE_ADDRESSES
+            hosts[DNS_QUAD9_DOMAIN] = DNS_QUAD9_ADDRESSES
+            hosts[DNS_YANDEX_DOMAIN] = DNS_YANDEX_ADDRESSES
 
 
             // DNS dns对象

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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
@@ -18,9 +19,9 @@
                 android:id="@+id/layout_backup"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
-                android:background="?attr/selectableItemBackground"
                 android:gravity="center|start"
                 android:orientation="horizontal"
                 android:padding="@dimen/padding">
@@ -58,9 +59,9 @@
                 android:id="@+id/layout_share"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/server_height"
+                android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
-                android:background="?attr/selectableItemBackground"
                 android:gravity="center|start"
                 android:orientation="horizontal"
                 android:padding="@dimen/padding">
@@ -82,9 +83,9 @@
                 android:id="@+id/layout_restore"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/server_height"
+                android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
-                android:background="?attr/selectableItemBackground"
                 android:gravity="center|start"
                 android:orientation="horizontal"
                 android:padding="@dimen/padding">
@@ -114,9 +115,9 @@
                 android:id="@+id/layout_soure_ccode"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/server_height"
+                android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
-                android:background="?attr/selectableItemBackground"
                 android:gravity="center|start"
                 android:orientation="horizontal"
                 android:padding="@dimen/padding">
@@ -138,9 +139,9 @@
                 android:id="@+id/layout_feedback"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/server_height"
+                android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
-                android:background="?attr/selectableItemBackground"
                 android:gravity="center|start"
                 android:orientation="horizontal"
                 android:padding="@dimen/padding">
@@ -163,9 +164,9 @@
                 android:id="@+id/layout_tg_channel"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/server_height"
+                android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
-                android:background="?attr/selectableItemBackground"
                 android:gravity="center|start"
                 android:orientation="horizontal"
                 android:padding="@dimen/padding">
@@ -187,9 +188,9 @@
                 android:id="@+id/layout_privacy_policy"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/server_height"
+                android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
-                android:background="?attr/selectableItemBackground"
                 android:gravity="center|start"
                 android:orientation="horizontal"
                 android:padding="@dimen/padding">

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <LinearLayout
@@ -39,7 +40,8 @@
                         android:layout_height="wrap_content"
                         android:maxLines="2"
                         android:text="@string/title_pref_per_app_proxy"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        app:theme="@style/BrandedSwitch" />
 
                 </LinearLayout>
 
@@ -57,7 +59,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/switch_bypass_apps_mode"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        app:theme="@style/BrandedSwitch" />
 
                 </LinearLayout>
             </LinearLayout>

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:paddingStart="@dimen/padding_start"
     android:paddingEnd="@dimen/padding_end"
     tools:context=".ui.LogcatActivity">
@@ -19,10 +20,10 @@
         android:id="@+id/sv_logcat"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
         android:fillViewport="false"
         android:foregroundGravity="bottom">
 

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

@@ -3,12 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
@@ -24,8 +24,7 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fitsSystemWindows="true">
+            android:layout_height="match_parent">
 
             <androidx.coordinatorlayout.widget.CoordinatorLayout
                 android:id="@+id/main_content"
@@ -39,19 +38,19 @@
 
                     <com.google.android.material.progressindicator.LinearProgressIndicator
                         android:id="@+id/pb_waiting"
-                        app:indicatorColor="@color/color_fab_active"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:indeterminate="true"
-                        android:visibility="invisible" />
+                        android:visibility="invisible"
+                        app:indicatorColor="@color/color_fab_active" />
 
                     <com.google.android.material.tabs.TabLayout
                         android:id="@+id/tab_group"
-                        app:tabMode="scrollable"
-                        app:tabTextAppearance="@style/TabLayoutTextStyle"
-                        app:tabIndicatorFullWidth="false"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_width="match_parent" />
+                        app:tabIndicatorFullWidth="false"
+                        app:tabMode="scrollable"
+                        app:tabTextAppearance="@style/TabLayoutTextStyle" />
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/recycler_view"
@@ -65,11 +64,11 @@
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/connection_test_height"
                         android:background="@color/colorPrimary"
-                        android:gravity="center|start"
-                        android:nextFocusRight="@+id/fab"
                         android:clickable="true"
                         android:focusable="true"
-                        android:nextFocusLeft="@+id/recycler_view">
+                        android:gravity="center|start"
+                        android:nextFocusLeft="@+id/recycler_view"
+                        android:nextFocusRight="@+id/fab">
 
                         <TextView
                             android:id="@+id/tv_test_state"

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

@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:fitsSystemWindows="true"
     tools:context=".ui.SubSettingActivity">
 
     <LinearLayout
@@ -42,9 +44,10 @@
 
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/chk_locked"
-                    android:text="@string/routing_settings_locked"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:text="@string/routing_settings_locked"
+                    app:theme="@style/BrandedSwitch" />
             </LinearLayout>
 
             <LinearLayout
@@ -74,10 +77,10 @@
                 <EditText
                     android:id="@+id/et_domain"
                     android:layout_width="match_parent"
-                    android:maxLines="10"
-                    android:hint="@string/routing_settings_tips"
                     android:layout_height="wrap_content"
-                    android:inputType="textMultiLine" />
+                    android:hint="@string/routing_settings_tips"
+                    android:inputType="textMultiLine"
+                    android:maxLines="10" />
             </LinearLayout>
 
             <LinearLayout
@@ -93,11 +96,11 @@
 
                 <EditText
                     android:id="@+id/et_ip"
-                    android:maxLines="10"
-                    android:hint="@string/routing_settings_tips"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:inputType="textMultiLine" />
+                    android:hint="@string/routing_settings_tips"
+                    android:inputType="textMultiLine"
+                    android:maxLines="10" />
             </LinearLayout>
 
             <LinearLayout
@@ -132,8 +135,8 @@
                 <EditText
                     android:id="@+id/et_protocol"
                     android:layout_width="match_parent"
-                    android:hint="@string/routing_settings_protocol_tip"
                     android:layout_height="@dimen/edit_height"
+                    android:hint="@string/routing_settings_protocol_tip"
                     android:inputType="text" />
             </LinearLayout>
 
@@ -151,8 +154,8 @@
                 <EditText
                     android:id="@+id/et_network"
                     android:layout_width="match_parent"
-                    android:hint="@string/routing_settings_network_tip"
                     android:layout_height="@dimen/edit_height"
+                    android:hint="@string/routing_settings_network_tip"
                     android:inputType="text" />
             </LinearLayout>
 
@@ -179,8 +182,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
             android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginBottom="@dimen/layout_margin_top_height"
             android:orientation="vertical" />
 
     </LinearLayout>

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".ui.ServerCustomConfigActivity">
 
     <LinearLayout
@@ -13,8 +14,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_margin="@dimen/layout_margin_spacing">
+            android:layout_margin="@dimen/layout_margin_spacing"
+            android:orientation="vertical">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -27,8 +28,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_margin="@dimen/layout_margin_spacing">
+            android:layout_margin="@dimen/layout_margin_spacing"
+            android:orientation="vertical">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -69,11 +70,11 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
             <com.blacksquircle.ui.editorkit.widget.TextProcessor
+                android:id="@+id/editor"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:gravity="top|start"
-                android:id="@+id/editor"
-                android:layout_marginTop="@dimen/layout_margin_top_height" />
+                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:gravity="top|start" />
         </LinearLayout>
 
     </LinearLayout>

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".ui.ServerActivity">
 
     <LinearLayout

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".ui.ServerActivity">
 
     <LinearLayout

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".ui.ServerActivity">
 
     <LinearLayout

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".ui.ServerActivity">
 
     <LinearLayout

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".ui.ServerActivity">
 
     <LinearLayout

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".ui.ServerActivity">
 
     <LinearLayout

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".ui.ServerActivity">
 
     <LinearLayout

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

@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/fragment_settings"
-    android:name="com.v2ray.ang.ui.SettingsActivity$SettingsFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.SettingsActivity" />
+    android:fitsSystemWindows="true"
+    android:orientation="vertical"
+    tools:context=".ui.SettingsActivity">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment_settings"
+        android:name="com.v2ray.ang.ui.SettingsActivity$SettingsFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>

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

@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:fitsSystemWindows="true"
     tools:context=".ui.SubSettingActivity">
 
     <LinearLayout
@@ -108,7 +110,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingStart="@dimen/padding_start"
-                    android:paddingEnd="@dimen/padding_end" />
+                    android:paddingEnd="@dimen/padding_end"
+                    app:theme="@style/BrandedSwitch" />
 
             </LinearLayout>
 
@@ -130,7 +133,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingStart="@dimen/padding_start"
-                    android:paddingEnd="@dimen/padding_end" />
+                    android:paddingEnd="@dimen/padding_end"
+                    app:theme="@style/BrandedSwitch" />
 
             </LinearLayout>
 
@@ -149,8 +153,8 @@
                     android:id="@+id/et_pre_profile"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/edit_height"
-                    android:inputType="text"
-                    android:hint="@string/sub_setting_pre_profile_tip" />
+                    android:hint="@string/sub_setting_pre_profile_tip"
+                    android:inputType="text" />
 
             </LinearLayout>
 
@@ -169,8 +173,8 @@
                     android:id="@+id/et_next_profile"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/edit_height"
-                    android:inputType="text"
-                    android:hint="@string/sub_setting_pre_profile_tip" />
+                    android:hint="@string/sub_setting_pre_profile_tip"
+                    android:inputType="text" />
 
             </LinearLayout>
         </LinearLayout>
@@ -178,8 +182,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
             android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginBottom="@dimen/layout_margin_top_height"
             android:orientation="vertical" />
 
     </LinearLayout>

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

@@ -2,6 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:padding="@dimen/padding"
     tools:context=".ui.TaskerActivity">
@@ -22,11 +23,11 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
-            android:layout_toLeftOf="@id/switch_start_service"
             android:layout_toStartOf="@id/switch_start_service"
+            android:layout_toLeftOf="@id/switch_start_service"
             android:text="@string/tasker_start_service"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".ui.UserAssetUrlActivity">
 
     <LinearLayout
@@ -77,8 +78,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
             android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginBottom="@dimen/layout_margin_top_height"
             android:orientation="vertical" />
 
     </LinearLayout>

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

@@ -19,9 +19,9 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/sub_height"
             android:layout_gravity="center"
+            android:background="?attr/selectableItemBackground"
             android:clickable="true"
             android:focusable="true"
-            android:background="?attr/selectableItemBackground"
             android:gravity="center"
             android:nextFocusRight="@+id/layout_edit"
             android:orientation="horizontal">
@@ -46,10 +46,10 @@
 
                     <ImageView
                         android:id="@+id/img_locked"
-                        android:layout_gravity="center"
-                        android:layout_marginStart="@dimen/padding_start"
                         android:layout_width="@dimen/padding"
                         android:layout_height="@dimen/padding"
+                        android:layout_gravity="center"
+                        android:layout_marginStart="@dimen/padding_start"
                         app:srcCompat="@drawable/ic_lock_24dp" />
 
                 </LinearLayout>
@@ -76,9 +76,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/sub_height"
                 android:gravity="center"
+                android:orientation="vertical"
                 android:paddingStart="@dimen/padding_start"
-                android:paddingEnd="@dimen/padding_end"
-                android:orientation="vertical">
+                android:paddingEnd="@dimen/padding_end">
 
                 <LinearLayout
                     android:id="@+id/layout_edit"
@@ -107,7 +107,8 @@
                     <androidx.appcompat.widget.SwitchCompat
                         android:id="@+id/chk_enable"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        app:theme="@style/BrandedSwitch" />
                 </LinearLayout>
             </LinearLayout>
 

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

@@ -19,9 +19,9 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/sub_height"
             android:layout_gravity="center"
+            android:background="?attr/selectableItemBackground"
             android:clickable="true"
             android:focusable="true"
-            android:background="?attr/selectableItemBackground"
             android:gravity="center"
             android:nextFocusRight="@+id/layout_edit"
             android:orientation="horizontal">
@@ -55,9 +55,10 @@
 
                     <androidx.appcompat.widget.SwitchCompat
                         android:id="@+id/chk_enable"
-                        android:text="@string/sub_setting_enable"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:text="@string/sub_setting_enable"
+                        app:theme="@style/BrandedSwitch" />
                 </LinearLayout>
 
             </LinearLayout>

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

@@ -14,7 +14,7 @@
     </style>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"></style>
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar" />
 
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
@@ -27,4 +27,8 @@
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowIsTranslucent">true</item>
     </style>
+
+    <style name="BrandedSwitch" parent="AppTheme">
+        <item name="colorAccent">@color/color_fab_active</item>
+    </style>
 </resources>

V2rayNG/gradle/libs.versions.toml

@@ -6,7 +6,7 @@ constraintlayout = "2.2.0"
 core = "3.5.3"
 editorkit = "2.9.0"
 flexbox = "3.0.0"
-fragmentKtx = "1.8.4"
+fragmentKtx = "1.8.5"
 gson = "2.11.0"
 junit = "4.13.2"
 kotlinReflect = "2.0.21"