From 54e95a61bc553d985f6c55823da20985b6103aa0 Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Tue, 6 Mar 2018 12:24:22 +0100
Subject: cleanup - rename layout files

---
 app/src/main/res/layout/a_main.xml                 |  42 +++++
 app/src/main/res/layout/a_provider_credentials.xml |   6 +-
 app/src/main/res/layout/a_provider_detail.xml      |   4 +-
 app/src/main/res/layout/a_provider_list.xml        |  30 +++
 app/src/main/res/layout/about.xml                  | 201 ---------------------
 app/src/main/res/layout/activity_main.xml          |  42 -----
 .../main/res/layout/checkbox_confirm_dialog.xml    |  24 ---
 .../main/res/layout/custom_notification_layout.xml |  48 -----
 app/src/main/res/layout/d_checkbox_confirm.xml     |  24 +++
 app/src/main/res/layout/drawer_main.xml            |  69 -------
 app/src/main/res/layout/eip_service_fragment.xml   | 130 -------------
 app/src/main/res/layout/f_about.xml                | 201 +++++++++++++++++++++
 app/src/main/res/layout/f_drawer_main.xml          |  69 +++++++
 app/src/main/res/layout/f_eip.xml                  | 130 +++++++++++++
 app/src/main/res/layout/fragment_main.xml          |  16 --
 app/src/main/res/layout/loading_screen.xml         |  41 -----
 app/src/main/res/layout/provider_credentials.xml   |  67 -------
 app/src/main/res/layout/provider_header.xml        |  22 ---
 app/src/main/res/layout/provider_list_activity.xml |  30 ---
 app/src/main/res/layout/provider_list_item.xml     |  34 ----
 app/src/main/res/layout/session_dialog.xml         |  42 -----
 app/src/main/res/layout/single_list_item.xml       |  12 --
 app/src/main/res/layout/switch_list_item.xml       |  15 --
 app/src/main/res/layout/v_custom_notification.xml  |  48 +++++
 app/src/main/res/layout/v_loading_screen.xml       |  41 +++++
 app/src/main/res/layout/v_provider_credentials.xml |  67 +++++++
 app/src/main/res/layout/v_provider_header.xml      |  22 +++
 app/src/main/res/layout/v_provider_list_item.xml   |  34 ++++
 app/src/main/res/layout/v_single_list_item.xml     |  12 ++
 app/src/main/res/layout/v_switch_list_item.xml     |  15 ++
 app/src/main/res/layout/v_vpn_status.xml           |  52 ++++++
 app/src/main/res/layout/vpnstatus.xml              |  52 ------
 32 files changed, 792 insertions(+), 850 deletions(-)
 create mode 100644 app/src/main/res/layout/a_main.xml
 create mode 100644 app/src/main/res/layout/a_provider_list.xml
 delete mode 100644 app/src/main/res/layout/about.xml
 delete mode 100644 app/src/main/res/layout/activity_main.xml
 delete mode 100644 app/src/main/res/layout/checkbox_confirm_dialog.xml
 delete mode 100644 app/src/main/res/layout/custom_notification_layout.xml
 create mode 100644 app/src/main/res/layout/d_checkbox_confirm.xml
 delete mode 100644 app/src/main/res/layout/drawer_main.xml
 delete mode 100644 app/src/main/res/layout/eip_service_fragment.xml
 create mode 100644 app/src/main/res/layout/f_about.xml
 create mode 100644 app/src/main/res/layout/f_drawer_main.xml
 create mode 100644 app/src/main/res/layout/f_eip.xml
 delete mode 100644 app/src/main/res/layout/fragment_main.xml
 delete mode 100644 app/src/main/res/layout/loading_screen.xml
 delete mode 100644 app/src/main/res/layout/provider_credentials.xml
 delete mode 100644 app/src/main/res/layout/provider_header.xml
 delete mode 100644 app/src/main/res/layout/provider_list_activity.xml
 delete mode 100644 app/src/main/res/layout/provider_list_item.xml
 delete mode 100644 app/src/main/res/layout/session_dialog.xml
 delete mode 100644 app/src/main/res/layout/single_list_item.xml
 delete mode 100644 app/src/main/res/layout/switch_list_item.xml
 create mode 100644 app/src/main/res/layout/v_custom_notification.xml
 create mode 100644 app/src/main/res/layout/v_loading_screen.xml
 create mode 100644 app/src/main/res/layout/v_provider_credentials.xml
 create mode 100644 app/src/main/res/layout/v_provider_header.xml
 create mode 100644 app/src/main/res/layout/v_provider_list_item.xml
 create mode 100644 app/src/main/res/layout/v_single_list_item.xml
 create mode 100644 app/src/main/res/layout/v_switch_list_item.xml
 create mode 100644 app/src/main/res/layout/v_vpn_status.xml
 delete mode 100644 app/src/main/res/layout/vpnstatus.xml

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

diff --git a/app/src/main/res/layout/a_main.xml b/app/src/main/res/layout/a_main.xml
new file mode 100644
index 00000000..bed05d18
--- /dev/null
+++ b/app/src/main/res/layout/a_main.xml
@@ -0,0 +1,42 @@
+<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="se.leap.bitmaskclient.MainActivity">
+
+
+    <!-- As the main content view, the view below consumes the entire
+         space available using match_parent in both dimensions. -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:minHeight="?attr/actionBarSize"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:titleTextColor="@android:color/white"
+            android:background="?attr/colorPrimary">
+        </android.support.v7.widget.Toolbar>
+
+        <FrameLayout
+            android:id="@+id/container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+    <!-- The drawer is given a fixed width in dp and extends the full height of
+         the container. -->
+    <fragment
+        android:id="@+id/navigation_drawer"
+        android:name="se.leap.bitmaskclient.drawer.NavigationDrawerFragment"
+        android:layout_width="@dimen/navigation_drawer_width"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        tools:layout="@layout/f_drawer_main" />
+
+</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/a_provider_credentials.xml b/app/src/main/res/layout/a_provider_credentials.xml
index 6667d905..5fefb2a3 100644
--- a/app/src/main/res/layout/a_provider_credentials.xml
+++ b/app/src/main/res/layout/a_provider_credentials.xml
@@ -7,7 +7,7 @@
     android:padding="@dimen/stdpadding"
     style="@style/BitmaskActivity">
 
-    <include layout="@layout/loading_screen" />
+    <include layout="@layout/v_loading_screen" />
 
     <LinearLayout
         android:id="@+id/content"
@@ -17,7 +17,7 @@
         >
 
         <include
-            layout="@layout/provider_header"
+            layout="@layout/v_provider_header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
                 <include
-                    layout="@layout/provider_credentials"
+                    layout="@layout/v_provider_credentials"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout/a_provider_detail.xml b/app/src/main/res/layout/a_provider_detail.xml
index 018d4ee8..56b38ada 100644
--- a/app/src/main/res/layout/a_provider_detail.xml
+++ b/app/src/main/res/layout/a_provider_detail.xml
@@ -7,7 +7,7 @@
     android:orientation="vertical"
     style="@style/BitmaskActivity" >
 
-    <include layout="@layout/loading_screen" />
+    <include layout="@layout/v_loading_screen" />
 
     <LinearLayout
         android:id="@+id/content"
@@ -16,7 +16,7 @@
         android:layout_height="match_parent">
 
         <include
-            layout="@layout/provider_header"
+            layout="@layout/v_provider_header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout/a_provider_list.xml b/app/src/main/res/layout/a_provider_list.xml
new file mode 100644
index 00000000..aa8cdfbb
--- /dev/null
+++ b/app/src/main/res/layout/a_provider_list.xml
@@ -0,0 +1,30 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/provider_list_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ProviderListActivity"
+    android:padding="@dimen/stdpadding"
+    style="@style/BitmaskActivity" >
+
+    <include layout="@layout/v_loading_screen" />
+
+    <LinearLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include layout="@layout/v_provider_header" />
+
+        <ListView
+            android:id="@+id/provider_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:drawSelectorOnTop="false"
+            android:layout_marginTop="@dimen/standard_margin"
+            />
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
deleted file mode 100644
index aba51141..00000000
--- a/app/src/main/res/layout/about.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/aboutLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:layout_marginLeft="8sp"
-    tools:context=".MainActivity" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/version"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autoLink="all"
-            android:text="@string/copyright_leapgui" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autoLink="all"
-            android:text="@string/copyright_blinktgui" />
-
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autoLink="all"
-            android:text="@string/repository_url_text" />
-
-	<TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autoLink="all"
-            android:text="@string/leap_tracker" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autoLink="all"
-            android:text="@string/translation_project_text" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autoLink="all"
-            android:text="@string/translationby" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/copyright_others" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/openvpn"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-        <!--
-         ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/openvpn_logo_descr"
-        android:src="@drawable/openvpnLogo" />
-        -->
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/opevpn_copyright" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/lzo"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/lzo_copyright" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/openssl"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/copyright_openssl" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/okhttp"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/copyright_okhttp" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/mbetTLS"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autoLink="web"
-            android:text="@string/copyright_mbetTLS" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/asio"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/copyright_asio" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/openvpn3"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/copyright_openvpn3" />
-    </LinearLayout>
-
-</ScrollView>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index de06efc7..00000000
--- a/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="se.leap.bitmaskclient.MainActivity">
-
-
-    <!-- As the main content view, the view below consumes the entire
-         space available using match_parent in both dimensions. -->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:minHeight="?attr/actionBarSize"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:titleTextColor="@android:color/white"
-            android:background="?attr/colorPrimary">
-        </android.support.v7.widget.Toolbar>
-
-        <FrameLayout
-            android:id="@+id/container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
-    <!-- The drawer is given a fixed width in dp and extends the full height of
-         the container. -->
-    <fragment
-        android:id="@+id/navigation_drawer"
-        android:name="se.leap.bitmaskclient.drawer.NavigationDrawerFragment"
-        android:layout_width="@dimen/navigation_drawer_width"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        tools:layout="@layout/drawer_main" />
-
-</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/checkbox_confirm_dialog.xml b/app/src/main/res/layout/checkbox_confirm_dialog.xml
deleted file mode 100644
index 6dd22417..00000000
--- a/app/src/main/res/layout/checkbox_confirm_dialog.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <se.leap.bitmaskclient.views.IconTextView
-        android:id="@+id/user_message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/activity_horizontal_margin"
-        android:layout_marginBottom="0dp"
-        android:autoLink="web"
-        />
-
-
-    <CheckBox
-        android:id="@+id/do_not_show_again"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/stdpadding"
-        android:text="@string/do_not_show_again" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/custom_notification_layout.xml b/app/src/main/res/layout/custom_notification_layout.xml
deleted file mode 100644
index e97fcbe2..00000000
--- a/app/src/main/res/layout/custom_notification_layout.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<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="match_parent"
-    style="@android:style/TextAppearance.StatusBar.EventContent"
-    >
-
-    <ImageView
-        android:id="@+id/image_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="20dp"
-        android:scaleType="center"
-        android:contentDescription="@string/app_name"
-        tools:src="@drawable/ic_stat_vpn"
-        tools:visibility="visible"
-        />
-
-
-    <LinearLayout
-        android:id="@+id/content_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignParentBottom="false"
-        android:layout_toRightOf="@+id/image_icon"
-        android:gravity="center_vertical"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            tools:text="Bitmask - Amsterdam"
-            />
-
-        <TextView
-            android:id="@+id/message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="2"
-            android:ellipsize="end"
-            tools:text="Connecting to Provider... with a long message that doesn't fit into the two lines of the notification."
-            />
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/d_checkbox_confirm.xml b/app/src/main/res/layout/d_checkbox_confirm.xml
new file mode 100644
index 00000000..6dd22417
--- /dev/null
+++ b/app/src/main/res/layout/d_checkbox_confirm.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <se.leap.bitmaskclient.views.IconTextView
+        android:id="@+id/user_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/activity_horizontal_margin"
+        android:layout_marginBottom="0dp"
+        android:autoLink="web"
+        />
+
+
+    <CheckBox
+        android:id="@+id/do_not_show_again"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/stdpadding"
+        android:text="@string/do_not_show_again" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/drawer_main.xml
deleted file mode 100644
index 54614f3f..00000000
--- a/app/src/main/res/layout/drawer_main.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<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="match_parent"
-    android:orientation="vertical"
-    android:background="@color/colorBackground"
-    tools:context="se.leap.bitmaskclient.drawer.NavigationDrawerFragment"
-    android:clickable="true"
-    android:focusable="true">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <android.support.v7.widget.AppCompatImageView
-            android:id="@+id/background"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:adjustViewBounds="false"
-            android:cropToPadding="false"
-            android:scaleType="fitXY"
-            app:srcCompat="@drawable/ic_colorsquare" />
-
-        <android.support.v7.widget.AppCompatImageView
-            android:id="@+id/mask"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:srcCompat="@drawable/mask" />
-    </FrameLayout>
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <ListView
-            android:id="@+id/accountList"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:isScrollContainer="false"
-            />
-
-        <View
-            android:id="@+id/divider"
-            android:layout_below="@id/accountList"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@android:color/darker_gray"
-            />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/divider"
-            android:layout_alignParentBottom="true"
-            >
-            <ListView
-                android:id="@+id/settingsList"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                />
-        </FrameLayout>
-
-
-
-    </RelativeLayout>
-
-</LinearLayout>
\ 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
deleted file mode 100644
index e220bf16..00000000
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/eipServiceFragment">
-
-    <android.support.constraint.Guideline
-        android:id="@+id/guideline_horizontal_top"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintGuide_percent="0.225"
-        />
-
-    <android.support.constraint.Guideline
-        android:id="@+id/guideline_vertical_left"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintGuide_percent="0.225"
-        />
-
-
-    <android.support.constraint.Guideline
-        android:id="@+id/guideline_horizontal_bottom"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintGuide_percent="0.775"
-        />
-
-    <android.support.constraint.Guideline
-        android:id="@+id/guideline_vertical_right"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintGuide_percent="0.775"
-        />
-
-    <android.support.v7.widget.AppCompatImageView
-        android:id="@+id/background"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitXY"
-        app:srcCompat="@drawable/ic_colorsquare" />
-
-
-    <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/eipLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:paddingTop="@dimen/stdpadding"
-        android:text="@string/eip_service_label"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:gravity="center"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-    <se.leap.bitmaskclient.views.VpnStateImage
-        android:id="@+id/vpn_state_image"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="@dimen/stdpadding"
-        app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_bottom"
-        app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right"
-        app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left"
-        app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_top"
-        app:layout_constraintDimensionRatio="1:1"
-        />
-
-    <android.support.v7.widget.AppCompatButton
-        android:id="@+id/vpn_main_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/stdpadding"
-        android:layout_marginEnd="@dimen/stdpadding"
-        android:layout_marginStart="@dimen/stdpadding"
-        android:layout_marginTop="@dimen/stdpadding"
-        android:layout_marginLeft="@dimen/stdpadding"
-        android:layout_marginRight="@dimen/stdpadding"
-        app:layout_constraintBottom_toBottomOf="@+id/background"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:text="@string/vpn.button.turn.on"
-        style="@style/BitmaskButtonBlack"
-        />
-
-    <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/routed_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:paddingTop="@dimen/stdpadding"
-        android:text="@string/vpn_securely_routed"
-        android:gravity="center"
-        android:visibility="visible"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/eipLabel" />
-
-    <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/vpn_route"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:gravity="center"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/routed_text" />
-
-</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml
new file mode 100644
index 00000000..aba51141
--- /dev/null
+++ b/app/src/main/res/layout/f_about.xml
@@ -0,0 +1,201 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/aboutLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:layout_marginLeft="8sp"
+    tools:context=".MainActivity" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/version"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="10sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autoLink="all"
+            android:text="@string/copyright_leapgui" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="10sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autoLink="all"
+            android:text="@string/copyright_blinktgui" />
+
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="10sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autoLink="all"
+            android:text="@string/repository_url_text" />
+
+	<TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autoLink="all"
+            android:text="@string/leap_tracker" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="10sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autoLink="all"
+            android:text="@string/translation_project_text" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="10sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autoLink="all"
+            android:text="@string/translationby" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="10sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_others" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="10sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/openvpn"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+        <!--
+         ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/openvpn_logo_descr"
+        android:src="@drawable/openvpnLogo" />
+        -->
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/opevpn_copyright" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/lzo"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/lzo_copyright" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/openssl"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_openssl" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/okhttp"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_okhttp" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/mbetTLS"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autoLink="web"
+            android:text="@string/copyright_mbetTLS" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/asio"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_asio" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/openvpn3"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_openvpn3" />
+    </LinearLayout>
+
+</ScrollView>
diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
new file mode 100644
index 00000000..54614f3f
--- /dev/null
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -0,0 +1,69 @@
+<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="match_parent"
+    android:orientation="vertical"
+    android:background="@color/colorBackground"
+    tools:context="se.leap.bitmaskclient.drawer.NavigationDrawerFragment"
+    android:clickable="true"
+    android:focusable="true">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <android.support.v7.widget.AppCompatImageView
+            android:id="@+id/background"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:adjustViewBounds="false"
+            android:cropToPadding="false"
+            android:scaleType="fitXY"
+            app:srcCompat="@drawable/ic_colorsquare" />
+
+        <android.support.v7.widget.AppCompatImageView
+            android:id="@+id/mask"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:srcCompat="@drawable/mask" />
+    </FrameLayout>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ListView
+            android:id="@+id/accountList"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:isScrollContainer="false"
+            />
+
+        <View
+            android:id="@+id/divider"
+            android:layout_below="@id/accountList"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@android:color/darker_gray"
+            />
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@id/divider"
+            android:layout_alignParentBottom="true"
+            >
+            <ListView
+                android:id="@+id/settingsList"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                />
+        </FrameLayout>
+
+
+
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml
new file mode 100644
index 00000000..e220bf16
--- /dev/null
+++ b/app/src/main/res/layout/f_eip.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/eipServiceFragment">
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline_horizontal_top"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintGuide_percent="0.225"
+        />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline_vertical_left"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.225"
+        />
+
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline_horizontal_bottom"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintGuide_percent="0.775"
+        />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline_vertical_right"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.775"
+        />
+
+    <android.support.v7.widget.AppCompatImageView
+        android:id="@+id/background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitXY"
+        app:srcCompat="@drawable/ic_colorsquare" />
+
+
+    <android.support.v7.widget.AppCompatTextView
+        android:id="@+id/eipLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="@dimen/stdpadding"
+        android:paddingRight="@dimen/stdpadding"
+        android:paddingStart="@dimen/stdpadding"
+        android:paddingEnd="@dimen/stdpadding"
+        android:paddingTop="@dimen/stdpadding"
+        android:text="@string/eip_service_label"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+    <se.leap.bitmaskclient.views.VpnStateImage
+        android:id="@+id/vpn_state_image"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_margin="@dimen/stdpadding"
+        app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_bottom"
+        app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right"
+        app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left"
+        app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_top"
+        app:layout_constraintDimensionRatio="1:1"
+        />
+
+    <android.support.v7.widget.AppCompatButton
+        android:id="@+id/vpn_main_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/stdpadding"
+        android:layout_marginEnd="@dimen/stdpadding"
+        android:layout_marginStart="@dimen/stdpadding"
+        android:layout_marginTop="@dimen/stdpadding"
+        android:layout_marginLeft="@dimen/stdpadding"
+        android:layout_marginRight="@dimen/stdpadding"
+        app:layout_constraintBottom_toBottomOf="@+id/background"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="@string/vpn.button.turn.on"
+        style="@style/BitmaskButtonBlack"
+        />
+
+    <android.support.v7.widget.AppCompatTextView
+        android:id="@+id/routed_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="@dimen/stdpadding"
+        android:paddingRight="@dimen/stdpadding"
+        android:paddingStart="@dimen/stdpadding"
+        android:paddingEnd="@dimen/stdpadding"
+        android:paddingTop="@dimen/stdpadding"
+        android:text="@string/vpn_securely_routed"
+        android:gravity="center"
+        android:visibility="visible"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/eipLabel" />
+
+    <android.support.v7.widget.AppCompatTextView
+        android:id="@+id/vpn_route"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="@dimen/stdpadding"
+        android:paddingRight="@dimen/stdpadding"
+        android:paddingStart="@dimen/stdpadding"
+        android:paddingEnd="@dimen/stdpadding"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/routed_text" />
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
deleted file mode 100644
index 31dbd11e..00000000
--- a/app/src/main/res/layout/fragment_main.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="se.leap.bitmaskclient.MainActivity$PlaceholderFragment">
-
-    <TextView
-        android:id="@+id/section_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout/loading_screen.xml b/app/src/main/res/layout/loading_screen.xml
deleted file mode 100644
index f4c7eb95..00000000
--- a/app/src/main/res/layout/loading_screen.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/loading_screen"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:visibility="gone">
-
-    <android.support.v7.widget.AppCompatImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        app:tint="@color/colorPrimary"
-        app:srcCompat="@drawable/action_history"
-        android:layout_marginTop="@dimen/loading_screen_icon_vertical_margin"
-        android:layout_marginBottom="@dimen/loading_screen_icon_vertical_margin"
-        />
-
-    <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/progressbar_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fadingEdge="horizontal"
-        android:singleLine="true"
-        android:text="@string/configuring_provider"
-        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-        android:layout_marginTop="@dimen/standard_margin"
-        android:layout_marginBottom="@dimen/standard_margin"
-        />
-
-    <ProgressBar
-        android:id="@+id/progressbar"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:indeterminate="true"
-        android:layout_marginTop="@dimen/standard_margin"
-        />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/provider_credentials.xml b/app/src/main/res/layout/provider_credentials.xml
deleted file mode 100644
index 0bfdcc47..00000000
--- a/app/src/main/res/layout/provider_credentials.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/provider_credentials_user_message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/TextAppearance.Design.Error"
-        android:visibility="gone"
-        android:linksClickable="true"
-        />
-
-    <android.support.design.widget.TextInputLayout
-        android:id="@+id/provider_credentials_username_error"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/auth_username"
-        app:errorEnabled="true"
-        android:layout_marginTop="@dimen/standard_margin"
-        >
-
-        <android.support.design.widget.TextInputEditText
-            android:id="@+id/provider_credentials_username"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ems="10"
-            android:inputType="text" />
-
-    </android.support.design.widget.TextInputLayout>
-
-    <android.support.design.widget.TextInputLayout
-        android:id="@+id/provider_credentials_password_error"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:passwordToggleEnabled="true"
-        android:hint="@string/password"
-        app:errorEnabled="true">
-
-        <android.support.design.widget.TextInputEditText
-            android:id="@+id/provider_credentials_password"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textPassword"
-            />
-
-    </android.support.design.widget.TextInputLayout>
-
-    <android.support.design.widget.TextInputLayout
-        android:id="@+id/provider_credentials_password_verification_error"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:passwordToggleEnabled="true"
-        android:hint="@string/password"
-        app:errorEnabled="true"
-        android:visibility="gone">
-
-        <android.support.design.widget.TextInputEditText
-            android:id="@+id/provider_credentials_password_verification"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textPassword"
-            android:visibility="gone"
-            />
-
-    </android.support.design.widget.TextInputLayout>
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/provider_header.xml b/app/src/main/res/layout/provider_header.xml
deleted file mode 100644
index 6b08976c..00000000
--- a/app/src/main/res/layout/provider_header.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" >
-
-    <android.support.v7.widget.AppCompatImageView
-        android:id="@+id/provider_header_logo"
-        android:layout_width="@dimen/bitmask_logo"
-        android:layout_height="@dimen/bitmask_logo"
-        android:adjustViewBounds="true"
-        app:srcCompat="@drawable/mask" />
-
-    <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/provider_header_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text=""
-        android:textAppearance="@style/Base.TextAppearance.AppCompat.Headline"
-        android:layout_marginTop="@dimen/standard_margin"
-        android:layout_marginBottom="@dimen/standard_margin"
-        />
-
-</merge>
diff --git a/app/src/main/res/layout/provider_list_activity.xml b/app/src/main/res/layout/provider_list_activity.xml
deleted file mode 100644
index 6c5281b8..00000000
--- a/app/src/main/res/layout/provider_list_activity.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/provider_list_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ProviderListActivity"
-    android:padding="@dimen/stdpadding"
-    style="@style/BitmaskActivity" >
-
-    <include layout="@layout/loading_screen" />
-
-    <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <include layout="@layout/provider_header" />
-
-        <ListView
-            android:id="@+id/provider_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:drawSelectorOnTop="false"
-            android:layout_marginTop="@dimen/standard_margin"
-            />
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout/provider_list_item.xml b/app/src/main/res/layout/provider_list_item.xml
deleted file mode 100644
index 1f0e135b..00000000
--- a/app/src/main/res/layout/provider_list_item.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:paddingTop="2dip"
-    android:paddingBottom="2dip"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/activatedBackgroundIndicator"
-    android:minHeight="?android:attr/listPreferredItemHeight"
->
-
-    <TextView android:id="@+id/provider_domain"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-        android:layout_marginTop="6dip"
-        android:textAppearance="?android:attr/textAppearanceListItem"
-    />
-
-    <TextView android:id="@+id/provider_name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-    />
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/session_dialog.xml b/app/src/main/res/layout/session_dialog.xml
deleted file mode 100644
index 62215ae8..00000000
--- a/app/src/main/res/layout/session_dialog.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    tools:context=".SessionDialog" >
-
-    <TextView
-        android:id="@+id/user_message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:visibility="gone"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <EditText
-        android:id="@+id/username_entered"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:layout_marginTop="16dp"
-        android:textSize="24sp"
-        android:ems="10"
-        android:hint="@string/username_hint"
-        android:inputType="textUri" >
-
-        <requestFocus />
-    </EditText>
-
-    <EditText
-        android:id="@+id/password_entered"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="24sp"
-        android:ems="10"
-        android:hint="@string/password_hint"
-        android:inputType="textPassword" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/single_list_item.xml b/app/src/main/res/layout/single_list_item.xml
deleted file mode 100644
index 652cb693..00000000
--- a/app/src/main/res/layout/single_list_item.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceListItemSmall"
-    android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-    android:background="?android:attr/activatedBackgroundIndicator"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/switch_list_item.xml b/app/src/main/res/layout/switch_list_item.xml
deleted file mode 100644
index bdb9a74c..00000000
--- a/app/src/main/res/layout/switch_list_item.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<android.support.v7.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceListItemSmall"
-    android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-    android:background="?android:attr/activatedBackgroundIndicator"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:checked="false"
-    tools:text="someOption" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/v_custom_notification.xml b/app/src/main/res/layout/v_custom_notification.xml
new file mode 100644
index 00000000..e97fcbe2
--- /dev/null
+++ b/app/src/main/res/layout/v_custom_notification.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<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="match_parent"
+    style="@android:style/TextAppearance.StatusBar.EventContent"
+    >
+
+    <ImageView
+        android:id="@+id/image_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        android:scaleType="center"
+        android:contentDescription="@string/app_name"
+        tools:src="@drawable/ic_stat_vpn"
+        tools:visibility="visible"
+        />
+
+
+    <LinearLayout
+        android:id="@+id/content_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentBottom="false"
+        android:layout_toRightOf="@+id/image_icon"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            tools:text="Bitmask - Amsterdam"
+            />
+
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="2"
+            android:ellipsize="end"
+            tools:text="Connecting to Provider... with a long message that doesn't fit into the two lines of the notification."
+            />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/v_loading_screen.xml b/app/src/main/res/layout/v_loading_screen.xml
new file mode 100644
index 00000000..f4c7eb95
--- /dev/null
+++ b/app/src/main/res/layout/v_loading_screen.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/loading_screen"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:visibility="gone">
+
+    <android.support.v7.widget.AppCompatImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        app:tint="@color/colorPrimary"
+        app:srcCompat="@drawable/action_history"
+        android:layout_marginTop="@dimen/loading_screen_icon_vertical_margin"
+        android:layout_marginBottom="@dimen/loading_screen_icon_vertical_margin"
+        />
+
+    <android.support.v7.widget.AppCompatTextView
+        android:id="@+id/progressbar_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fadingEdge="horizontal"
+        android:singleLine="true"
+        android:text="@string/configuring_provider"
+        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+        android:layout_marginTop="@dimen/standard_margin"
+        android:layout_marginBottom="@dimen/standard_margin"
+        />
+
+    <ProgressBar
+        android:id="@+id/progressbar"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:layout_marginTop="@dimen/standard_margin"
+        />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/v_provider_credentials.xml b/app/src/main/res/layout/v_provider_credentials.xml
new file mode 100644
index 00000000..0bfdcc47
--- /dev/null
+++ b/app/src/main/res/layout/v_provider_credentials.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <android.support.v7.widget.AppCompatTextView
+        android:id="@+id/provider_credentials_user_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/TextAppearance.Design.Error"
+        android:visibility="gone"
+        android:linksClickable="true"
+        />
+
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/provider_credentials_username_error"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/auth_username"
+        app:errorEnabled="true"
+        android:layout_marginTop="@dimen/standard_margin"
+        >
+
+        <android.support.design.widget.TextInputEditText
+            android:id="@+id/provider_credentials_username"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="text" />
+
+    </android.support.design.widget.TextInputLayout>
+
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/provider_credentials_password_error"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:passwordToggleEnabled="true"
+        android:hint="@string/password"
+        app:errorEnabled="true">
+
+        <android.support.design.widget.TextInputEditText
+            android:id="@+id/provider_credentials_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword"
+            />
+
+    </android.support.design.widget.TextInputLayout>
+
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/provider_credentials_password_verification_error"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:passwordToggleEnabled="true"
+        android:hint="@string/password"
+        app:errorEnabled="true"
+        android:visibility="gone">
+
+        <android.support.design.widget.TextInputEditText
+            android:id="@+id/provider_credentials_password_verification"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword"
+            android:visibility="gone"
+            />
+
+    </android.support.design.widget.TextInputLayout>
+</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/v_provider_header.xml b/app/src/main/res/layout/v_provider_header.xml
new file mode 100644
index 00000000..6b08976c
--- /dev/null
+++ b/app/src/main/res/layout/v_provider_header.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
+
+    <android.support.v7.widget.AppCompatImageView
+        android:id="@+id/provider_header_logo"
+        android:layout_width="@dimen/bitmask_logo"
+        android:layout_height="@dimen/bitmask_logo"
+        android:adjustViewBounds="true"
+        app:srcCompat="@drawable/mask" />
+
+    <android.support.v7.widget.AppCompatTextView
+        android:id="@+id/provider_header_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text=""
+        android:textAppearance="@style/Base.TextAppearance.AppCompat.Headline"
+        android:layout_marginTop="@dimen/standard_margin"
+        android:layout_marginBottom="@dimen/standard_margin"
+        />
+
+</merge>
diff --git a/app/src/main/res/layout/v_provider_list_item.xml b/app/src/main/res/layout/v_provider_list_item.xml
new file mode 100644
index 00000000..1f0e135b
--- /dev/null
+++ b/app/src/main/res/layout/v_provider_list_item.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:paddingTop="2dip"
+    android:paddingBottom="2dip"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+>
+
+    <TextView android:id="@+id/provider_domain"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:layout_marginTop="6dip"
+        android:textAppearance="?android:attr/textAppearanceListItem"
+    />
+
+    <TextView android:id="@+id/provider_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+    />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/v_single_list_item.xml b/app/src/main/res/layout/v_single_list_item.xml
new file mode 100644
index 00000000..652cb693
--- /dev/null
+++ b/app/src/main/res/layout/v_single_list_item.xml
@@ -0,0 +1,12 @@
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceListItemSmall"
+    android:gravity="center_vertical"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/v_switch_list_item.xml b/app/src/main/res/layout/v_switch_list_item.xml
new file mode 100644
index 00000000..bdb9a74c
--- /dev/null
+++ b/app/src/main/res/layout/v_switch_list_item.xml
@@ -0,0 +1,15 @@
+<android.support.v7.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceListItemSmall"
+    android:gravity="center_vertical"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:checked="false"
+    tools:text="someOption" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/v_vpn_status.xml b/app/src/main/res/layout/v_vpn_status.xml
new file mode 100644
index 00000000..3b464b62
--- /dev/null
+++ b/app/src/main/res/layout/v_vpn_status.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/vpnstatus.xml b/app/src/main/res/layout/vpnstatus.xml
deleted file mode 100644
index 3b464b62..00000000
--- a/app/src/main/res/layout/vpnstatus.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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
-- 
cgit v1.2.3