From cdeaf6c2ae2fa96a2ef1e0ae6c931c6d50b27271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 16 Apr 2015 13:02:06 +0200
Subject: Button with circle progress, added.

Next step: a bit of UI design, removing the switch.
---
 app/src/main/res/layout/eip_service_fragment.xml | 20 ++++++++++++++++++++
 app/src/main/res/values/dimens.xml               |  1 +
 2 files changed, 21 insertions(+)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index 6adcfab0..0cc1df7d 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -48,4 +48,24 @@
         android:layout_toRightOf="@+id/status_message"
         android:layout_toEndOf="@+id/status_message" />
 
+    <view
+        android:id="@+id/vpn.Status.Image"
+        android:layout_width="@dimen/progress_button"
+        android:color="@android:color/holo_blue_dark"
+        android:layout_height="@dimen/progress_button"
+        class="mbanje.kurt.fabbutton.FabButton"
+        android:layout_gravity="center"
+        android:visibility="visible"
+        android:layout_centerInParent="true"
+        android:indeterminate="true"
+        android:max="100"
+        fbb_autoStart="true"
+        fbb_progressColor="#ff170aff"
+        fbb_progressWidthRatio="0.1"
+        fbb_showEndBitmap="true"
+        android:layout_toRightOf="@id/eipSwitch"
+        android:layout_toEndOf="@id/eipSwitch"
+        android:layout_alignTop="@id/eipSwitch"
+        />
+
 </RelativeLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 727f5a78..4e8dad45 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -17,4 +17,5 @@
     <dimen name="round_button_diameter">56dp</dimen>
     <dimen name="switchbar_pad">16dp</dimen>
     <dimen name="vpn_setting_padding">16dp</dimen>
+    <dimen name="progress_button">32dp</dimen>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 90c28f492b800b706c1d6f14482baf3e75c4be7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 16 Apr 2015 13:16:04 +0200
Subject: Remove eip switch.

---
 app/src/main/res/layout/eip_service_fragment.xml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index 0cc1df7d..669abef0 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -40,14 +40,6 @@
         android:clickable="true"
         android:text="@string/eip_state_not_connected" />
 
-    <Switch
-        android:id="@+id/eipSwitch"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/status_message"
-        android:layout_toRightOf="@+id/status_message"
-        android:layout_toEndOf="@+id/status_message" />
-
     <view
         android:id="@+id/vpn.Status.Image"
         android:layout_width="@dimen/progress_button"
@@ -62,10 +54,11 @@
         fbb_autoStart="true"
         fbb_progressColor="#ff170aff"
         fbb_progressWidthRatio="0.1"
-        fbb_showEndBitmap="true"
-        android:layout_toRightOf="@id/eipSwitch"
-        android:layout_toEndOf="@id/eipSwitch"
-        android:layout_alignTop="@id/eipSwitch"
+        android:layout_toRightOf="@id/eipLabel"
+        android:layout_toEndOf="@id/eipLabel"
+        android:layout_alignTop="@id/eipLabel"
+        android:layout_marginStart="@dimen/add_button_margin"
+        android:layout_marginLeft="@dimen/add_button_margin"
         />
 
 </RelativeLayout>
-- 
cgit v1.2.3


From 8862197a0a138f942e9c76a29aaf189f4c5141b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 16 Apr 2015 13:20:45 +0200
Subject: Remove progress bar.

---
 app/src/main/res/layout/eip_service_fragment.xml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index 669abef0..fea0093e 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -15,23 +15,12 @@
         android:text="@string/eip_service_label"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <ProgressBar
-        android:id="@+id/eipProgress"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@android:style/Widget.Holo.ProgressBar.Horizontal"
-        android:indeterminate="true"
-        android:visibility="gone"
-        android:layout_below="@id/eipLabel"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp" />
-
     <TextView
         android:id="@+id/status_message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-        android:layout_below="@id/eipProgress"
+        android:layout_below="@id/eipLabel"
         android:layout_centerVertical="true"
         android:paddingTop="5dp"
         android:paddingBottom="10dp"
-- 
cgit v1.2.3


From d486768d6b0664d9032605897c8f1847ef4e3a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 20 Apr 2015 18:20:05 +0200
Subject: Remove textual status.

I had a difficult moment trying to detect if the LogWindow had already
been shown after an error. Finally, I implemented a LogWindowWrapper
which contains a field for the reason it was shown, so that we can check
if the previous error is the same than the current one leading to the
avoidance of the second LogWindow. For this to work, we need to reset
that reason each time we trigger a new vpn state (i.e. each time the
user taps on the vpn icon).
---
 app/src/main/res/layout/eip_service_fragment.xml | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index fea0093e..4ad8725d 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -15,20 +15,6 @@
         android:text="@string/eip_service_label"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        android:id="@+id/status_message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@id/eipLabel"
-        android:layout_centerVertical="true"
-        android:paddingTop="5dp"
-        android:paddingBottom="10dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:clickable="true"
-        android:text="@string/eip_state_not_connected" />
-
     <view
         android:id="@+id/vpn.Status.Image"
         android:layout_width="@dimen/progress_button"
-- 
cgit v1.2.3


From 990de6d1dec42d9a03b2bd799f16b6fcfd91b959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 23 Apr 2015 17:20:18 +0200
Subject: FlowLayout, to show the vpn icon in some small devices

Tested with physical Galaxy Young S6310.
---
 .../res/layout-xlarge/eip_service_fragment.xml     | 58 +++++++++-------------
 app/src/main/res/layout/eip_service_fragment.xml   | 15 +++---
 2 files changed, 29 insertions(+), 44 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
index 38b6aca3..bfa1105c 100644
--- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml
+++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
@@ -3,54 +3,42 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="10dp"
-    android:layout_marginLeft="20dp" >
+    android:layout_marginLeft="20dp"
+    android:layout_marginStart="20dp">
 
     <TextView
         android:id="@+id/eipLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:clickable="true"
         android:text="@string/eip_service_label"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="26sp" />
 
-    <Switch
-        android:id="@+id/eipSwitch"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginRight="10dp"
-        android:height="26dp"/>
-    
-    <ProgressBar 
-        android:id="@+id/eipProgress"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@android:style/Widget.Holo.ProgressBar.Horizontal"
+    <view
+        android:id="@+id/vpn.Status.Image"
+        android:layout_width="@dimen/progress_button"
+        android:color="@android:color/holo_blue_dark"
+        android:layout_height="@dimen/progress_button"
+        class="mbanje.kurt.fabbutton.FabButton"
+        android:layout_gravity="center"
+        android:visibility="visible"
+        android:layout_centerInParent="true"
         android:indeterminate="true"
-        android:visibility="gone"
-        android:layout_below="@id/eipLabel"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp" />
-
-    <TextView
-        android:id="@+id/status_message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/eipLabel"
-        android:paddingBottom="10dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:paddingTop="10dp"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:clickable="true"
-        android:text="@string/eip_state_not_connected"
-        android:textSize="16sp" />
-
+        android:max="100"
+        fbb_autoStart="true"
+        fbb_progressColor="#ff170aff"
+        fbb_progressWidthRatio="0.1"
+        android:layout_toRightOf="@id/eipLabel"
+        android:layout_toEndOf="@id/eipLabel"
+        android:layout_alignTop="@id/eipLabel"
+        android:layout_marginStart="@dimen/add_button_margin"
+        android:layout_marginLeft="@dimen/add_button_margin"
+        />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index 4ad8725d..e013c7b4 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+<com.wefika.flowlayout.FlowLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginTop="10dp" >
+    android:layout_marginTop="10dp"
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/eipLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
         android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:clickable="true"
         android:text="@string/eip_service_label"
         android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -29,11 +29,8 @@
         fbb_autoStart="true"
         fbb_progressColor="#ff170aff"
         fbb_progressWidthRatio="0.1"
-        android:layout_toRightOf="@id/eipLabel"
-        android:layout_toEndOf="@id/eipLabel"
-        android:layout_alignTop="@id/eipLabel"
         android:layout_marginStart="@dimen/add_button_margin"
         android:layout_marginLeft="@dimen/add_button_margin"
         />
 
-</RelativeLayout>
+</com.wefika.flowlayout.FlowLayout>
-- 
cgit v1.2.3


From 8707f9e9a07f8c53955df14ef9b26d13a0eb60da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 27 Apr 2015 17:10:20 +0200
Subject: testEveryProvider also works

---
 app/src/main/res/values-es/strings.xml | 2 --
 app/src/main/res/values/strings.xml    | 2 --
 2 files changed, 4 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 82ca44e9..42b8cce4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -65,8 +65,6 @@
     <string name="eip_cancel_connect_title">¿Abortar conexión?</string>
     <string name="eip_cancel_connect_text">Hay una conexión iniciándose. ¿Quieres cancelarla?</string>
     <string name="eip.warning.browser_inconsistency">Para salvaguardar la privacidad de tu información personal, te recomendamos que después de apagar la VPN cierres la sesión del navegador y abras una sesión privada en él. Gracias.</string>
-    <string name="yes">Sí</string>
-    <string name="no">No</string>
     <string name="eip_state_not_connected">"¡Conexión no protegida!"</string>
     <string name="eip_state_connected">Conexión protegida.</string>
     <string name="provider_problem">Parece que hay un problema con el proveedor.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bcfd3a2c..07bc4770 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,8 +63,6 @@
     <string name="eip_cancel_connect_title">Cancel connection?</string>
     <string name="eip_cancel_connect_text">There is a connection attempt in progress.  Do you wish to cancel it?</string>
     <string name="eip.warning.browser_inconsistency">In order to avoid leaking your personal information, please close your browser and start a private window after disconnecting the Encrypted VPN Internet Access. Thanks.</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
     <string name="eip_state_not_connected">"Not running! Connection not secure!"</string>
     <string name="eip_state_connected">Connection Secure.</string>
     <string name="provider_problem">It seems there is a problem with the provider.</string>
-- 
cgit v1.2.3


From bd68fe662af7734d94a8853b38f418f19879e389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 27 Apr 2015 18:08:59 +0200
Subject: Added a button to the UI

Turn on VPN touching that button, and leave the image as a mere indicator.
---
 app/src/main/res/layout/eip_service_fragment.xml | 6 ++++++
 app/src/main/res/values-es/strings.xml           | 3 ++-
 app/src/main/res/values/strings.xml              | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index e013c7b4..b3651b51 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -15,6 +15,12 @@
         android:text="@string/eip_service_label"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
+    <Button
+        android:id="@+id/vpn.main.button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+
     <view
         android:id="@+id/vpn.Status.Image"
         android:layout_width="@dimen/progress_button"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 42b8cce4..063c3f8b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -77,5 +77,6 @@
     <string name="logging_in_user_status">está iniciando sesión.</string>
     <string name="logging_out_user_status">está cerrando sesión.</string>
     <string name="signingup_message">está siendo registrado.</string>
-
+    <string name="vpn.button.turn.on">Iniciar VPN</string>
+    <string name="vpn.button.turn.off">Apagar VPN</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 07bc4770..674bb7c8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -75,4 +75,6 @@
     <string name="logging_in_user_status">is logging in.</string>
     <string name="logging_out_user_status">is logging out.</string>
     <string name="signingup_message">is being registered.</string>
+    <string name="vpn.button.turn.on">Turn on VPN</string>
+    <string name="vpn.button.turn.off">Turn off VPN</string>
 </resources>
-- 
cgit v1.2.3


From aa46c860c559601fe4c35d21d1319472fae21712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 27 Apr 2015 18:42:15 +0200
Subject: Added the button to the xlarg layout

---
 app/src/main/res/layout-xlarge/eip_service_fragment.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
index bfa1105c..7fcaacbc 100644
--- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml
+++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.wefika.flowlayout.FlowLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="10dp"
@@ -20,6 +20,12 @@
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="26sp" />
 
+    <Button
+        android:id="@+id/vpn.main.button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+
     <view
         android:id="@+id/vpn.Status.Image"
         android:layout_width="@dimen/progress_button"
@@ -41,4 +47,4 @@
         android:layout_marginLeft="@dimen/add_button_margin"
         />
 
-</RelativeLayout>
+</com.wefika.flowlayout.FlowLayout>
-- 
cgit v1.2.3


From d0e6f53c5a9e901181cf8470d247a27f3ed5782f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 28 Apr 2015 11:59:03 +0200
Subject: Seem good sizes, but layout is ugly.

---
 .../main/res/layout-xlarge/eip_service_fragment.xml    | 18 +++++++++---------
 app/src/main/res/layout/eip_service_fragment.xml       | 13 +++++++------
 app/src/main/res/values-es/strings.xml                 |  4 ++--
 app/src/main/res/values/dimens.xml                     |  1 -
 app/src/main/res/values/strings.xml                    |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
index 7fcaacbc..9efc209c 100644
--- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml
+++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
@@ -10,27 +10,27 @@
         android:id="@+id/eipLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
         android:layout_marginLeft="10dp"
         android:layout_marginStart="10dp"
-        android:clickable="true"
+        android:layout_marginTop="12dp"
         android:text="@string/eip_service_label"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="26sp" />
+        android:textSize="24dp"/>
 
     <Button
         android:id="@+id/vpn.main.button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginLeft="24dp"
+        android:textSize="32sp"
         />
 
     <view
         android:id="@+id/vpn.Status.Image"
-        android:layout_width="@dimen/progress_button"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:color="@android:color/holo_blue_dark"
-        android:layout_height="@dimen/progress_button"
         class="mbanje.kurt.fabbutton.FabButton"
         android:layout_gravity="center"
         android:visibility="visible"
@@ -43,8 +43,8 @@
         android:layout_toRightOf="@id/eipLabel"
         android:layout_toEndOf="@id/eipLabel"
         android:layout_alignTop="@id/eipLabel"
-        android:layout_marginStart="@dimen/add_button_margin"
-        android:layout_marginLeft="@dimen/add_button_margin"
+        android:layout_marginStart="24dp"
+        android:layout_marginLeft="24dp"
         />
 
 </com.wefika.flowlayout.FlowLayout>
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index b3651b51..9a396080 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.wefika.flowlayout.FlowLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="10dp"
     android:orientation="horizontal">
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="10dp"
         android:layout_marginStart="10dp"
-        android:clickable="true"
+        android:layout_marginTop="12dp"
         android:text="@string/eip_service_label"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -19,13 +19,16 @@
         android:id="@+id/vpn.main.button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textSize="12sp"
         />
 
     <view
         android:id="@+id/vpn.Status.Image"
-        android:layout_width="@dimen/progress_button"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginLeft="3dp"
+        android:layout_marginStart="3dp"
         android:color="@android:color/holo_blue_dark"
-        android:layout_height="@dimen/progress_button"
         class="mbanje.kurt.fabbutton.FabButton"
         android:layout_gravity="center"
         android:visibility="visible"
@@ -35,8 +38,6 @@
         fbb_autoStart="true"
         fbb_progressColor="#ff170aff"
         fbb_progressWidthRatio="0.1"
-        android:layout_marginStart="@dimen/add_button_margin"
-        android:layout_marginLeft="@dimen/add_button_margin"
         />
 
 </com.wefika.flowlayout.FlowLayout>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 063c3f8b..acf002bc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -77,6 +77,6 @@
     <string name="logging_in_user_status">está iniciando sesión.</string>
     <string name="logging_out_user_status">está cerrando sesión.</string>
     <string name="signingup_message">está siendo registrado.</string>
-    <string name="vpn.button.turn.on">Iniciar VPN</string>
-    <string name="vpn.button.turn.off">Apagar VPN</string>
+    <string name="vpn.button.turn.on">Iniciar</string>
+    <string name="vpn.button.turn.off">Apagar</string>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4e8dad45..727f5a78 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -17,5 +17,4 @@
     <dimen name="round_button_diameter">56dp</dimen>
     <dimen name="switchbar_pad">16dp</dimen>
     <dimen name="vpn_setting_padding">16dp</dimen>
-    <dimen name="progress_button">32dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 674bb7c8..6856b713 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -75,6 +75,6 @@
     <string name="logging_in_user_status">is logging in.</string>
     <string name="logging_out_user_status">is logging out.</string>
     <string name="signingup_message">is being registered.</string>
-    <string name="vpn.button.turn.on">Turn on VPN</string>
-    <string name="vpn.button.turn.off">Turn off VPN</string>
+    <string name="vpn.button.turn.on">Turn on</string>
+    <string name="vpn.button.turn.off">Turn off</string>
 </resources>
-- 
cgit v1.2.3


From 232b9d1b562c752a281935f05af55e1b13f33127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 28 Apr 2015 12:20:50 +0200
Subject: Put button and icon below the vpn label

Some devices are too small to show everything in the same row, so I'm
centering everything and spliting the layout in two: the label and the
button&icon.
---
 .../res/layout-xlarge/eip_service_fragment.xml     | 63 ++++++++++++----------
 app/src/main/res/layout/eip_service_fragment.xml   | 58 +++++++++++---------
 2 files changed, 67 insertions(+), 54 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
index 9efc209c..a9f01fb8 100644
--- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml
+++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.wefika.flowlayout.FlowLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="10dp"
@@ -13,38 +13,43 @@
         android:layout_marginLeft="10dp"
         android:layout_marginStart="10dp"
         android:layout_marginTop="12dp"
+        android:layout_marginBottom="12dp"
         android:text="@string/eip_service_label"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="24dp"/>
+        android:textSize="24sp"/>
 
-    <Button
-        android:id="@+id/vpn.main.button"
+
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginLeft="24dp"
-        android:textSize="32sp"
-        />
+        android:orientation="horizontal"
+        android:layout_below="@+id/eipLabel"
+        android:layout_centerInParent="true">
 
-    <view
-        android:id="@+id/vpn.Status.Image"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:color="@android:color/holo_blue_dark"
-        class="mbanje.kurt.fabbutton.FabButton"
-        android:layout_gravity="center"
-        android:visibility="visible"
-        android:layout_centerInParent="true"
-        android:indeterminate="true"
-        android:max="100"
-        fbb_autoStart="true"
-        fbb_progressColor="#ff170aff"
-        fbb_progressWidthRatio="0.1"
-        android:layout_toRightOf="@id/eipLabel"
-        android:layout_toEndOf="@id/eipLabel"
-        android:layout_alignTop="@id/eipLabel"
-        android:layout_marginStart="24dp"
-        android:layout_marginLeft="24dp"
-        />
+        <Button
+            android:id="@+id/vpn.main.button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginLeft="24dp"
+            android:textSize="32sp"
+            />
 
-</com.wefika.flowlayout.FlowLayout>
+        <view
+            android:id="@+id/vpn.Status.Image"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:color="@android:color/holo_blue_dark"
+            class="mbanje.kurt.fabbutton.FabButton"
+            android:layout_gravity="center"
+            android:visibility="visible"
+            android:indeterminate="true"
+            android:max="100"
+            fbb_autoStart="true"
+            fbb_progressColor="#ff170aff"
+            fbb_progressWidthRatio="0.1"
+            android:layout_marginStart="24dp"
+            android:layout_marginLeft="24dp"
+            />
+    </LinearLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index 9a396080..1360b8e0 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -1,43 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.wefika.flowlayout.FlowLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="10dp"
-    android:orientation="horizontal">
+    android:layout_marginTop="10dp">
 
     <TextView
         android:id="@+id/eipLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
         android:layout_marginLeft="10dp"
         android:layout_marginStart="10dp"
         android:layout_marginTop="12dp"
+        android:layout_marginBottom="12dp"
         android:text="@string/eip_service_label"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <Button
-        android:id="@+id/vpn.main.button"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="12sp"
-        />
+        android:orientation="horizontal"
+        android:layout_below="@+id/eipLabel"
+        android:layout_centerInParent="true">
 
-    <view
-        android:id="@+id/vpn.Status.Image"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginLeft="3dp"
-        android:layout_marginStart="3dp"
-        android:color="@android:color/holo_blue_dark"
-        class="mbanje.kurt.fabbutton.FabButton"
-        android:layout_gravity="center"
-        android:visibility="visible"
-        android:layout_centerInParent="true"
-        android:indeterminate="true"
-        android:max="100"
-        fbb_autoStart="true"
-        fbb_progressColor="#ff170aff"
-        fbb_progressWidthRatio="0.1"
-        />
+        <Button
+            android:id="@+id/vpn.main.button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="12sp"
+            />
 
-</com.wefika.flowlayout.FlowLayout>
+        <view
+            android:id="@+id/vpn.Status.Image"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_marginLeft="3dp"
+            android:layout_marginStart="3dp"
+            android:color="@android:color/holo_blue_dark"
+            class="mbanje.kurt.fabbutton.FabButton"
+            android:layout_gravity="center"
+            android:visibility="visible"
+            android:layout_centerInParent="true"
+            android:indeterminate="true"
+            android:max="100"
+            fbb_autoStart="true"
+            fbb_progressColor="#ff170aff"
+            fbb_progressWidthRatio="0.1"
+            />
+    </LinearLayout>
+</RelativeLayout>
-- 
cgit v1.2.3


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-xlarge/dashboard.xml | 97 +++++++++-------------------
 app/src/main/res/layout/dashboard.xml        | 39 ++++-------
 2 files changed, 44 insertions(+), 92 deletions(-)

(limited to 'app/src/main/res')

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"
-- 
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 ++++-------------
 app/src/main/res/layout/fragment_user_session.xml | 37 +++++++++++++++++++++++
 app/src/main/res/values-es/strings.xml            |  2 +-
 app/src/main/res/values/strings.xml               |  2 +-
 4 files changed, 45 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/res/layout/fragment_user_session.xml

(limited to 'app/src/main/res')

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"
diff --git a/app/src/main/res/layout/fragment_user_session.xml b/app/src/main/res/layout/fragment_user_session.xml
new file mode 100644
index 00000000..3b7b23c6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_user_session.xml
@@ -0,0 +1,37 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    tools:context="se.leap.bitmaskclient.userstatus.UserSessionFragment">
+
+    <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="wrap_content"
+            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>
+
+    <Button
+        android:id="@+id/user_session_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+</LinearLayout>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index acf002bc..c125b8bc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -69,7 +69,7 @@
     <string name="eip_state_connected">Conexión protegida.</string>
     <string name="provider_problem">Parece que hay un problema con el proveedor.</string>
     <string name="try_another_provider">Prueba con otro proveedor, o contacta con este.</string>
-    <string name="default_user"></string>
+    <string name="default_user">Anónimo</string>
     <string name="logged_in_user_status">inició sesión.</string>
     <string name="logged_out_user_status">cerró la sesión.</string>
     <string name="didnt_log_out_user_status">no cerró la sesión.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6856b713..06670aee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -67,7 +67,7 @@
     <string name="eip_state_connected">Connection Secure.</string>
     <string name="provider_problem">It seems there is a problem with the provider.</string>
     <string name="try_another_provider">Please try another provider, or contact yours.</string>
-    <string name="default_user">You</string>
+    <string name="default_user">Anonymous</string>
     <string name="logged_in_user_status">is logged in.</string>
     <string name="logged_out_user_status">logged out.</string>
     <string name="didnt_log_out_user_status">didn\'t log out. Try later, it may be a problem in the network or in the provider. If the problem persists, then wipe Bitmask data from the Android settings</string>
-- 
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 +++++-------
 app/src/main/res/layout/fragment_user_session.xml |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'app/src/main/res')

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>
diff --git a/app/src/main/res/layout/fragment_user_session.xml b/app/src/main/res/layout/fragment_user_session.xml
index 3b7b23c6..2abd6f22 100644
--- a/app/src/main/res/layout/fragment_user_session.xml
+++ b/app/src/main/res/layout/fragment_user_session.xml
@@ -1,12 +1,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="horizontal"
     tools:context="se.leap.bitmaskclient.userstatus.UserSessionFragment">
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content">
 
         <ProgressBar
-- 
cgit v1.2.3


From 9a54c425f6d96e1872899eabf78fb60082a8d234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 29 Apr 2015 18:21:03 +0200
Subject: Functional.

---
 app/src/main/res/layout/fragment_user_session.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/fragment_user_session.xml b/app/src/main/res/layout/fragment_user_session.xml
index 2abd6f22..0d2a1840 100644
--- a/app/src/main/res/layout/fragment_user_session.xml
+++ b/app/src/main/res/layout/fragment_user_session.xml
@@ -13,8 +13,7 @@
             android:id="@+id/user_session_status_progress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:indeterminate="true"
-            android:visibility="gone"/>
+            android:indeterminate="true"/>
 
         <TextView
             android:id="@+id/user_session_status"
-- 
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 +-
 app/src/main/res/layout/eip_service_fragment.xml  |  1 -
 app/src/main/res/layout/fragment_user_session.xml | 63 ++++++++++++++---------
 app/src/main/res/menu/client_dashboard.xml        | 10 ----
 app/src/main/res/values-es/strings.xml            |  2 +-
 app/src/main/res/values/strings.xml               |  2 +-
 6 files changed, 42 insertions(+), 38 deletions(-)

(limited to 'app/src/main/res')

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"/>
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index 1360b8e0..06b514d3 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -40,7 +40,6 @@
             class="mbanje.kurt.fabbutton.FabButton"
             android:layout_gravity="center"
             android:visibility="visible"
-            android:layout_centerInParent="true"
             android:indeterminate="true"
             android:max="100"
             fbb_autoStart="true"
diff --git a/app/src/main/res/layout/fragment_user_session.xml b/app/src/main/res/layout/fragment_user_session.xml
index 0d2a1840..81e68199 100644
--- a/app/src/main/res/layout/fragment_user_session.xml
+++ b/app/src/main/res/layout/fragment_user_session.xml
@@ -1,36 +1,51 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    tools:context="se.leap.bitmaskclient.userstatus.UserSessionFragment">
+    android:layout_marginTop="10dp"
+    tools:context="se.leap.bitmaskclient.userstatus.UserStatusFragment">
+
+    <TextView
+        android:id="@+id/user.status.username"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="6dp"
+        android:layout_marginBottom="6dp"
+        android:layout_centerHorizontal="true"
+        android:text="@string/default_username"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_below="@id/user.status.username"
+        android:layout_centerInParent="true">
 
-        <ProgressBar
-            android:id="@+id/user_session_status_progress"
+        <Button
+            android:id="@+id/user.status.button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:indeterminate="true"/>
+            />
 
-        <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" />
+        <view
+            android:id="@+id/user.status.icon"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_marginLeft="3dp"
+            android:layout_marginStart="3dp"
+            android:color="@android:color/holo_blue_dark"
+            class="mbanje.kurt.fabbutton.FabButton"
+            android:layout_gravity="center"
+            android:visibility="visible"
+            android:indeterminate="true"
+            android:max="100"
+            fbb_autoStart="true"
+            fbb_progressColor="#ff170aff"
+            fbb_progressWidthRatio="0.1"
+            />
 
     </LinearLayout>
-
-    <Button
-        android:id="@+id/user_session_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        />
-</LinearLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/menu/client_dashboard.xml b/app/src/main/res/menu/client_dashboard.xml
index 9bc39d7b..e0336cc0 100644
--- a/app/src/main/res/menu/client_dashboard.xml
+++ b/app/src/main/res/menu/client_dashboard.xml
@@ -15,15 +15,5 @@
         android:id="@+id/signup_button"
         android:title="@string/signup_button"
         android:visible="false"/>
-    <item
-        android:id="@+id/login_button"
-        android:showAsAction="ifRoom"
-        android:title="@string/login_button"
-        android:visible="false"/>
-    <item
-        android:id="@+id/logout_button"
-        android:showAsAction="ifRoom"
-        android:title="@string/logout_button"
-        android:visible="false"/>
 
 </menu>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c125b8bc..7f0670b8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -69,7 +69,7 @@
     <string name="eip_state_connected">Conexión protegida.</string>
     <string name="provider_problem">Parece que hay un problema con el proveedor.</string>
     <string name="try_another_provider">Prueba con otro proveedor, o contacta con este.</string>
-    <string name="default_user">Anónimo</string>
+    <string name="default_username">Anónimo</string>
     <string name="logged_in_user_status">inició sesión.</string>
     <string name="logged_out_user_status">cerró la sesión.</string>
     <string name="didnt_log_out_user_status">no cerró la sesión.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 06670aee..7746795e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -67,7 +67,7 @@
     <string name="eip_state_connected">Connection Secure.</string>
     <string name="provider_problem">It seems there is a problem with the provider.</string>
     <string name="try_another_provider">Please try another provider, or contact yours.</string>
-    <string name="default_user">Anonymous</string>
+    <string name="default_username">Anonymous</string>
     <string name="logged_in_user_status">is logged in.</string>
     <string name="logged_out_user_status">logged out.</string>
     <string name="didnt_log_out_user_status">didn\'t log out. Try later, it may be a problem in the network or in the provider. If the problem persists, then wipe Bitmask data from the Android settings</string>
-- 
cgit v1.2.3


From 436de7afeea2cd234db8a4b70ace396101126e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 30 Apr 2015 19:09:31 +0200
Subject: Better layout, xlarge adaptation too.

---
 .../res/layout-xlarge/fragment_user_session.xml    | 55 ++++++++++++++++++++++
 app/src/main/res/layout/fragment_user_session.xml  | 29 ++++++------
 2 files changed, 70 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/res/layout-xlarge/fragment_user_session.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout-xlarge/fragment_user_session.xml b/app/src/main/res/layout-xlarge/fragment_user_session.xml
new file mode 100644
index 00000000..30969219
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/fragment_user_session.xml
@@ -0,0 +1,55 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="30dp"
+    android:layout_marginLeft="60dp"
+    android:layout_marginStart="60dp"
+    android:orientation="vertical"
+    tools:context="se.leap.bitmaskclient.userstatus.UserStatusFragment">
+
+    <TextView
+        android:id="@+id/user.status.username"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="30dp"
+        android:layout_marginRight="60dp"
+        android:layout_marginEnd="60dp"
+        android:layout_gravity="center"
+        android:textSize="46sp"
+        android:text="@string/default_username"
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+    <LinearLayout
+        android:id="@+id/user.status.buttonAndIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center">
+
+        <Button
+            android:id="@+id/user.status.button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="24sp"
+            />
+
+        <view
+            android:id="@+id/user.status.icon"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:layout_marginLeft="26dp"
+            android:layout_marginStart="26dp"
+            android:background="@android:color/transparent"
+            android:color="@android:color/holo_blue_dark"
+            class="mbanje.kurt.fabbutton.FabButton"
+            android:layout_gravity="center"
+            android:visibility="visible"
+            android:indeterminate="true"
+            android:max="100"
+            fbb_autoStart="true"
+            fbb_progressColor="#ff170aff"
+            fbb_progressWidthRatio="0.3"
+            />
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_user_session.xml b/app/src/main/res/layout/fragment_user_session.xml
index 81e68199..5194e495 100644
--- a/app/src/main/res/layout/fragment_user_session.xml
+++ b/app/src/main/res/layout/fragment_user_session.xml
@@ -1,41 +1,42 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="10dp"
+    android:layout_marginLeft="20dp"
+    android:layout_marginStart="20dp"
     tools:context="se.leap.bitmaskclient.userstatus.UserStatusFragment">
 
     <TextView
         android:id="@+id/user.status.username"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="18sp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="6dp"
-        android:layout_marginBottom="6dp"
-        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="10dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
+        android:textSize="20sp"
         android:text="@string/default_username"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
 
     <LinearLayout
+        android:id="@+id/user.status.buttonAndIcon"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/user.status.username"
-        android:layout_centerInParent="true">
+        android:layout_height="wrap_content">
 
         <Button
             android:id="@+id/user.status.button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textSize="14sp"
             />
 
         <view
             android:id="@+id/user.status.icon"
             android:layout_width="32dp"
             android:layout_height="32dp"
-            android:layout_marginLeft="3dp"
-            android:layout_marginStart="3dp"
+            android:layout_marginLeft="9dp"
+            android:layout_marginStart="9dp"
+            android:background="@android:color/transparent"
             android:color="@android:color/holo_blue_dark"
             class="mbanje.kurt.fabbutton.FabButton"
             android:layout_gravity="center"
@@ -48,4 +49,4 @@
             />
 
     </LinearLayout>
-</RelativeLayout>
+</LinearLayout>
-- 
cgit v1.2.3


From 6d2e86277cdf02d3c731d963656e2c4a0f8fea5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 5 May 2015 11:28:01 +0200
Subject: Rename user session fragment, add icon resource.

The FabButton doesn't scale the icon as big as I want it to be, and it
doesn't let me set the size to "wrap_content" because the library sets
the sizes to match_parent.
I'm going to try to modify my fork of FabButton to see if I can obtain
what I want in its demo: just an icon and the progress indicator, the
icon as big as possible.
---
 .../main/res/drawable-hdpi/ic_account_circle.png   | Bin 0 -> 1028 bytes
 .../main/res/drawable-mdpi/ic_account_circle.png   | Bin 0 -> 669 bytes
 .../main/res/drawable-xhdpi/ic_account_circle.png  | Bin 0 -> 1447 bytes
 .../main/res/drawable-xxhdpi/ic_account_circle.png | Bin 0 -> 2339 bytes
 .../res/drawable-xxxhdpi/ic_account_circle.png     | Bin 0 -> 3663 bytes
 .../res/layout-xlarge/fragment_user_session.xml    |  55 ---------------------
 .../res/layout-xlarge/user_session_fragment.xml    |  55 +++++++++++++++++++++
 app/src/main/res/layout/fragment_user_session.xml  |  52 -------------------
 app/src/main/res/layout/user_session_fragment.xml  |  51 +++++++++++++++++++
 9 files changed, 106 insertions(+), 107 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_account_circle.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_account_circle.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_account_circle.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_account_circle.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_account_circle.png
 delete mode 100644 app/src/main/res/layout-xlarge/fragment_user_session.xml
 create mode 100644 app/src/main/res/layout-xlarge/user_session_fragment.xml
 delete mode 100644 app/src/main/res/layout/fragment_user_session.xml
 create mode 100644 app/src/main/res/layout/user_session_fragment.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable-hdpi/ic_account_circle.png b/app/src/main/res/drawable-hdpi/ic_account_circle.png
new file mode 100644
index 00000000..60e50a03
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_account_circle.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_account_circle.png b/app/src/main/res/drawable-mdpi/ic_account_circle.png
new file mode 100644
index 00000000..9cc9f0b5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_account_circle.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_account_circle.png b/app/src/main/res/drawable-xhdpi/ic_account_circle.png
new file mode 100644
index 00000000..8af55604
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_account_circle.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_account_circle.png b/app/src/main/res/drawable-xxhdpi/ic_account_circle.png
new file mode 100644
index 00000000..6e81a76b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_account_circle.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_account_circle.png b/app/src/main/res/drawable-xxxhdpi/ic_account_circle.png
new file mode 100644
index 00000000..9511ae3a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_account_circle.png differ
diff --git a/app/src/main/res/layout-xlarge/fragment_user_session.xml b/app/src/main/res/layout-xlarge/fragment_user_session.xml
deleted file mode 100644
index 30969219..00000000
--- a/app/src/main/res/layout-xlarge/fragment_user_session.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="30dp"
-    android:layout_marginLeft="60dp"
-    android:layout_marginStart="60dp"
-    android:orientation="vertical"
-    tools:context="se.leap.bitmaskclient.userstatus.UserStatusFragment">
-
-    <TextView
-        android:id="@+id/user.status.username"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="30dp"
-        android:layout_marginRight="60dp"
-        android:layout_marginEnd="60dp"
-        android:layout_gravity="center"
-        android:textSize="46sp"
-        android:text="@string/default_username"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <LinearLayout
-        android:id="@+id/user.status.buttonAndIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center">
-
-        <Button
-            android:id="@+id/user.status.button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="24sp"
-            />
-
-        <view
-            android:id="@+id/user.status.icon"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:layout_marginLeft="26dp"
-            android:layout_marginStart="26dp"
-            android:background="@android:color/transparent"
-            android:color="@android:color/holo_blue_dark"
-            class="mbanje.kurt.fabbutton.FabButton"
-            android:layout_gravity="center"
-            android:visibility="visible"
-            android:indeterminate="true"
-            android:max="100"
-            fbb_autoStart="true"
-            fbb_progressColor="#ff170aff"
-            fbb_progressWidthRatio="0.3"
-            />
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout-xlarge/user_session_fragment.xml b/app/src/main/res/layout-xlarge/user_session_fragment.xml
new file mode 100644
index 00000000..30969219
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/user_session_fragment.xml
@@ -0,0 +1,55 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="30dp"
+    android:layout_marginLeft="60dp"
+    android:layout_marginStart="60dp"
+    android:orientation="vertical"
+    tools:context="se.leap.bitmaskclient.userstatus.UserStatusFragment">
+
+    <TextView
+        android:id="@+id/user.status.username"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="30dp"
+        android:layout_marginRight="60dp"
+        android:layout_marginEnd="60dp"
+        android:layout_gravity="center"
+        android:textSize="46sp"
+        android:text="@string/default_username"
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+    <LinearLayout
+        android:id="@+id/user.status.buttonAndIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center">
+
+        <Button
+            android:id="@+id/user.status.button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="24sp"
+            />
+
+        <view
+            android:id="@+id/user.status.icon"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:layout_marginLeft="26dp"
+            android:layout_marginStart="26dp"
+            android:background="@android:color/transparent"
+            android:color="@android:color/holo_blue_dark"
+            class="mbanje.kurt.fabbutton.FabButton"
+            android:layout_gravity="center"
+            android:visibility="visible"
+            android:indeterminate="true"
+            android:max="100"
+            fbb_autoStart="true"
+            fbb_progressColor="#ff170aff"
+            fbb_progressWidthRatio="0.3"
+            />
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_user_session.xml b/app/src/main/res/layout/fragment_user_session.xml
deleted file mode 100644
index 5194e495..00000000
--- a/app/src/main/res/layout/fragment_user_session.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="10dp"
-    android:layout_marginLeft="20dp"
-    android:layout_marginStart="20dp"
-    tools:context="se.leap.bitmaskclient.userstatus.UserStatusFragment">
-
-    <TextView
-        android:id="@+id/user.status.username"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginEnd="20dp"
-        android:textSize="20sp"
-        android:text="@string/default_username"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <LinearLayout
-        android:id="@+id/user.status.buttonAndIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <Button
-            android:id="@+id/user.status.button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="14sp"
-            />
-
-        <view
-            android:id="@+id/user.status.icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginLeft="9dp"
-            android:layout_marginStart="9dp"
-            android:background="@android:color/transparent"
-            android:color="@android:color/holo_blue_dark"
-            class="mbanje.kurt.fabbutton.FabButton"
-            android:layout_gravity="center"
-            android:visibility="visible"
-            android:indeterminate="true"
-            android:max="100"
-            fbb_autoStart="true"
-            fbb_progressColor="#ff170aff"
-            fbb_progressWidthRatio="0.1"
-            />
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout/user_session_fragment.xml b/app/src/main/res/layout/user_session_fragment.xml
new file mode 100644
index 00000000..18eda6d9
--- /dev/null
+++ b/app/src/main/res/layout/user_session_fragment.xml
@@ -0,0 +1,51 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="10dp"
+    android:layout_marginLeft="20dp"
+    android:layout_marginStart="20dp"
+    tools:context="se.leap.bitmaskclient.userstatus.UserStatusFragment">
+
+    <TextView
+        android:id="@+id/user.status.username"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
+        android:textSize="20sp"
+        android:text="@string/default_username"
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+    <LinearLayout
+        android:id="@+id/user.status.buttonAndIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <Button
+            android:id="@+id/user.status.button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            />
+
+        <view
+            android:id="@+id/user.status.icon"
+            android:layout_width="32dp"
+            android:layout_marginLeft="9dp"
+            android:layout_marginStart="9dp"
+            android:src="@drawable/ic_account_circle"
+            android:color="@android:color/transparent"
+            class="mbanje.kurt.fabbutton.FabButton"
+            android:layout_gravity="center"
+            android:visibility="visible"
+            android:indeterminate="true"
+            android:max="100"
+            fbb_autoStart="true"
+            fbb_progressColor="#ff170aff"
+            fbb_progressWidthRatio="0.1"
+            />
+
+    </LinearLayout>
+</LinearLayout>
-- 
cgit v1.2.3


From de63a99c74bb05c271b0c7a5903b6bfab9ec0a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 29 May 2015 10:33:51 +0200
Subject: Updated libraries, simplified user status fragment

Updated butterknife, dagger, renderers, fabbuton and gson, as well as
gradle plugin.
---
 app/src/main/res/layout/user_session_fragment.xml | 48 ++++++++++-------------
 1 file changed, 20 insertions(+), 28 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/user_session_fragment.xml b/app/src/main/res/layout/user_session_fragment.xml
index 18eda6d9..30068381 100644
--- a/app/src/main/res/layout/user_session_fragment.xml
+++ b/app/src/main/res/layout/user_session_fragment.xml
@@ -12,40 +12,32 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginRight="15dp"
         android:layout_marginEnd="20dp"
         android:textSize="20sp"
         android:text="@string/default_username"
         android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-    <LinearLayout
-        android:id="@+id/user.status.buttonAndIcon"
+    <Button
+        android:id="@+id/user.status.button"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <Button
-            android:id="@+id/user.status.button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="14sp"
-            />
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        />
 
-        <view
-            android:id="@+id/user.status.icon"
-            android:layout_width="32dp"
-            android:layout_marginLeft="9dp"
-            android:layout_marginStart="9dp"
-            android:src="@drawable/ic_account_circle"
-            android:color="@android:color/transparent"
-            class="mbanje.kurt.fabbutton.FabButton"
-            android:layout_gravity="center"
-            android:visibility="visible"
-            android:indeterminate="true"
-            android:max="100"
-            fbb_autoStart="true"
-            fbb_progressColor="#ff170aff"
-            fbb_progressWidthRatio="0.1"
-            />
+    <view
+        android:id="@+id/user.status.icon"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_marginLeft="9dp"
+        android:layout_marginStart="9dp"
+        android:shadowRadius="0"
+        android:src="@drawable/ic_account_circle"
+        android:color="@android:color/transparent"
+        class="se.leap.bitmaskclient.userstatus.FabButton"
+        android:indeterminate="true"
+        fbb_progressColor="@android:color/holo_blue_dark"
+        fbb_progressWidthRatio="0.1"
+        />
 
-    </LinearLayout>
 </LinearLayout>
-- 
cgit v1.2.3