From 8a97531a5a1d2e013db08b7fbef0eb2cd10baaf9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 24 Jan 2014 13:41:37 +0400
Subject: tweak typography and layouts a bit

---
 res/layout/article_fragment.xml              | 35 ++++++++--------------------
 res/layout/article_fragment_compat.xml       | 25 ++++----------------
 res/layout/headlines_row.xml                 |  5 ++++
 res/layout/headlines_row_selected.xml        |  5 ++++
 res/layout/headlines_row_selected_unread.xml |  5 ++++
 res/layout/headlines_row_unread.xml          |  9 +++++--
 6 files changed, 36 insertions(+), 48 deletions(-)

(limited to 'res')

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index 70016361..65ff34f9 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -1,7 +1,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/article_fragment"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_height="match_parent"
     android:background="?articleBackground"
     android:padding="5sp" >
 
@@ -28,46 +28,28 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:paddingTop="4dp"
+                    android:fontFamily="sans-serif-condensed"
                     android:paddingBottom="4dp"
-                    android:text="My simple headline"
+                    android:text="My simple headline"                    
                     android:textColor="?linkColor"
                     android:textSize="18sp" />
 
-                <TextView
-                    android:id="@+id/author"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:text="by Author"
-                    android:textColor="?headlineSecondaryTextColor"
-                    android:textSize="12sp" />
-
                 <TextView
                     android:id="@+id/comments"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:gravity="right"
+                    android:fontFamily="sans-serif-light"
                     android:text="24 comments"
                     android:textColor="?linkColor"
                     android:textSize="12sp" />
 
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp"
-                    android:layout_marginTop="4dp"
-                    android:layout_weight="0"
-                    android:background="?ttrssHorizontalDivider"
-                    android:paddingTop="2dip" />
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_weight="1"                    
+                    android:paddingTop="4dp"
                     android:paddingBottom="4dp" >
 
                     <TextView
@@ -77,6 +59,7 @@
                         android:layout_weight="0.5"
                         android:ellipsize="end"
                         android:singleLine="true"
+                        android:fontFamily="sans-serif-light"
                         android:text="Example Feed"
                         android:textColor="?headlineSecondaryTextColor"
                         android:textSize="12sp" />
@@ -87,10 +70,12 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="0.5"
                         android:gravity="right"
+                        android:fontFamily="sans-serif-light"
                         android:text="Jan 01, 12:00"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="?headlineSecondaryTextColor"
                         android:textSize="12sp" />
+
                 </LinearLayout>
 
             </LinearLayout>
diff --git a/res/layout/article_fragment_compat.xml b/res/layout/article_fragment_compat.xml
index 8c37eb72..dfe49ae7 100644
--- a/res/layout/article_fragment_compat.xml
+++ b/res/layout/article_fragment_compat.xml
@@ -26,22 +26,11 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:paddingBottom="4dp"
+            android:fontFamily="sans-serif-condensed"
             android:text="My simple headline"
             android:textColor="?linkColor"
             android:textSize="18sp" />
 
-        <TextView
-            android:id="@+id/author"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="right"
-            android:singleLine="true"
-            android:text="by Author"
-            android:textColor="?headlineSecondaryTextColor"
-            android:textSize="12sp" />
-
         <TextView
             android:id="@+id/comments"
             android:layout_width="match_parent"
@@ -49,18 +38,10 @@
             android:layout_weight="1"
             android:gravity="right"
             android:text="24 comments"
+            android:fontFamily="sans-serif-light"
             android:textColor="?linkColor"
             android:textSize="12sp" />
 
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="4dp"
-            android:layout_weight="0"
-            android:background="?ttrssHorizontalDivider"
-            android:paddingTop="2dip" />
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -75,6 +56,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:text="Example Feed"
+                android:fontFamily="sans-serif-light"
                 android:textColor="?headlineSecondaryTextColor"
                 android:textSize="12sp" />
 
@@ -85,6 +67,7 @@
                 android:layout_weight="0.5"
                 android:gravity="right"
                 android:text="Jan 01, 12:00"
+                android:fontFamily="sans-serif-light"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="?headlineSecondaryTextColor"
                 android:textSize="12sp" />
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 6df28379..92998b3e 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -36,6 +36,7 @@
                 android:gravity="center_vertical"
                 android:singleLine="false"
                 android:text="Sample entry title"
+                android:fontFamily="sans-serif-condensed"
                 android:textColor="?headlineTextColor"
                 android:textSize="18sp" />
         </LinearLayout>
@@ -58,6 +59,7 @@
                 android:gravity="center_vertical"
                 android:singleLine="true"
                 android:text="Example Feed"
+                android:fontFamily="sans-serif-light"
                 android:textColor="?headlineSecondaryTextColor"
                 android:textSize="12sp" />
 
@@ -68,6 +70,7 @@
                 android:layout_weight="1"
                 android:gravity="right|center_vertical"
                 android:text="Jan 01, 12:00"
+                android:fontFamily="sans-serif-light"
                 android:textColor="?headlineSecondaryTextColor"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -102,6 +105,8 @@
                 android:gravity="center_vertical"
                 android:singleLine="true"
                 android:text="by Author"
+                android:fontFamily="sans-serif-light"
+                android:textStyle="italic"
                 android:textColor="?headlineSecondaryTextColor"
                 android:textSize="12sp" />
 
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index 849e2b6f..2f6e9cba 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -31,6 +31,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:fontFamily="sans-serif-condensed"
                 android:gravity="center_vertical"
                 android:singleLine="false"
                 android:text="Sample entry title"
@@ -55,6 +56,7 @@
                 android:ellipsize="end"
                 android:gravity="center_vertical"
                 android:singleLine="true"
+                android:fontFamily="sans-serif-light"
                 android:text="Example Feed"
                 android:textColor="?headlineSelectedSecondaryTextColor"
                 android:textSize="12sp" />
@@ -66,6 +68,7 @@
                 android:layout_weight="1"
                 android:gravity="right|center_vertical"
                 android:text="Jan 01, 12:00"
+                android:fontFamily="sans-serif-light"
                 android:textColor="?headlineSelectedSecondaryTextColor"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -100,6 +103,8 @@
                 android:gravity="center_vertical"
                 android:singleLine="true"
                 android:text="by Author"
+                android:fontFamily="sans-serif-light"
+                android:textStyle="italic"
                 android:textColor="?headlineSelectedSecondaryTextColor"
                 android:textSize="12sp" />
 
diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index 0fa6e213..d8ab9ce5 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -34,6 +34,7 @@
                 android:gravity="center_vertical"
                 android:singleLine="false"
                 android:text="Sample entry title"
+                android:fontFamily="sans-serif-condensed"
                 android:textColor="?headlineSelectedTextColor"
                 android:textSize="18sp"
                 android:textStyle="bold" />
@@ -57,6 +58,7 @@
                 android:gravity="center_vertical"
                 android:singleLine="true"
                 android:text="Example Feed"
+                android:fontFamily="sans-serif-light"
                 android:textColor="?headlineSelectedSecondaryTextColor"
                 android:textSize="12sp" />
 
@@ -66,6 +68,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="right|center_vertical"
+                android:fontFamily="sans-serif-light"
                 android:text="Jan 01, 12:00"
                 android:textColor="?headlineSelectedSecondaryTextColor"
                 android:textSize="12sp" />
@@ -101,6 +104,8 @@
                 android:gravity="center_vertical"
                 android:singleLine="true"
                 android:text="by Author"
+                android:fontFamily="sans-serif-light"
+                android:textStyle="italic"
                 android:textColor="?headlineSelectedSecondaryTextColor"
                 android:textSize="12sp" />
 
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index 44f1c218..94df05f3 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -28,6 +28,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:fontFamily="sans-serif-condensed"
                 android:gravity="center_vertical"
                 android:singleLine="false"
                 android:text="Sample entry title"
@@ -53,15 +54,17 @@
                 android:ellipsize="end"
                 android:gravity="center_vertical"
                 android:singleLine="true"
-                android:text="Example Feed"
+                android:fontFamily="sans-serif-light"
+                android:text="Example Feed"                
                 android:textColor="?headlineSecondaryTextColor"
                 android:textSize="12sp" />
 
             <TextView
                 android:id="@+id/date"
-                android:layout_width="wrap_content"
+                android:layout_width="wrap_content"                
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:fontFamily="sans-serif-light"
                 android:gravity="right|center_vertical"
                 android:text="Jan 01, 12:00"
                 android:textColor="?headlineSecondaryTextColor"
@@ -98,6 +101,8 @@
                 android:gravity="center_vertical"
                 android:singleLine="true"
                 android:text="by Author"
+                android:fontFamily="sans-serif-light"
+                android:textStyle="italic"
                 android:textColor="?headlineSecondaryTextColor"
                 android:textSize="12sp" />
 
-- 
cgit v1.2.3-54-g00ecf