From c396ab425878bb2e7c5195d739b070377cb6aa1e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 12 May 2013 18:35:40 +0400
Subject: update all headline views (remove unnecessary variants), add separate
 color for secondary headline text

---
 res/layout/headlines_row_selected_unread.xml | 181 ++++++++++++++-------------
 1 file changed, 91 insertions(+), 90 deletions(-)

(limited to 'res/layout/headlines_row_selected_unread.xml')

diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index 03c4ffdb..7a9930c3 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -3,14 +3,14 @@
     android:id="@+id/headlines_row"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:background="?headlineSelectedBackgroundSolid"
-    android:orientation="vertical" >
+    android:background="?headlineSelectedBackground"
+    android:orientation="vertical"
+    android:paddingRight="6dp" >
 
     <LinearLayout
         android:id="@+id/linearLayout6"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
         android:orientation="horizontal" >
 
         <CheckBox
@@ -18,108 +18,109 @@
             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:padding="3dp" >
-
-
-            <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>
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="false"
+            android:text="{Title...}"
+            android:textColor="?headlineSelectedTextColor"
+            android:textSize="16sp"
+            android:textStyle="bold" />
 
-            <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" />
+    </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
+        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>
+        <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="?headlineSelectedSecondaryTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
+
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:gravity="right|center_vertical"
+            android:paddingRight="12dp"
+            android:text="Jan 01"
+            android:textColor="?headlineSelectedSecondaryTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-            <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>
 
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:text="Jan 01"
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="10sp"
-                android:textStyle="italic" />
+    <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>
-
-
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="0dp" >
 
-        <LinearLayout
-            android:id="@+id/linearLayout4"
+        <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="?headlineSelectedSecondaryTextColor"
+            android:textSize="12sp" />
+
+        <ImageView
+            android:id="@+id/marked"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingRight="6dp" >
+            android:layout_weight="0"
+            android:clickable="true"
+            android:paddingRight="6dp"
+            android:src="@android:drawable/star_off" />
 
-            <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: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
-- 
cgit v1.2.3-54-g00ecf