diff options
| author | ByteHamster <ByteHamster@users.noreply.github.com> | 2023-02-18 14:51:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-18 14:51:55 +0100 |
| commit | 997860fe522e67dff087e4184a80fc9656de28d8 (patch) | |
| tree | 75387ba9614686b8251950cdd375ed162fc5cbaf /core | |
| parent | caf49c5da8a2f541b099ff32c15a7e96e1c557e8 (diff) | |
| download | AntennaPod-997860fe522e67dff087e4184a80fc9656de28d8.zip | |
Extra toggle for full black theme (#6328)
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java | 7 | ||||
| -rw-r--r-- | core/src/main/res/values/arrays.xml | 14 |
2 files changed, 5 insertions, 16 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java index b7e4934f5..afe814fcb 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java @@ -59,12 +59,15 @@ public abstract class ThemeSwitcher { if (theme == UserPreferences.ThemePreference.SYSTEM) { int nightMode = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; if (nightMode == Configuration.UI_MODE_NIGHT_YES) { - return UserPreferences.ThemePreference.DARK; + theme = UserPreferences.ThemePreference.DARK; } else { - return UserPreferences.ThemePreference.LIGHT; + theme = UserPreferences.ThemePreference.LIGHT; } } + if (theme == UserPreferences.ThemePreference.DARK && UserPreferences.getIsBlackTheme()) { + theme = UserPreferences.ThemePreference.BLACK; + } return theme; } } diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml index b08541771..090d5e2e4 100644 --- a/core/src/main/res/values/arrays.xml +++ b/core/src/main/res/values/arrays.xml @@ -135,20 +135,6 @@ <item>-2</item> </string-array> - <string-array name="theme_options"> - <item>@string/pref_theme_title_use_system</item> - <item>@string/pref_theme_title_light</item> - <item>@string/pref_theme_title_dark</item> - <item>@string/pref_theme_title_trueblack</item> - </string-array> - - <string-array name="theme_values"> - <item>system</item> - <item>0</item> - <item>1</item> - <item>2</item> - </string-array> - <string-array name="nav_drawer_titles"> <item>@string/home_label</item> <item>@string/queue_label</item> |