summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-11-26 11:17:38 +0300
committerAndrew Dolgov <[email protected]>2011-11-26 11:17:38 +0300
commite722a06651bc74cab83b59158c6d4f07042cc9a6 (patch)
treed31022a5d9292b047d42eeadec4b9353c2e39522 /src
parent5b0c674f2bba0c0e5a7fc016b7a003d133d0cd0e (diff)
fix themes for 2.x devices
Diffstat (limited to 'src')
-rw-r--r--src/org/fox/ttrss/MainActivity.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 8ea10fc7..4169c87e 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -75,16 +75,16 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe
@Override
public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
m_prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) {
- setTheme(R.style.DarkTheme);
+ setTheme(android.os.Build.VERSION.SDK_INT > 10 ? R.style.DarkTheme : R.style.DarkCompatTheme);
} else {
- setTheme(R.style.LightTheme);
+ setTheme(android.os.Build.VERSION.SDK_INT > 10 ? R.style.LightTheme : R.style.LightCompatTheme);
}
+ super.onCreate(savedInstanceState);
+
m_themeName = m_prefs.getString("theme", "THEME_DARK");
if (savedInstanceState != null) {
@@ -336,6 +336,7 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe
}
m_menu.findItem(R.id.load_more_articles).setVisible(m_activeFeed != null);
+ m_menu.findItem(R.id.show_all_articles).setVisible(m_activeFeed != null);
} else {
m_menu.findItem(R.id.login).setVisible(true);