diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml index 79de6413..0b8e11f1 100644 --- a/res/layout/headlines_row.xml +++ b/res/layout/headlines_row.xml @@ -2,6 +2,7 @@ - - + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 96c92a2f..7933d3f3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -34,4 +34,6 @@ Could not decode content (UnsupportedEncodingException) Sort feeds by unread count More headlines... + Show all articles + Show unread articles diff --git a/res/values/style.xml b/res/values/style.xml index 1a486b69..8615771b 100644 --- a/res/values/style.xml +++ b/res/values/style.xml @@ -8,12 +8,29 @@ @android:color/transparent #fff7d5 #ffffff + @android:color/transparent #96C5FF #96C5FF #909090 #DBC981 + + - + + + \ No newline at end of file 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);