From b7c9792ada57c2fcc398c95320bfbb57ae59fb35 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 20 Jun 2012 14:16:24 +0400
Subject: [PATCH] various layout and code updates to support feed_title in
 virtual feeds (requires API 3)

---
 res/layout-port/headlines_row.xml            |  62 ++++----
 res/layout-port/headlines_row_selected.xml   |  65 +++++----
 res/layout-port/headlines_row_unread.xml     |  63 +++++----
 res/layout-xlarge/headlines_row.xml          | 141 -------------------
 res/layout-xlarge/headlines_row_selected.xml | 139 ------------------
 res/layout-xlarge/headlines_row_unread.xml   | 139 ------------------
 res/layout/headlines_row.xml                 |  17 ++-
 res/layout/headlines_row_selected.xml        |  17 ++-
 res/layout/headlines_row_unread.xml          |  17 ++-
 src/org/fox/ttrss/ArticleFragment.java       |   4 +-
 src/org/fox/ttrss/HeadlinesFragment.java     |  11 ++
 src/org/fox/ttrss/types/Article.java         |   4 +
 12 files changed, 174 insertions(+), 505 deletions(-)
 delete mode 100644 res/layout-xlarge/headlines_row.xml
 delete mode 100644 res/layout-xlarge/headlines_row_selected.xml
 delete mode 100644 res/layout-xlarge/headlines_row_unread.xml

diff --git a/res/layout-port/headlines_row.xml b/res/layout-port/headlines_row.xml
index d957ae9d..223dfc0d 100644
--- a/res/layout-port/headlines_row.xml
+++ b/res/layout-port/headlines_row.xml
@@ -33,8 +33,8 @@
                 android:layout_height="match_parent"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:textColor="?headlineTextColor"
                 android:text="There are many variations of passages of Lorem Ipsum available"
+                android:textColor="?headlineTextColor"
                 android:textSize="16sp" />
 
             <LinearLayout
@@ -76,7 +76,19 @@
                     android:layout_weight="1"
                     android:text="Jan 01, 00:00"
                     android:textColor="#909090"
-                    android:textSize="13sp" />
+                    android:textSize="11sp" />
+


+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="11sp" />
 
                 <ImageView
                     android:id="@+id/marked"
@@ -102,33 +114,33 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1" />
-    
+
     <LinearLayout
-            android:id="@+id/attachments_holder"
+        android:id="@+id/attachments_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0" >
+
+        <Spinner
+            android:id="@+id/attachments"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0" >
+            android:layout_weight="1"
+            android:prompt="@string/attachments_prompt" />
 
-            <Spinner
-                android:id="@+id/attachments"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:prompt="@string/attachments_prompt" />
+        <Button
+            android:id="@+id/attachment_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:text="@string/attachment_view" />
 
-            <Button
-                android:id="@+id/attachment_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:text="@string/attachment_view" />
-
-            <Button
-                android:id="@+id/attachment_copy"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:text="@string/attachment_copy" />
-        </LinearLayout>
+        <Button
+            android:id="@+id/attachment_copy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:text="@string/attachment_copy" />
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout-port/headlines_row_selected.xml b/res/layout-port/headlines_row_selected.xml
index 50eadb49..74b7ca8d 100644
--- a/res/layout-port/headlines_row_selected.xml
+++ b/res/layout-port/headlines_row_selected.xml
@@ -7,7 +7,6 @@
     android:gravity="center_vertical"
     android:orientation="vertical" >
 
-
     <LinearLayout
         android:id="@+id/linearLayout7"
         android:layout_width="match_parent"
@@ -34,8 +33,8 @@
                 android:layout_height="match_parent"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:textColor="?headlineSelectedTextColor"
                 android:text="There are many variations of passages of Lorem Ipsum available"
+                android:textColor="?headlineSelectedTextColor"
                 android:textSize="16sp" />
 
             <LinearLayout
@@ -77,7 +76,19 @@
                     android:layout_weight="1"
                     android:text="Jan 01, 00:00"
                     android:textColor="#909090"
-                    android:textSize="13sp" />
+                    android:textSize="11sp" />
+
+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="11sp" />
 
                 <ImageView
                     android:id="@+id/marked"
@@ -96,41 +107,41 @@
                     android:src="@drawable/ic_rss_bw" />
             </LinearLayout>
         </LinearLayout>
-
     </LinearLayout>
 
     <TextView
         android:id="@+id/content"
-        android:text="Article content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        android:text="Article content" />
 
     <LinearLayout
-            android:id="@+id/attachments_holder"
+        android:id="@+id/attachments_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0" >
+
+        <Spinner
+            android:id="@+id/attachments"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0" >
+            android:layout_weight="1"
+            android:prompt="@string/attachments_prompt" />
 
-            <Spinner
-                android:id="@+id/attachments"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:prompt="@string/attachments_prompt" />
+        <Button
+            android:id="@+id/attachment_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:text="@string/attachment_view" />
 
-            <Button
-                android:id="@+id/attachment_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:text="@string/attachment_view" />
+        <Button
+            android:id="@+id/attachment_copy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:text="@string/attachment_copy" />
+    </LinearLayout>
 
-            <Button
-                android:id="@+id/attachment_copy"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:text="@string/attachment_copy" />
-        </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout-port/headlines_row_unread.xml b/res/layout-port/headlines_row_unread.xml
index fcf1c387..4910cdc7 100644
--- a/res/layout-port/headlines_row_unread.xml
+++ b/res/layout-port/headlines_row_unread.xml
@@ -7,7 +7,6 @@
     android:gravity="center_vertical"
     android:orientation="vertical" >
 
-
     <LinearLayout
         android:id="@+id/linearLayout7"
         android:layout_width="match_parent"
@@ -34,8 +33,8 @@
                 android:layout_height="match_parent"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:textColor="?headlineTextColor"
                 android:text="There are many variations of passages of Lorem Ipsum available"
+                android:textColor="?headlineTextColor"
                 android:textSize="16sp" />
 
             <LinearLayout
@@ -77,7 +76,19 @@
                     android:layout_weight="1"
                     android:text="Jan 01, 00:00"
                     android:textColor="#909090"
-                    android:textSize="13sp" />
+                    android:textSize="11sp" />
+


+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="11sp" />
 
                 <ImageView
                     android:id="@+id/marked"
@@ -96,10 +107,8 @@
                     android:src="@drawable/ic_rss_bw" />
             </LinearLayout>
         </LinearLayout>
-
     </LinearLayout>
 
-
     <TextView
         android:id="@+id/content"
         android:layout_width="match_parent"
@@ -107,31 +116,31 @@
         android:layout_weight="1" />
 
     <LinearLayout
-            android:id="@+id/attachments_holder"
+        android:id="@+id/attachments_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0" >
+
+        <Spinner
+            android:id="@+id/attachments"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0" >
+            android:layout_weight="1"
+            android:prompt="@string/attachments_prompt" />
 
-            <Spinner
-                android:id="@+id/attachments"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:prompt="@string/attachments_prompt" />
+        <Button
+            android:id="@+id/attachment_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:text="@string/attachment_view" />
 
-            <Button
-                android:id="@+id/attachment_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:text="@string/attachment_view" />
+        <Button
+            android:id="@+id/attachment_copy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:text="@string/attachment_copy" />
+    </LinearLayout>
 
-            <Button
-                android:id="@+id/attachment_copy"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:text="@string/attachment_copy" />
-        </LinearLayout>
-    
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge/headlines_row.xml b/res/layout-xlarge/headlines_row.xml
deleted file mode 100644
index 73e6b941..00000000
--- a/res/layout-xlarge/headlines_row.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines_row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?headlineNormalBackground"
-    android:orientation="vertical" >
-
-
-    <LinearLayout
-        android:id="@+id/linearLayout6"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal" >
-
-
-        <ImageView
-            android:id="@+id/headlines_separator"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?headlineSeparatorNormal"
-            android:paddingRight="4dip" />
-
-        <CheckBox
-            android:id="@+id/selected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusable="false"
-            android:paddingLeft="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textColor="?headlineTextColor"
-                android:text="{Title...}"
-                android:textSize="16sp" >
-            </TextView>
-
-            <TextView
-                android:id="@+id/excerpt"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="{Content excerpt...}"
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/linerLayout3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
-
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Jan 01"
-                android:textColor="#909090"
-                android:textSize="13sp" >
-            </TextView>
-
-            <LinearLayout
-                android:id="@+id/linearLayout4"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingRight="2sp" >
-
-                <ImageView
-                    android:id="@+id/marked"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:src="@android:drawable/star_off" >
-                </ImageView>
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" >
-                </ImageView>
-            </LinearLayout>
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:padding="3dip" >
-    </TextView>
-
-        <LinearLayout
-            android:id="@+id/attachments_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0" >
-
-            <Spinner
-                android:id="@+id/attachments"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:prompt="@string/attachments_prompt" />
-
-            <Button
-                android:id="@+id/attachment_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:text="@string/attachment_view" />
-
-            <Button
-                android:id="@+id/attachment_copy"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:text="@string/attachment_copy" />
-        </LinearLayout>
-        
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge/headlines_row_selected.xml b/res/layout-xlarge/headlines_row_selected.xml
deleted file mode 100644
index 00171f0d..00000000
--- a/res/layout-xlarge/headlines_row_selected.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines_row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?headlineSelectedBackground"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:id="@+id/linearLayout6"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal" >
-
-        <ImageView
-            android:id="@+id/headlines_separator"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?headlineSeparatorSelected"
-            android:paddingRight="4dip" />
-
-        <CheckBox
-            android:id="@+id/selected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusable="false"
-            android:paddingLeft="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textColor="?headlineSelectedTextColor"
-                android:text="{Title...}"
-                android:textSize="16sp" >
-            </TextView>
-
-            <TextView
-                android:id="@+id/excerpt"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="{Content excerpt...}"
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/linerLayout3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
-
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Jan 01"
-                android:textColor="#909090"
-                android:textSize="13sp" >
-            </TextView>
-
-            <LinearLayout
-                android:id="@+id/linearLayout4"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingRight="2sp" >
-
-                <ImageView
-                    android:id="@+id/marked"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:src="@android:drawable/star_off" >
-                </ImageView>
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" >
-                </ImageView>
-            </LinearLayout>
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:padding="3dip" >
-    </TextView>
-    
-        <LinearLayout
-            android:id="@+id/attachments_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0" >
-
-            <Spinner
-                android:id="@+id/attachments"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:prompt="@string/attachments_prompt" />
-
-            <Button
-                android:id="@+id/attachment_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:text="@string/attachment_view" />
-
-            <Button
-                android:id="@+id/attachment_copy"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:text="@string/attachment_copy" />
-        </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge/headlines_row_unread.xml b/res/layout-xlarge/headlines_row_unread.xml
deleted file mode 100644
index 1ba714ab..00000000
--- a/res/layout-xlarge/headlines_row_unread.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines_row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?headlineUnreadBackground"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:id="@+id/linearLayout6"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal" >
-
-        <ImageView
-            android:id="@+id/headlines_separator"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?headlineSeparatorUnread"
-            android:paddingRight="4dip" />
-
-        <CheckBox
-            android:id="@+id/selected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusable="false"
-            android:paddingLeft="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:text="{Title...}"
-                android:textColor="?headlineTextColor"
-                android:textSize="16sp" >
-            </TextView>
-
-            <TextView
-                android:id="@+id/excerpt"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="{Content excerpt...}"
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/linerLayout3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
-
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Jan 01"
-                android:textColor="#909090"
-                android:textSize="13sp" >
-            </TextView>
-
-            <LinearLayout
-                android:id="@+id/linearLayout4"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingRight="2sp" >
-
-                <ImageView
-                    android:id="@+id/marked"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:src="@android:drawable/star_off" >
-                </ImageView>
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" >
-                </ImageView>
-            </LinearLayout>
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:padding="3dip" >
-    </TextView>
-
-        <LinearLayout
-            android:id="@+id/attachments_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0" >
-
-            <Spinner
-                android:id="@+id/attachments"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:prompt="@string/attachments_prompt" />
-
-            <Button
-                android:id="@+id/attachment_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:text="@string/attachment_view" />
-
-            <Button
-                android:id="@+id/attachment_copy"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:text="@string/attachment_copy" />
-        </LinearLayout>
-        
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 77e98234..26c7bc95 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -58,7 +58,7 @@
                 android:textSize="13sp" >
             </TextView>
         </LinearLayout>
-
+

         <LinearLayout
             android:id="@+id/linerLayout3"
             android:layout_width="wrap_content"
@@ -67,13 +67,25 @@
             android:orientation="vertical"
             android:padding="3dip" >
 
+            <TextView
+                android:id="@+id/feed_title"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:ellipsize="end"
+                android:gravity="center_horizontal"
+                android:singleLine="true"
+                android:text="{Feed title...}"
+                android:textColor="?headlineExcerptTextColor"
+                android:textSize="11sp" />
+
             <TextView
                 android:id="@+id/date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
                 android:text="Jan 01"
                 android:textColor="#909090"
-                android:textSize="13sp" >
+                android:textSize="11sp" >
             </TextView>
 
             <LinearLayout
@@ -100,6 +112,7 @@
                 </ImageView>
             </LinearLayout>
         </LinearLayout>
+
     </LinearLayout>
 
     <TextView
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index 519b7839..8a6ee7e7 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -56,7 +56,7 @@
                 android:textSize="13sp" >
             </TextView>
         </LinearLayout>
-
+

         <LinearLayout
             android:id="@+id/linerLayout3"
             android:layout_width="wrap_content"
@@ -65,13 +65,25 @@
             android:orientation="vertical"
             android:padding="3dip" >
 
+            <TextView
+                android:id="@+id/feed_title"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:ellipsize="end"
+                android:gravity="center_horizontal|right"
+                android:singleLine="true"
+                android:text="{Feed title...}"
+                android:textColor="?headlineExcerptTextColor"
+                android:textSize="11sp" />
+
             <TextView
                 android:id="@+id/date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
                 android:text="Jan 01"
                 android:textColor="#909090"
-                android:textSize="13sp" >
+                android:textSize="11sp" >
             </TextView>
 
             <LinearLayout
@@ -98,6 +110,7 @@
                 </ImageView>
             </LinearLayout>
         </LinearLayout>
+
     </LinearLayout>
 
     <TextView
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index bf980749..5a2bbc53 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -56,7 +56,7 @@
                 android:textSize="13sp" >
             </TextView>
         </LinearLayout>
-
+

         <LinearLayout
             android:id="@+id/linerLayout3"
             android:layout_width="wrap_content"
@@ -65,13 +65,25 @@
             android:orientation="vertical"
             android:padding="3dip" >
 
+            <TextView
+                android:id="@+id/feed_title"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:ellipsize="end"
+                android:gravity="center_horizontal"
+                android:singleLine="true"
+                android:text="{Feed title...}"
+                android:textColor="?headlineExcerptTextColor"
+                android:textSize="11sp" />
+
             <TextView
                 android:id="@+id/date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
                 android:text="Jan 01"
                 android:textColor="#909090"
-                android:textSize="13sp" >
+                android:textSize="11sp" >
             </TextView>
 
             <LinearLayout
@@ -98,6 +110,7 @@
                 </ImageView>
             </LinearLayout>
         </LinearLayout>
+
     </LinearLayout>
 
     <TextView
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index 00823f60..7b1128aa 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -281,7 +281,9 @@ public class ArticleFragment extends Fragment {
 			TextView tagv = (TextView)view.findViewById(R.id.tags);
 						
 			if (tagv != null) {
-				if (m_article.tags != null) {
+				if (m_article.feed_title != null) {
+					tagv.setText(m_article.feed_title);
+				} else if (m_article.tags != null) {
 					String tagsStr = "";
 				
 					for (String tag : m_article.tags)
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index da50a917..58b68e75 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -399,6 +399,17 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 				}
 			}
 
+			TextView ft = (TextView)v.findViewById(R.id.feed_title);
+			
+			if (ft != null) {
+				if (article.feed_title != null && (m_feed.is_cat || m_feed.id < 0)) {
+					ft.setText(article.feed_title);					
+				} else {
+					ft.setVisibility(View.GONE);
+				}
+				
+			}
+			
 			ImageView marked = (ImageView)v.findViewById(R.id.marked);
 			
 			if (marked != null) {
diff --git a/src/org/fox/ttrss/types/Article.java b/src/org/fox/ttrss/types/Article.java
index 28e54d51..2ad86e91 100644
--- a/src/org/fox/ttrss/types/Article.java
+++ b/src/org/fox/ttrss/types/Article.java
@@ -21,6 +21,7 @@ public class Article implements Parcelable {
 	public List<Attachment> attachments;
 	public String content;
 	public List<List<String>> labels;
+	public String feed_title;
 	
 	public Article(Parcel in) {
 		readFromParcel(in);
@@ -52,6 +53,7 @@ public class Article implements Parcelable {
 		out.writeStringList(tags);
 		out.writeString(content);
 		out.writeList(attachments);
+		out.writeString(feed_title);
 	}
 	
 	public void readFromParcel(Parcel in) {
@@ -72,6 +74,8 @@ public class Article implements Parcelable {
 		
 		attachments = new ArrayList<Attachment>();
 		in.readList(attachments, Attachment.class.getClassLoader());
+		
+		feed_title = in.readString();
 	}
 	
 	@SuppressWarnings("rawtypes")