Skip to content

Commit 1386524

Browse files
hawkffhawkff
committed
Theme polish: Dracula-M3 yellow names, DHC muted status text, FAB inset
Address review feedback: - Dracula-M3: profile names now use Dracula yellow (#F1FA8C) instead of white, matching the authentic Dracula look. - Dark High Contrast: the bottom-bar speed arrows and the 'tap to check connection' detail text now use a muted near-white (on-surface-variant) instead of bright blue \u2014 a more restrained OLED palette in the spirit of F-Droid's true-black theme; blue stays reserved for links/route-proxy. - Lift the bottom status bar (and the docked FAB + its anchored progress ring) above the navigation-bar inset under edge-to-edge, so the loading ring is no longer clipped by the system inset. Verified on Android (Dracula-M3 + Dark High Contrast).
1 parent 85048c7 commit 1386524

3 files changed

Lines changed: 19 additions & 12 deletions

File tree

‎app/src/main/java/io/nekohasekai/sagernet/ui/ThemedActivity.kt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package io.nekohasekai.sagernet.ui
33
import android.content.res.Configuration
44
import android.os.Build
55
import android.os.Bundle
6+
import android.view.View
67
import android.widget.TextView
78
import androidx.annotation.StringRes
89
import androidx.appcompat.app.AppCompatActivity
@@ -59,6 +60,12 @@ abstract class ThemedActivity : AppCompatActivity {
5960
findViewById<AppBarLayout>(R.id.appbar)?.apply {
6061
updatePadding(top = bars.top)
6162
}
63+
// Lift the bottom status bar (and the FAB docked into it, plus the FAB's
64+
// progress ring anchored to the FAB) above the navigation bar so the
65+
// ring isn't clipped by the system inset under edge-to-edge.
66+
findViewById<View>(R.id.stats)?.apply {
67+
updatePadding(bottom = bars.bottom)
68+
}
6269
insets
6370
}
6471
}

‎app/src/main/res/values-night/themes.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@
137137
<item name="statusStoppedColor">@color/dhc_red</item>
138138
<item name="statusConnectingColor">@color/dhc_yellow</item>
139139
<item name="testFailColor">@color/dhc_red</item>
140-
<item name="speedTextColor">@color/dhc_accent</item>
140+
<item name="speedTextColor">@color/dhc_on_surface_variant</item>
141141
<item name="fabStoppedColor">@color/dhc_on_primary</item>
142142
<item name="fabConnectedColor">@color/dhc_on_primary</item>
143-
<item name="statusDetailColor">@color/dhc_accent</item>
143+
<item name="statusDetailColor">@color/dhc_on_surface_variant</item>
144144
<item name="statusTestingColor">@color/dhc_yellow</item>
145145
<item name="routeProxyColor">@color/dhc_blue</item>
146146
<item name="navSelectedColor">?attr/colorPrimary</item>
@@ -186,7 +186,7 @@
186186
<item name="primaryOrTextSecondary">@color/draculam3_primary</item>
187187
<item name="primaryOrTextPrimary">@color/draculam3_primary</item>
188188
<item name="protocolColor">@color/draculam3_green</item>
189-
<item name="profileNameColor">@color/draculam3_on_surface</item>
189+
<item name="profileNameColor">@color/draculam3_yellow</item>
190190
<item name="statusConnectedColor">@color/draculam3_green</item>
191191
<item name="statusStoppedColor">@color/draculam3_red</item>
192192
<item name="statusConnectingColor">@color/draculam3_yellow</item>
@@ -449,10 +449,10 @@
449449
<item name="statusStoppedColor">@color/dhc_red</item>
450450
<item name="statusConnectingColor">@color/dhc_yellow</item>
451451
<item name="testFailColor">@color/dhc_red</item>
452-
<item name="speedTextColor">@color/dhc_accent</item>
452+
<item name="speedTextColor">@color/dhc_on_surface_variant</item>
453453
<item name="fabStoppedColor">@color/dhc_on_primary</item>
454454
<item name="fabConnectedColor">@color/dhc_on_primary</item>
455-
<item name="statusDetailColor">@color/dhc_accent</item>
455+
<item name="statusDetailColor">@color/dhc_on_surface_variant</item>
456456
<item name="statusTestingColor">@color/dhc_yellow</item>
457457
<item name="routeProxyColor">@color/dhc_blue</item>
458458
</style>
@@ -485,7 +485,7 @@
485485
<item name="colorOutline">@color/draculam3_outline</item>
486486
<item name="colorOutlineVariant">@color/draculam3_outline_variant</item>
487487
<item name="protocolColor">@color/draculam3_green</item>
488-
<item name="profileNameColor">@color/draculam3_on_surface</item>
488+
<item name="profileNameColor">@color/draculam3_yellow</item>
489489
<item name="statusConnectedColor">@color/draculam3_green</item>
490490
<item name="statusStoppedColor">@color/draculam3_red</item>
491491
<item name="statusConnectingColor">@color/draculam3_yellow</item>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -868,12 +868,12 @@
868868
<item name="statusStoppedColor">@color/dhc_red</item>
869869
<item name="statusConnectingColor">@color/dhc_yellow</item>
870870
<item name="testFailColor">@color/dhc_red</item>
871-
<item name="speedTextColor">@color/dhc_accent</item>
871+
<item name="speedTextColor">@color/dhc_on_surface_variant</item>
872872
<item name="fabStoppedColor">@color/dhc_on_primary</item>
873873
<!-- Connected airplane icon: dark, so it stays visible on the green FAB
874874
(the green statusConnectedColor would vanish against it). -->
875875
<item name="fabConnectedColor">@color/dhc_on_primary</item>
876-
<item name="statusDetailColor">@color/dhc_accent</item>
876+
<item name="statusDetailColor">@color/dhc_on_surface_variant</item>
877877
<item name="statusTestingColor">@color/dhc_yellow</item>
878878
<item name="routeProxyColor">@color/dhc_blue</item>
879879
<item name="navSelectedColor">?attr/colorPrimary</item>
@@ -919,7 +919,7 @@
919919
<item name="primaryOrTextSecondary">@color/draculam3_primary</item>
920920
<item name="primaryOrTextPrimary">@color/draculam3_primary</item>
921921
<item name="protocolColor">@color/draculam3_green</item>
922-
<item name="profileNameColor">@color/draculam3_on_surface</item>
922+
<item name="profileNameColor">@color/draculam3_yellow</item>
923923
<item name="statusConnectedColor">@color/draculam3_green</item>
924924
<item name="statusStoppedColor">@color/draculam3_red</item>
925925
<item name="statusConnectingColor">@color/draculam3_yellow</item>
@@ -1239,10 +1239,10 @@
12391239
<item name="statusStoppedColor">@color/dhc_red</item>
12401240
<item name="statusConnectingColor">@color/dhc_yellow</item>
12411241
<item name="testFailColor">@color/dhc_red</item>
1242-
<item name="speedTextColor">@color/dhc_accent</item>
1242+
<item name="speedTextColor">@color/dhc_on_surface_variant</item>
12431243
<item name="fabStoppedColor">@color/dhc_on_primary</item>
12441244
<item name="fabConnectedColor">@color/dhc_on_primary</item>
1245-
<item name="statusDetailColor">@color/dhc_accent</item>
1245+
<item name="statusDetailColor">@color/dhc_on_surface_variant</item>
12461246
<item name="statusTestingColor">@color/dhc_yellow</item>
12471247
<item name="routeProxyColor">@color/dhc_blue</item>
12481248
</style>
@@ -1275,7 +1275,7 @@
12751275
<item name="colorOutline">@color/draculam3_outline</item>
12761276
<item name="colorOutlineVariant">@color/draculam3_outline_variant</item>
12771277
<item name="protocolColor">@color/draculam3_green</item>
1278-
<item name="profileNameColor">@color/draculam3_on_surface</item>
1278+
<item name="profileNameColor">@color/draculam3_yellow</item>
12791279
<item name="statusConnectedColor">@color/draculam3_green</item>
12801280
<item name="statusStoppedColor">@color/draculam3_red</item>
12811281
<item name="statusConnectingColor">@color/draculam3_yellow</item>

0 commit comments

Comments
 (0)