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/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 ++-
 8 files changed, 157 insertions(+), 51 deletions(-)

(limited to 'res/layout')

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