summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AndroidManifest.xml4
-rw-r--r--res/values/strings.xml2
-rw-r--r--res/xml/preferences.xml8
-rw-r--r--src/org/fox/ttrss/HeadlinesFragment.java18
4 files changed, 22 insertions, 10 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2d230b56..4bad3740 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss"
- android:versionCode="145"
- android:versionName="1.22" >
+ android:versionCode="146"
+ android:versionName="1.23" >
<uses-sdk
android:minSdkVersion="8"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b93e47a6..f21ef831 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -158,4 +158,6 @@
<string name="theme_dark_gray">Dark gray</string>
<string name="offline_articles_to_download">Number of articles to download</string>
<string name="offline_articles_to_download_long">Number of articles to download for Offlinemode. (newest first)</string>
+ <string name="pref_headlines_show_content_long">Show content previews in headlines list</string>
+ <string name="pref_headlines_show_content">Preview article content</string>
</resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 4976bca6..74d284f9 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -86,6 +86,12 @@
android:key="default_view_mode"
android:summary="@string/pref_default_view_mode_long"
android:title="@string/pref_default_view_mode" />
+
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="headlines_show_content"
+ android:summary="@string/pref_headlines_show_content_long"
+ android:title="@string/pref_headlines_show_content" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/reading" >
<ListPreference
@@ -140,4 +146,4 @@
android:title="@string/transport_debugging" />
</PreferenceCategory>
-</PreferenceScreen>
+</PreferenceScreen> \ No newline at end of file
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index e8de1dbd..2a860141 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -650,14 +650,18 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
String articleContent = article.content != null ? article.content : "";
if (te != null) {
- String excerpt = Jsoup.parse(articleContent).text();
-
- if (excerpt.length() > 200)
- excerpt = excerpt.substring(0, 200) + "...";
-
- te.setText(excerpt);
+ if (!m_prefs.getBoolean("headlines_show_content", true)) {
+ te.setVisibility(View.GONE);
+ } else {
+ String excerpt = Jsoup.parse(articleContent).text();
+
+ if (excerpt.length() > 200)
+ excerpt = excerpt.substring(0, 200) + "...";
+
+ te.setText(excerpt);
+ }
}
-
+
/* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);
if (separator != null && m_onlineServices.isSmallScreen()) {