From 8efcd3910deb5e71e0d3a4258a496e695fbb611b Mon Sep 17 00:00:00 2001
From: hawkff <109485367+hawkff@users.noreply.github.com>
Date: Fri, 19 Jun 2026 23:55:05 -0400
Subject: [PATCH 1/7] Color protocol labels green in Dracula theme

Add a protocolColor theme attr for the profile-row protocol/type label.
The base themes default it to ?attr/accentOrTextSecondary (preserving the
current accent-colored behavior for all themes), and the Dracula day/night
styles override it with Dracula green (#50fa7b). getProtocolColor() now reads
R.attr.protocolColor instead of accentOrTextSecondary directly.

Verified on device: Dracula, Black (deepest attr chain) and Pink_SSR all
start with no crash and no attribute-resolution failures.
---
 app/src/main/java/moe/matsuri/nb4a/Protocols.kt | 2 +-
 app/src/main/res/values-v26/themes.xml          | 2 ++
 app/src/main/res/values/attrs.xml               | 3 +++
 app/src/main/res/values/colors.xml              | 2 ++
 app/src/main/res/values/themes.xml              | 5 +++++
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/moe/matsuri/nb4a/Protocols.kt b/app/src/main/java/moe/matsuri/nb4a/Protocols.kt
index 28f826800..12d1dbdee 100644
--- a/app/src/main/java/moe/matsuri/nb4a/Protocols.kt
+++ b/app/src/main/java/moe/matsuri/nb4a/Protocols.kt
@@ -44,7 +44,7 @@ object Protocols {
     fun Context.getProtocolColor(type: Int): Int {
         return when (type) {
             TYPE_NEKO -> getColorAttr(android.R.attr.textColorPrimary)
-            else -> getColorAttr(R.attr.accentOrTextSecondary)
+            else -> getColorAttr(R.attr.protocolColor)
         }
     }
 
diff --git a/app/src/main/res/values-v26/themes.xml b/app/src/main/res/values-v26/themes.xml
index 6bce0da1c..96b4733f6 100644
--- a/app/src/main/res/values-v26/themes.xml
+++ b/app/src/main/res/values-v26/themes.xml
@@ -5,6 +5,8 @@
         <!-- Default nav-drawer selected-item fill; satisfies the
              ?itemShapeFillColor self-reference in @color/navigation_item. -->
         <item name="itemShapeFillColor">?colorPrimary</item>
+        <!-- Protocol/type label color; defaults to accent, Dracula overrides green. -->
+        <item name="protocolColor">?attr/accentOrTextSecondary</item>
         <item name="actionModeCloseDrawable">@drawable/ic_navigation_close</item>
         <item name="colorButtonNormal">?colorAccent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 20cef29eb..073a0c59b 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -10,6 +10,9 @@
     <attr name="fabColorBackground" format="color" />
     <attr name="selectedColorPrimary" format="color" />
     <attr name="whiteOrTextPrimary" format="color" />
+    <!-- Text color for the protocol/type label on a profile row. Defaults to
+         the accent color; Dracula overrides it with its green. -->
+    <attr name="protocolColor" format="color" />
     <!-- Tonal "elevated surface" color for cards (route / group); each theme
          variant tints toward its own primary. -->
     <attr name="cardElevatedSurfaceColor" format="color" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1fc3610ac..c5370adae 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -300,6 +300,8 @@
     <color name="color_dracula_accent">#FF79C6</color>
     <color name="color_dracula_100">#E9DDFB</color>
     <color name="color_dracula_300">#9A7BD0</color>
+    <!-- Dracula green (#50fa7b), used for the protocol/type label. -->
+    <color name="color_dracula_green">#50FA7B</color>
 
     <color name="color_ng_black_accent">#9E9E9E</color>
     <color name="color_ng_black_primary">#2B2B2B</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e06ebb322..ab90f9704 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,6 +2,8 @@
     <!-- Base application theme. -->
     <style name="Theme.SagerNet" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="actionBarStyle">@style/Widget.MaterialComponents.ActionBar.Solid</item>
+        <!-- Protocol/type label color; defaults to accent, Dracula overrides green. -->
+        <item name="protocolColor">?attr/accentOrTextSecondary</item>
         <!-- Default nav-drawer selected-item fill; also satisfies the
              ?itemShapeFillColor self-reference in @color/navigation_item so the
              ColorStateList resolves for every theme. Only Black overrides it;
@@ -63,6 +65,7 @@
 
     <style name="Theme.SagerNet.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
         <item name="actionBarStyle">@style/Widget.MaterialComponents.ActionBar.Solid</item>
+        <item name="protocolColor">?attr/accentOrTextSecondary</item>
         <item name="itemShapeFillColor">?colorPrimary</item>
         <item name="actionModeCloseDrawable">@drawable/ic_navigation_close</item>
         <item name="colorButtonNormal">?colorAccent</item>
@@ -612,6 +615,7 @@
         <item name="colorMaterial100">@color/color_dracula_100</item>
         <item name="colorMaterial300">@color/color_dracula_300</item>
         <item name="cardElevatedSurfaceColor">@color/card_elevated_dracula</item>
+        <item name="protocolColor">@color/color_dracula_green</item>
     </style>
 
     <style name="Theme.SagerNet.Dialog.Black" parent="Theme.SagerNet.Dialog">
@@ -648,6 +652,7 @@
         <item name="colorMaterial100">@color/color_dracula_100</item>
         <item name="colorMaterial300">@color/color_dracula_300</item>
         <item name="cardElevatedSurfaceColor">@color/card_elevated_dracula</item>
+        <item name="protocolColor">@color/color_dracula_green</item>
     </style>
 
     <style name="Theme.Start" parent="Theme.MaterialComponents.DayNight">

From f74b290fd7b1161438994f3bd63c546ef74b0cd7 Mon Sep 17 00:00:00 2001
From: hawkff <109485367+hawkff@users.noreply.github.com>
Date: Sat, 20 Jun 2026 00:04:17 -0400
Subject: [PATCH 2/7] Apply protocolColor green in night Dracula styles

Dracula forces night mode on, so the active styles at runtime are the
values-night Theme.SagerNet.Dracula / Dialog.Dracula variants. They redeclare
the Dracula colors but were missing the protocolColor override, so the label
fell back to the base ?accentOrTextSecondary (pink) and the green never
applied. Add protocolColor=color_dracula_green to both night styles.

Verified in the compiled APK via aapt2: night Dracula styles now resolve
protocolColor to @color/color_dracula_green (#ff50fa7b). Fixes the issue
Greptile flagged on PR #39.
---
 app/src/main/res/values-night/themes.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 9b3c36627..db8d04655 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -26,6 +26,9 @@
         <item name="android:colorBackground">@color/dracula_background</item>
         <item name="colorOnBackground">@color/dracula_on_surface</item>
         <item name="android:windowBackground">@color/dracula_background</item>
+        <!-- Night is Dracula's active code path (it forces night mode on), so the
+             green protocol-label override must live here too, not only day. -->
+        <item name="protocolColor">@color/color_dracula_green</item>
     </style>
 
     <style name="Theme.SagerNet.Dialog.Dracula" parent="Theme.SagerNet.Dialog">
@@ -40,5 +43,6 @@
         <item name="colorOnSurface">@color/dracula_on_surface</item>
         <item name="android:colorBackground">@color/dracula_background</item>
         <item name="colorOnBackground">@color/dracula_on_surface</item>
+        <item name="protocolColor">@color/color_dracula_green</item>
     </style>
 </resources>

From ae4854d0c73db76cd18d18849f5e066e994db767 Mon Sep 17 00:00:00 2001
From: hawkff <109485367+hawkff@users.noreply.github.com>
Date: Sat, 20 Jun 2026 01:15:02 -0400
Subject: [PATCH 3/7] Add Dracula semantic colors: yellow names, red fails,
 state-colored connect

Extend the Dracula theme's semantic palette via theme attrs (default to the
prior colors for all other themes, so they are unchanged):

- profileNameColor: profile name label -> Dracula yellow (#f1fa8c)
- testFailColor: connection-test failures -> Dracula red (#ff5555)
- statusConnectedColor / statusStoppedColor: the bottom StatsBar status text
  and the connect-button (airplane) icon are tinted green when Connected and
  red when Stopped; transient Connecting/Stopping states stay neutral.

All overrides are duplicated into values-night (Dracula's active path) as well
as day. Verified in the compiled APK via aapt2 that the night Dracula style
resolves profileNameColor=yellow, statusConnected=green, statusStopped/testFail=red.
---
 .../sagernet/ui/ConfigurationFragment.kt          |  7 ++++---
 .../nekohasekai/sagernet/widget/ServiceButton.kt  | 15 +++++++++++++++
 .../io/nekohasekai/sagernet/widget/StatsBar.kt    | 13 +++++++++++++
 app/src/main/res/values-night/themes.xml          |  6 +++++-
 app/src/main/res/values-v26/themes.xml            |  4 ++++
 app/src/main/res/values/attrs.xml                 |  8 ++++++++
 app/src/main/res/values/colors.xml                |  4 ++++
 app/src/main/res/values/themes.xml                | 14 ++++++++++++++
 8 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/ConfigurationFragment.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/ConfigurationFragment.kt
index 332aff75e..1bff1dcc2 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/ui/ConfigurationFragment.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/ui/ConfigurationFragment.kt
@@ -762,14 +762,14 @@ class ConfigurationFragment @JvmOverloads constructor(
 
                     2 -> {
                         profileStatusText = profile.error
-                        profileStatusColor = context.getColour(R.color.material_red_500)
+                        profileStatusColor = context.getColorAttr(R.attr.testFailColor)
                     }
 
                     3 -> {
                         val err = profile.error ?: ""
                         val msg = Protocols.genFriendlyMsg(err)
                         profileStatusText = if (msg != err) msg else getString(R.string.unavailable)
-                        profileStatusColor = context.getColour(R.color.material_red_500)
+                        profileStatusColor = context.getColorAttr(R.attr.testFailColor)
                     }
                 }
 
@@ -1803,6 +1803,7 @@ class ConfigurationFragment @JvmOverloads constructor(
                 }
 
                 profileName.text = proxyEntity.displayName()
+                profileName.setTextColor(requireContext().getColorAttr(R.attr.profileNameColor))
                 profileType.text = proxyEntity.displayType()
                 profileType.setTextColor(requireContext().getProtocolColor(proxyEntity.type))
 
@@ -1854,7 +1855,7 @@ class ConfigurationFragment @JvmOverloads constructor(
                     profileStatus.text = getString(R.string.available, proxyEntity.ping)
                     profileStatus.setTextColor(requireContext().getColour(R.color.material_green_500))
                 } else {
-                    profileStatus.setTextColor(requireContext().getColour(R.color.material_red_500))
+                    profileStatus.setTextColor(requireContext().getColorAttr(R.attr.testFailColor))
                     if (proxyEntity.status == 2) {
                         profileStatus.text = proxyEntity.error
                     }
diff --git a/app/src/main/java/io/nekohasekai/sagernet/widget/ServiceButton.kt b/app/src/main/java/io/nekohasekai/sagernet/widget/ServiceButton.kt
index b86659e60..a31f7bbe7 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/widget/ServiceButton.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/widget/ServiceButton.kt
@@ -1,6 +1,7 @@
 package io.nekohasekai.sagernet.widget
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.util.AttributeSet
@@ -17,6 +18,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.progressindicator.BaseProgressIndicator
 import io.nekohasekai.sagernet.R
 import io.nekohasekai.sagernet.bg.BaseService
+import io.nekohasekai.sagernet.ktx.getColorAttr
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import java.util.*
@@ -118,6 +120,7 @@ class ServiceButton @JvmOverloads constructor(
         }
         checked = state == BaseService.State.Connected
         refreshDrawableState()
+        applyStateTint(state)
         val description = context.getText(if (state.canStop) R.string.stop else R.string.connect)
         contentDescription = description
         TooltipCompat.setTooltipText(this, description)
@@ -129,6 +132,18 @@ class ServiceButton @JvmOverloads constructor(
         )
     }
 
+    private fun applyStateTint(state: BaseService.State) {
+        // Tint the connect FAB icon by state: connected=green, stopped=red,
+        // transient states neutral (cleared). Non-Dracula themes default these
+        // attrs to the primary text color, so there is no visible change.
+        val attr = when (state) {
+            BaseService.State.Connected -> R.attr.statusConnectedColor
+            BaseService.State.Stopped -> R.attr.statusStoppedColor
+            else -> null
+        }
+        imageTintList = attr?.let { ColorStateList.valueOf(context.getColorAttr(it)) }
+    }
+
     private fun changeState(icon: AnimatedState, animate: Boolean) {
         fun counters(a: AnimatedState, b: AnimatedState): Boolean =
             a == iconStopped && b == iconConnecting ||
diff --git a/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt b/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt
index 2116c237e..9853a57be 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt
@@ -80,8 +80,21 @@ class StatsBar @JvmOverloads constructor(
         TooltipCompat.setTooltipText(this, text)
     }
 
+    private fun setStatusColorByState(state: BaseService.State) {
+        // Connected = statusConnectedColor, Stopped = statusStoppedColor, transient
+        // states stay neutral. For non-Dracula themes these attrs default to the
+        // primary text color, so there is no visible change.
+        val attr = when (state) {
+            BaseService.State.Connected -> R.attr.statusConnectedColor
+            BaseService.State.Stopped -> R.attr.statusStoppedColor
+            else -> android.R.attr.textColorPrimary
+        }
+        statusText.setTextColor(context.getColorAttr(attr))
+    }
+
     fun changeState(state: BaseService.State) {
         val activity = context as MainActivity
+        setStatusColorByState(state)
         fun postWhenStarted(what: () -> Unit) = activity.lifecycleScope.launch(Dispatchers.Main) {
             delay(100L)
             activity.whenStarted { what() }
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index db8d04655..a4805bd5c 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -27,8 +27,12 @@
         <item name="colorOnBackground">@color/dracula_on_surface</item>
         <item name="android:windowBackground">@color/dracula_background</item>
         <!-- Night is Dracula's active code path (it forces night mode on), so the
-             green protocol-label override must live here too, not only day. -->
+             semantic color overrides must live here too, not only day. -->
         <item name="protocolColor">@color/color_dracula_green</item>
+        <item name="profileNameColor">@color/color_dracula_yellow</item>
+        <item name="statusConnectedColor">@color/color_dracula_green</item>
+        <item name="statusStoppedColor">@color/color_dracula_red</item>
+        <item name="testFailColor">@color/color_dracula_red</item>
     </style>
 
     <style name="Theme.SagerNet.Dialog.Dracula" parent="Theme.SagerNet.Dialog">
diff --git a/app/src/main/res/values-v26/themes.xml b/app/src/main/res/values-v26/themes.xml
index 96b4733f6..4eae37e9f 100644
--- a/app/src/main/res/values-v26/themes.xml
+++ b/app/src/main/res/values-v26/themes.xml
@@ -7,6 +7,10 @@
         <item name="itemShapeFillColor">?colorPrimary</item>
         <!-- Protocol/type label color; defaults to accent, Dracula overrides green. -->
         <item name="protocolColor">?attr/accentOrTextSecondary</item>
+        <item name="profileNameColor">?android:attr/textColorPrimary</item>
+        <item name="statusConnectedColor">?android:attr/textColorPrimary</item>
+        <item name="statusStoppedColor">?android:attr/textColorPrimary</item>
+        <item name="testFailColor">@color/material_red_500</item>
         <item name="actionModeCloseDrawable">@drawable/ic_navigation_close</item>
         <item name="colorButtonNormal">?colorAccent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 073a0c59b..121b67e75 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -13,6 +13,14 @@
     <!-- Text color for the protocol/type label on a profile row. Defaults to
          the accent color; Dracula overrides it with its green. -->
     <attr name="protocolColor" format="color" />
+    <!-- Profile name label color. Defaults to primary text; Dracula = yellow. -->
+    <attr name="profileNameColor" format="color" />
+    <!-- Service status / connect-button colors. Default to primary text so non-
+         Dracula themes are unchanged; Dracula tints connected=green, stopped=red. -->
+    <attr name="statusConnectedColor" format="color" />
+    <attr name="statusStoppedColor" format="color" />
+    <!-- Connection-test failure color. Default Material red; Dracula = #ff5555. -->
+    <attr name="testFailColor" format="color" />
     <!-- Tonal "elevated surface" color for cards (route / group); each theme
          variant tints toward its own primary. -->
     <attr name="cardElevatedSurfaceColor" format="color" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c5370adae..67fb6f00b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -302,6 +302,10 @@
     <color name="color_dracula_300">#9A7BD0</color>
     <!-- Dracula green (#50fa7b), used for the protocol/type label. -->
     <color name="color_dracula_green">#50FA7B</color>
+    <!-- Dracula red (#ff5555): failures / stopped state. -->
+    <color name="color_dracula_red">#FF5555</color>
+    <!-- Dracula yellow (#f1fa8c): profile name label. -->
+    <color name="color_dracula_yellow">#F1FA8C</color>
 
     <color name="color_ng_black_accent">#9E9E9E</color>
     <color name="color_ng_black_primary">#2B2B2B</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ab90f9704..03a78d95b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -4,6 +4,12 @@
         <item name="actionBarStyle">@style/Widget.MaterialComponents.ActionBar.Solid</item>
         <!-- Protocol/type label color; defaults to accent, Dracula overrides green. -->
         <item name="protocolColor">?attr/accentOrTextSecondary</item>
+        <!-- Per-theme semantic colors; default to primary text (no visible change),
+             Dracula overrides them. -->
+        <item name="profileNameColor">?android:attr/textColorPrimary</item>
+        <item name="statusConnectedColor">?android:attr/textColorPrimary</item>
+        <item name="statusStoppedColor">?android:attr/textColorPrimary</item>
+        <item name="testFailColor">@color/material_red_500</item>
         <!-- Default nav-drawer selected-item fill; also satisfies the
              ?itemShapeFillColor self-reference in @color/navigation_item so the
              ColorStateList resolves for every theme. Only Black overrides it;
@@ -66,6 +72,10 @@
     <style name="Theme.SagerNet.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
         <item name="actionBarStyle">@style/Widget.MaterialComponents.ActionBar.Solid</item>
         <item name="protocolColor">?attr/accentOrTextSecondary</item>
+        <item name="profileNameColor">?android:attr/textColorPrimary</item>
+        <item name="statusConnectedColor">?android:attr/textColorPrimary</item>
+        <item name="statusStoppedColor">?android:attr/textColorPrimary</item>
+        <item name="testFailColor">@color/material_red_500</item>
         <item name="itemShapeFillColor">?colorPrimary</item>
         <item name="actionModeCloseDrawable">@drawable/ic_navigation_close</item>
         <item name="colorButtonNormal">?colorAccent</item>
@@ -616,6 +626,10 @@
         <item name="colorMaterial300">@color/color_dracula_300</item>
         <item name="cardElevatedSurfaceColor">@color/card_elevated_dracula</item>
         <item name="protocolColor">@color/color_dracula_green</item>
+        <item name="profileNameColor">@color/color_dracula_yellow</item>
+        <item name="statusConnectedColor">@color/color_dracula_green</item>
+        <item name="statusStoppedColor">@color/color_dracula_red</item>
+        <item name="testFailColor">@color/color_dracula_red</item>
     </style>
 
     <style name="Theme.SagerNet.Dialog.Black" parent="Theme.SagerNet.Dialog">

From 5e54a71f1fd753513001cc68802c21150cd6d70b Mon Sep 17 00:00:00 2001
From: hawkff <109485367+hawkff@users.noreply.github.com>
Date: Sat, 20 Jun 2026 01:29:15 -0400
Subject: [PATCH 4/7] Fix FAB tint regression and complete Dracula dialog
 overrides

Addresses reviewer feedback on PR:

- P1: applyStateTint set imageTintList to ?textColorPrimary on every theme,
  which on non-Dracula light themes painted the connect-FAB icon a dark/wrong
  color, and cleared the tint to null on transient states. Default
  statusConnectedColor/statusStoppedColor to ?attr/colorOnPrimary (the FAB's
  normal on-primary icon color) and use colorOnPrimary for transient states, so
  non-Dracula themes keep their original appearance. StatsBar status text uses
  the same fallback (it sits on the colorPrimary bar).
- Major/P2: add the four missing semantic overrides (profileName/status/
  testFail) to Theme.SagerNet.Dialog.Dracula in both day and night so the
  Dracula dialog palette stays consistent.

Verified in compiled APK: base theme status attrs resolve to ?colorOnPrimary;
Dracula resolves to yellow/green/red.
---
 .../io/nekohasekai/sagernet/widget/ServiceButton.kt  | 10 +++++-----
 .../java/io/nekohasekai/sagernet/widget/StatsBar.kt  |  7 ++++---
 app/src/main/res/values-night/themes.xml             |  4 ++++
 app/src/main/res/values-v26/themes.xml               |  4 ++--
 app/src/main/res/values/themes.xml                   | 12 ++++++++----
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/io/nekohasekai/sagernet/widget/ServiceButton.kt b/app/src/main/java/io/nekohasekai/sagernet/widget/ServiceButton.kt
index a31f7bbe7..27da446b1 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/widget/ServiceButton.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/widget/ServiceButton.kt
@@ -133,15 +133,15 @@ class ServiceButton @JvmOverloads constructor(
     }
 
     private fun applyStateTint(state: BaseService.State) {
-        // Tint the connect FAB icon by state: connected=green, stopped=red,
-        // transient states neutral (cleared). Non-Dracula themes default these
-        // attrs to the primary text color, so there is no visible change.
+        // Tint the connect FAB icon by state: connected=green, stopped=red. For
+        // transient states (and on non-Dracula themes) fall back to colorOnPrimary,
+        // which is the FAB's normal icon color, so those themes look unchanged.
         val attr = when (state) {
             BaseService.State.Connected -> R.attr.statusConnectedColor
             BaseService.State.Stopped -> R.attr.statusStoppedColor
-            else -> null
+            else -> com.google.android.material.R.attr.colorOnPrimary
         }
-        imageTintList = attr?.let { ColorStateList.valueOf(context.getColorAttr(it)) }
+        imageTintList = ColorStateList.valueOf(context.getColorAttr(attr))
     }
 
     private fun changeState(icon: AnimatedState, animate: Boolean) {
diff --git a/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt b/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt
index 9853a57be..afe93d18e 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt
@@ -82,12 +82,13 @@ class StatsBar @JvmOverloads constructor(
 
     private fun setStatusColorByState(state: BaseService.State) {
         // Connected = statusConnectedColor, Stopped = statusStoppedColor, transient
-        // states stay neutral. For non-Dracula themes these attrs default to the
-        // primary text color, so there is no visible change.
+        // states use colorOnPrimary (the bar's normal on-primary text color). For
+        // non-Dracula themes the connected/stopped attrs also default to
+        // colorOnPrimary, so there is no visible change.
         val attr = when (state) {
             BaseService.State.Connected -> R.attr.statusConnectedColor
             BaseService.State.Stopped -> R.attr.statusStoppedColor
-            else -> android.R.attr.textColorPrimary
+            else -> com.google.android.material.R.attr.colorOnPrimary
         }
         statusText.setTextColor(context.getColorAttr(attr))
     }
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index a4805bd5c..c1c654d90 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -48,5 +48,9 @@
         <item name="android:colorBackground">@color/dracula_background</item>
         <item name="colorOnBackground">@color/dracula_on_surface</item>
         <item name="protocolColor">@color/color_dracula_green</item>
+        <item name="profileNameColor">@color/color_dracula_yellow</item>
+        <item name="statusConnectedColor">@color/color_dracula_green</item>
+        <item name="statusStoppedColor">@color/color_dracula_red</item>
+        <item name="testFailColor">@color/color_dracula_red</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-v26/themes.xml b/app/src/main/res/values-v26/themes.xml
index 4eae37e9f..4e66e7dad 100644
--- a/app/src/main/res/values-v26/themes.xml
+++ b/app/src/main/res/values-v26/themes.xml
@@ -8,8 +8,8 @@
         <!-- Protocol/type label color; defaults to accent, Dracula overrides green. -->
         <item name="protocolColor">?attr/accentOrTextSecondary</item>
         <item name="profileNameColor">?android:attr/textColorPrimary</item>
-        <item name="statusConnectedColor">?android:attr/textColorPrimary</item>
-        <item name="statusStoppedColor">?android:attr/textColorPrimary</item>
+        <item name="statusConnectedColor">?attr/colorOnPrimary</item>
+        <item name="statusStoppedColor">?attr/colorOnPrimary</item>
         <item name="testFailColor">@color/material_red_500</item>
         <item name="actionModeCloseDrawable">@drawable/ic_navigation_close</item>
         <item name="colorButtonNormal">?colorAccent</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 03a78d95b..05d27f806 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -7,8 +7,8 @@
         <!-- Per-theme semantic colors; default to primary text (no visible change),
              Dracula overrides them. -->
         <item name="profileNameColor">?android:attr/textColorPrimary</item>
-        <item name="statusConnectedColor">?android:attr/textColorPrimary</item>
-        <item name="statusStoppedColor">?android:attr/textColorPrimary</item>
+        <item name="statusConnectedColor">?attr/colorOnPrimary</item>
+        <item name="statusStoppedColor">?attr/colorOnPrimary</item>
         <item name="testFailColor">@color/material_red_500</item>
         <!-- Default nav-drawer selected-item fill; also satisfies the
              ?itemShapeFillColor self-reference in @color/navigation_item so the
@@ -73,8 +73,8 @@
         <item name="actionBarStyle">@style/Widget.MaterialComponents.ActionBar.Solid</item>
         <item name="protocolColor">?attr/accentOrTextSecondary</item>
         <item name="profileNameColor">?android:attr/textColorPrimary</item>
-        <item name="statusConnectedColor">?android:attr/textColorPrimary</item>
-        <item name="statusStoppedColor">?android:attr/textColorPrimary</item>
+        <item name="statusConnectedColor">?attr/colorOnPrimary</item>
+        <item name="statusStoppedColor">?attr/colorOnPrimary</item>
         <item name="testFailColor">@color/material_red_500</item>
         <item name="itemShapeFillColor">?colorPrimary</item>
         <item name="actionModeCloseDrawable">@drawable/ic_navigation_close</item>
@@ -667,6 +667,10 @@
         <item name="colorMaterial300">@color/color_dracula_300</item>
         <item name="cardElevatedSurfaceColor">@color/card_elevated_dracula</item>
         <item name="protocolColor">@color/color_dracula_green</item>
+        <item name="profileNameColor">@color/color_dracula_yellow</item>
+        <item name="statusConnectedColor">@color/color_dracula_green</item>
+        <item name="statusStoppedColor">@color/color_dracula_red</item>
+        <item name="testFailColor">@color/color_dracula_red</item>
     </style>
 
     <style name="Theme.Start" parent="Theme.MaterialComponents.DayNight">

From 6dd4ad5d974f05d54995df1946d0d958ca1ccddd Mon Sep 17 00:00:00 2001
From: hawkff <109485367+hawkff@users.noreply.github.com>
Date: Sat, 20 Jun 2026 08:15:05 -0400
Subject: [PATCH 5/7] Extend Dracula colors: yellow speeds/stopped-FAB,
 two-tone status, cyan proxy, pink nav
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Per design review of the live theme:

- speedTextColor: bottom-bar up/down speed text (incl. 0 B/s) -> Dracula yellow.
- fabStoppedColor: connect-FAB icon when Stopped -> Dracula yellow (the red
  strikethrough plane was nearly invisible on the pink/purple FAB). Status
  TEXT for stopped/shutting-down stays red via statusStoppedColor.
- Two-tone status text: 'Connected,' / 'Success:' lead segment in green, the
  remainder (hint / handshake detail) in yellow (statusDetailColor). 'Testing…'
  yellow, 'Shutting down…' red. Falls back to single lead color if a locale
  string lacks the separator (safe, no crash).
- routeProxyColor: Proxy route rule -> Dracula cyan #8be9fd (Dracula's blue).
- navSelectedColor: selected nav-drawer item (fill + icon/text) -> Dracula
  accent (pink) to match the toggle-on color. Black keeps its accent; other
  themes default to colorPrimary (unchanged).

All gated via theme attrs that default to prior colors, so the other ~22
themes are visually unchanged. Verified attr resolution in the compiled APK.
---
 .../nekohasekai/sagernet/ui/RouteFragment.kt  | 14 +++--
 .../sagernet/widget/ServiceButton.kt          |  2 +-
 .../nekohasekai/sagernet/widget/StatsBar.kt   | 56 ++++++++++++++++---
 app/src/main/res/color/nav_item_fill.xml      |  2 +-
 app/src/main/res/color/navigation_icon.xml    |  4 +-
 app/src/main/res/values-night/themes.xml      |  9 +++
 app/src/main/res/values-v26/themes.xml        |  5 ++
 app/src/main/res/values/attrs.xml             | 14 +++++
 app/src/main/res/values/colors.xml            |  2 +
 app/src/main/res/values/themes.xml            | 20 +++++++
 10 files changed, 109 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/RouteFragment.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/RouteFragment.kt
index cf4e7aa6c..25720e9f1 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/ui/RouteFragment.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/ui/RouteFragment.kt
@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
+import io.nekohasekai.sagernet.ktx.getColorAttr
 import androidx.core.view.ViewCompat
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
@@ -287,13 +288,14 @@ class RouteFragment : ToolbarFragment(R.layout.layout_route), Toolbar.OnMenuItem
                 routeOutbound.text = rule.displayOutbound()
 
                 // set text color based on route type
-                val colorRes = when (rule.outbound) {
-                    -2L -> R.color.color_route_block   // block: red
-                    -1L -> R.color.color_route_direct  // direct: green
-                    0L -> R.color.color_route_proxy    // proxy: blue
-                    else -> R.color.color_route_config // config: purple
+                val ctx = itemView.context
+                val outboundColor = when (rule.outbound) {
+                    -2L -> ContextCompat.getColor(ctx, R.color.color_route_block)   // block: red
+                    -1L -> ContextCompat.getColor(ctx, R.color.color_route_direct)  // direct: green
+                    0L -> ctx.getColorAttr(R.attr.routeProxyColor)                  // proxy: blue/cyan
+                    else -> ContextCompat.getColor(ctx, R.color.color_route_config) // config: purple
                 }
-                routeOutbound.setTextColor(ContextCompat.getColor(itemView.context, colorRes))
+                routeOutbound.setTextColor(outboundColor)
 
                 itemView.setOnClickListener {
                     enableSwitch.performClick()
diff --git a/app/src/main/java/io/nekohasekai/sagernet/widget/ServiceButton.kt b/app/src/main/java/io/nekohasekai/sagernet/widget/ServiceButton.kt
index 27da446b1..e8e0183f4 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/widget/ServiceButton.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/widget/ServiceButton.kt
@@ -138,7 +138,7 @@ class ServiceButton @JvmOverloads constructor(
         // which is the FAB's normal icon color, so those themes look unchanged.
         val attr = when (state) {
             BaseService.State.Connected -> R.attr.statusConnectedColor
-            BaseService.State.Stopped -> R.attr.statusStoppedColor
+            BaseService.State.Stopped -> R.attr.fabStoppedColor
             else -> com.google.android.material.R.attr.colorOnPrimary
         }
         imageTintList = ColorStateList.valueOf(context.getColorAttr(attr))
diff --git a/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt b/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt
index afe93d18e..99398b5e4 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt
@@ -2,7 +2,9 @@ package io.nekohasekai.sagernet.widget
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.text.SpannableStringBuilder
 import android.text.format.Formatter
+import android.text.style.ForegroundColorSpan
 import android.util.AttributeSet
 import android.view.View
 import android.widget.TextView
@@ -80,14 +82,38 @@ class StatsBar @JvmOverloads constructor(
         TooltipCompat.setTooltipText(this, text)
     }
 
+    // Two-tone status: color the lead segment (split at [sep], kept with the lead)
+    // and the remainder separately. Used for "Connected, …" and "Success: …".
+    private fun setStatusTwoTone(
+        full: CharSequence, sep: Char, leadAttr: Int, restAttr: Int
+    ) {
+        val s = full.toString()
+        val idx = s.indexOf(sep)
+        if (idx < 0) {
+            statusText.setTextColor(context.getColorAttr(leadAttr))
+            setStatus(full)
+            return
+        }
+        val cut = idx + 1 // keep the separator char with the lead segment
+        val span = SpannableStringBuilder(s)
+        span.setSpan(
+            ForegroundColorSpan(context.getColorAttr(leadAttr)),
+            0, cut, SpannableStringBuilder.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+        span.setSpan(
+            ForegroundColorSpan(context.getColorAttr(restAttr)),
+            cut, s.length, SpannableStringBuilder.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+        setStatus(span)
+    }
+
     private fun setStatusColorByState(state: BaseService.State) {
-        // Connected = statusConnectedColor, Stopped = statusStoppedColor, transient
-        // states use colorOnPrimary (the bar's normal on-primary text color). For
-        // non-Dracula themes the connected/stopped attrs also default to
-        // colorOnPrimary, so there is no visible change.
+        // Connected = statusConnectedColor (green), Stopped/Stopping = statusStoppedColor
+        // (red — "Shutting down…" reads as red), Connecting/other = colorOnPrimary.
+        // Non-Dracula themes default these attrs to colorOnPrimary, so no change.
         val attr = when (state) {
             BaseService.State.Connected -> R.attr.statusConnectedColor
-            BaseService.State.Stopped -> R.attr.statusStoppedColor
+            BaseService.State.Stopped, BaseService.State.Stopping -> R.attr.statusStoppedColor
             else -> com.google.android.material.R.attr.colorOnPrimary
         }
         statusText.setTextColor(context.getColorAttr(attr))
@@ -95,7 +121,6 @@ class StatsBar @JvmOverloads constructor(
 
     fun changeState(state: BaseService.State) {
         val activity = context as MainActivity
-        setStatusColorByState(state)
         fun postWhenStarted(what: () -> Unit) = activity.lifecycleScope.launch(Dispatchers.Main) {
             delay(100L)
             activity.whenStarted { what() }
@@ -103,13 +128,18 @@ class StatsBar @JvmOverloads constructor(
         if ((state == BaseService.State.Connected).also { hideOnScroll = it }) {
             postWhenStarted {
                 if (allowShow) performShow()
-                setStatus(app.getText(R.string.vpn_connected))
+                // "Connected," in green; the "tap to check connection" hint in detail color.
+                setStatusTwoTone(
+                    app.getText(R.string.vpn_connected), ',',
+                    R.attr.statusConnectedColor, R.attr.statusDetailColor
+                )
             }
         } else {
             postWhenStarted {
                 performHide()
             }
             updateSpeed(0, 0)
+            setStatusColorByState(state)
             setStatus(
                 context.getText(
                     when (state) {
@@ -124,6 +154,9 @@ class StatsBar @JvmOverloads constructor(
 
     @SuppressLint("SetTextI18n")
     fun updateSpeed(txRate: Long, rxRate: Long) {
+        val speedColor = context.getColorAttr(R.attr.speedTextColor)
+        txText.setTextColor(speedColor)
+        rxText.setTextColor(speedColor)
         txText.text = "▲  ${
             context.getString(
                 R.string.speed, Formatter.formatFileSize(context, txRate)
@@ -139,20 +172,24 @@ class StatsBar @JvmOverloads constructor(
     fun testConnection() {
         val activity = context as MainActivity
         isEnabled = false
+        // "Testing…" in the detail color.
+        statusText.setTextColor(context.getColorAttr(R.attr.statusDetailColor))
         setStatus(app.getText(R.string.connection_test_testing))
         runOnDefaultDispatcher {
             try {
                 val elapsed = activity.urlTest()
                 onMainDispatcher {
                     isEnabled = true
-                    setStatus(
+                    // "Success:" in green; the handshake detail in detail color.
+                    setStatusTwoTone(
                         app.getString(
                             if (DataStore.connectionTestURL.startsWith("https://")) {
                                 R.string.connection_test_available
                             } else {
                                 R.string.connection_test_available_http
                             }, elapsed
-                        )
+                        ), ':',
+                        R.attr.statusConnectedColor, R.attr.statusDetailColor
                     )
                 }
 
@@ -160,6 +197,7 @@ class StatsBar @JvmOverloads constructor(
                 Logs.w(e.toString())
                 onMainDispatcher {
                     isEnabled = true
+                    statusText.setTextColor(context.getColorAttr(R.attr.statusDetailColor))
                     setStatus(app.getText(R.string.connection_test_testing))
 
                     activity.snackbar(
diff --git a/app/src/main/res/color/nav_item_fill.xml b/app/src/main/res/color/nav_item_fill.xml
index f23d44ec7..d3cdd7475 100644
--- a/app/src/main/res/color/nav_item_fill.xml
+++ b/app/src/main/res/color/nav_item_fill.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorPrimary" android:alpha="0.16" android:state_checked="true" />
+    <item android:color="?attr/navSelectedColor" android:alpha="0.16" android:state_checked="true" />
     <item android:color="@android:color/transparent" />
 </selector>
diff --git a/app/src/main/res/color/navigation_icon.xml b/app/src/main/res/color/navigation_icon.xml
index 99c3f94f7..eff42755a 100644
--- a/app/src/main/res/color/navigation_icon.xml
+++ b/app/src/main/res/color/navigation_icon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/primaryOrTextSecondary" android:state_checked="true" />
+    <item android:color="?attr/navSelectedColor" android:state_checked="true" />
     <item android:color="?android:textColorPrimary" android:state_checked="false" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index c1c654d90..134e17495 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -33,6 +33,11 @@
         <item name="statusConnectedColor">@color/color_dracula_green</item>
         <item name="statusStoppedColor">@color/color_dracula_red</item>
         <item name="testFailColor">@color/color_dracula_red</item>
+        <item name="speedTextColor">@color/color_dracula_yellow</item>
+        <item name="fabStoppedColor">@color/color_dracula_yellow</item>
+        <item name="statusDetailColor">@color/color_dracula_yellow</item>
+        <item name="routeProxyColor">@color/color_dracula_cyan</item>
+        <item name="navSelectedColor">?attr/colorAccent</item>
     </style>
 
     <style name="Theme.SagerNet.Dialog.Dracula" parent="Theme.SagerNet.Dialog">
@@ -52,5 +57,9 @@
         <item name="statusConnectedColor">@color/color_dracula_green</item>
         <item name="statusStoppedColor">@color/color_dracula_red</item>
         <item name="testFailColor">@color/color_dracula_red</item>
+        <item name="speedTextColor">@color/color_dracula_yellow</item>
+        <item name="fabStoppedColor">@color/color_dracula_yellow</item>
+        <item name="statusDetailColor">@color/color_dracula_yellow</item>
+        <item name="routeProxyColor">@color/color_dracula_cyan</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-v26/themes.xml b/app/src/main/res/values-v26/themes.xml
index 4e66e7dad..46be99f2e 100644
--- a/app/src/main/res/values-v26/themes.xml
+++ b/app/src/main/res/values-v26/themes.xml
@@ -11,6 +11,11 @@
         <item name="statusConnectedColor">?attr/colorOnPrimary</item>
         <item name="statusStoppedColor">?attr/colorOnPrimary</item>
         <item name="testFailColor">@color/material_red_500</item>
+        <item name="speedTextColor">?attr/colorOnPrimary</item>
+        <item name="fabStoppedColor">?attr/colorOnPrimary</item>
+        <item name="statusDetailColor">?attr/colorOnPrimary</item>
+        <item name="routeProxyColor">@color/color_route_proxy</item>
+        <item name="navSelectedColor">?attr/colorPrimary</item>
         <item name="actionModeCloseDrawable">@drawable/ic_navigation_close</item>
         <item name="colorButtonNormal">?colorAccent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 121b67e75..a49146833 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -21,6 +21,20 @@
     <attr name="statusStoppedColor" format="color" />
     <!-- Connection-test failure color. Default Material red; Dracula = #ff5555. -->
     <attr name="testFailColor" format="color" />
+    <!-- Bottom-bar speed text (arrows + rate). Default on-primary; Dracula = yellow. -->
+    <attr name="speedTextColor" format="color" />
+    <!-- Connect-FAB icon tint when Stopped. Default on-primary; Dracula = yellow
+         (red was invisible on the pink/purple FAB). Separate from the red
+         statusStoppedColor used for the status text. -->
+    <attr name="fabStoppedColor" format="color" />
+    <!-- Secondary status text (the part after "Connected," / "Success:").
+         Default on-primary; Dracula = yellow. -->
+    <attr name="statusDetailColor" format="color" />
+    <!-- Proxy route-rule color. Default blue; Dracula = cyan. -->
+    <attr name="routeProxyColor" format="color" />
+    <!-- Selected nav-drawer item color (fill tint + icon/text). Default primary;
+         Dracula uses its accent (pink) to match the toggle-on color. -->
+    <attr name="navSelectedColor" format="color" />
     <!-- Tonal "elevated surface" color for cards (route / group); each theme
          variant tints toward its own primary. -->
     <attr name="cardElevatedSurfaceColor" format="color" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 67fb6f00b..cad484329 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -306,6 +306,8 @@
     <color name="color_dracula_red">#FF5555</color>
     <!-- Dracula yellow (#f1fa8c): profile name label. -->
     <color name="color_dracula_yellow">#F1FA8C</color>
+    <!-- Dracula cyan (#8be9fd): the Dracula "blue" (e.g. proxy route rules). -->
+    <color name="color_dracula_cyan">#8BE9FD</color>
 
     <color name="color_ng_black_accent">#9E9E9E</color>
     <color name="color_ng_black_primary">#2B2B2B</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 05d27f806..8c01ecf00 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -10,6 +10,11 @@
         <item name="statusConnectedColor">?attr/colorOnPrimary</item>
         <item name="statusStoppedColor">?attr/colorOnPrimary</item>
         <item name="testFailColor">@color/material_red_500</item>
+        <item name="speedTextColor">?attr/colorOnPrimary</item>
+        <item name="fabStoppedColor">?attr/colorOnPrimary</item>
+        <item name="statusDetailColor">?attr/colorOnPrimary</item>
+        <item name="routeProxyColor">@color/color_route_proxy</item>
+        <item name="navSelectedColor">?attr/colorPrimary</item>
         <!-- Default nav-drawer selected-item fill; also satisfies the
              ?itemShapeFillColor self-reference in @color/navigation_item so the
              ColorStateList resolves for every theme. Only Black overrides it;
@@ -76,6 +81,11 @@
         <item name="statusConnectedColor">?attr/colorOnPrimary</item>
         <item name="statusStoppedColor">?attr/colorOnPrimary</item>
         <item name="testFailColor">@color/material_red_500</item>
+        <item name="speedTextColor">?attr/colorOnPrimary</item>
+        <item name="fabStoppedColor">?attr/colorOnPrimary</item>
+        <item name="statusDetailColor">?attr/colorOnPrimary</item>
+        <item name="routeProxyColor">@color/color_route_proxy</item>
+        <item name="navSelectedColor">?attr/colorPrimary</item>
         <item name="itemShapeFillColor">?colorPrimary</item>
         <item name="actionModeCloseDrawable">@drawable/ic_navigation_close</item>
         <item name="colorButtonNormal">?colorAccent</item>
@@ -598,6 +608,7 @@
         <item name="selectedColorPrimary">@color/color_ng_black_accent</item>
         <item name="fabColorBackground">@color/color_ng_black_accent</item>
         <item name="itemShapeFillColor">@color/color_ng_black_accent</item>
+        <item name="navSelectedColor">@color/color_ng_black_accent</item>
 
         <item name="accentOrTextSecondary">?android:textColorSecondary</item>
         <item name="accentOrTextPrimary">?android:textColorPrimary</item>
@@ -630,6 +641,11 @@
         <item name="statusConnectedColor">@color/color_dracula_green</item>
         <item name="statusStoppedColor">@color/color_dracula_red</item>
         <item name="testFailColor">@color/color_dracula_red</item>
+        <item name="speedTextColor">@color/color_dracula_yellow</item>
+        <item name="fabStoppedColor">@color/color_dracula_yellow</item>
+        <item name="statusDetailColor">@color/color_dracula_yellow</item>
+        <item name="routeProxyColor">@color/color_dracula_cyan</item>
+        <item name="navSelectedColor">?attr/colorAccent</item>
     </style>
 
     <style name="Theme.SagerNet.Dialog.Black" parent="Theme.SagerNet.Dialog">
@@ -671,6 +687,10 @@
         <item name="statusConnectedColor">@color/color_dracula_green</item>
         <item name="statusStoppedColor">@color/color_dracula_red</item>
         <item name="testFailColor">@color/color_dracula_red</item>
+        <item name="speedTextColor">@color/color_dracula_yellow</item>
+        <item name="fabStoppedColor">@color/color_dracula_yellow</item>
+        <item name="statusDetailColor">@color/color_dracula_yellow</item>
+        <item name="routeProxyColor">@color/color_dracula_cyan</item>
     </style>
 
     <style name="Theme.Start" parent="Theme.MaterialComponents.DayNight">

From ecc51f98d8a6e2eb19b20c1578d9dae60d46aace Mon Sep 17 00:00:00 2001
From: hawkff <109485367+hawkff@users.noreply.github.com>
Date: Sat, 20 Jun 2026 08:44:56 -0400
Subject: [PATCH 6/7] Recolor speeds, stopped-FAB, and status detail to Dracula
 cyan
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Per design review: switch speedTextColor (up/down + 0 B/s), fabStoppedColor
(stopped airplane icon), and statusDetailColor ('tap to check connection' /
'…handshake took Nms') from yellow to Dracula cyan (#8be9fd). Profile names
stay yellow; protocol=green, connected=green, stopped/fail status text=red,
proxy route=cyan, nav selected=accent. Other themes unchanged.
---
 app/src/main/res/values-night/themes.xml | 12 ++++++------
 app/src/main/res/values/themes.xml       | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 134e17495..fe5795151 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -33,9 +33,9 @@
         <item name="statusConnectedColor">@color/color_dracula_green</item>
         <item name="statusStoppedColor">@color/color_dracula_red</item>
         <item name="testFailColor">@color/color_dracula_red</item>
-        <item name="speedTextColor">@color/color_dracula_yellow</item>
-        <item name="fabStoppedColor">@color/color_dracula_yellow</item>
-        <item name="statusDetailColor">@color/color_dracula_yellow</item>
+        <item name="speedTextColor">@color/color_dracula_cyan</item>
+        <item name="fabStoppedColor">@color/color_dracula_cyan</item>
+        <item name="statusDetailColor">@color/color_dracula_cyan</item>
         <item name="routeProxyColor">@color/color_dracula_cyan</item>
         <item name="navSelectedColor">?attr/colorAccent</item>
     </style>
@@ -57,9 +57,9 @@
         <item name="statusConnectedColor">@color/color_dracula_green</item>
         <item name="statusStoppedColor">@color/color_dracula_red</item>
         <item name="testFailColor">@color/color_dracula_red</item>
-        <item name="speedTextColor">@color/color_dracula_yellow</item>
-        <item name="fabStoppedColor">@color/color_dracula_yellow</item>
-        <item name="statusDetailColor">@color/color_dracula_yellow</item>
+        <item name="speedTextColor">@color/color_dracula_cyan</item>
+        <item name="fabStoppedColor">@color/color_dracula_cyan</item>
+        <item name="statusDetailColor">@color/color_dracula_cyan</item>
         <item name="routeProxyColor">@color/color_dracula_cyan</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8c01ecf00..596284d78 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -641,9 +641,9 @@
         <item name="statusConnectedColor">@color/color_dracula_green</item>
         <item name="statusStoppedColor">@color/color_dracula_red</item>
         <item name="testFailColor">@color/color_dracula_red</item>
-        <item name="speedTextColor">@color/color_dracula_yellow</item>
-        <item name="fabStoppedColor">@color/color_dracula_yellow</item>
-        <item name="statusDetailColor">@color/color_dracula_yellow</item>
+        <item name="speedTextColor">@color/color_dracula_cyan</item>
+        <item name="fabStoppedColor">@color/color_dracula_cyan</item>
+        <item name="statusDetailColor">@color/color_dracula_cyan</item>
         <item name="routeProxyColor">@color/color_dracula_cyan</item>
         <item name="navSelectedColor">?attr/colorAccent</item>
     </style>
@@ -687,9 +687,9 @@
         <item name="statusConnectedColor">@color/color_dracula_green</item>
         <item name="statusStoppedColor">@color/color_dracula_red</item>
         <item name="testFailColor">@color/color_dracula_red</item>
-        <item name="speedTextColor">@color/color_dracula_yellow</item>
-        <item name="fabStoppedColor">@color/color_dracula_yellow</item>
-        <item name="statusDetailColor">@color/color_dracula_yellow</item>
+        <item name="speedTextColor">@color/color_dracula_cyan</item>
+        <item name="fabStoppedColor">@color/color_dracula_cyan</item>
+        <item name="statusDetailColor">@color/color_dracula_cyan</item>
         <item name="routeProxyColor">@color/color_dracula_cyan</item>
     </style>
 

From 15f85a4611e3ed635abf6d2a16e6f872c47a3ffe Mon Sep 17 00:00:00 2001
From: hawkff <109485367+hawkff@users.noreply.github.com>
Date: Sat, 20 Jun 2026 09:07:15 -0400
Subject: [PATCH 7/7] Keep Testing... yellow while detail text stays cyan
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a dedicated statusTestingColor attr so the connection-test 'Testing…'
in-progress text is Dracula yellow, separate from statusDetailColor (cyan)
used for the 'tap to check connection' hint and the 'handshake took Nms'
detail. Defaults to colorOnPrimary for other themes (unchanged).
---
 .../main/java/io/nekohasekai/sagernet/widget/StatsBar.kt    | 6 +++---
 app/src/main/res/values-night/themes.xml                    | 2 ++
 app/src/main/res/values-v26/themes.xml                      | 1 +
 app/src/main/res/values/attrs.xml                           | 4 +++-
 app/src/main/res/values/themes.xml                          | 4 ++++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt b/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt
index 99398b5e4..821670db2 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt
@@ -172,8 +172,8 @@ class StatsBar @JvmOverloads constructor(
     fun testConnection() {
         val activity = context as MainActivity
         isEnabled = false
-        // "Testing…" in the detail color.
-        statusText.setTextColor(context.getColorAttr(R.attr.statusDetailColor))
+        // "Testing…" in the testing color.
+        statusText.setTextColor(context.getColorAttr(R.attr.statusTestingColor))
         setStatus(app.getText(R.string.connection_test_testing))
         runOnDefaultDispatcher {
             try {
@@ -197,7 +197,7 @@ class StatsBar @JvmOverloads constructor(
                 Logs.w(e.toString())
                 onMainDispatcher {
                     isEnabled = true
-                    statusText.setTextColor(context.getColorAttr(R.attr.statusDetailColor))
+                    statusText.setTextColor(context.getColorAttr(R.attr.statusTestingColor))
                     setStatus(app.getText(R.string.connection_test_testing))
 
                     activity.snackbar(
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index fe5795151..ff5dc33b4 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -36,6 +36,7 @@
         <item name="speedTextColor">@color/color_dracula_cyan</item>
         <item name="fabStoppedColor">@color/color_dracula_cyan</item>
         <item name="statusDetailColor">@color/color_dracula_cyan</item>
+        <item name="statusTestingColor">@color/color_dracula_yellow</item>
         <item name="routeProxyColor">@color/color_dracula_cyan</item>
         <item name="navSelectedColor">?attr/colorAccent</item>
     </style>
@@ -60,6 +61,7 @@
         <item name="speedTextColor">@color/color_dracula_cyan</item>
         <item name="fabStoppedColor">@color/color_dracula_cyan</item>
         <item name="statusDetailColor">@color/color_dracula_cyan</item>
+        <item name="statusTestingColor">@color/color_dracula_yellow</item>
         <item name="routeProxyColor">@color/color_dracula_cyan</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-v26/themes.xml b/app/src/main/res/values-v26/themes.xml
index 46be99f2e..6b1efb0c9 100644
--- a/app/src/main/res/values-v26/themes.xml
+++ b/app/src/main/res/values-v26/themes.xml
@@ -14,6 +14,7 @@
         <item name="speedTextColor">?attr/colorOnPrimary</item>
         <item name="fabStoppedColor">?attr/colorOnPrimary</item>
         <item name="statusDetailColor">?attr/colorOnPrimary</item>
+        <item name="statusTestingColor">?attr/colorOnPrimary</item>
         <item name="routeProxyColor">@color/color_route_proxy</item>
         <item name="navSelectedColor">?attr/colorPrimary</item>
         <item name="actionModeCloseDrawable">@drawable/ic_navigation_close</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index a49146833..bda8ff5b5 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -28,8 +28,10 @@
          statusStoppedColor used for the status text. -->
     <attr name="fabStoppedColor" format="color" />
     <!-- Secondary status text (the part after "Connected," / "Success:").
-         Default on-primary; Dracula = yellow. -->
+         Default on-primary; Dracula = cyan. -->
     <attr name="statusDetailColor" format="color" />
+    <!-- "Testing…" connection-test in-progress text. Default on-primary; Dracula = yellow. -->
+    <attr name="statusTestingColor" format="color" />
     <!-- Proxy route-rule color. Default blue; Dracula = cyan. -->
     <attr name="routeProxyColor" format="color" />
     <!-- Selected nav-drawer item color (fill tint + icon/text). Default primary;
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 596284d78..021a3934a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -13,6 +13,7 @@
         <item name="speedTextColor">?attr/colorOnPrimary</item>
         <item name="fabStoppedColor">?attr/colorOnPrimary</item>
         <item name="statusDetailColor">?attr/colorOnPrimary</item>
+        <item name="statusTestingColor">?attr/colorOnPrimary</item>
         <item name="routeProxyColor">@color/color_route_proxy</item>
         <item name="navSelectedColor">?attr/colorPrimary</item>
         <!-- Default nav-drawer selected-item fill; also satisfies the
@@ -84,6 +85,7 @@
         <item name="speedTextColor">?attr/colorOnPrimary</item>
         <item name="fabStoppedColor">?attr/colorOnPrimary</item>
         <item name="statusDetailColor">?attr/colorOnPrimary</item>
+        <item name="statusTestingColor">?attr/colorOnPrimary</item>
         <item name="routeProxyColor">@color/color_route_proxy</item>
         <item name="navSelectedColor">?attr/colorPrimary</item>
         <item name="itemShapeFillColor">?colorPrimary</item>
@@ -644,6 +646,7 @@
         <item name="speedTextColor">@color/color_dracula_cyan</item>
         <item name="fabStoppedColor">@color/color_dracula_cyan</item>
         <item name="statusDetailColor">@color/color_dracula_cyan</item>
+        <item name="statusTestingColor">@color/color_dracula_yellow</item>
         <item name="routeProxyColor">@color/color_dracula_cyan</item>
         <item name="navSelectedColor">?attr/colorAccent</item>
     </style>
@@ -690,6 +693,7 @@
         <item name="speedTextColor">@color/color_dracula_cyan</item>
         <item name="fabStoppedColor">@color/color_dracula_cyan</item>
         <item name="statusDetailColor">@color/color_dracula_cyan</item>
+        <item name="statusTestingColor">@color/color_dracula_yellow</item>
         <item name="routeProxyColor">@color/color_dracula_cyan</item>
     </style>