From 651029505689544bf9d7f49b8933a9cb9a0e272f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Mon, 31 Dec 2012 13:25:23 +0400
Subject: [PATCH] tablet headline row layout updates

---
 res/layout-sw600dp/headlines_row.xml          | 38 +++++++----------
 res/layout-sw600dp/headlines_row_selected.xml | 41 +++++++------------
 res/layout-sw600dp/headlines_row_unread.xml   | 38 +++++++----------
 src/org/fox/ttrss/HeadlinesFragment.java      |  4 +-
 4 files changed, 45 insertions(+), 76 deletions(-)

diff --git a/res/layout-sw600dp/headlines_row.xml b/res/layout-sw600dp/headlines_row.xml
index e23bf87d..2983823e 100644
--- a/res/layout-sw600dp/headlines_row.xml
+++ b/res/layout-sw600dp/headlines_row.xml
@@ -50,24 +50,26 @@
                 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/date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Jan 01"
                 android:textColor="?headlineExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
+                android:textSize="11sp"
+                android:textStyle="italic" />
+
+        </LinearLayout>
+

+        <LinearLayout
+            android:id="@+id/linerLayout3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="15px"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="3dip" >
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -95,16 +97,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/headlines_row_selected.xml b/res/layout-sw600dp/headlines_row_selected.xml
index 52d85cee..b7bab698 100644
--- a/res/layout-sw600dp/headlines_row_selected.xml
+++ b/res/layout-sw600dp/headlines_row_selected.xml
@@ -28,7 +28,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical" >
-

+
             <TextView
                 android:id="@+id/title"
                 android:layout_width="match_parent"
@@ -39,7 +39,6 @@
                 android:textColor="?headlineSelectedTextColor"
                 android:textSize="16sp"
                 android:textStyle="bold" >
-
             </TextView>
 
             <TextView
@@ -50,24 +49,26 @@
                 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/date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Jan 01"
                 android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
+                android:textSize="11sp"
+                android:textStyle="italic" />
+
+        </LinearLayout>
+



+        <LinearLayout
+            android:id="@+id/linerLayout3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="15px"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="3dip" >
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -95,16 +96,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/headlines_row_unread.xml b/res/layout-sw600dp/headlines_row_unread.xml
index 527d2aa9..e1ab6e28 100644
--- a/res/layout-sw600dp/headlines_row_unread.xml
+++ b/res/layout-sw600dp/headlines_row_unread.xml
@@ -50,24 +50,26 @@
                 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/date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Jan 01"
                 android:textColor="?headlineExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
+                android:textSize="11sp"
+                android:textStyle="italic" />
+
+        </LinearLayout>
+

+        <LinearLayout
+            android:id="@+id/linerLayout3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="15px"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="3dip" >
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
@@ -95,16 +97,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/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index d9298b10..b1501a7b 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -641,8 +641,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 			if (te != null) {
 				String excerpt = Jsoup.parse(articleContent).text(); 
 				
-				if (excerpt.length() > 100)
-					excerpt = excerpt.substring(0, 100) + "...";
+				if (excerpt.length() > 200)
+					excerpt = excerpt.substring(0, 200) + "...";
 				
 				te.setText(excerpt);
 			}