summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'app/src')
-rw-r--r--app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java2
-rw-r--r--app/src/main/res/layout-xlarge/dashboard.xml22
-rw-r--r--app/src/main/res/layout-xlarge/eip_service_fragment.xml2
-rw-r--r--app/src/main/res/layout-xlarge/logwindow.xml17
-rw-r--r--app/src/main/res/layout-xlarge/user_session_fragment.xml3
-rw-r--r--app/src/main/res/layout-xlarge/vpnstatus.xml52
-rw-r--r--app/src/main/res/layout/eip_service_fragment.xml2
-rw-r--r--app/src/main/res/layout/logwindow.xml17
-rw-r--r--app/src/main/res/layout/user_session_fragment.xml3
9 files changed, 59 insertions, 61 deletions
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java
index f76ba93b..4c6a6370 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java
@@ -7,10 +7,10 @@ import com.robotium.solo.Condition;
import com.robotium.solo.Solo;
import de.blinkt.openvpn.activities.DisconnectVPN;
-import mbanje.kurt.fabbutton.FabButton;
import mbanje.kurt.fabbutton.ProgressRingView;
import se.leap.bitmaskclient.Dashboard;
import se.leap.bitmaskclient.R;
+import se.leap.bitmaskclient.userstatus.FabButton;
import static junit.framework.Assert.assertTrue;
diff --git a/app/src/main/res/layout-xlarge/dashboard.xml b/app/src/main/res/layout-xlarge/dashboard.xml
index 3c93a04c..b9c78b68 100644
--- a/app/src/main/res/layout-xlarge/dashboard.xml
+++ b/app/src/main/res/layout-xlarge/dashboard.xml
@@ -22,28 +22,10 @@
android:textAppearance="?android:attr/textAppearanceMedium" />
<LinearLayout
+ android:id="@+id/user.status.fragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- 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>
+ android:orientation="horizontal"/>
<LinearLayout
android:id="@+id/servicesCollection"
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 2b3c4f2e..2b826be2 100644
--- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml
+++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
@@ -35,7 +35,7 @@
android:textSize="32sp"
/>
- <mbanje.kurt.fabbutton.FabButton
+ <se.leap.bitmaskclient.userstatus.FabButton
android:id="@+id/vpn_status_image"
android:layout_width="48dp"
android:layout_height="48dp"
diff --git a/app/src/main/res/layout-xlarge/logwindow.xml b/app/src/main/res/layout-xlarge/logwindow.xml
deleted file mode 100644
index 4051c92c..00000000
--- a/app/src/main/res/layout-xlarge/logwindow.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <TextView android:text="@string/speed_waiting"
- android:singleLine="true"
- android:id="@+id/speed"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
- <ListView
- android:id="@android:id/list"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent" />
-
-</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/user_session_fragment.xml b/app/src/main/res/layout-xlarge/user_session_fragment.xml
index 30969219..d4729555 100644
--- a/app/src/main/res/layout-xlarge/user_session_fragment.xml
+++ b/app/src/main/res/layout-xlarge/user_session_fragment.xml
@@ -33,7 +33,7 @@
android:textSize="24sp"
/>
- <view
+ <se.leap.bitmaskclient.userstatus.FabButton
android:id="@+id/user.status.icon"
android:layout_width="56dp"
android:layout_height="56dp"
@@ -41,7 +41,6 @@
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"
diff --git a/app/src/main/res/layout-xlarge/vpnstatus.xml b/app/src/main/res/layout-xlarge/vpnstatus.xml
new file mode 100644
index 00000000..3b464b62
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/vpnstatus.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) 2012-2016 Arne Schwabe
+ ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ -->
+
+<merge xmlns:tools="http://schemas.android.com/tools"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <Space
+ android:layout_weight="1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+
+ <TextView
+ android:text="@string/uploaded_data"
+ style="@style/logWindowStatusTitle"/>
+
+ <TextView
+ style="@style/logWindowStatusText"
+ android:id="@+id/speedUp"
+ tools:text="4 Mbit/s 6.7 GB"/>
+
+ <TextView
+ android:text="@string/downloaded_data"
+ style="@style/logWindowStatusTitle"/>
+
+ <TextView
+ style="@style/logWindowStatusText"
+ android:id="@+id/speedDown"
+ tools:text="2 Mbit/s 4.7 GB"/>
+
+
+ <Space
+ android:layout_weight="1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+
+ <TextView
+ android:text="@string/vpn_status"
+ style="@style/logWindowStatusTitle"/>
+
+ <TextView
+
+ android:id="@+id/speedStatus"
+ tools:text="Connected to a very long ipv4 and 3483489348238824829482384928"
+ style="@style/logWindowStatusText"/>
+
+
+</merge> \ No newline at end of file
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index c8370cf1..cef01c18 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -30,7 +30,7 @@
android:textSize="12sp"
/>
- <mbanje.kurt.fabbutton.FabButton
+ <se.leap.bitmaskclient.userstatus.FabButton
android:id="@+id/vpn_status_image"
android:layout_width="32dp"
android:layout_height="32dp"
diff --git a/app/src/main/res/layout/logwindow.xml b/app/src/main/res/layout/logwindow.xml
deleted file mode 100644
index 4051c92c..00000000
--- a/app/src/main/res/layout/logwindow.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <TextView android:text="@string/speed_waiting"
- android:singleLine="true"
- android:id="@+id/speed"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
- <ListView
- android:id="@android:id/list"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent" />
-
-</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/user_session_fragment.xml b/app/src/main/res/layout/user_session_fragment.xml
index d33f9b9a..914c8462 100644
--- a/app/src/main/res/layout/user_session_fragment.xml
+++ b/app/src/main/res/layout/user_session_fragment.xml
@@ -26,7 +26,7 @@
android:textSize="14sp"
/>
- <view
+ <se.leap.bitmaskclient.userstatus.FabButton
android:id="@+id/user.status.icon"
android:layout_width="32dp"
android:layout_height="32dp"
@@ -35,7 +35,6 @@
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"