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: support showing article author (requires api 5) bump version

---
 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 ++++++++++++++++++++++
 4 files changed, 120 insertions(+)

(limited to 'res/layout-sw600dp')

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"
-- 
cgit v1.2.3