40 files changed, 51 insertions, 134 deletions

diff --git a/app/src/main/res/drawable-hdpi/ic_settings.png b/app/src/main/res/drawable-hdpi/ic_settings.png
new file mode 100644
index 00000000..d3322976
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_settings.png
diff --git a/app/src/main/res/drawable-ldpi/ic_settings.png b/app/src/main/res/drawable-ldpi/ic_settings.png
new file mode 100644
index 00000000..2fe03464
--- /dev/null
+++ b/app/src/main/res/drawable-ldpi/ic_settings.png
diff --git a/app/src/main/res/drawable-mdpi/ic_settings.png b/app/src/main/res/drawable-mdpi/ic_settings.png
new file mode 100644
index 00000000..b5988be9
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_settings.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings.png b/app/src/main/res/drawable-xhdpi/ic_settings.png
new file mode 100644
index 00000000..d5959bd9
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_settings.png
diff --git a/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml b/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml
index 0cbb08f6..1d689db6 100644
--- a/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml
+++ b/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml
@@ -58,7 +58,7 @@
         app:layout_constraintWidth_min="731dp"
         >
 
-        <include layout="@layout/loading_screen" />
+        <include layout="@layout/v_loading_screen" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -67,7 +67,7 @@
             android:orientation="vertical">
 
             <include
-                layout="@layout/provider_header"
+                layout="@layout/v_provider_header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
@@ -83,7 +83,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-sw600dp-port/a_provider_detail.xml b/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml
index bdafa45a..6d7c97ae 100644
--- a/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml
+++ b/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml
@@ -58,7 +58,7 @@
         app:layout_constraintTop_toTopOf="@+id/guideline_top"
         app:layout_constraintWidth_min="731dp">
 
-        <include layout="@layout/loading_screen" />
+        <include layout="@layout/v_loading_screen" />
 
         <LinearLayout
             android:id="@+id/content"
@@ -67,7 +67,7 @@
             android:layout_height="wrap_content">
 
             <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-sw600dp-port/provider_list_activity.xml b/app/src/main/res/layout-sw600dp-port/a_provider_list.xml
index f02398c5..818ce864 100644
--- a/app/src/main/res/layout-sw600dp-port/provider_list_activity.xml
+++ b/app/src/main/res/layout-sw600dp-port/a_provider_list.xml
@@ -58,7 +58,7 @@
         app:layout_constraintTop_toTopOf="@+id/guideline_top"
         app:layout_constraintWidth_min="731dp">
 
-        <include layout="@layout/loading_screen" />
+        <include layout="@layout/v_loading_screen" />
 
         <LinearLayout
             android:id="@+id/content"
@@ -66,7 +66,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <include layout="@layout/provider_header"
+            <include layout="@layout/v_provider_header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout-sw600dp-port/f_log.xml b/app/src/main/res/layout-sw600dp-port/f_log.xml
index 78dc4c62..ebadeb74 100644
--- a/app/src/main/res/layout-sw600dp-port/f_log.xml
+++ b/app/src/main/res/layout-sw600dp-port/f_log.xml
@@ -22,7 +22,7 @@
 
         <include layout="@layout/f_log_sliders"/>
 
-        <include layout="@layout/vpnstatus"/>
+        <include layout="@layout/v_vpn_status"/>
     </LinearLayout>
 
     <ListView
diff --git a/app/src/main/res/layout-sw600dp/f_log.xml b/app/src/main/res/layout-sw600dp/f_log.xml
index 34daf8be..b014ee9d 100644
--- a/app/src/main/res/layout-sw600dp/f_log.xml
+++ b/app/src/main/res/layout-sw600dp/f_log.xml
@@ -22,7 +22,7 @@
 
         <include layout="@layout/f_log_sliders"/>
 
-        <include layout="@layout/vpnstatus"/>
+        <include layout="@layout/v_vpn_status"/>
     </LinearLayout>
 
     <ListView
diff --git a/app/src/main/res/layout-xlarge/a_provider_credentials.xml b/app/src/main/res/layout-xlarge/a_provider_credentials.xml
index 2184aeb8..79045082 100644
--- a/app/src/main/res/layout-xlarge/a_provider_credentials.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_credentials.xml
@@ -57,7 +57,7 @@
         app:layout_constraintTop_toTopOf="@+id/guideline_top"
         app:layout_constraintWidth_min="731dp">
 
-        <include layout="@layout/loading_screen" />
+        <include layout="@layout/v_loading_screen" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -66,7 +66,7 @@
             android:orientation="vertical">
 
             <include
-                layout="@layout/provider_header"
+                layout="@layout/v_provider_header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
@@ -82,7 +82,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-xlarge/a_provider_detail.xml b/app/src/main/res/layout-xlarge/a_provider_detail.xml
index 18098079..c1eeb0e0 100644
--- a/app/src/main/res/layout-xlarge/a_provider_detail.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_detail.xml
@@ -58,7 +58,7 @@
         app:layout_constraintTop_toTopOf="@+id/guideline_top"
         app:layout_constraintWidth_min="731dp">
 
-        <include layout="@layout/loading_screen" />
+        <include layout="@layout/v_loading_screen" />
 
         <LinearLayout
             android:id="@+id/content"
@@ -67,7 +67,7 @@
             android:layout_height="wrap_content">
 
             <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-xlarge/provider_list_activity.xml b/app/src/main/res/layout-xlarge/a_provider_list.xml
index cdffc24e..9150466a 100644
--- a/app/src/main/res/layout-xlarge/provider_list_activity.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_list.xml
@@ -58,7 +58,7 @@
         app:layout_constraintTop_toTopOf="@+id/guideline_top"
         app:layout_constraintWidth_min="731dp">
 
-        <include layout="@layout/loading_screen" />
+        <include layout="@layout/v_loading_screen" />
 
         <LinearLayout
             android:id="@+id/content"
@@ -66,7 +66,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <include layout="@layout/provider_header"
+            <include layout="@layout/v_provider_header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout-xlarge/about.xml b/app/src/main/res/layout-xlarge/f_about.xml
index c7896917..c7896917 100644
--- a/app/src/main/res/layout-xlarge/about.xml
+++ b/app/src/main/res/layout-xlarge/f_about.xml
diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/f_eip.xml
index 2326ffe8..2326ffe8 100644
--- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml
+++ b/app/src/main/res/layout-xlarge/f_eip.xml
diff --git a/app/src/main/res/layout-xlarge/session_dialog.xml b/app/src/main/res/layout-xlarge/session_dialog.xml
deleted file mode 100644
index 3a9eebb8..00000000
--- a/app/src/main/res/layout-xlarge/session_dialog.xml
+++ /dev/null
@@ -1,39 +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=".LogInDialog" >
-
-    <TextView
-        android:id="@+id/user_message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        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: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: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-xlarge/loading_screen.xml b/app/src/main/res/layout-xlarge/v_loading_screen.xml
index 2af6b411..2af6b411 100644
--- a/app/src/main/res/layout-xlarge/loading_screen.xml
+++ b/app/src/main/res/layout-xlarge/v_loading_screen.xml
diff --git a/app/src/main/res/layout-xlarge/provider_header.xml b/app/src/main/res/layout-xlarge/v_provider_header.xml
index 45f8302b..45f8302b 100644
--- a/app/src/main/res/layout-xlarge/provider_header.xml
+++ b/app/src/main/res/layout-xlarge/v_provider_header.xml
diff --git a/app/src/main/res/layout-xlarge/provider_list_item.xml b/app/src/main/res/layout-xlarge/v_provider_list_item.xml
index ec1e1242..ec1e1242 100644
--- a/app/src/main/res/layout-xlarge/provider_list_item.xml
+++ b/app/src/main/res/layout-xlarge/v_provider_list_item.xml
diff --git a/app/src/main/res/layout-xlarge/single_list_item.xml b/app/src/main/res/layout-xlarge/v_single_list_item.xml
index ad3de093..ad3de093 100644
--- a/app/src/main/res/layout-xlarge/single_list_item.xml
+++ b/app/src/main/res/layout-xlarge/v_single_list_item.xml
diff --git a/app/src/main/res/layout-xlarge/vpnstatus.xml b/app/src/main/res/layout-xlarge/v_vpn_status.xml
index 3b464b62..3b464b62 100644
--- a/app/src/main/res/layout-xlarge/vpnstatus.xml
+++ b/app/src/main/res/layout-xlarge/v_vpn_status.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/a_main.xml
index de06efc7..bed05d18 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/a_main.xml
@@ -37,6 +37,6 @@
         android:layout_width="@dimen/navigation_drawer_width"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        tools:layout="@layout/drawer_main" />
+        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/provider_list_activity.xml b/app/src/main/res/layout/a_provider_list.xml
index 6c5281b8..aa8cdfbb 100644
--- a/app/src/main/res/layout/provider_list_activity.xml
+++ b/app/src/main/res/layout/a_provider_list.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"
@@ -15,7 +15,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <include layout="@layout/provider_header" />
+        <include layout="@layout/v_provider_header" />
 
         <ListView
             android:id="@+id/provider_list"
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/about.xml b/app/src/main/res/layout/f_about.xml
index aba51141..aba51141 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/f_about.xml
diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index 54614f3f..54614f3f 100644
--- a/app/src/main/res/layout/drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/f_eip.xml
index e220bf16..e220bf16 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/f_eip.xml
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/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/custom_notification_layout.xml b/app/src/main/res/layout/v_custom_notification.xml
index e97fcbe2..e97fcbe2 100644
--- a/app/src/main/res/layout/custom_notification_layout.xml
+++ b/app/src/main/res/layout/v_custom_notification.xml
diff --git a/app/src/main/res/layout/loading_screen.xml b/app/src/main/res/layout/v_loading_screen.xml
index f4c7eb95..f4c7eb95 100644
--- a/app/src/main/res/layout/loading_screen.xml
+++ b/app/src/main/res/layout/v_loading_screen.xml
diff --git a/app/src/main/res/layout/provider_credentials.xml b/app/src/main/res/layout/v_provider_credentials.xml
index 0bfdcc47..0bfdcc47 100644
--- a/app/src/main/res/layout/provider_credentials.xml
+++ b/app/src/main/res/layout/v_provider_credentials.xml
diff --git a/app/src/main/res/layout/provider_header.xml b/app/src/main/res/layout/v_provider_header.xml
index 6b08976c..6b08976c 100644
--- a/app/src/main/res/layout/provider_header.xml
+++ b/app/src/main/res/layout/v_provider_header.xml
diff --git a/app/src/main/res/layout/provider_list_item.xml b/app/src/main/res/layout/v_provider_list_item.xml
index 1f0e135b..1f0e135b 100644
--- a/app/src/main/res/layout/provider_list_item.xml
+++ b/app/src/main/res/layout/v_provider_list_item.xml
diff --git a/app/src/main/res/layout/single_list_item.xml b/app/src/main/res/layout/v_single_list_item.xml
index 652cb693..652cb693 100644
--- a/app/src/main/res/layout/single_list_item.xml
+++ b/app/src/main/res/layout/v_single_list_item.xml
diff --git a/app/src/main/res/layout/switch_list_item.xml b/app/src/main/res/layout/v_switch_list_item.xml
index bdb9a74c..bdb9a74c 100644
--- a/app/src/main/res/layout/switch_list_item.xml
+++ b/app/src/main/res/layout/v_switch_list_item.xml
diff --git a/app/src/main/res/layout/vpnstatus.xml b/app/src/main/res/layout/v_vpn_status.xml
index 3b464b62..3b464b62 100644
--- a/app/src/main/res/layout/vpnstatus.xml
+++ b/app/src/main/res/layout/v_vpn_status.xml
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
deleted file mode 100644
index 56f43959..00000000
--- a/app/src/main/res/menu/main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="se.leap.bitmaskclient.MainActivity">
-    <item
-        android:id="@+id/action_example"
-        android:showAsAction="withText|ifRoom"
-        android:title="@string/action_example" />
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings" />
-</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 71b6d437..a308b5e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -110,4 +110,7 @@
   <string name="vpn_certificate_user_message">The VPN certificate is invalid. Please log in to download a new one.</string>
   <string name="save_battery">Save battery</string>
   <string name="save_battery_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string>
+  <string name="always_on_vpn">Always-on VPN</string>
+  <string name="do_not_show_again">Do not show again.</string>
+  <string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon [img src] and turn the switch on."</string>
 </resources>