fix(theme): color the in-progress status text (Dracula yellow) and harden getColorAttr

The 'Connecting…' / 'Testing…' status text fell into the colorOnPrimary branch, which
renders dark on Dracula's light-purple primary instead of yellow. Add a
statusConnectingColor attr (default colorOnPrimary; Dracula = yellow) and use it for the
Connecting state.

While wiring it up, surfaced and fixed a latent crash in getColorAttr: when a theme attr
resolves to a literal color value (resourceId == 0) rather than a @color resource ref,
ContextCompat.getColor(0) threw Resources$NotFoundException (Resource ID #0x0). Now use
the literal data when it is a color type, falling back to TRANSPARENT otherwise. This
hardens every getColorAttr caller, not just the new attr.

Verified on-device (Dracula): connect no longer crashes; in-progress status renders yellow.

Author: hawkff

app/src/main/java/io/nekohasekai/sagernet/ktx/Utils.kt

@@ -11,6 +11,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.res.Resources
+import android.graphics.Color
 import android.os.Build
 import android.system.Os
 import android.system.OsConstants
@@ -284,9 +285,22 @@ fun Context.getColour(@ColorRes colorRes: Int): Int {
 }
 
 fun Context.getColorAttr(@AttrRes resId: Int): Int {
-    return ContextCompat.getColor(this, TypedValue().also {
-        theme.resolveAttribute(resId, it, true)
-    }.resourceId)
+    val tv = TypedValue()
+    // resolveRefs = true follows ?attr chains (e.g. statusConnectingColor -> colorOnPrimary).
+    // The result is either a color-resource reference (resourceId != 0) or a literal color
+    // value (resourceId == 0); ContextCompat.getColor(0) would throw on the latter.
+    theme.resolveAttribute(resId, tv, true)
+    if (tv.resourceId != 0) {
+        return ContextCompat.getColor(this, tv.resourceId)
+    }
+    // No backing resource: the attr resolved directly to a literal value. Use it only
+    // when it is actually a color (e.g. ?attr/colorOnPrimary defined as a literal);
+    // otherwise fall back to a safe default rather than returning a garbage int.
+    return if (tv.type in TypedValue.TYPE_FIRST_COLOR_INT..TypedValue.TYPE_LAST_COLOR_INT) {
+        tv.data
+    } else {
+        Color.TRANSPARENT
+    }
 }
 
 val isExpert: Boolean by lazy { BuildConfig.DEBUG || DataStore.isExpert }

app/src/main/java/io/nekohasekai/sagernet/widget/StatsBar.kt

@@ -109,11 +109,13 @@ class StatsBar @JvmOverloads constructor(
 
     private fun setStatusColorByState(state: BaseService.State) {
         // Connected = statusConnectedColor (green), Stopped/Stopping = statusStoppedColor
-        // (red — "Shutting down…" reads as red), Connecting/other = colorOnPrimary.
+        // (red — "Shutting down…" reads as red), Connecting = statusConnectingColor (Dracula
+        // yellow; colorOnPrimary elsewhere), 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, BaseService.State.Stopping -> R.attr.statusStoppedColor
+            BaseService.State.Connecting -> R.attr.statusConnectingColor
             else -> com.google.android.material.R.attr.colorOnPrimary
         }
         statusText.setTextColor(context.getColorAttr(attr))

app/src/main/res/values/attrs.xml

@@ -19,6 +19,9 @@
          Dracula themes are unchanged; Dracula tints connected=green, stopped=red. -->
     <attr name="statusConnectedColor" format="color" />
     <attr name="statusStoppedColor" format="color" />
+    <!-- "Connecting…" in-progress status text. Default on-primary; Dracula = yellow
+         (on-primary resolved to dark on Dracula's light-purple primary). -->
+    <attr name="statusConnectingColor" 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. -->

app/src/main/res/values/themes.xml

@@ -9,6 +9,7 @@
         <item name="profileNameColor">?android:attr/textColorPrimary</item>
         <item name="statusConnectedColor">?attr/colorOnPrimary</item>
         <item name="statusStoppedColor">?attr/colorOnPrimary</item>
+        <item name="statusConnectingColor">?attr/colorOnPrimary</item>
         <item name="testFailColor">@color/material_red_500</item>
         <item name="speedTextColor">?attr/colorOnPrimary</item>
         <item name="fabStoppedColor">?attr/colorOnPrimary</item>
@@ -81,6 +82,7 @@
         <item name="profileNameColor">?android:attr/textColorPrimary</item>
         <item name="statusConnectedColor">?attr/colorOnPrimary</item>
         <item name="statusStoppedColor">?attr/colorOnPrimary</item>
+        <item name="statusConnectingColor">?attr/colorOnPrimary</item>
         <item name="testFailColor">@color/material_red_500</item>
         <item name="speedTextColor">?attr/colorOnPrimary</item>
         <item name="fabStoppedColor">?attr/colorOnPrimary</item>
@@ -642,6 +644,7 @@
         <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="statusConnectingColor">@color/color_dracula_yellow</item>
         <item name="testFailColor">@color/color_dracula_red</item>
         <item name="speedTextColor">@color/color_dracula_cyan</item>
         <item name="fabStoppedColor">@color/color_dracula_cyan</item>
@@ -689,6 +692,7 @@
         <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="statusConnectingColor">@color/color_dracula_yellow</item>
         <item name="testFailColor">@color/color_dracula_red</item>
         <item name="speedTextColor">@color/color_dracula_cyan</item>
         <item name="fabStoppedColor">@color/color_dracula_cyan</item>