From 8d279b67b6e23a438ac01d1972b97e05070928ad Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sat, 25 Jan 2014 22:18:26 +0400
Subject: use line-spacing on headlines; increase default line-height on
 articles a bit

---
 res/layout/article_fragment.xml              | 16 ++++++++--------
 res/layout/headlines_row.xml                 |  1 +
 res/layout/headlines_row_selected.xml        |  1 +
 res/layout/headlines_row_selected_unread.xml |  1 +
 res/layout/headlines_row_unread.xml          |  1 +
 5 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'res')

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index 83729a6f..fde7c106 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -2,11 +2,10 @@
     android:id="@+id/article_fragment"
     android:layout_width="fill_parent"
     android:layout_height="match_parent"
-    android:background="?articleBackground"
-    android:padding="5sp" >
+    android:background="?articleBackground">
 
     <org.fox.ttrss.util.NoChildFocusScrollView
-        android:id="@+id/scrollView1"
+        android:id="@+id/article_scrollview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fillViewport="false" >
@@ -21,7 +20,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingBottom="2dp" >
+                android:paddingBottom="6dp" >
 
                 <TextView
                     android:id="@+id/title"
@@ -55,8 +54,8 @@
                         android:id="@+id/tags"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="0.5"
-                        android:ellipsize="end"
+                        android:layout_weight="1"
+                        android:ellipsize="middle"
                         android:singleLine="true"
                         android:fontFamily="sans-serif-light"
                         android:text="Example Feed"
@@ -67,8 +66,9 @@
                         android:id="@+id/date"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="0.5"
+                        android:layout_weight="0"
                         android:gravity="right"
+                        android:layout_marginLeft="10dp"
                         android:fontFamily="sans-serif-light"
                         android:text="Jan 01, 12:00"
                         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -88,7 +88,7 @@
                 android:textColor="?articleNoteTextColor"
                 android:textSize="13sp"
                 android:padding="2dp"
-                android:layout_marginBottom="4dp"
+                android:layout_marginBottom="6dp"
                 android:text="[Article note]" />
 
             <org.fox.ttrss.util.LessBrokenWebView
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 7590c292..8d3b4c26 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -79,6 +79,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:paddingTop="3dp"
+            android:lineSpacingExtra="2sp"
             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?headlineExcerptTextColor"
             android:textSize="13sp" />
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index 0364ab3c..9123e44e 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -77,6 +77,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:paddingTop="3dp"
+            android:lineSpacingExtra="2sp"
             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?headlineSelectedExcerptTextColor"
             android:textSize="13sp" />
diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index 4edce92a..0b7d7b84 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -78,6 +78,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:paddingTop="3dp"
+            android:lineSpacingExtra="2sp"
             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?headlineSelectedExcerptTextColor"
             android:textSize="13sp" />
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index a6c56c63..0fd5a836 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -75,6 +75,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:paddingTop="3dp"
+            android:lineSpacingExtra="2sp"
             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?headlineExcerptTextColor"
             android:textSize="13sp" />
-- 
cgit v1.2.3-54-g00ecf