Skip to content

Commit a5d9213

Browse files
committed
DHC green accent, Legacy colors rename, progress dialog padding
Address review feedback: - Dark High Contrast: use green (colorPrimary) for colorAccent/colorSecondary so section headers (App Settings / Route Settings) and switch toggles are green, matching the green identity (and the theme's green picker swatch), instead of the previously confusing blue. Blue (colorTertiary / route proxy / links) stays reserved for links. - Rename the picker's 'Classic colors...' entry to 'Legacy colors...'. - Add top padding + spacing above the connection-test progress dialog's loading circle so it isn't flush against the dialog's top edge. Verified on Android (DHC: green header + green toggle).
1 parent 1a1b976 commit a5d9213

4 files changed

Lines changed: 17 additions & 14 deletions

File tree

app/src/main/res/layout/layout_progress_list.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
6-
android:orientation="vertical">
6+
android:orientation="vertical"
7+
android:paddingTop="24dp"
8+
android:paddingBottom="8dp">
79

810
<com.google.android.material.progressindicator.CircularProgressIndicator
911
android:id="@+id/progress_circular"
1012
android:layout_width="match_parent"
1113
android:layout_height="wrap_content"
1214
android:layout_gravity="center"
15+
android:layout_marginBottom="12dp"
1316
android:indeterminate="true"
1417
app:indicatorColor="?colorPrimary" />
1518

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<item name="colorPrimary">@color/dhc_primary</item>
9898
<item name="appBarBackgroundColor">@color/dhc_background</item>
9999
<item name="colorPrimaryDark">@color/dhc_primary_dark</item>
100-
<item name="colorAccent">@color/dhc_accent</item>
100+
<item name="colorAccent">@color/dhc_primary</item>
101101
<item name="colorOnPrimary">@color/dhc_on_primary</item>
102102
<item name="colorMaterial100">@color/dhc_100</item>
103103
<item name="colorMaterial300">@color/dhc_300</item>
@@ -117,7 +117,7 @@
117117
<item name="tabIndicatorColor">@color/dhc_primary</item>
118118
<item name="colorPrimaryContainer">@color/dhc_container</item>
119119
<item name="colorOnPrimaryContainer">@color/dhc_on_surface</item>
120-
<item name="colorSecondary">@color/dhc_accent</item>
120+
<item name="colorSecondary">@color/dhc_primary</item>
121121
<item name="colorSecondaryContainer">@color/dhc_container</item>
122122
<item name="colorOnSecondaryContainer">@color/dhc_on_surface</item>
123123
<item name="colorTertiary">@color/dhc_blue</item>
@@ -127,8 +127,8 @@
127127
<item name="colorOnSurfaceVariant">@color/dhc_on_surface_variant</item>
128128
<item name="colorOutline">@color/dhc_outline</item>
129129
<item name="colorOutlineVariant">@color/dhc_outline_variant</item>
130-
<item name="accentOrTextSecondary">@color/dhc_accent</item>
131-
<item name="accentOrTextPrimary">@color/dhc_accent</item>
130+
<item name="accentOrTextSecondary">@color/dhc_primary</item>
131+
<item name="accentOrTextPrimary">@color/dhc_primary</item>
132132
<item name="primaryOrTextSecondary">@color/dhc_primary</item>
133133
<item name="primaryOrTextPrimary">@color/dhc_primary</item>
134134
<item name="protocolColor">@color/dhc_green</item>
@@ -421,7 +421,7 @@
421421
<item name="colorPrimary">@color/dhc_primary</item>
422422
<item name="appBarBackgroundColor">@color/dhc_background</item>
423423
<item name="colorPrimaryDark">@color/dhc_primary_dark</item>
424-
<item name="colorAccent">@color/dhc_accent</item>
424+
<item name="colorAccent">@color/dhc_primary</item>
425425
<item name="colorOnPrimary">@color/dhc_on_primary</item>
426426
<item name="colorMaterial100">@color/dhc_100</item>
427427
<item name="colorMaterial300">@color/dhc_300</item>
@@ -433,7 +433,7 @@
433433
<item name="colorOnBackground">@color/dhc_on_surface</item>
434434
<item name="colorPrimaryContainer">@color/dhc_container</item>
435435
<item name="colorOnPrimaryContainer">@color/dhc_on_surface</item>
436-
<item name="colorSecondary">@color/dhc_accent</item>
436+
<item name="colorSecondary">@color/dhc_primary</item>
437437
<item name="colorSecondaryContainer">@color/dhc_container</item>
438438
<item name="colorOnSecondaryContainer">@color/dhc_on_surface</item>
439439
<item name="colorTertiary">@color/dhc_blue</item>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<string name="theme_monokai">Monokai</string>
2222
<string name="theme_ayu">Ayu</string>
2323
<string name="theme_catppuccin">Catppuccin</string>
24-
<string name="theme_classic_colors">Classic colors…</string>
24+
<string name="theme_classic_colors">Legacy colors…</string>
2525
<string name="theme_classic_color_swatch">Color theme %1$d</string>
2626
<string name="document">Document</string>
2727
<string name="group_default">Ungrouped</string>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@
818818
<item name="colorPrimary">@color/dhc_primary</item>
819819
<item name="appBarBackgroundColor">@color/dhc_background</item>
820820
<item name="colorPrimaryDark">@color/dhc_primary_dark</item>
821-
<item name="colorAccent">@color/dhc_accent</item>
821+
<item name="colorAccent">@color/dhc_primary</item>
822822
<item name="colorOnPrimary">@color/dhc_on_primary</item>
823823
<item name="colorMaterial100">@color/dhc_100</item>
824824
<item name="colorMaterial300">@color/dhc_300</item>
@@ -845,7 +845,7 @@
845845
<!-- M3 container/variant roles on the dark canvas. -->
846846
<item name="colorPrimaryContainer">@color/dhc_container</item>
847847
<item name="colorOnPrimaryContainer">@color/dhc_on_surface</item>
848-
<item name="colorSecondary">@color/dhc_accent</item>
848+
<item name="colorSecondary">@color/dhc_primary</item>
849849
<item name="colorSecondaryContainer">@color/dhc_container</item>
850850
<item name="colorOnSecondaryContainer">@color/dhc_on_surface</item>
851851
<item name="colorTertiary">@color/dhc_blue</item>
@@ -858,8 +858,8 @@
858858

859859
<!-- Semantic colors: green action accent reads on black, so primary text
860860
accents use it; status uses GitHub-style green/red/yellow. -->
861-
<item name="accentOrTextSecondary">@color/dhc_accent</item>
862-
<item name="accentOrTextPrimary">@color/dhc_accent</item>
861+
<item name="accentOrTextSecondary">@color/dhc_primary</item>
862+
<item name="accentOrTextPrimary">@color/dhc_primary</item>
863863
<item name="primaryOrTextSecondary">@color/dhc_primary</item>
864864
<item name="primaryOrTextPrimary">@color/dhc_primary</item>
865865
<item name="protocolColor">@color/dhc_green</item>
@@ -1211,7 +1211,7 @@
12111211
<item name="colorPrimary">@color/dhc_primary</item>
12121212
<item name="appBarBackgroundColor">@color/dhc_background</item>
12131213
<item name="colorPrimaryDark">@color/dhc_primary_dark</item>
1214-
<item name="colorAccent">@color/dhc_accent</item>
1214+
<item name="colorAccent">@color/dhc_primary</item>
12151215
<item name="colorOnPrimary">@color/dhc_on_primary</item>
12161216
<item name="colorMaterial100">@color/dhc_100</item>
12171217
<item name="colorMaterial300">@color/dhc_300</item>
@@ -1223,7 +1223,7 @@
12231223
<item name="colorOnBackground">@color/dhc_on_surface</item>
12241224
<item name="colorPrimaryContainer">@color/dhc_container</item>
12251225
<item name="colorOnPrimaryContainer">@color/dhc_on_surface</item>
1226-
<item name="colorSecondary">@color/dhc_accent</item>
1226+
<item name="colorSecondary">@color/dhc_primary</item>
12271227
<item name="colorSecondaryContainer">@color/dhc_container</item>
12281228
<item name="colorOnSecondaryContainer">@color/dhc_on_surface</item>
12291229
<item name="colorTertiary">@color/dhc_blue</item>

0 commit comments

Comments
 (0)