diff options
-rw-r--r-- | res/layout/headlines_row.xml | 1 | ||||
-rw-r--r-- | res/menu/main_menu.xml | 10 | ||||
-rw-r--r-- | res/values/attrs.xml | 1 | ||||
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | res/values/style.xml | 37 | ||||
-rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 9 |
6 files changed, 52 insertions, 8 deletions
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 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:gravity="center_vertical"
+ android:background="?headlineNormalBackground"
android:id="@+id/headlines_row" android:orientation="horizontal" android:layout_height="wrap_content">
<ImageView android:background="?headlineSeparatorNormal" android:paddingRight="4dip" android:layout_height="match_parent" android:layout_width="wrap_content"></ImageView>
<CheckBox android:focusable="false"
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 0e5380a6..fb0bd1d7 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -19,13 +19,19 @@ android:icon="@android:drawable/ic_menu_close_clear_cancel" android:title="@string/close_article" android:showAsAction="ifRoom|withText"/> - - <item android:id="@+id/load_more_articles" + + <item android:id="@+id/load_more_articles" android:visible="false" android:icon="@android:drawable/ic_menu_more" android:title="@string/load_more_articles" android:showAsAction="ifRoom|withText"/> + <item android:id="@+id/show_all_articles" + android:visible="false" + android:icon="@android:drawable/ic_menu_agenda" + android:title="@string/show_all_articles" + android:showAsAction="ifRoom|withText"/> + <item android:id="@+id/update_feeds" android:enabled="false" android:icon="@android:drawable/ic_menu_rotate" diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 6ed260dd..630c361f 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -8,6 +8,7 @@ <attr name="articleDivider" format="reference|color" />
<attr name="headlineSelectedBackground" format="reference|color" />
<attr name="headlineUnreadBackground" format="reference|color" />
+ <attr name="headlineNormalBackground" format="reference|color" />
<attr name="feedsSelectedBackground" format="reference|color" />
<attr name="headlineSeparatorUnread" format="reference|color" />
<attr name="headlineSeparatorSelected" format="reference|color" />
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 @@ <string name="could_not_decode_content">Could not decode content (UnsupportedEncodingException)</string> <string name="sort_feeds_by_unread">Sort feeds by unread count</string> <string name="load_more_articles">More headlines...</string> + <string name="show_all_articles">Show all articles</string> + <string name="show_unread_articles">Show unread articles</string> </resources> 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 @@ <item name="articleHeader">@android:color/transparent</item>
<item name="headlineSelectedBackground">#fff7d5</item>
<item name="headlineUnreadBackground">#ffffff</item>
+ <item name="headlineNormalBackground">@android:color/transparent</item>
<item name="feedsSelectedBackground">#96C5FF</item>
<item name="headlineSeparatorUnread">#96C5FF</item>
<item name="headlineSeparatorNormal">#909090</item>
<item name="headlineSeparatorSelected">#DBC981</item>
</style>
+ <style name="LightCompatTheme" parent="android:Theme.Light">
+ <item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
+ <item name="feedlistBackground">#fafafa</item>
+ <item name="unreadCounterColor">#0000ff</item>
+ <item name="headlinesBackground">#ffffff</item>
+ <item name="articleDivider">#96c5ff</item>
+ <item name="articleHeader">@android:color/transparent</item>
+ <item name="headlineSelectedBackground">#fff7d5</item>
+ <item name="headlineUnreadBackground">#ffffff</item>
+ <item name="headlineNormalBackground">#f0f0f0</item>
+ <item name="feedsSelectedBackground">#96C5FF</item>
+ <item name="headlineSeparatorUnread">#96C5FF</item>
+ <item name="headlineSeparatorNormal">#909090</item>
+ <item name="headlineSeparatorSelected">#DBC981</item>
+ </style>
+
<style name="DarkTheme" parent="android:Theme.Holo">
<item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
<item name="feedlistBackground">#101010</item>
@@ -23,11 +40,27 @@ <item name="articleHeader">@android:color/transparent</item>
<item name="headlineSelectedBackground">#303060</item>
<item name="headlineUnreadBackground">#303030</item>
+ <item name="headlineNormalBackground">@android:color/transparent</item>
<item name="feedsSelectedBackground">#303060</item>
<item name="headlineSeparatorUnread">#303060</item>
<item name="headlineSeparatorNormal">#303030</item>
<item name="headlineSeparatorSelected">#47478E</item>
-
</style>
-
+
+ <style name="DarkCompatTheme" parent="android:Theme">
+ <item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
+ <item name="feedlistBackground">#101010</item>
+ <item name="unreadCounterColor">#303030</item>
+ <item name="headlinesBackground">#000000</item>
+ <item name="articleDivider">#303060</item>
+ <item name="articleHeader">@android:color/transparent</item>
+ <item name="headlineSelectedBackground">#303060</item>
+ <item name="headlineUnreadBackground">#303030</item>
+ <item name="headlineNormalBackground">@android:color/transparent</item>
+ <item name="feedsSelectedBackground">#303060</item>
+ <item name="headlineSeparatorUnread">#303060</item>
+ <item name="headlineSeparatorNormal">#303030</item>
+ <item name="headlineSeparatorSelected">#47478E</item>
+ </style>
+
</resources>
\ 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); |