From 89f53233cb695d0c64ab5d0f231b37f93fc9c581 Mon Sep 17 00:00:00 2001
From: Eliot the Cougar <eliotfur@gmail.com>
Date: Thu, 1 Oct 2026 10:08:56 +0300
Subject: [PATCH] Fix navigation bar theme API lint errors (#6259)

---
 V2rayNG/app/src/main/res/values-night-v27/themes.xml | 6 ++++++
 V2rayNG/app/src/main/res/values-night/themes.xml     | 3 +--
 V2rayNG/app/src/main/res/values-v27/themes.xml       | 6 ++++++
 V2rayNG/app/src/main/res/values/themes.xml           | 6 ++++--
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 V2rayNG/app/src/main/res/values-night-v27/themes.xml
 create mode 100644 V2rayNG/app/src/main/res/values-v27/themes.xml

diff --git a/V2rayNG/app/src/main/res/values-night-v27/themes.xml b/V2rayNG/app/src/main/res/values-night-v27/themes.xml
new file mode 100644
index 000000000..2a716baab
--- /dev/null
+++ b/V2rayNG/app/src/main/res/values-night-v27/themes.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppThemeBase" parent="AppThemeBaseCommon">
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+</resources>
diff --git a/V2rayNG/app/src/main/res/values-night/themes.xml b/V2rayNG/app/src/main/res/values-night/themes.xml
index 672c89ce8..e7cedbe1b 100644
--- a/V2rayNG/app/src/main/res/values-night/themes.xml
+++ b/V2rayNG/app/src/main/res/values-night/themes.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Night theme: override window background and status bar flags for dark mode -->
-    <style name="AppThemeBase" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="AppThemeBaseCommon" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:windowLightNavigationBar">false</item>
         <item name="android:windowBackground">@color/window_background_dark</item>
     </style>
 
diff --git a/V2rayNG/app/src/main/res/values-v27/themes.xml b/V2rayNG/app/src/main/res/values-v27/themes.xml
new file mode 100644
index 000000000..284112ae2
--- /dev/null
+++ b/V2rayNG/app/src/main/res/values-v27/themes.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppThemeBase" parent="AppThemeBaseCommon">
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+</resources>
diff --git a/V2rayNG/app/src/main/res/values/themes.xml b/V2rayNG/app/src/main/res/values/themes.xml
index 05013b402..7d103fcb3 100644
--- a/V2rayNG/app/src/main/res/values/themes.xml
+++ b/V2rayNG/app/src/main/res/values/themes.xml
@@ -2,14 +2,16 @@
     <color name="window_background_light">#FFFFFFFF</color>
     <color name="window_background_dark">#FF1C1B1F</color>
 
-    <style name="AppThemeBase" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="AppThemeBaseCommon" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowLightNavigationBar">true</item>
         <item name="android:windowBackground">@color/window_background_light</item>
     </style>
 
+    <!-- API 27+ adds navigation bar icon appearance in the versioned base theme. -->
+    <style name="AppThemeBase" parent="AppThemeBaseCommon" />
+
     <style name="AppThemeDayNight" parent="AppThemeBase" />
 
     <style name="AppThemeDayNight.NoActionBar" parent="AppThemeBase" />