From 6ac43e5e95046308815581abf3189f12df841923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 19 Jun 2014 16:39:27 +0200
Subject: Provider name in Dashboard is ellipsized correctly

---
 app/src/main/res/layout/client_dashboard.xml | 58 ++++++++++------------------
 app/src/main/res/values/untranslatable.xml   |  3 +-
 2 files changed, 23 insertions(+), 38 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/res/layout/client_dashboard.xml b/app/src/main/res/layout/client_dashboard.xml
index a5387efd..0103e7bc 100644
--- a/app/src/main/res/layout/client_dashboard.xml
+++ b/app/src/main/res/layout/client_dashboard.xml
@@ -10,44 +10,28 @@
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:background="?android:attr/selectableItemBackground" >
-    
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="vertical"
-            android:paddingLeft="10dp" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:singleLine="true"
-                android:text="@string/provider_label"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="24sp" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="vertical"
-            android:paddingLeft="15dp" >
-
-            <TextView
-                android:id="@+id/providerName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:singleLine="true"
-                android:text="@string/provider_label_none"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+      
+      <TextView
+	  android:layout_marginLeft="5dp"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:ellipsize="marquee"
+          android:fadingEdge="horizontal"
+          android:singleLine="true"
+          android:text="@string/provider_label"
+          android:textAppearance="?android:attr/textAppearanceMedium" />
+      
+      <TextView
+	  android:layout_marginLeft="10dp"
+          android:id="@+id/providerName"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:ellipsize="marquee"
+          android:fadingEdge="horizontal"
+          android:singleLine="true"
+          android:text="@string/provider_label_none"
+          android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        </LinearLayout>
     </LinearLayout>
 
     <View
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 4212cec2..de355720 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -853,4 +853,5 @@
 
 
 
-</resources>
+
+</resources>
\ No newline at end of file
-- 
cgit v1.2.3


From f721df21a6fd1f3bb2588e67298ae33993041779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 19 Jun 2014 16:41:53 +0200
Subject: Reordered introduced lines in textviews

---
 app/src/main/res/layout/client_dashboard.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/res/layout/client_dashboard.xml b/app/src/main/res/layout/client_dashboard.xml
index 0103e7bc..f33ac285 100644
--- a/app/src/main/res/layout/client_dashboard.xml
+++ b/app/src/main/res/layout/client_dashboard.xml
@@ -12,9 +12,9 @@
         android:background="?android:attr/selectableItemBackground" >
       
       <TextView
-	  android:layout_marginLeft="5dp"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
+	  android:layout_marginLeft="5dp"
           android:ellipsize="marquee"
           android:fadingEdge="horizontal"
           android:singleLine="true"
@@ -22,10 +22,10 @@
           android:textAppearance="?android:attr/textAppearanceMedium" />
       
       <TextView
-	  android:layout_marginLeft="10dp"
           android:id="@+id/providerName"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
+	  android:layout_marginLeft="10dp"
           android:ellipsize="marquee"
           android:fadingEdge="horizontal"
           android:singleLine="true"
-- 
cgit v1.2.3