diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-04-27 18:09:40 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-04-27 18:09:40 -0700 |
| commit | 366b3d35ae8d3a410678e90f3382e457c7d9445e (patch) | |
| tree | 9cebc000b2fe77925e5db29c36621c3f613e0de2 /app/src/main/java/github/daneren2005/dsub/util/Util.java | |
| parent | 28a8dba5682a953570c04013b4acbd7b5dcab685 (diff) | |
| download | dsub-366b3d35ae8d3a410678e90f3382e457c7d9445e.tar.gz dsub-366b3d35ae8d3a410678e90f3382e457c7d9445e.tar.bz2 dsub-366b3d35ae8d3a410678e90f3382e457c7d9445e.zip | |
Merge work for #259 after project structure change
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/util/Util.java')
| -rw-r--r-- | app/src/main/java/github/daneren2005/dsub/util/Util.java | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Util.java b/app/src/main/java/github/daneren2005/dsub/util/Util.java index 75d8d5dd..876dc648 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/Util.java +++ b/app/src/main/java/github/daneren2005/dsub/util/Util.java @@ -48,6 +48,7 @@ import android.view.Gravity; import android.widget.TextView; import android.widget.Toast; import github.daneren2005.dsub.R; +import github.daneren2005.dsub.activity.SubsonicFragmentActivity; import github.daneren2005.dsub.domain.MusicDirectory; import github.daneren2005.dsub.domain.PlayerState; import github.daneren2005.dsub.domain.RepeatMode; @@ -256,14 +257,26 @@ public final class Util { } public static void applyTheme(Context context, String theme) { - if ("dark".equals(theme)) { - context.setTheme(R.style.Theme_DSub_Dark); - } else if ("black".equals(theme)) { - context.setTheme(R.style.Theme_DSub_Black); - } else if ("holo".equals(theme)) { - context.setTheme(R.style.Theme_DSub_Holo); + if(context instanceof SubsonicFragmentActivity) { + if ("dark".equals(theme)) { + context.setTheme(R.style.Theme_DSub_Dark_No_Actionbar); + } else if ("black".equals(theme)) { + context.setTheme(R.style.Theme_DSub_Black_No_Actionbar); + } else if ("holo".equals(theme)) { + context.setTheme(R.style.Theme_DSub_Holo_No_Actionbar); + } else { + context.setTheme(R.style.Theme_DSub_Light_No_Actionbar); + } } else { - context.setTheme(R.style.Theme_DSub_Light); + if ("dark".equals(theme)) { + context.setTheme(R.style.Theme_DSub_Dark); + } else if ("black".equals(theme)) { + context.setTheme(R.style.Theme_DSub_Black); + } else if ("holo".equals(theme)) { + context.setTheme(R.style.Theme_DSub_Holo); + } else { + context.setTheme(R.style.Theme_DSub_Light); + } } SharedPreferences prefs = Util.getPreferences(context); |