From 09c3fdf39c23257938a57e1df9244e48640ab616 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Mon, 31 Dec 2012 14:21:57 +0400
Subject: [PATCH] various more layout tweaks

---
 res/layout-port/headlines_row.xml          | 49 ++++++++++------------
 res/layout-port/headlines_row_selected.xml | 49 ++++++++++------------
 res/layout-port/headlines_row_unread.xml   | 49 ++++++++++------------
 res/layout/headlines_row.xml               | 42 +++++++------------
 res/layout/headlines_row_selected.xml      | 42 +++++++------------
 res/layout/headlines_row_unread.xml        | 44 ++++++++-----------
 src/org/fox/ttrss/HeadlinesFragment.java   |  7 ++--
 7 files changed, 116 insertions(+), 166 deletions(-)

diff --git a/res/layout-port/headlines_row.xml b/res/layout-port/headlines_row.xml
index 47d20835..66c87e49 100644
--- a/res/layout-port/headlines_row.xml
+++ b/res/layout-port/headlines_row.xml
@@ -26,30 +26,35 @@
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
-            <LinearLayout
-                android:id="@+id/linerLayout3"
+            <TextView
+                android:id="@+id/feed_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:ellipsize="end"
+                android:gravity="right"
+                android:singleLine="true"
+                android:text="{Feed title...}"
+                android:textColor="?headlineExcerptTextColor"
+                android:textSize="10sp" />
+
+            <TextView
+                android:id="@+id/excerpt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/excerpt"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="13sp" />
-            </LinearLayout>
-
+                android:layout_weight="1"
+                android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
+                android:textColor="?headlineExcerptTextColor"
+                android:textSize="13sp" />
+

             <LinearLayout
                 android:id="@+id/linearLayout4"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
                 android:gravity="center"
-                android:orientation="horizontal" >
+                android:orientation="horizontal"
+                android:paddingRight="4dp" >
 
                 <CheckBox
                     android:id="@+id/selected"
@@ -67,18 +72,6 @@
                     android:textColor="?headlineExcerptTextColor"
                     android:textSize="10sp"
                     android:textStyle="italic" />
-

-                <TextView
-                    android:id="@+id/feed_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:text="{Feed title...}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
 
                 <ImageView
                     android:id="@+id/marked"
diff --git a/res/layout-port/headlines_row_selected.xml b/res/layout-port/headlines_row_selected.xml
index c7451d96..83f7a14d 100644
--- a/res/layout-port/headlines_row_selected.xml
+++ b/res/layout-port/headlines_row_selected.xml
@@ -26,30 +26,35 @@
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
-            <LinearLayout
-                android:id="@+id/linerLayout3"
+            <TextView
+                android:id="@+id/feed_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:ellipsize="end"
+                android:gravity="right"
+                android:singleLine="true"
+                android:text="{Feed title...}"
+                android:textColor="?headlineSelectedExcerptTextColor"
+                android:textSize="10sp" />
+
+            <TextView
+                android:id="@+id/excerpt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/excerpt"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
-                    android:textColor="?headlineSelectedExcerptTextColor"
-                    android:textSize="13sp" />
-            </LinearLayout>
-
+                android:layout_weight="1"
+                android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
+                android:textColor="?headlineSelectedExcerptTextColor"
+                android:textSize="13sp" />
+

             <LinearLayout
                 android:id="@+id/linearLayout4"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
                 android:gravity="center"
-                android:orientation="horizontal" >
+                android:orientation="horizontal"
+                android:paddingRight="4dp" >
 
                 <CheckBox
                     android:id="@+id/selected"
@@ -67,18 +72,6 @@
                     android:textColor="?headlineSelectedExcerptTextColor"
                     android:textSize="10sp"
                     android:textStyle="italic" />
-

-                <TextView
-                    android:id="@+id/feed_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:text="{Feed title...}"
-                    android:textColor="?headlineSelectedExcerptTextColor"
-                    android:textSize="10sp" />
 
                 <ImageView
                     android:id="@+id/marked"
diff --git a/res/layout-port/headlines_row_unread.xml b/res/layout-port/headlines_row_unread.xml
index 9dcbc83e..2c1c362b 100644
--- a/res/layout-port/headlines_row_unread.xml
+++ b/res/layout-port/headlines_row_unread.xml
@@ -26,30 +26,35 @@
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
-            <LinearLayout
-                android:id="@+id/linerLayout3"
+            <TextView
+                android:id="@+id/feed_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:ellipsize="end"
+                android:gravity="right"
+                android:singleLine="true"
+                android:text="{Feed title...}"
+                android:textColor="?headlineExcerptTextColor"
+                android:textSize="10sp" />
+
+            <TextView
+                android:id="@+id/excerpt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/excerpt"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="13sp" />
-            </LinearLayout>
-
+                android:layout_weight="1"
+                android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
+                android:textColor="?headlineExcerptTextColor"
+                android:textSize="13sp" />
+

             <LinearLayout
                 android:id="@+id/linearLayout4"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
                 android:gravity="center"
-                android:orientation="horizontal" >
+                android:orientation="horizontal"
+                android:paddingRight="4dp" >
 
                 <CheckBox
                     android:id="@+id/selected"
@@ -67,18 +72,6 @@
                     android:textColor="?headlineExcerptTextColor"
                     android:textSize="10sp"
                     android:textStyle="italic" />
-

-                <TextView
-                    android:id="@+id/feed_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:text="{Feed title...}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
 
                 <ImageView
                     android:id="@+id/marked"
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 98260633..71a920a7 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -21,13 +21,14 @@
             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" >
+            android:orientation="vertical"
+            android:padding="3dp" >
 

             <TextView
                 android:id="@+id/title"
@@ -73,38 +74,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:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
+            android:paddingRight="6dp" >
 
-            <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/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index 8ecd44a7..a53b6af2 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -21,13 +21,14 @@
             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" >
+            android:orientation="vertical"
+            android:padding="3dp" >
 

             <TextView
                 android:id="@+id/title"
@@ -73,38 +74,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:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
+            android:paddingRight="6dp" >
 
-            <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/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index 7e8be39d..4884c8c2 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:background="?headlineUnreadBackground"
     android:orientation="vertical" >
-
+


     <LinearLayout
         android:id="@+id/linearLayout6"
         android:layout_width="match_parent"
@@ -21,13 +21,14 @@
             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" >
+            android:orientation="vertical"
+            android:padding="3dp" >
 

             <TextView
                 android:id="@+id/title"
@@ -73,38 +74,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:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
+            android:paddingRight="6dp" >
 
-            <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/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index 1ca3edba..85a61aa5 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -589,10 +589,11 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 			if (ft != null) {
 				if (article.feed_title != null && (m_feed.is_cat || m_feed.id < 0)) {
 					
-					if (article.feed_title.length() > 20)
+					/* if (article.feed_title.length() > 20)
 						ft.setText(article.feed_title.substring(0, 20) + "...");
-					else
-						ft.setText(article.feed_title);
+					else */
+					
+					ft.setText(article.feed_title);
 					
 				} else {
 					ft.setVisibility(View.GONE);