From c84a1100b01fda8d30aa80adb3f267aff306d535 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 12 May 2013 18:01:00 +0400
Subject: [PATCH] improve readability of sw600dp headline rows

---
 .classpath                                    |  22 +--
 project.properties                            |   2 +-
 .../headlines_row_selected.xml                |  80 --------
 .../headlines_row_selected_unread.xml         |  81 --------
 res/layout-sw600dp/article_fragment.xml       |   4 +-
 res/layout-sw600dp/headlines_row.xml          | 176 ++++++++---------
 res/layout-sw600dp/headlines_row_selected.xml | 181 ++++++++---------
 .../headlines_row_selected_unread.xml         | 182 +++++++++---------
 res/layout-sw600dp/headlines_row_unread.xml   | 179 ++++++++---------
 9 files changed, 378 insertions(+), 529 deletions(-)
 delete mode 100644 res/layout-sw600dp-port/headlines_row_selected.xml
 delete mode 100644 res/layout-sw600dp-port/headlines_row_selected_unread.xml

diff --git a/.classpath b/.classpath
index ecdd04f3..be5840b2 100644
--- a/.classpath
+++ b/.classpath
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="libs/gson-1.7.1.jar"/>
-	<classpathentry kind="lib" path="libs/jsoup-1.6.1.jar"/>
-	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="lib" path="libs/gson-1.7.1.jar"/>
+	<classpathentry kind="lib" path="libs/jsoup-1.6.1.jar"/>
+	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/project.properties b/project.properties
index 4fe1b47d..c6312a57 100644
--- a/project.properties
+++ b/project.properties
@@ -10,4 +10,4 @@
 # Project target.
 target=android-17
 android.library.reference.1=..\\Android-ViewPagerIndicator\\library
-android.library.reference.2=../ActionBarSherlock/actionbarsherlock
+android.library.reference.2=..\\ActionBarSherlock\\actionbarsherlock
diff --git a/res/layout-sw600dp-port/headlines_row_selected.xml b/res/layout-sw600dp-port/headlines_row_selected.xml
deleted file mode 100644
index cdcc20e7..00000000
--- a/res/layout-sw600dp-port/headlines_row_selected.xml
+++ /dev/null
@@ -1,80 +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="?headlineSelectedBackgroundSolid"
-    android:padding="4sp"
-    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" >
-
-        <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="false"
-                android:text="{Title...}"
-                android:textColor="?headlineSelectedTextColor"
-                android:textSize="16sp"
-                android:textStyle="normal" >
-
-            </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/linearLayout4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingRight="15px" >
-
-            <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
-                android:id="@+id/published"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@drawable/ic_rss_bw" />
-        </LinearLayout>
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp-port/headlines_row_selected_unread.xml b/res/layout-sw600dp-port/headlines_row_selected_unread.xml
deleted file mode 100644
index 0805077d..00000000
--- a/res/layout-sw600dp-port/headlines_row_selected_unread.xml
+++ /dev/null
@@ -1,81 +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="?headlineSelectedBackgroundSolid"
-    android:padding="4sp"
-    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" >
-
-        <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="false"
-                android:text="{Title...}"
-                android:textColor="?headlineSelectedTextColor"
-                android:textSize="16sp"
-                android:textStyle="bold" >
-
-            </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/linearLayout4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingRight="15px" >
-
-            <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
-                android:id="@+id/published"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@drawable/ic_rss_bw" />
-        </LinearLayout>
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/article_fragment.xml b/res/layout-sw600dp/article_fragment.xml
index 7cde45f4..3b48bed1 100644
--- a/res/layout-sw600dp/article_fragment.xml
+++ b/res/layout-sw600dp/article_fragment.xml
@@ -56,8 +56,7 @@
                     android:singleLine="true"
                     android:text="{Author}"
                     android:textColor="?headlineExcerptTextColor"
-                    android:textSize="13sp"
-                    android:textStyle="italic" />
+                    android:textSize="13sp" />
             </LinearLayout>
 
             <LinearLayout
@@ -71,6 +70,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0.7"
                     android:ellipsize="end"
+                    android:textStyle="italic" 
                     android:singleLine="true"
                     android:text="{TAGS}"
                     android:textColor="?headlineExcerptTextColor"
diff --git a/res/layout-sw600dp/headlines_row.xml b/res/layout-sw600dp/headlines_row.xml
index d049dbcc..80da7423 100644
--- a/res/layout-sw600dp/headlines_row.xml
+++ b/res/layout-sw600dp/headlines_row.xml
@@ -4,8 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:background="?headlineNormalBackground"
-    android:padding="4sp"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:padding="6dp" >
 
     <LinearLayout
         android:id="@+id/linearLayout6"
@@ -19,102 +19,106 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:focusable="false"
-            android:paddingLeft="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp" />
 
-        <LinearLayout
-            android:id="@+id/linearLayout1"
+        <TextView
+            android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:orientation="vertical" >
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="false"
+            android:text="{Title...}"
+            android:textColor="?headlineTextColor"
+            android:textSize="16sp" />
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="false"
-                android:text="{Title...}"
-                android:textColor="?headlineTextColor"
-                android:textSize="16sp" >
+    </LinearLayout>
 
-            </TextView>
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="6dp"
+        android:paddingTop="6dp" >
 
-            <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:layout_weight="0.25"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Feed title...}"
+            android:textColor="?headlineExcerptTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-                <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"
-                android:layout_height="match_parent"
-                android:text="{Content excerpt...}"
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
-
-
-
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Jan 01"
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="11sp"
-                android:textStyle="italic" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/linearLayout4"
+        <TextView
+            android:id="@+id/date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingRight="15px" >
+            android:layout_weight="0.5"
+            android:gravity="right|center_vertical"
+            android:text="Jan 01"
+            android:textColor="?headlineExcerptTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-            <ImageView
-                android:id="@+id/marked"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@android:drawable/star_off" />
+    </LinearLayout>
 
-            <ImageView
-                android:id="@+id/published"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@drawable/ic_rss_bw" />
-        </LinearLayout>
+    <TextView
+        android:id="@+id/excerpt"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="6dp"
+        android:text="{Content excerpt...}"
+        android:textColor="?headlineExcerptTextColor"
+        android:textSize="13sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="0dp" >
+
+        <TextView
+            android:id="@+id/author"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Author}"
+            android:textColor="?headlineExcerptTextColor"
+            android:textSize="12sp" />
+
+        <ImageView
+            android:id="@+id/marked"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:clickable="true"
+            android:paddingRight="6dp"
+            android:src="@android:drawable/star_off" />
+
+        <ImageView
+            android:id="@+id/published"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:clickable="true"            
+            android:src="@drawable/ic_rss_bw" />
 
     </LinearLayout>
 
diff --git a/res/layout-sw600dp/headlines_row_selected.xml b/res/layout-sw600dp/headlines_row_selected.xml
index f18ff51f..3cfd98e8 100644
--- a/res/layout-sw600dp/headlines_row_selected.xml
+++ b/res/layout-sw600dp/headlines_row_selected.xml
@@ -4,8 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:background="?headlineSelectedBackground"
-    android:padding="4sp"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:padding="6dp" >
 
     <LinearLayout
         android:id="@+id/linearLayout6"
@@ -19,106 +19,107 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:focusable="false"
-            android:paddingLeft="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp" />
 
-        <LinearLayout
-            android:id="@+id/linearLayout1"
+        <TextView
+            android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:orientation="vertical" >
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="false"
+            android:text="{Title...}"
+            android:textColor="?headlineSelectedTextColor"
+            android:textSize="16sp" />
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="false"
-                android:text="{Title...}"
-                android:textColor="?headlineSelectedTextColor"
-                android:textSize="16sp"
-                android:textStyle="normal" >
-            </TextView>
+    </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/feed_and_author"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="6dp"
+        android:paddingTop="6dp" >
 
-                <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/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="0.25"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Feed title...}"
+            android:textColor="?headlineSelectedExcerptTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-                <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"
-                android:layout_height="match_parent"
-                android:text="{Content excerpt...}"
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
-
-
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Jan 01"
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="11sp"
-                android:textStyle="italic" />
-
-        </LinearLayout>
-
-
-
-
-
-
-        <LinearLayout
-            android:id="@+id/linearLayout4"
+        <TextView
+            android:id="@+id/date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingRight="15px" >
+            android:layout_weight="0.5"
+            android:gravity="right|center_vertical"
+            android:text="Jan 01"
+            android:textColor="?headlineSelectedExcerptTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-            <ImageView
-                android:id="@+id/marked"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@android:drawable/star_off" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/excerpt"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="6dp"
+        android:text="{Content excerpt...}"
+        android:textColor="?headlineSelectedExcerptTextColor"
+        android:textSize="13sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="0dp" >
+
+        <TextView
+            android:id="@+id/author"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Author}"
+            android:textColor="?headlineSelectedExcerptTextColor"
+            android:textSize="12sp" />
+
+        <ImageView
+            android:id="@+id/marked"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:clickable="true"
+            android:paddingRight="6dp"
+            android:src="@android:drawable/star_off" />
+
+        <ImageView
+            android:id="@+id/published"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:clickable="true"            
+            android:src="@drawable/ic_rss_bw" />
 
-            <ImageView
-                android:id="@+id/published"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@drawable/ic_rss_bw" />
-        </LinearLayout>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/headlines_row_selected_unread.xml b/res/layout-sw600dp/headlines_row_selected_unread.xml
index 9fa73d04..2d3354b6 100644
--- a/res/layout-sw600dp/headlines_row_selected_unread.xml
+++ b/res/layout-sw600dp/headlines_row_selected_unread.xml
@@ -4,8 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:background="?headlineSelectedBackground"
-    android:padding="4sp"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:padding="6dp" >
 
     <LinearLayout
         android:id="@+id/linearLayout6"
@@ -19,106 +19,108 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:focusable="false"
-            android:paddingLeft="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp" />
 
-        <LinearLayout
-            android:id="@+id/linearLayout1"
+        <TextView
+            android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:orientation="vertical" >
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="false"
+            android:text="{Title...}"
+            android:textColor="?headlineSelectedTextColor"
+            android:textSize="16sp"
+            android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="false"
-                android:text="{Title...}"
-                android:textColor="?headlineSelectedTextColor"
-                android:textSize="16sp"
-                android:textStyle="bold" >
-            </TextView>
-            
-            <LinearLayout
-                android:id="@+id/feed_and_author"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
+    </LinearLayout>
 
-                <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" />
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="6dp"
+        android:paddingTop="6dp" >
 
-                <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" />
+        <TextView
+            android:id="@+id/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="0.25"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Feed title...}"
+            android:textColor="?headlineSelectedExcerptTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-            </LinearLayout>
-
-            <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>
-
-
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Jan 01"
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="11sp"
-                android:textStyle="italic" />
-
-        </LinearLayout>
-
-
-
-
-
-
-        <LinearLayout
-            android:id="@+id/linearLayout4"
+        <TextView
+            android:id="@+id/date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingRight="15px" >
+            android:layout_weight="0.5"
+            android:gravity="right|center_vertical"
+            android:text="Jan 01"
+            android:textColor="?headlineSelectedExcerptTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-            <ImageView
-                android:id="@+id/marked"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@android:drawable/star_off" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/excerpt"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="6dp"
+        android:text="{Content excerpt...}"
+        android:textColor="?headlineSelectedExcerptTextColor"
+        android:textSize="13sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="0dp" >
+
+        <TextView
+            android:id="@+id/author"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Author}"
+            android:textColor="?headlineSelectedExcerptTextColor"
+            android:textSize="12sp" />
+
+        <ImageView
+            android:id="@+id/marked"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:clickable="true"
+            android:paddingRight="6dp"
+            android:src="@android:drawable/star_off" />
+
+        <ImageView
+            android:id="@+id/published"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:clickable="true"            
+            android:src="@drawable/ic_rss_bw" />
 
-            <ImageView
-                android:id="@+id/published"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@drawable/ic_rss_bw" />
-        </LinearLayout>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/headlines_row_unread.xml b/res/layout-sw600dp/headlines_row_unread.xml
index d58b78a6..4187af8f 100644
--- a/res/layout-sw600dp/headlines_row_unread.xml
+++ b/res/layout-sw600dp/headlines_row_unread.xml
@@ -4,8 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:background="?headlineUnreadBackground"
-    android:padding="4sp"    
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:padding="6dp" >
 
     <LinearLayout
         android:id="@+id/linearLayout6"
@@ -19,104 +19,107 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:focusable="false"
-            android:paddingLeft="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp" />
 
-        <LinearLayout
-            android:id="@+id/linearLayout1"
+        <TextView
+            android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:orientation="vertical" >
-
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="false"
+            android:text="{Title...}"
+            android:textColor="?headlineUnreadTextColor"
+            android:textSize="16sp"
+            android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="false"
-                android:text="{Title...}"
-                android:textColor="?headlineUnreadTextColor"
-                android:textSize="16sp"
-                android:textStyle="bold" >
+    </LinearLayout>
 
-            </TextView>
-            
-            <LinearLayout
-                android:id="@+id/feed_and_author"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="6dp"
+        android:paddingTop="6dp" >
 
-                <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/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="0.25"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Feed title...}"
+            android:textColor="?headlineExcerptTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-                <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"
-                android:layout_height="match_parent"
-                android:text="{Content excerpt...}"
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
-
-
-
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Jan 01"
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="11sp"
-                android:textStyle="italic" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/linearLayout4"
+        <TextView
+            android:id="@+id/date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingRight="15px" >
+            android:layout_weight="0.5"
+            android:gravity="right|center_vertical"
+            android:text="Jan 01"
+            android:textColor="?headlineExcerptTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-            <ImageView
-                android:id="@+id/marked"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@android:drawable/star_off" />
+    </LinearLayout>
 
-            <ImageView
-                android:id="@+id/published"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@drawable/ic_rss_bw" />
-        </LinearLayout>
+    <TextView
+        android:id="@+id/excerpt"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="6dp"
+        android:text="{Content excerpt...}"
+        android:textColor="?headlineExcerptTextColor"
+        android:textSize="13sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="0dp" >
+
+        <TextView
+            android:id="@+id/author"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Author}"
+            android:textColor="?headlineExcerptTextColor"
+            android:textSize="12sp" />
+
+        <ImageView
+            android:id="@+id/marked"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:clickable="true"
+            android:paddingRight="6dp"
+            android:src="@android:drawable/star_off" />
+
+        <ImageView
+            android:id="@+id/published"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:clickable="true"            
+            android:src="@drawable/ic_rss_bw" />
 
     </LinearLayout>