summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main/res
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2014-11-13 21:42:10 +0300
committerAndrew Dolgov <[email protected]>2014-11-13 21:42:10 +0300
commit89823f32f1e5fdac55e7dfc3487d6e2c99ff1cf1 (patch)
treeb241133fe24b21239d50816b7f0b33f078b08567 /org.fox.ttrss/src/main/res
parent4f6ac1ef0532407d2d09b4cd8c3fd39f67e0ec5f (diff)
implement compact headline mode
Diffstat (limited to 'org.fox.ttrss/src/main/res')
-rw-r--r--org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml1
-rw-r--r--org.fox.ttrss/src/main/res/layout/headlines_fragment.xml2
-rw-r--r--org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml119
-rw-r--r--org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml2
-rw-r--r--org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml119
-rw-r--r--org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml2
-rw-r--r--org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml120
-rw-r--r--org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml120
-rw-r--r--org.fox.ttrss/src/main/res/values/arrays.xml10
-rw-r--r--org.fox.ttrss/src/main/res/values/strings.xml6
-rw-r--r--org.fox.ttrss/src/main/res/values/style.xml8
-rw-r--r--org.fox.ttrss/src/main/res/xml/preferences.xml12
12 files changed, 510 insertions, 11 deletions
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml
index 7995d491..f4ff2c59 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml
@@ -20,6 +20,7 @@
android:orientation="horizontal" >
<FrameLayout
+ android:paddingRight="4dp"
android:id="@+id/headlines_fragment"
android:layout_width="0dp"
android:layout_height="match_parent"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml b/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
index 0473b915..1b9b58a8 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
@@ -13,8 +13,6 @@
android:id="@+id/headlines_list"
android:layout_width="match_parent"
android:layoutAnimation="@anim/layout_headline"
- android:dividerHeight="0dp"
- android:divider="@null"
android:layout_height="match_parent" >
</ListView>
</android.support.v4.widget.SwipeRefreshLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
new file mode 100644
index 00000000..63ff030b
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/headlines_row"
+ android:padding="8dp"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:background="?headlineNormalBackground"
+ tools:ignore="HardcodedText" >
+
+ <CheckBox
+ android:id="@+id/selected"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:layout_gravity="center"
+ android:focusable="false" />
+
+ <LinearLayout
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_gravity="center"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:text="Sample entry title"
+ android:textColor="?headlineUnreadTextColor"
+ android:textSize="18sp"
+ android:layout_span="2" />
+
+ <TextView
+ android:id="@+id/excerpt"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+ android:textColor="?headlineExcerptTextColor"
+ android:textSize="13sp"
+ android:layout_span="2" />
+
+ <LinearLayout
+ android:paddingTop="2dp"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <TextView
+ android:id="@+id/feed_title"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:fontFamily="sans-serif-light"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+ android:textColor="?headlineSecondaryTextColor"
+ android:textSize="12sp"
+ android:layout_weight="0.5" />
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/headline_footer"
+ android:orientation="vertical"
+ android:layout_weight="0"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="sans-serif-light"
+ android:singleLine="true"
+ android:ellipsize="none"
+ android:layout_weight="1"
+ android:text="Jan 01, 12:00, 1970"
+ android:textColor="?headlineSecondaryTextColor"
+ android:textSize="12sp"
+ />
+
+
+ <ImageView
+ android:id="@+id/marked"
+ android:layout_width="16dp"
+ android:layout_gravity="bottom|right"
+ android:layout_height="16dp"
+ android:layout_weight="0"
+ android:clickable="true"
+ android:src="@drawable/ic_star_empty" />
+
+
+
+ </LinearLayout>
+
+ <!-- <ImageView
+ android:id="@+id/article_menu_button"
+ android:layout_gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="16dp"
+ android:layout_weight="0"
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp"
+ android:src="@drawable/ic_action_overflow" /> -->
+
+
+</LinearLayout> \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
index 6a66b3ad..a51ee13d 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
@@ -150,7 +150,7 @@
android:gravity="center_vertical"
android:singleLine="true"
android:text="by Author"
- android:textColor="?headlineSecondaryTextColor"
+ android:textColor="?headlineSelectedSecondaryTextColor"
android:textSize="12sp"
android:textStyle="italic" />
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
new file mode 100644
index 00000000..d6823d37
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/headlines_row"
+ android:padding="8dp"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:background="?headlineSelectedBackground"
+ tools:ignore="HardcodedText" >
+
+ <CheckBox
+ android:id="@+id/selected"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:layout_gravity="center"
+ android:focusable="false" />
+
+ <LinearLayout
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_gravity="center"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:text="Sample entry title"
+ android:textColor="?headlineSelectedTextColor"
+ android:textSize="18sp"
+ android:layout_span="2" />
+
+ <TextView
+ android:id="@+id/excerpt"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+ android:textColor="?headlineSelectedExcerptTextColor"
+ android:textSize="13sp"
+ android:layout_span="2" />
+
+ <LinearLayout
+ android:paddingTop="2dp"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <TextView
+ android:id="@+id/feed_title"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:fontFamily="sans-serif-light"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+ android:textColor="?headlineSelectedSecondaryTextColor"
+ android:textSize="12sp"
+ android:layout_weight="0.5" />
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/headline_footer"
+ android:orientation="vertical"
+ android:layout_weight="0"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="sans-serif-light"
+ android:singleLine="true"
+ android:ellipsize="none"
+ android:layout_weight="1"
+ android:text="Jan 01, 12:00, 1970"
+ android:textColor="?headlineSelectedSecondaryTextColor"
+ android:textSize="12sp"
+ />
+
+
+ <ImageView
+ android:id="@+id/marked"
+ android:layout_width="16dp"
+ android:layout_gravity="bottom|right"
+ android:layout_height="16dp"
+ android:layout_weight="0"
+ android:clickable="true"
+ android:src="@drawable/ic_star_empty" />
+
+
+
+ </LinearLayout>
+
+ <!-- <ImageView
+ android:id="@+id/article_menu_button"
+ android:layout_gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="16dp"
+ android:layout_weight="0"
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp"
+ android:src="@drawable/ic_action_overflow" /> -->
+
+
+</LinearLayout> \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
index 38538734..0c2a4dc8 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
@@ -151,7 +151,7 @@
android:gravity="center_vertical"
android:singleLine="true"
android:text="by Author"
- android:textColor="?headlineSecondaryTextColor"
+ android:textColor="?headlineSelectedSecondaryTextColor"
android:textSize="12sp"
android:textStyle="italic" />
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
new file mode 100644
index 00000000..0a1bf830
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/headlines_row"
+ android:padding="8dp"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:background="?headlineSelectedBackground"
+ tools:ignore="HardcodedText" >
+
+ <CheckBox
+ android:id="@+id/selected"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:layout_gravity="center"
+ android:focusable="false" />
+
+ <LinearLayout
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_gravity="center"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:text="Sample entry title"
+ android:textColor="?headlineSelectedTextColor"
+ android:textStyle="bold"
+ android:textSize="18sp"
+ android:layout_span="2" />
+
+ <TextView
+ android:id="@+id/excerpt"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+ android:textColor="?headlineSelectedExcerptTextColor"
+ android:textSize="13sp"
+ android:layout_span="2" />
+
+ <LinearLayout
+ android:paddingTop="2dp"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <TextView
+ android:id="@+id/feed_title"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:fontFamily="sans-serif-light"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+ android:textColor="?headlineSelectedSecondaryTextColor"
+ android:textSize="12sp"
+ android:layout_weight="0.5" />
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/headline_footer"
+ android:orientation="vertical"
+ android:layout_weight="0"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="sans-serif-light"
+ android:singleLine="true"
+ android:ellipsize="none"
+ android:layout_weight="1"
+ android:text="Jan 01, 12:00, 1970"
+ android:textColor="?headlineSelectedSecondaryTextColor"
+ android:textSize="12sp"
+ />
+
+
+ <ImageView
+ android:id="@+id/marked"
+ android:layout_width="16dp"
+ android:layout_gravity="bottom|right"
+ android:layout_height="16dp"
+ android:layout_weight="0"
+ android:clickable="true"
+ android:src="@drawable/ic_star_empty" />
+
+
+
+ </LinearLayout>
+
+ <!-- <ImageView
+ android:id="@+id/article_menu_button"
+ android:layout_gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="16dp"
+ android:layout_weight="0"
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp"
+ android:src="@drawable/ic_action_overflow" /> -->
+
+
+</LinearLayout> \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
new file mode 100644
index 00000000..ac9b2b81
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/headlines_row"
+ android:padding="8dp"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:background="?headlineUnreadBackground"
+ tools:ignore="HardcodedText" >
+
+ <CheckBox
+ android:id="@+id/selected"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:layout_gravity="center"
+ android:focusable="false" />
+
+ <LinearLayout
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_gravity="center"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:text="Sample entry title"
+ android:textColor="?headlineUnreadTextColor"
+ android:textStyle="bold"
+ android:textSize="18sp"
+ android:layout_span="2" />
+
+ <TextView
+ android:id="@+id/excerpt"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+ android:textColor="?headlineExcerptTextColor"
+ android:textSize="13sp"
+ android:layout_span="2" />
+
+ <LinearLayout
+ android:paddingTop="2dp"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <TextView
+ android:id="@+id/feed_title"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:fontFamily="sans-serif-light"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+ android:textColor="?headlineSecondaryTextColor"
+ android:textSize="12sp"
+ android:layout_weight="0.5" />
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/headline_footer"
+ android:orientation="vertical"
+ android:layout_weight="0"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="sans-serif-light"
+ android:singleLine="true"
+ android:ellipsize="none"
+ android:layout_weight="1"
+ android:text="Jan 01, 12:00, 1970"
+ android:textColor="?headlineSecondaryTextColor"
+ android:textSize="12sp"
+ />
+
+
+ <ImageView
+ android:id="@+id/marked"
+ android:layout_width="16dp"
+ android:layout_gravity="bottom|right"
+ android:layout_height="16dp"
+ android:layout_weight="0"
+ android:clickable="true"
+ android:src="@drawable/ic_star_empty" />
+
+
+
+ </LinearLayout>
+
+ <!-- <ImageView
+ android:id="@+id/article_menu_button"
+ android:layout_gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="16dp"
+ android:layout_weight="0"
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp"
+ android:src="@drawable/ic_action_overflow" /> -->
+
+
+</LinearLayout> \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/arrays.xml b/org.fox.ttrss/src/main/res/values/arrays.xml
index 9069466a..2dddaea8 100644
--- a/org.fox.ttrss/src/main/res/values/arrays.xml
+++ b/org.fox.ttrss/src/main/res/values/arrays.xml
@@ -11,6 +11,16 @@
<item>THEME_SEPIA</item>
<item>THEME_AMBER</item>
</string-array>
+ <string-array name="headline_mode_names">
+ <item>@string/headline_display_mode_default</item>
+ <item>@string/headline_display_mode_no_images</item>
+ <item>@string/headline_display_mode_compact</item>
+ </string-array>
+ <string-array name="headline_mode_values" translatable="false">
+ <item>HL_DEFAULT</item>
+ <item>HL_NOIMAGES</item>
+ <item>HL_COMPACT</item>
+ </string-array>
<string-array name="pref_offline_amounts" translatable="false">
<item>150</item>
<item>250</item>
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 970f479d..f5353153 100644
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -254,5 +254,9 @@
<string name="prefs_enable_fab">Enable FAB</string>
<string name="prefs_enable_fab_long">Show floating action button when reading</string>
<string name="prefs_open_fresh_on_startup">Open Fresh articles on startup</string>
-
+ <string name="prefs_headline_display_mode">Headline display mode</string>
+ <string name="prefs_headline_display_mode_long">Cards, cards with images, or compact mode</string>
+ <string name="headline_display_mode_default">Default</string>
+ <string name="headline_display_mode_no_images">No images</string>
+ <string name="headline_display_mode_compact">Compact</string>
</resources>
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index d4b7dc23..ba419927 100644
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -7,7 +7,7 @@
<item name="unreadCounterColor">#909090</item>
<item name="headlinesBackground">#f0f0f0</item>
<item name="articleBackground">@android:color/white</item>
- <item name="headlineSelectedBackground">?colorAccent</item>
+ <item name="headlineSelectedBackground">#88b0f0</item>
<item name="headlineUnreadBackground">@android:color/white</item>
<item name="headlineNormalBackground">#f5f5f5</item>
<item name="feedsSelectedBackground">?colorPrimaryDark</item>
@@ -17,7 +17,7 @@
<item name="headlineSelectedTextColor">#ffffff</item>
<item name="headlineExcerptTextColor">@android:color/secondary_text_light</item>
<item name="headlineSecondaryTextColor">#909090</item>
- <item name="headlineSelectedSecondaryTextColor">#606060</item>
+ <item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item>
<item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_light</item>
<item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
<item name="linkColor">?colorPrimary</item>
@@ -92,8 +92,8 @@
<item name="headlineSecondaryTextColor">#909090</item>
<item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
<item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item>
- <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item>
- <item name="headlineSelectedBackground">?colorPrimary</item>
+ <item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item>
+ <item name="headlineSelectedBackground">#88b0f0</item>
<item name="headlineUnreadBackground">#383c42</item>
<item name="linkColor">?colorPrimary</item>
<item name="loadingBackground">@android:color/black</item>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index ac67647b..fbaec0d2 100644
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -85,10 +85,10 @@
android:summary="@string/pref_headlines_show_content_long"
android:title="@string/pref_headlines_show_content" />
- <CheckBoxPreference
+ <!-- <CheckBoxPreference
android:defaultValue="true"
android:key="headlines_show_flavor_image"
- android:title="@string/prefs_headlines_show_flavor_image" />
+ android:title="@string/prefs_headlines_show_flavor_image" /> -->
<!-- <CheckBoxPreference
android:defaultValue="false"
@@ -114,6 +114,14 @@
android:dialogMessage="@string/pref_headline_font_size"
android:title="@string/pref_headline_font_size" />
+ <ListPreference
+ android:defaultValue="HL_DEFAULT"
+ android:entries="@array/headline_mode_names"
+ android:entryValues="@array/headline_mode_values"
+ android:key="headline_mode"
+ android:summary="@string/prefs_headline_display_mode_long"
+ android:title="@string/prefs_headline_display_mode" />
+
<CheckBoxPreference
android:defaultValue="true"
android:key="open_fresh_on_startup"