diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-06-01 04:16:45 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-06-01 14:57:25 +0200 |
| commit | 92a22115fea52854063aa5fb0beb4a85bcf2bdc4 (patch) | |
| tree | 2eb957c32b249401b717afc8f8adaba611af2767 /app/src/main/res/values | |
| parent | 0751fc5235e51088c23530f446f58e54e407de9c (diff) | |
global: fix theme situation and clean up cruft while adding more cruft
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/colors.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 47a2d2b4..bb3b6e9b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <!-- TODO(msf): remove these two hard-coded colors --> <color name="list_item_activated">#cfd8dc</color> <!-- Blue Grey 200 --> <color name="list_item_ripple">#808e95</color> <!-- Blue Grey 200 dark --> + + <!-- TODO(zx2c4): set this once we have a color decided - <color name="accent">#2196F3</color> --> </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1fda6aa6..f5cd3814 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar" /> + <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar"> + <!--TODO(zx2c4): set this once we have a color decided: <item name="colorAccent">@color/accent</item>--> + </style> <style name="SettingsTheme" parent="AppTheme"> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> @@ -9,6 +11,7 @@ <style name="fab_label" parent="android:TextAppearance.DeviceDefault.Inverse"> <item name="android:background">@drawable/fab_label_background</item> + <item name="android:textColor">#ffffff</item> <!-- TODO(msf): themeify this --> </style> </resources> |