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 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

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

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>
-- 
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/layout/eip_service_fragment.xml')

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/layout/eip_service_fragment.xml')

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/layout/eip_service_fragment.xml')

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.
---
 app/src/main/res/layout/eip_service_fragment.xml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

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

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 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 ++++++
 1 file changed, 6 insertions(+)

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

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"
-- 
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.

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

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

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>
-- 
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.
---
 app/src/main/res/layout/eip_service_fragment.xml | 58 ++++++++++++++----------
 1 file changed, 33 insertions(+), 25 deletions(-)

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

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 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/eip_service_fragment.xml | 1 -
 1 file changed, 1 deletion(-)

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

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