Merge branch 'develop'0.9.4

3 files changed, 96 insertions, 82 deletions

diff --git a/app/src/main/res/layout/dashboard.xml b/app/src/main/res/layout/dashboard.xml
index f4269fe2..6a9bbe97 100644
--- a/app/src/main/res/layout/dashboard.xml
+++ b/app/src/main/res/layout/dashboard.xml
@@ -5,61 +5,30 @@
     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:id="@+id/user.status.fragment"
         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:ellipsize="marquee"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            />
-    </LinearLayout>
-    
+        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/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index 64d22147..06b514d3 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -2,50 +2,49 @@
 <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:layout_marginTop="10dp">
 
     <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_centerHorizontal="true"
         android:layout_marginLeft="10dp"
-        android:clickable="true"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginBottom="12dp"
         android:text="@string/eip_service_label"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <Switch
-        android:id="@+id/eipSwitch"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginRight="10dp" />
+        android:orientation="horizontal"
+        android:layout_below="@+id/eipLabel"
+        android:layout_centerInParent="true">
 
-    <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_centerVertical="true"
-        android:paddingTop="5dp"
-        android:paddingBottom="10dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:clickable="true"
-        android:text="@string/eip_state_not_connected" />
+        <Button
+            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="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>
 </RelativeLayout>
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..d33f9b9a
--- /dev/null
+++ b/app/src/main/res/layout/user_session_fragment.xml
@@ -0,0 +1,46 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    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="15dp"
+        android:layout_marginEnd="20dp"
+        android:textSize="20sp"
+        android:text="@string/default_username"
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+    <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:shadowRadius="0"
+        android:src="@drawable/ic_account_circle"
+        android:color="@android:color/transparent"
+        class="se.leap.bitmaskclient.userstatus.FabButton"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        app:fbb_progressColor="@android:color/holo_green_dark"
+        app:fbb_progressWidthRatio="0.2"
+        app:fbb_showShadow="false"
+        />
+
+</LinearLayout>