From df400f57394badb6f249205074662ac3a00e6da5 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Fri, 24 May 2013 08:25:29 -0700 Subject: Revert black modifications, add new separate black theme --- .../src/github/daneren2005/dsub/activity/SettingsActivity.java | 4 ++++ .../src/github/daneren2005/dsub/activity/SubsonicActivity.java | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'subsonic-android/src/github') diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java index 4fdf8431..88e487f1 100644 --- a/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java +++ b/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java @@ -306,10 +306,14 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer String activeTheme = Util.getTheme(this); if ("dark".equals(activeTheme)) { setTheme(R.style.Theme_DSub_Dark); + } else if ("black".equals(activeTheme)) { + setTheme(R.style.Theme_DSub_Black); } else if ("light".equals(activeTheme)) { setTheme(R.style.Theme_DSub_Light); } else if ("dark_fullscreen".equals(activeTheme)) { setTheme(R.style.Theme_DSub_Dark_Fullscreen); + } else if ("black_fullscreen".equals(activeTheme)) { + setTheme(R.style.Theme_DSub_Black_Fullscreen); } else if ("light_fullscreen".equals(activeTheme)) { setTheme(R.style.Theme_DSub_Light_Fullscreen); } else if("holo".equals(activeTheme)) { diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicActivity.java index cb4cac6f..0c8d130a 100644 --- a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicActivity.java +++ b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicActivity.java @@ -277,10 +277,14 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem theme = Util.getTheme(this); if ("dark".equals(theme)) { setTheme(R.style.Theme_DSub_Dark); + } else if ("black".equals(theme)) { + setTheme(R.style.Theme_DSub_Black); } else if ("light".equals(theme)) { setTheme(R.style.Theme_DSub_Light); } else if ("dark_fullscreen".equals(theme)) { setTheme(R.style.Theme_DSub_Dark_Fullscreen); + } else if ("black_fullscreen".equals(theme)) { + setTheme(R.style.Theme_DSub_Black_Fullscreen); } else if ("light_fullscreen".equals(theme)) { setTheme(R.style.Theme_DSub_Light_Fullscreen); } else if("holo".equals(theme)) { -- cgit v1.2.3