From 5792022b559eb3ac886f363f76b6f3857efb8d29 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sat, 30 Mar 2013 19:30:47 +0400
Subject: [PATCH] support showing article author (requires api 5) bump version

---
 AndroidManifest.xml                           |  8 +--
 res/layout-port/headlines_row.xml             | 40 +++++++++----
 res/layout-port/headlines_row_selected.xml    | 40 +++++++++----
 .../headlines_row_selected_unread.xml         | 40 +++++++++----
 res/layout-port/headlines_row_unread.xml      | 40 +++++++++----
 res/layout-sw600dp/headlines_row.xml          | 30 ++++++++++
 res/layout-sw600dp/headlines_row_selected.xml | 30 ++++++++++
 .../headlines_row_selected_unread.xml         | 30 ++++++++++
 res/layout-sw600dp/headlines_row_unread.xml   | 30 ++++++++++
 res/layout/article_fragment.xml               | 14 +++++
 res/layout/headlines_row.xml                  | 46 +++++++++------
 res/layout/headlines_row_loadmore.xml         |  3 +-
 res/layout/headlines_row_selected.xml         | 39 +++++++++----
 res/layout/headlines_row_selected_unread.xml  | 39 +++++++++----
 res/layout/headlines_row_unread.xml           | 58 +++++++++++++++----
 res/layout/loading_fragment.xml               |  3 +-
 res/layout/share.xml                          |  6 +-
 src/org/fox/ttrss/ArticleFragment.java        | 12 +++-
 src/org/fox/ttrss/HeadlinesFragment.java      |  8 +++
 .../ttrss/offline/OfflineArticleFragment.java |  8 ++-
 src/org/fox/ttrss/types/Article.java          |  3 +
 21 files changed, 424 insertions(+), 103 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3af6dfb6..ccc44067 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="150"
-    android:versionName="1.4.2" >
+    android:versionCode="151"
+    android:versionName="1.4.3" >
 
     <uses-sdk
         android:minSdkVersion="8"
@@ -44,10 +44,6 @@
             android:name=".CommonActivity"
             android:label="@string/app_name" >
         </activity>
-        <activity
-            android:name=".ArticleActivity"
-            android:label="@string/app_name" >
-        </activity>
         <activity
             android:name=".offline.OfflineActivity"
             android:label="@string/app_name" >
diff --git a/res/layout-port/headlines_row.xml b/res/layout-port/headlines_row.xml
index 7bdb6e65..7ad36445 100644
--- a/res/layout-port/headlines_row.xml
+++ b/res/layout-port/headlines_row.xml
@@ -27,17 +27,35 @@
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
-            <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="10sp" />
+            <LinearLayout
+                android:id="@+id/feed_and_author"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ellipsize="end"
+                    android:layout_weight="0.5"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+                <TextView
+                    android:id="@+id/author"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.5"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/excerpt"
diff --git a/res/layout-port/headlines_row_selected.xml b/res/layout-port/headlines_row_selected.xml
index 6ea9953f..ed7c4d06 100644
--- a/res/layout-port/headlines_row_selected.xml
+++ b/res/layout-port/headlines_row_selected.xml
@@ -26,17 +26,35 @@
                 android:textSize="16sp"
                 android:textStyle="normal" />
 
-            <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="?headlineSelectedExcerptTextColor"
-                android:textSize="10sp" />
+            <LinearLayout
+                android:id="@+id/feed_and_author"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ellipsize="end"
+                    android:layout_weight="0.5"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+                <TextView
+                    android:id="@+id/author"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.5"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/excerpt"
diff --git a/res/layout-port/headlines_row_selected_unread.xml b/res/layout-port/headlines_row_selected_unread.xml
index 07119bf7..63cc67fa 100644
--- a/res/layout-port/headlines_row_selected_unread.xml
+++ b/res/layout-port/headlines_row_selected_unread.xml
@@ -27,17 +27,35 @@
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
-            <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="?headlineSelectedExcerptTextColor"
-                android:textSize="10sp" />
+            <LinearLayout
+                android:id="@+id/feed_and_author"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ellipsize="end"
+                    android:layout_weight="0.5"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+                <TextView
+                    android:id="@+id/author"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.5"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/excerpt"
diff --git a/res/layout-port/headlines_row_unread.xml b/res/layout-port/headlines_row_unread.xml
index fc4ba8a4..4b3c10b7 100644
--- a/res/layout-port/headlines_row_unread.xml
+++ b/res/layout-port/headlines_row_unread.xml
@@ -27,17 +27,35 @@
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
-            <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="10sp" />
+            <LinearLayout
+                android:id="@+id/feed_and_author"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ellipsize="end"
+                    android:layout_weight="0.5"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+                <TextView
+                    android:id="@+id/author"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.5"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/excerpt"
diff --git a/res/layout-sw600dp/headlines_row.xml b/res/layout-sw600dp/headlines_row.xml
index 90131a82..c3bdacbd 100644
--- a/res/layout-sw600dp/headlines_row.xml
+++ b/res/layout-sw600dp/headlines_row.xml
@@ -44,6 +44,36 @@
 
             </TextView>
 
+            <LinearLayout
+                android:id="@+id/feed_and_author"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ellipsize="end"
+                    android:layout_weight="0.5"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+                <TextView
+                    android:id="@+id/author"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.5"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
+            
             <TextView
                 android:id="@+id/excerpt"
                 android:layout_width="match_parent"
diff --git a/res/layout-sw600dp/headlines_row_selected.xml b/res/layout-sw600dp/headlines_row_selected.xml
index ed84f9f6..f18ff51f 100644
--- a/res/layout-sw600dp/headlines_row_selected.xml
+++ b/res/layout-sw600dp/headlines_row_selected.xml
@@ -42,6 +42,36 @@
                 android:textStyle="normal" >
             </TextView>
 
+            <LinearLayout
+                android:id="@+id/feed_and_author"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ellipsize="end"
+                    android:layout_weight="0.5"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+                <TextView
+                    android:id="@+id/author"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.5"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
+            
             <TextView
                 android:id="@+id/excerpt"
                 android:layout_width="match_parent"
diff --git a/res/layout-sw600dp/headlines_row_selected_unread.xml b/res/layout-sw600dp/headlines_row_selected_unread.xml
index 0157fb65..9fa73d04 100644
--- a/res/layout-sw600dp/headlines_row_selected_unread.xml
+++ b/res/layout-sw600dp/headlines_row_selected_unread.xml
@@ -41,6 +41,36 @@
                 android:textSize="16sp"
                 android:textStyle="bold" >
             </TextView>
+            
+            <LinearLayout
+                android:id="@+id/feed_and_author"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ellipsize="end"
+                    android:layout_weight="0.5"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+                <TextView
+                    android:id="@+id/author"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.5"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/excerpt"
diff --git a/res/layout-sw600dp/headlines_row_unread.xml b/res/layout-sw600dp/headlines_row_unread.xml
index 12ebf6ef..d58b78a6 100644
--- a/res/layout-sw600dp/headlines_row_unread.xml
+++ b/res/layout-sw600dp/headlines_row_unread.xml
@@ -43,6 +43,36 @@
                 android:textStyle="bold" >
 
             </TextView>
+            
+            <LinearLayout
+                android:id="@+id/feed_and_author"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ellipsize="end"
+                    android:layout_weight="0.5"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+                <TextView
+                    android:id="@+id/author"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.5"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/excerpt"
diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index f5ae4d43..611386dc 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -36,6 +36,20 @@
                 android:textColor="?linkColor"
                 android:textSize="13sp" />
 
+            <TextView
+                    android:id="@+id/author"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:gravity="right"
+                    android:textStyle="italic"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="13sp" />
+            
+            
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 24e0d910..571cfd9b 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -21,7 +21,6 @@
             android:paddingLeft="6dip"
             android:paddingRight="6dip" >
         </CheckBox>
-
 
         <LinearLayout
             android:id="@+id/linearLayout1"
@@ -30,7 +29,6 @@
             android:layout_weight="1"
             android:orientation="vertical"
             android:padding="3dp" >
-
 
             <TextView
                 android:id="@+id/title"
@@ -42,19 +40,37 @@
                 android:textColor="?headlineTextColor"
                 android:textSize="16sp"
                 android:textStyle="bold" >
-
             </TextView>
 
-            <TextView
-                android:id="@+id/feed_title"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:gravity="center_horizontal"
-                android:singleLine="true"
-                android:text="{Feed title...}"
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="10sp" />
+            <LinearLayout
+                android:id="@+id/feed_and_author"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ellipsize="end"
+                    android:layout_weight="0.5"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+                <TextView
+                    android:id="@+id/author"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.5"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/excerpt"
@@ -64,7 +80,6 @@
                 android:textColor="?headlineExcerptTextColor"
                 android:textSize="13sp" >
             </TextView>
-
 
             <TextView
                 android:id="@+id/date"
@@ -75,10 +90,7 @@
                 android:textColor="?headlineExcerptTextColor"
                 android:textSize="10sp"
                 android:textStyle="italic" />
-
         </LinearLayout>
-
-
 
         <LinearLayout
             android:id="@+id/linearLayout4"
diff --git a/res/layout/headlines_row_loadmore.xml b/res/layout/headlines_row_loadmore.xml
index ab7adc87..053186bd 100644
--- a/res/layout/headlines_row_loadmore.xml
+++ b/res/layout/headlines_row_loadmore.xml
@@ -7,7 +7,8 @@
     android:gravity="center"
     android:padding="5dp"
     android:orientation="horizontal" >
-

+
+
         <ProgressBar
             android:id="@+id/loadmore_progress"
             style="?android:attr/progressBarStyleSmall"
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index eefe8639..babf3f6b 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -45,16 +45,35 @@
 
             </TextView>
 
-            <TextView
-                android:id="@+id/feed_title"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:gravity="center_horizontal|right"
-                android:singleLine="true"
-                android:text="{Feed title...}"
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="10sp" />
+            <LinearLayout
+                android:id="@+id/feed_and_author"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ellipsize="end"
+                    android:layout_weight="0.5"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+                <TextView
+                    android:id="@+id/author"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.5"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/excerpt"
diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index c4423d57..03c4ffdb 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -45,16 +45,35 @@
 
             </TextView>
 
-            <TextView
-                android:id="@+id/feed_title"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:gravity="center_horizontal|right"
-                android:singleLine="true"
-                android:text="{Feed title...}"
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="10sp" />
+            <LinearLayout
+                android:id="@+id/feed_and_author"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ellipsize="end"
+                    android:layout_weight="0.5"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+                <TextView
+                    android:id="@+id/author"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.5"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/excerpt"
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index c530d0ee..1e789f71 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -47,16 +47,54 @@
 
             </TextView>
 
-            <TextView
-                android:id="@+id/feed_title"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:gravity="center_horizontal"
-                android:singleLine="true"
-                android:text="{Feed title...}"
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="10sp" />
+            <LinearLayout
+                android:id="@+id/feed_and_author"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+                <LinearLayout
+                android:id="@+id/feed_and_author"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+                <TextView
+                    android:id="@+id/feed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ellipsize="end"
+                    android:layout_weight="0.5"
+                    android:singleLine="true"
+                    android:text="{Feed title...}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+                <TextView
+                    android:id="@+id/author"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.5"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
+
+                <TextView
+                    android:id="@+id/author"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.5"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/excerpt"
diff --git a/res/layout/loading_fragment.xml b/res/layout/loading_fragment.xml
index ab820170..352662e6 100644
--- a/res/layout/loading_fragment.xml
+++ b/res/layout/loading_fragment.xml
@@ -2,7 +2,8 @@
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" >
-

+
+
         <ProgressBar
             android:id="@+id/progressBar1"
             style="?android:attr/progressBarStyleLarge"
diff --git a/res/layout/share.xml b/res/layout/share.xml
index f1803130..3b0dd682 100644
--- a/res/layout/share.xml
+++ b/res/layout/share.xml
@@ -25,7 +25,8 @@
         android:ems="10"
         android:hint="@string/share_url_hint"
         android:singleLine="true" />
-

+
+
     <EditText
         android:id="@+id/content"
         android:layout_width="wrap_content"
@@ -40,7 +41,8 @@
 
         <requestFocus />
     </EditText>
-

+
+
     <Button
         android:id="@+id/share_button"
         android:layout_width="100dp"
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index c2763436..cb2c94f4 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -291,7 +291,17 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl
 				} else {
 					tagv.setVisibility(View.GONE);
 				}
-			}			
+			}
+			
+			TextView author = (TextView)view.findViewById(R.id.author);
+
+			if (author != null) {
+				if (m_article.author != null && m_article.author.length() > 0) {
+					author.setText(m_article.author);				
+				} else {
+					author.setVisibility(View.GONE);
+				}
+			}
 		} 
 		
 		return view;    	
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index 8c2b8aa8..924f3b52 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -664,6 +664,14 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 				}
 			}       	
 			
+			String articleAuthor = article.author != null ? article.author : "";
+			
+			TextView author = (TextView)v.findViewById(R.id.author);
+			
+			if (author != null) {
+				author.setText(articleAuthor);
+			}
+			
 			/* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);
 			
 			if (separator != null && m_onlineServices.isSmallScreen()) {
diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
index 5a2803ff..22d1ae02 100644
--- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -279,7 +279,13 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector.
 					String tagsStr = m_cursor.getString(m_cursor.getColumnIndex("tags"));
 					tagv.setText(tagsStr);
 				}
-			}			
+			}	
+			
+			TextView author = (TextView)view.findViewById(R.id.author);
+
+			if (author != null) {
+				author.setVisibility(View.GONE);
+			}
 		} 
 		
 		return view;    	
diff --git a/src/org/fox/ttrss/types/Article.java b/src/org/fox/ttrss/types/Article.java
index 8e619b4b..46da68ab 100644
--- a/src/org/fox/ttrss/types/Article.java
+++ b/src/org/fox/ttrss/types/Article.java
@@ -25,6 +25,7 @@ public class Article implements Parcelable {
 	public int comments_count;
 	public String comments_link;
 	public boolean always_display_attachments;
+	public String author;
 	
 	public Article(Parcel in) {
 		readFromParcel(in);
@@ -64,6 +65,7 @@ public class Article implements Parcelable {
 		out.writeInt(comments_count);
 		out.writeString(comments_link);
 		out.writeInt(always_display_attachments ? 1 : 0);
+		out.writeString(author);
 	}
 	
 	public void readFromParcel(Parcel in) {
@@ -90,6 +92,7 @@ public class Article implements Parcelable {
 		comments_count = in.readInt();
 		comments_link = in.readString();
 		always_display_attachments = in.readInt() == 1;
+		author = in.readString();
 	}
 	
 	@SuppressWarnings("rawtypes")