From 3fcdae62aa524ac5c9f6bf6363603221892b7481 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 28 May 2013 14:50:03 +0400
Subject: [PATCH] ellipsize long feed titles

---
 res/layout-sw600dp/feeds.xml      | 55 -------------------------------
 res/layout-sw600dp/headlines.xml  |  6 ++--
 res/layout/feeds_row.xml          |  2 ++
 res/layout/feeds_row_selected.xml |  2 ++
 4 files changed, 7 insertions(+), 58 deletions(-)
 delete mode 100644 res/layout-sw600dp/feeds.xml

diff --git a/res/layout-sw600dp/feeds.xml b/res/layout-sw600dp/feeds.xml
deleted file mode 100644
index 88aa8eb7..00000000
--- a/res/layout-sw600dp/feeds.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?headlinesBackgroundSolid"
-    android:orientation="vertical" >
-
-    <FrameLayout
-        android:id="@+id/sw600dp_anchor"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone" >
-
-    </FrameLayout>
-
-    <LinearLayout
-        android:id="@+id/loading_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:visibility="gone" >
-
-        <TextView
-            android:id="@+id/loading_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:baselineAligned="false"
-        android:weightSum="1.05"
-        android:orientation="horizontal" >
-
-        <FrameLayout
-            android:id="@+id/feeds_fragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="?feedlistBackground" >
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/headlines_fragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="2"
-            android:background="?headlinesBackground" >
-        </FrameLayout>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/headlines.xml b/res/layout-sw600dp/headlines.xml
index 88aa8eb7..7e7f0e52 100644
--- a/res/layout-sw600dp/headlines.xml
+++ b/res/layout-sw600dp/headlines.xml
@@ -32,14 +32,14 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:baselineAligned="false"
-        android:weightSum="1.05"
+        android:weightSum="1.3"
         android:orientation="horizontal" >
 
         <FrameLayout
             android:id="@+id/feeds_fragment"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1"
+            android:layout_weight="1.1"
             android:background="?feedlistBackground" >
         </FrameLayout>
 
@@ -47,7 +47,7 @@
             android:id="@+id/headlines_fragment"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="2"
+            android:layout_weight="1.9"
             android:background="?headlinesBackground" >
         </FrameLayout>
     </LinearLayout>
diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml
index 2bfb1b13..e52de2c2 100644
--- a/res/layout/feeds_row.xml
+++ b/res/layout/feeds_row.xml
@@ -27,6 +27,8 @@
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
         android:paddingLeft="8dip"
+        android:singleLine="true"
+        android:ellipsize="end"
         android:text="{FEED}"
         android:textColor="?feedlistTextColor"
         android:textSize="18dip" />
diff --git a/res/layout/feeds_row_selected.xml b/res/layout/feeds_row_selected.xml
index ecb793f1..7876d150 100644
--- a/res/layout/feeds_row_selected.xml
+++ b/res/layout/feeds_row_selected.xml
@@ -27,6 +27,8 @@
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
         android:paddingLeft="6dip"
+        android:singleLine="true"
+        android:ellipsize="end"        
         android:text="{FEED}"
         android:textColor="?feedlistSelectedTextColor"
         android:textSize="18dip" />