From e9b049c5403aa17fd1ca59ae42ff501d15a664eb Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 16 Apr 2013 13:15:21 +0400 Subject: unify theme setting, disable light theme on HC --- src/org/fox/ttrss/CommonActivity.java | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'src/org/fox/ttrss/CommonActivity.java') diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java index 0566aaf8..3db70fdf 100644 --- a/src/org/fox/ttrss/CommonActivity.java +++ b/src/org/fox/ttrss/CommonActivity.java @@ -30,11 +30,6 @@ public class CommonActivity extends FragmentActivity { protected SharedPreferences m_prefs; - protected boolean isDarkTheme() { - return m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK") || - m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK_GRAY"); - } - protected void setSmallScreen(boolean smallScreen) { Log.d(TAG, "m_smallScreenMode=" + smallScreen); m_smallScreenMode = smallScreen; @@ -142,4 +137,24 @@ public class CommonActivity extends FragmentActivity { toast.show(); } + protected void setAppTheme(SharedPreferences prefs) { + String defaultTheme = "THEME_DARK"; + + if (prefs.getString("theme", defaultTheme).equals("THEME_DARK")) { + setTheme(R.style.DarkTheme); + } else if (prefs.getString("theme", defaultTheme).equals("THEME_SEPIA")) { + setTheme(R.style.SepiaTheme); + } else if (prefs.getString("theme", defaultTheme).equals("THEME_DARK_GRAY")) { + setTheme(R.style.DarkGrayTheme); + } else { + // LightTheme is not supported on honeycomb + + if (android.os.Build.VERSION.SDK_INT >= 11 && android.os.Build.VERSION.SDK_INT < 14) { + toast(R.string.light_theme_is_not_supported_on_honeycomb); + setTheme(R.style.DarkTheme); + } else { + setTheme(R.style.LightTheme); + } + } + } } -- cgit v1.2.3-54-g00ecf