From cd2df32b453497a7acb1e3662c8df8a5f9411793 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Mon, 31 Dec 2012 14:01:59 +0400
Subject: [PATCH] various layout readability updates

---
 res/layout-port/headlines_row.xml             |  28 ++--
 res/layout-port/headlines_row_selected.xml    |  28 ++--
 res/layout-port/headlines_row_unread.xml      |  28 ++--
 .../headlines_row_selected.xml                |  56 ++------
 res/layout-sw600dp/article_fragment.xml       | 120 ++++++++++++++++++
 res/layout-sw600dp/headlines_row.xml          |  42 +++---
 res/layout-sw600dp/headlines_row_selected.xml |  41 +++---
 res/layout-sw600dp/headlines_row_unread.xml   |  42 +++---
 res/layout/article_fragment.xml               |   8 +-
 res/layout/headlines_row.xml                  |  61 ++++-----
 res/layout/headlines_row_selected.xml         |  61 ++++-----
 res/layout/headlines_row_unread.xml           |  61 ++++-----
 src/org/fox/ttrss/ArticleFragment.java        |   4 -
 src/org/fox/ttrss/HeadlinesFragment.java      |   4 +-
 .../offline/OfflineHeadlinesFragment.java     |   4 +-
 15 files changed, 295 insertions(+), 293 deletions(-)
 create mode 100644 res/layout-sw600dp/article_fragment.xml

diff --git a/res/layout-port/headlines_row.xml b/res/layout-port/headlines_row.xml
index 4dd8de2d..47d20835 100644
--- a/res/layout-port/headlines_row.xml
+++ b/res/layout-port/headlines_row.xml
@@ -14,16 +14,17 @@
             android:layout_weight="1"
             android:orientation="vertical"
             android:padding="3dip" >
-
+

             <TextView
                 android:id="@+id/title"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:ellipsize="end"
-                android:singleLine="true"
+                android:singleLine="false"
                 android:text="There are many variations of passages of Lorem Ipsum available"
                 android:textColor="?headlineTextColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                android:textStyle="bold" />
 
             <LinearLayout
                 android:id="@+id/linerLayout3"
@@ -56,7 +57,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
                     android:focusable="false" />
-
+


                 <TextView
                     android:id="@+id/date"
                     android:layout_width="match_parent"
@@ -64,8 +65,9 @@
                     android:layout_weight="1"
                     android:text="Jan 01, 00:00"
                     android:textColor="?headlineExcerptTextColor"
-                    android:textSize="11sp" />
-
+                    android:textSize="10sp"
+                    android:textStyle="italic" />
+

                 <TextView
                     android:id="@+id/feed_title"
                     android:layout_width="wrap_content"
@@ -76,7 +78,7 @@
                     android:singleLine="true"
                     android:text="{Feed title...}"
                     android:textColor="?headlineExcerptTextColor"
-                    android:textSize="11sp" />
+                    android:textSize="10sp" />
 
                 <ImageView
                     android:id="@+id/marked"
@@ -96,16 +98,4 @@
             </LinearLayout>
         </LinearLayout>
 
-    <ImageButton
-        android:id="@+id/article_menu_button"
-        android:layout_width="50dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:background="@android:color/transparent"
-        android:paddingBottom="4dp"
-        android:paddingRight="4dp"
-        android:paddingTop="4dp"
-        android:scaleType="fitEnd"
-        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout-port/headlines_row_selected.xml b/res/layout-port/headlines_row_selected.xml
index 46df3f71..c7451d96 100644
--- a/res/layout-port/headlines_row_selected.xml
+++ b/res/layout-port/headlines_row_selected.xml
@@ -14,16 +14,17 @@
             android:layout_weight="1"
             android:orientation="vertical"
             android:padding="3dip" >
-
+

             <TextView
                 android:id="@+id/title"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:ellipsize="end"
-                android:singleLine="true"
+                android:singleLine="false"
                 android:text="There are many variations of passages of Lorem Ipsum available"
                 android:textColor="?headlineSelectedTextColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                android:textStyle="bold" />
 
             <LinearLayout
                 android:id="@+id/linerLayout3"
@@ -56,7 +57,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
                     android:focusable="false" />
-
+


                 <TextView
                     android:id="@+id/date"
                     android:layout_width="match_parent"
@@ -64,8 +65,9 @@
                     android:layout_weight="1"
                     android:text="Jan 01, 00:00"
                     android:textColor="?headlineSelectedExcerptTextColor"
-                    android:textSize="11sp" />
-
+                    android:textSize="10sp"
+                    android:textStyle="italic" />
+

                 <TextView
                     android:id="@+id/feed_title"
                     android:layout_width="wrap_content"
@@ -76,7 +78,7 @@
                     android:singleLine="true"
                     android:text="{Feed title...}"
                     android:textColor="?headlineSelectedExcerptTextColor"
-                    android:textSize="11sp" />
+                    android:textSize="10sp" />
 
                 <ImageView
                     android:id="@+id/marked"
@@ -96,16 +98,4 @@
             </LinearLayout>
         </LinearLayout>
 
-    <ImageButton
-        android:id="@+id/article_menu_button"
-        android:layout_width="50dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:background="@android:color/transparent"
-        android:paddingBottom="4dp"
-        android:paddingRight="4dp"
-        android:paddingTop="4dp"
-        android:scaleType="fitEnd"
-        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout-port/headlines_row_unread.xml b/res/layout-port/headlines_row_unread.xml
index f19ebe06..9dcbc83e 100644
--- a/res/layout-port/headlines_row_unread.xml
+++ b/res/layout-port/headlines_row_unread.xml
@@ -14,16 +14,17 @@
             android:layout_weight="1"
             android:orientation="vertical"
             android:padding="3dip" >
-
+

             <TextView
                 android:id="@+id/title"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:ellipsize="end"
-                android:singleLine="true"
+                android:singleLine="false"
                 android:text="There are many variations of passages of Lorem Ipsum available"
                 android:textColor="?headlineUnreadTextColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                android:textStyle="bold" />
 
             <LinearLayout
                 android:id="@+id/linerLayout3"
@@ -56,7 +57,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
                     android:focusable="false" />
-
+


                 <TextView
                     android:id="@+id/date"
                     android:layout_width="match_parent"
@@ -64,8 +65,9 @@
                     android:layout_weight="1"
                     android:text="Jan 01, 00:00"
                     android:textColor="?headlineExcerptTextColor"
-                    android:textSize="11sp" />
-
+                    android:textSize="10sp"
+                    android:textStyle="italic" />
+

                 <TextView
                     android:id="@+id/feed_title"
                     android:layout_width="wrap_content"
@@ -76,7 +78,7 @@
                     android:singleLine="true"
                     android:text="{Feed title...}"
                     android:textColor="?headlineExcerptTextColor"
-                    android:textSize="11sp" />
+                    android:textSize="10sp" />
 
                 <ImageView
                     android:id="@+id/marked"
@@ -96,16 +98,4 @@
             </LinearLayout>
         </LinearLayout>
 
-    <ImageButton
-        android:id="@+id/article_menu_button"
-        android:layout_width="50dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:background="@android:color/transparent"
-        android:paddingBottom="4dp"
-        android:paddingRight="4dp"
-        android:paddingTop="4dp"
-        android:scaleType="fitEnd"
-        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp-port/headlines_row_selected.xml b/res/layout-sw600dp-port/headlines_row_selected.xml
index dd313d25..8a60b217 100644
--- a/res/layout-sw600dp-port/headlines_row_selected.xml
+++ b/res/layout-sw600dp-port/headlines_row_selected.xml
@@ -4,6 +4,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:background="?headlineSelectedBackgroundSolid"
+    android:padding="4sp"
     android:orientation="vertical" >
 
     <LinearLayout
@@ -34,7 +35,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:ellipsize="end"
-                android:singleLine="true"
+                android:singleLine="false"
                 android:text="{Title...}"
                 android:textColor="?headlineSelectedTextColor"
                 android:textSize="16sp"
@@ -53,58 +54,27 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/linerLayout3"
+            android:id="@+id/linearLayout4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
+            android:paddingRight="15px" >
 
-            <TextView
-                android:id="@+id/date"
+            <ImageView
+                android:id="@+id/marked"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Jan 01"
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
+                android:clickable="true"
+                android:src="@android:drawable/star_off" />
 
-            <LinearLayout
-                android:id="@+id/linearLayout4"
+            <ImageView
+                android:id="@+id/published"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingRight="2sp" >
-
-                <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>
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" >
-                </ImageView>
-            </LinearLayout>
+                android:clickable="true"
+                android:src="@drawable/ic_rss_bw" />
         </LinearLayout>
+
     </LinearLayout>
 
-    <ImageButton
-        android:id="@+id/article_menu_button"
-        android:layout_width="50dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:background="@android:color/transparent"
-        android:paddingBottom="4dp"
-        android:paddingRight="4dp"
-        android:paddingTop="4dp"
-        android:scaleType="fitEnd"
-        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/article_fragment.xml b/res/layout-sw600dp/article_fragment.xml
new file mode 100644
index 00000000..82cd99d4
--- /dev/null
+++ b/res/layout-sw600dp/article_fragment.xml
@@ -0,0 +1,120 @@
+<LinearLayout 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:orientation="vertical"
+    android:padding="10sp" >
+

+        <LinearLayout
+            android:id="@+id/article_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:orientation="vertical"
+            android:paddingBottom="4sp" >
+

+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="There are many variations of passages of Lorem Ipsum available"
+                android:textColor="?linkColor"
+                android:textSize="21sp" />
+


+            <TextView
+                android:id="@+id/comments"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingBottom="2sp"
+                android:paddingTop="2sp"
+                android:text="24 comments"
+                android:textColor="?linkColor"
+                android:textSize="13sp" />
+            
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" >
+
+                <TextView
+                    android:id="@+id/tags"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.7"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:text="{TAGS}"
+                    android:textSize="13sp" />
+

+                <TextView
+                    android:id="@+id/date"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.2"
+                    android:gravity="right"
+                    android:text="{DATE}"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="13sp"
+                    android:textStyle="italic" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:background="?horizontalDivider"
+                android:layout_marginTop="5sp"
+                android:layout_marginBottom="5sp"                
+                android:paddingTop="2dip" />
+
+        </LinearLayout>
+
+        <com.nobu_games.android.view.web.TitleBarWebView
+            android:id="@+id/content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            />
+

+        <LinearLayout
+            android:id="@+id/attachments_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:paddingTop="5sp" >
+
+            <Spinner
+                android:id="@+id/attachments"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:prompt="@string/attachments_prompt" />
+
+            <Button
+                android:id="@+id/attachment_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:text="@string/attachment_view" />
+
+            <Button
+                android:id="@+id/attachment_share"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:text="@string/attachment_share" />
+            
+            <Button
+                android:id="@+id/attachment_copy"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:text="@string/attachment_copy" />
+        </LinearLayout>
+    
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/headlines_row.xml b/res/layout-sw600dp/headlines_row.xml
index 2983823e..eb1819e9 100644
--- a/res/layout-sw600dp/headlines_row.xml
+++ b/res/layout-sw600dp/headlines_row.xml
@@ -4,6 +4,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:background="?headlineNormalBackground"
+    android:padding="4sp"
     android:orientation="vertical" >
 
     <LinearLayout
@@ -34,7 +35,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:ellipsize="end"
-                android:singleLine="true"
+                android:singleLine="false"
                 android:text="{Title...}"
                 android:textColor="?headlineTextColor"
                 android:textSize="16sp"
@@ -61,40 +62,29 @@
                 android:textStyle="italic" />
 
         </LinearLayout>
-

+
         <LinearLayout
-            android:id="@+id/linerLayout3"
+            android:id="@+id/linearLayout4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="15px"
             android:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
+            android:paddingRight="15px" >
 
-            <LinearLayout
-                android:id="@+id/linearLayout4"
+            <ImageView
+                android:id="@+id/marked"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingRight="2sp" >
+                android:clickable="true"
+                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>
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" >
-                </ImageView>
-            </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>
+
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/headlines_row_selected.xml b/res/layout-sw600dp/headlines_row_selected.xml
index b7bab698..c8c02767 100644
--- a/res/layout-sw600dp/headlines_row_selected.xml
+++ b/res/layout-sw600dp/headlines_row_selected.xml
@@ -4,6 +4,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:background="?headlineSelectedBackground"
+    android:padding="4sp"
     android:orientation="vertical" >
 
     <LinearLayout
@@ -34,7 +35,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:ellipsize="end"
-                android:singleLine="true"
+                android:singleLine="false"
                 android:text="{Title...}"
                 android:textColor="?headlineSelectedTextColor"
                 android:textSize="16sp"
@@ -60,39 +61,27 @@
                 android:textStyle="italic" />
 
         </LinearLayout>
-



+





         <LinearLayout
-            android:id="@+id/linerLayout3"
+            android:id="@+id/linearLayout4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="15px"
             android:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
+            android:paddingRight="15px" >
 
-            <LinearLayout
-                android:id="@+id/linearLayout4"
+            <ImageView
+                android:id="@+id/marked"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingRight="2sp" >
+                android:clickable="true"
+                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>
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" >
-                </ImageView>
-            </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>
     </LinearLayout>
 
diff --git a/res/layout-sw600dp/headlines_row_unread.xml b/res/layout-sw600dp/headlines_row_unread.xml
index e1ab6e28..c5e56a5e 100644
--- a/res/layout-sw600dp/headlines_row_unread.xml
+++ b/res/layout-sw600dp/headlines_row_unread.xml
@@ -4,6 +4,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:background="?headlineUnreadBackground"
+    android:padding="4sp"    
     android:orientation="vertical" >
 
     <LinearLayout
@@ -34,7 +35,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:ellipsize="end"
-                android:singleLine="true"
+                android:singleLine="false"
                 android:text="{Title...}"
                 android:textColor="?headlineUnreadTextColor"
                 android:textSize="16sp"
@@ -61,40 +62,29 @@
                 android:textStyle="italic" />
 
         </LinearLayout>
-

+
         <LinearLayout
-            android:id="@+id/linerLayout3"
+            android:id="@+id/linearLayout4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="15px"
             android:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
+            android:paddingRight="15px" >
 
-            <LinearLayout
-                android:id="@+id/linearLayout4"
+            <ImageView
+                android:id="@+id/marked"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingRight="2sp" >
+                android:clickable="true"
+                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>
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" >
-                </ImageView>
-            </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>
+
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index 4849b5a8..b23ed643 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -40,11 +40,12 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.7"
+                    android:textColor="?headlineExcerptTextColor"
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:text="{TAGS}"
                     android:textSize="13sp" />
-
+

                 <TextView
                     android:id="@+id/date"
                     android:layout_width="wrap_content"
@@ -52,8 +53,11 @@
                     android:layout_weight="0.2"
                     android:gravity="right"
                     android:text="{DATE}"
+                    android:textColor="?headlineExcerptTextColor"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textSize="13sp" />
+                    android:textSize="13sp"
+                    android:textStyle="italic" />
+
             </LinearLayout>
 
             <ImageView
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 4f003505..98260633 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -28,39 +28,23 @@
             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="true"
+                android:singleLine="false"
                 android:text="{Title...}"
                 android:textColor="?headlineTextColor"
-                android:textSize="16sp" >
-            </TextView>
+                android:textSize="16sp"
+                android:textStyle="bold" >
 
-            <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>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/linerLayout3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
 
             <TextView
                 android:id="@+id/feed_title"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:ellipsize="end"
                 android:gravity="center_horizontal"
@@ -69,6 +53,15 @@
                 android:textColor="?headlineExcerptTextColor"
                 android:textSize="10sp" />
 
+            <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"
@@ -76,8 +69,18 @@
                 android:gravity="center_horizontal"
                 android:text="Jan 01"
                 android:textColor="?headlineExcerptTextColor"
-                android:textSize="10sp" >
-            </TextView>
+                android:textSize="10sp"
+                android:textStyle="italic" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/linerLayout3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="3dip" >
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -105,16 +108,4 @@
         </LinearLayout>
     </LinearLayout>
 
-    <ImageButton
-        android:id="@+id/article_menu_button"
-        android:layout_width="50dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:background="@android:color/transparent"
-        android:paddingBottom="4dp"
-        android:paddingRight="4dp"
-        android:paddingTop="4dp"
-        android:scaleType="fitEnd"
-        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index ced2e03c..8ecd44a7 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -28,39 +28,23 @@
             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="true"
+                android:singleLine="false"
                 android:text="{Title...}"
                 android:textColor="?headlineSelectedTextColor"
-                android:textSize="16sp" >
-            </TextView>
+                android:textSize="16sp"
+                android:textStyle="bold" >
 
-            <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/linerLayout3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
 
             <TextView
                 android:id="@+id/feed_title"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:ellipsize="end"
                 android:gravity="center_horizontal|right"
@@ -69,6 +53,15 @@
                 android:textColor="?headlineSelectedExcerptTextColor"
                 android:textSize="10sp" />
 
+            <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"
@@ -76,8 +69,18 @@
                 android:gravity="center_horizontal"
                 android:text="Jan 01"
                 android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="10sp" >
-            </TextView>
+                android:textSize="10sp"
+                android:textStyle="italic" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/linerLayout3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="3dip" >
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -105,16 +108,4 @@
         </LinearLayout>
     </LinearLayout>
 
-    <ImageButton
-        android:id="@+id/article_menu_button"
-        android:layout_width="50dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:background="@android:color/transparent"
-        android:paddingBottom="4dp"
-        android:paddingRight="4dp"
-        android:paddingTop="4dp"
-        android:scaleType="fitEnd"
-        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index fafe39b5..7e8be39d 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -28,39 +28,23 @@
             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="true"
+                android:singleLine="false"
                 android:text="{Title...}"
                 android:textColor="?headlineUnreadTextColor"
-                android:textSize="16sp" >
-            </TextView>
+                android:textSize="16sp"
+                android:textStyle="bold" >
 
-            <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>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/linerLayout3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
 
             <TextView
                 android:id="@+id/feed_title"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:ellipsize="end"
                 android:gravity="center_horizontal"
@@ -69,6 +53,15 @@
                 android:textColor="?headlineExcerptTextColor"
                 android:textSize="10sp" />
 
+            <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"
@@ -76,8 +69,18 @@
                 android:gravity="center_horizontal"
                 android:text="Jan 01"
                 android:textColor="?headlineExcerptTextColor"
-                android:textSize="10sp" >
-            </TextView>
+                android:textSize="10sp"
+                android:textStyle="italic" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/linerLayout3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="3dip" >
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -105,16 +108,4 @@
         </LinearLayout>
     </LinearLayout>
 
-    <ImageButton
-        android:id="@+id/article_menu_button"
-        android:layout_width="50dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:background="@android:color/transparent"
-        android:paddingBottom="4dp"
-        android:paddingRight="4dp"
-        android:paddingTop="4dp"
-        android:scaleType="fitEnd"
-        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index 2f41aa40..ccd7703f 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -126,10 +126,6 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl
 				else
 					titleStr = m_article.title;
 				
-				if (!m_activity.isSmallScreen()) {
-					title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 21f);
-				}
-				
 				title.setText(titleStr);
 				//title.setPaintFlags(title.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
 				title.setOnClickListener(new OnClickListener() {					
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index b1501a7b..1ca3edba 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -686,7 +686,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 				});
 			}
 			
-			ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
+			/* ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
 			
 			if (ib != null) {
 				ib.setVisibility(android.os.Build.VERSION.SDK_INT >= 10 ? View.VISIBLE : View.GONE);
@@ -696,7 +696,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 						getActivity().openContextMenu(v);
 					}
 				});								
-			}
+			} */
 			
 			return v;
 		}
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index a5494ed5..e2d3e096 100644
--- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -553,7 +553,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 				});
 			}
 			
-			ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
+			/* ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
 			
 			if (ib != null) {
 				ib.setVisibility(android.os.Build.VERSION.SDK_INT >= 10 ? View.VISIBLE : View.GONE);				
@@ -563,7 +563,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 						getActivity().openContextMenu(v);
 					}
 				});								
-			}
+			} */
 			
 			return v;
 		}