implement basic UI for VPN tethering

3 files changed, 37 insertions, 44 deletions

diff --git a/app/src/main/res/layout/d_list_selection.xml b/app/src/main/res/layout/d_list_selection.xml
index a9a84c0e..ef963303 100644
--- a/app/src/main/res/layout/d_list_selection.xml
+++ b/app/src/main/res/layout/d_list_selection.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView     xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -18,46 +18,34 @@
             android:layout_marginTop="@dimen/add_button_margin"
             android:layout_marginLeft="@dimen/activity_horizontal_margin"
             android:layout_marginRight="@dimen/activity_horizontal_margin"
-            android:text="@string/always_on_vpn"
             android:textAllCaps="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:textStyle="bold"
             />
 
-        <se.leap.bitmaskclient.views.IconTextView
+        <android.support.v7.widget.AppCompatTextView
             android:id="@+id/user_message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/activity_horizontal_margin"
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginBottom="0dp"
-            android:autoLink="web"
-            tools:text="@string/always_on_vpn_user_message"
+            tools:text="@string/tethering_message"
             android:textSize="17sp"
             />
 
-        <android.support.v7.widget.AppCompatTextView
-            android:id="@+id/block_vpn_user_message"
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/selection_list_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:drawSelectorOnTop="false"
             android:layout_marginLeft="@dimen/activity_horizontal_margin"
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/standard_margin"
             android:layout_marginBottom="@dimen/standard_margin"
-            android:text="@string/always_on_blocking_vpn_user_message"
-            android:visibility="gone"
+            android:visibility="visible"
             tools:visibility="visible"
-            android:textSize="17sp"
             />
 
-
-        <CheckBox
-            android:id="@+id/do_not_show_again"
-            android:textAppearance="@style/TextAppearance.AppCompat"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/stdpadding"
-            android:text="@string/do_not_show_again" />
-
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index f6c9b2bb..505bd714 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -88,6 +88,16 @@
             android:visibility="gone"
             />
 
+
+        <se.leap.bitmaskclient.views.IconTextEntry
+            android:id="@+id/tethering"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:text="@string/tethering"
+            app:icon="@drawable/ic_access_point_36"
+            android:visibility="gone"
+            />
+
         <se.leap.bitmaskclient.views.IconTextEntry
             android:id="@+id/exclude_apps"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/v_icon_select_text_list_item.xml b/app/src/main/res/layout/v_icon_select_text_list_item.xml
index 64cc474a..2fa56b46 100644
--- a/app/src/main/res/layout/v_icon_select_text_list_item.xml
+++ b/app/src/main/res/layout/v_icon_select_text_list_item.xml
@@ -5,48 +5,43 @@
     android:orientation="horizontal"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <ImageView
+    <android.support.v7.widget.AppCompatImageView
         android:id="@+id/material_icon"
         android:layout_width="?android:attr/listPreferredItemHeightSmall"
         android:layout_height="?android:attr/listPreferredItemHeightSmall"
+        android:padding="6dp"
         android:layout_gravity="center"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-        tools:src="@drawable/ic_add_circle_outline_grey600_24dp"
+        tools:ignore="ContentDescription"
+        tools:src="@drawable/ic_bluetooth"
         />
+
     <TextView
         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:paddingStart="4dp"
+        android:paddingLeft="4dp"
+        android:paddingEnd="4dp"
+        android:paddingRight="4dp"
         android:minHeight="?android:attr/listPreferredItemHeightSmall"
         tools:text="TEST"
         android:layout_toEndOf="@id/material_icon"
         android:layout_toRightOf="@+id/material_icon"
-        android:layout_above="@+id/subtitle"
         />
 
-    <TextView
-        android:id="@+id/subtitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:layout_alignParentBottom="true"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-        android:paddingBottom="4dp"
-        tools:text="TEST"
-        android:visibility="gone"
-        android:layout_toEndOf="@id/material_icon"
-        android:layout_toRightOf="@+id/material_icon"
+    <android.support.v7.widget.AppCompatImageView
+        android:id="@+id/checked_icon"
+        android:layout_width="?android:attr/listPreferredItemHeightSmall"
+        android:layout_height="?android:attr/listPreferredItemHeightSmall"
+        android:layout_gravity="center"
+        android:padding="10dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        tools:src="@drawable/ic_check_bold"
+        android:visibility="visible"
+        tools:visibility="visible"
         />
 
     <View