Remove the "provider:" label, simplifying layout

2 files changed, 44 insertions, 92 deletions

diff --git a/app/src/main/res/layout-xlarge/dashboard.xml b/app/src/main/res/layout-xlarge/dashboard.xml
index 268bd3f9..3c93a04c 100644
--- a/app/src/main/res/layout-xlarge/dashboard.xml
+++ b/app/src/main/res/layout-xlarge/dashboard.xml
@@ -5,80 +5,45 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:layout_marginLeft="10sp"
+    android:layout_marginStart="10sp"
     android:layout_marginTop="10sp"
     tools:context=".Dashboard" >
-    
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="42dp"
-        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="32sp" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="vertical"
-            android:paddingLeft="32dp" >
 
-            <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" />
-
-        </LinearLayout>
-    </LinearLayout>
+    <TextView
+        android:id="@+id/providerName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="32dp"
+        android:layout_marginStart="32dp"
+        android:textSize="48sp"
+        android:ellipsize="marquee"
+        android:gravity="center_vertical"
+        android:text="@string/provider_label_none"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="32dp">
-      <ProgressBar
-          android:id="@+id/user_session_status_progress"
-          android:layout_width="wrap_content"
-          android:layout_height="fill_parent"
-          android:indeterminate="true"
-          android:visibility="gone"/>
-      <TextView
-          android:id="@+id/user_session_status"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:textSize="18sp"
-          android:layout_marginLeft="10dp"
-          android:ellipsize="marquee"
-          android:singleLine="true"
-          android:textAppearance="?android:attr/textAppearanceMedium"
-          />
+        android:layout_marginLeft="32dp"
+        android:layout_marginStart="32dp">
+        <ProgressBar
+            android:id="@+id/user_session_status_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:indeterminate="true"
+            android:visibility="gone"/>
+        <TextView
+            android:id="@+id/user_session_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            />
     </LinearLayout>
-    
-    <View
-        android:layout_width="wrap_content"
-        android:layout_height="1dp"
-        android:layout_marginBottom="7dp"
-        android:background="@android:drawable/divider_horizontal_bright" />
 
     <LinearLayout
         android:id="@+id/servicesCollection"
diff --git a/app/src/main/res/layout/dashboard.xml b/app/src/main/res/layout/dashboard.xml
index f4269fe2..d76ccbec 100644
--- a/app/src/main/res/layout/dashboard.xml
+++ b/app/src/main/res/layout/dashboard.xml
@@ -5,33 +5,19 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context=".Dashboard" >
-    
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="?android:attr/selectableItemBackground" >
-      
-      <TextView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-	  android:layout_marginLeft="5dp"
-          android:ellipsize="marquee"
-          android:singleLine="true"
-          android:text="@string/provider_label"
-          android:textAppearance="?android:attr/textAppearanceMedium" />
-      
-      <TextView
-          android:id="@+id/providerName"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:textSize="28sp"
-	  android:layout_marginLeft="10dp"
-          android:ellipsize="marquee"
-          android:singleLine="true"
-          android:text="@string/provider_label_none"
-          android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    </LinearLayout>
+    <TextView
+        android:id="@+id/providerName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
+        android:textSize="26sp"
+        android:ellipsize="marquee"
+        android:gravity="center_vertical"
+        android:singleLine="true"
+        android:text="@string/provider_label_none"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -48,6 +34,7 @@
             android:layout_height="wrap_content"
             android:textSize="18sp"
             android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:ellipsize="marquee"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"