From 6cc1443a27a4be762e4b53deb464d15a99d698ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 28 Apr 2015 16:45:17 +0200
Subject: Remove the "provider:" label, simplifying layout

---
 app/src/main/res/layout/dashboard.xml | 39 ++++++++++++-----------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

(limited to 'app/src/main/res/layout/dashboard.xml')

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"
-- 
cgit v1.2.3


From f008b5ec8e1c74968e4a605d2de5423edf91b854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 29 Apr 2015 12:25:24 +0200
Subject: Creating a user session fragment.

I've separated the user session management to it, and encapsulated
ProviderAPICommand into its own class.

Putting the fragment statically in dashboard.xml isn't working, Android
complains about it being duplicated, so I'm going to add it dynamically.
---
 app/src/main/res/layout/dashboard.xml | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

(limited to 'app/src/main/res/layout/dashboard.xml')

diff --git a/app/src/main/res/layout/dashboard.xml b/app/src/main/res/layout/dashboard.xml
index d76ccbec..30074b6a 100644
--- a/app/src/main/res/layout/dashboard.xml
+++ b/app/src/main/res/layout/dashboard.xml
@@ -18,29 +18,13 @@
         android:singleLine="true"
         android:text="@string/provider_label_none"
         android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <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>
     
+    <fragment android:name="se.leap.bitmaskclient.userstatus.UserSessionFragment"
+        android:id="@+id/user_session_fragment"
+        android:tag="user_session_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
     <LinearLayout
         android:id="@+id/servicesCollection"
         android:layout_width="match_parent"
-- 
cgit v1.2.3


From 8833acbafe00eb2941cfa052cb679fc2684b5290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 29 Apr 2015 12:47:43 +0200
Subject: Dynamically load user session fragment.

Tests click new button, instead of action bar's.

Fixing more bugs...
---
 app/src/main/res/layout/dashboard.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'app/src/main/res/layout/dashboard.xml')

diff --git a/app/src/main/res/layout/dashboard.xml b/app/src/main/res/layout/dashboard.xml
index 30074b6a..95445d63 100644
--- a/app/src/main/res/layout/dashboard.xml
+++ b/app/src/main/res/layout/dashboard.xml
@@ -18,19 +18,17 @@
         android:singleLine="true"
         android:text="@string/provider_label_none"
         android:textAppearance="?android:attr/textAppearanceMedium" />
-    
-    <fragment android:name="se.leap.bitmaskclient.userstatus.UserSessionFragment"
+
+    <LinearLayout
         android:id="@+id/user_session_fragment"
-        android:tag="user_session_fragment"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"/>
 
     <LinearLayout
         android:id="@+id/servicesCollection"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="0.11"
-        android:orientation="vertical" >
-    </LinearLayout>
-
+        android:orientation="vertical" />
 </LinearLayout>
-- 
cgit v1.2.3


From 237e51e09ea7ae13c4cdf7fd9247447f6d75fb9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 30 Apr 2015 13:51:43 +0200
Subject: Works smoothly, correct texts.

Next step: beautify.
---
 app/src/main/res/layout/dashboard.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res/layout/dashboard.xml')

diff --git a/app/src/main/res/layout/dashboard.xml b/app/src/main/res/layout/dashboard.xml
index 95445d63..6a9bbe97 100644
--- a/app/src/main/res/layout/dashboard.xml
+++ b/app/src/main/res/layout/dashboard.xml
@@ -20,7 +20,7 @@
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <LinearLayout
-        android:id="@+id/user_session_fragment"
+        android:id="@+id/user.status.fragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"/>
-- 
cgit v1.2.3