diff options
author | ByteHamster <info@bytehamster.com> | 2018-06-06 16:09:15 +0200 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2018-06-06 16:09:15 +0200 |
commit | 2a8408d84dfaaaff89851df435e1c9d64586c32a (patch) | |
tree | aaff8a5eb66aa50fdccd2eb55233eb121668e581 /core/src/main/java/de/danoeh | |
parent | fe92c98661e3b0817aed2c26dee258b0a572dd5e (diff) | |
parent | 12ee8d89b2fd7eeebcf3ec0432ffb343e07f81d2 (diff) | |
download | AntennaPod-2a8408d84dfaaaff89851df435e1c9d64586c32a.zip |
Merge branch 'develop' of https://github.com/alifeflow/AntennaPod into alifeflow-develop
Diffstat (limited to 'core/src/main/java/de/danoeh')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java | 4 | ||||
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java index 44b2fa2b2..e59fe4c11 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java @@ -161,6 +161,8 @@ public class UserPreferences { int theme = getTheme(); if (theme == R.style.Theme_AntennaPod_Dark) { return R.style.Theme_AntennaPod_Dark_NoTitle; + } else if (theme == R.style.Theme_AntennaPod_TrueBlack) { + return R.style.Theme_AntennaPod_TrueBlack_NoTitle; } else { return R.style.Theme_AntennaPod_Light_NoTitle; } @@ -597,6 +599,8 @@ public class UserPreferences { return R.style.Theme_AntennaPod_Light; case 1: return R.style.Theme_AntennaPod_Dark; + case 2: + return R.style.Theme_AntennaPod_TrueBlack; default: return R.style.Theme_AntennaPod_Light; } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java index f67367643..184c3ee54 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java @@ -12,6 +12,8 @@ public class ThemeUtils { int theme = UserPreferences.getTheme(); if (theme == R.style.Theme_AntennaPod_Dark) { return R.color.selection_background_color_dark; + }else if (theme == R.style.Theme_AntennaPod_TrueBlack){ + return R.color.selection_background_color_trueblack; } else if (theme == R.style.Theme_AntennaPod_Light) { return R.color.selection_background_color_light; } else { |