From 0157b7b54f864258ae437c3566fe2cb74f0da61e Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 1 Jan 2020 21:24:50 +0100
Subject: add new icons for tethering

---
 .../main/res/drawable-hdpi/ic_access_point_36.png  | Bin 0 -> 2246 bytes
 app/src/main/res/drawable-hdpi/ic_bluetooth.png    | Bin 0 -> 1043 bytes
 app/src/main/res/drawable-hdpi/ic_check_bold.png   | Bin 0 -> 808 bytes
 app/src/main/res/drawable-hdpi/ic_usb.png          | Bin 0 -> 1000 bytes
 app/src/main/res/drawable-hdpi/ic_wifi.png         | Bin 0 -> 1496 bytes
 app/src/main/res/drawable-ldpi/ic_bluetooth.png    | Bin 0 -> 797 bytes
 app/src/main/res/drawable-ldpi/ic_check_bold.png   | Bin 0 -> 652 bytes
 app/src/main/res/drawable-ldpi/ic_usb.png          | Bin 0 -> 644 bytes
 app/src/main/res/drawable-ldpi/ic_wifi.png         | Bin 0 -> 881 bytes
 .../main/res/drawable-mdpi/ic_access_point_36.png  | Bin 0 -> 1301 bytes
 app/src/main/res/drawable-mdpi/ic_bluetooth.png    | Bin 0 -> 980 bytes
 app/src/main/res/drawable-mdpi/ic_check_bold.png   | Bin 0 -> 725 bytes
 app/src/main/res/drawable-mdpi/ic_usb.png          | Bin 0 -> 859 bytes
 app/src/main/res/drawable-mdpi/ic_wifi.png         | Bin 0 -> 1123 bytes
 .../main/res/drawable-xhdpi/ic_access_point_36.png | Bin 0 -> 2878 bytes
 app/src/main/res/drawable-xhdpi/ic_bluetooth.png   | Bin 0 -> 1300 bytes
 app/src/main/res/drawable-xhdpi/ic_check_bold.png  | Bin 0 -> 900 bytes
 app/src/main/res/drawable-xhdpi/ic_usb.png         | Bin 0 -> 1397 bytes
 app/src/main/res/drawable-xhdpi/ic_wifi.png        | Bin 0 -> 1894 bytes
 app/src/main/res/drawable-xxhdpi/ic_bluetooth.png  | Bin 0 -> 1805 bytes
 app/src/main/res/drawable-xxhdpi/ic_check_bold.png | Bin 0 -> 1212 bytes
 app/src/main/res/drawable-xxhdpi/ic_usb.png        | Bin 0 -> 1707 bytes
 app/src/main/res/drawable-xxhdpi/ic_wifi.png       | Bin 0 -> 2639 bytes
 .../res/drawable-xxxhdpi/ic_access_point_36.png    | Bin 0 -> 5906 bytes
 app/src/main/res/drawable-xxxhdpi/ic_bluetooth.png | Bin 0 -> 2138 bytes
 .../main/res/drawable-xxxhdpi/ic_check_bold.png    | Bin 0 -> 1494 bytes
 app/src/main/res/drawable-xxxhdpi/ic_usb.png       | Bin 0 -> 2359 bytes
 app/src/main/res/drawable-xxxhdpi/ic_wifi.png      | Bin 0 -> 3399 bytes
 app/src/main/res/layout/d_list_selection.xml       |  63 +++++++++++++++++++++
 .../res/layout/v_icon_select_text_list_item.xml    |  58 +++++++++++++++++++
 30 files changed, 121 insertions(+)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_access_point_36.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_bluetooth.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_check_bold.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_usb.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_wifi.png
 create mode 100644 app/src/main/res/drawable-ldpi/ic_bluetooth.png
 create mode 100644 app/src/main/res/drawable-ldpi/ic_check_bold.png
 create mode 100644 app/src/main/res/drawable-ldpi/ic_usb.png
 create mode 100644 app/src/main/res/drawable-ldpi/ic_wifi.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_access_point_36.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_bluetooth.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_check_bold.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_usb.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_wifi.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_access_point_36.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_bluetooth.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_check_bold.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_usb.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_wifi.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_bluetooth.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_check_bold.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_usb.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_wifi.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_access_point_36.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_bluetooth.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_check_bold.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_usb.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_wifi.png
 create mode 100644 app/src/main/res/layout/d_list_selection.xml
 create mode 100644 app/src/main/res/layout/v_icon_select_text_list_item.xml

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

diff --git a/app/src/main/res/drawable-hdpi/ic_access_point_36.png b/app/src/main/res/drawable-hdpi/ic_access_point_36.png
new file mode 100644
index 00000000..03444d0f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_access_point_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_bluetooth.png b/app/src/main/res/drawable-hdpi/ic_bluetooth.png
new file mode 100644
index 00000000..e7c1589b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_bluetooth.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_check_bold.png b/app/src/main/res/drawable-hdpi/ic_check_bold.png
new file mode 100644
index 00000000..28418346
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_check_bold.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_usb.png b/app/src/main/res/drawable-hdpi/ic_usb.png
new file mode 100644
index 00000000..b9de586f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_usb.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_wifi.png b/app/src/main/res/drawable-hdpi/ic_wifi.png
new file mode 100644
index 00000000..ca6b94a3
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_wifi.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_bluetooth.png b/app/src/main/res/drawable-ldpi/ic_bluetooth.png
new file mode 100644
index 00000000..3a73c82f
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_bluetooth.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_check_bold.png b/app/src/main/res/drawable-ldpi/ic_check_bold.png
new file mode 100644
index 00000000..4f765ed4
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_check_bold.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_usb.png b/app/src/main/res/drawable-ldpi/ic_usb.png
new file mode 100644
index 00000000..d48d2f50
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_usb.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_wifi.png b/app/src/main/res/drawable-ldpi/ic_wifi.png
new file mode 100644
index 00000000..56ad6403
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_wifi.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_access_point_36.png b/app/src/main/res/drawable-mdpi/ic_access_point_36.png
new file mode 100644
index 00000000..c461a0a5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_access_point_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_bluetooth.png b/app/src/main/res/drawable-mdpi/ic_bluetooth.png
new file mode 100644
index 00000000..a1cecd2b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_bluetooth.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_check_bold.png b/app/src/main/res/drawable-mdpi/ic_check_bold.png
new file mode 100644
index 00000000..872ef957
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_check_bold.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_usb.png b/app/src/main/res/drawable-mdpi/ic_usb.png
new file mode 100644
index 00000000..3ad5ebc1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_usb.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_wifi.png b/app/src/main/res/drawable-mdpi/ic_wifi.png
new file mode 100644
index 00000000..21a69023
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_wifi.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_access_point_36.png b/app/src/main/res/drawable-xhdpi/ic_access_point_36.png
new file mode 100644
index 00000000..4ae3d1d9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_access_point_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_bluetooth.png b/app/src/main/res/drawable-xhdpi/ic_bluetooth.png
new file mode 100644
index 00000000..32a854e5
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_bluetooth.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_check_bold.png b/app/src/main/res/drawable-xhdpi/ic_check_bold.png
new file mode 100644
index 00000000..da6a1ecb
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_check_bold.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_usb.png b/app/src/main/res/drawable-xhdpi/ic_usb.png
new file mode 100644
index 00000000..c11940b1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_usb.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_wifi.png b/app/src/main/res/drawable-xhdpi/ic_wifi.png
new file mode 100644
index 00000000..cf1bb909
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_wifi.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bluetooth.png b/app/src/main/res/drawable-xxhdpi/ic_bluetooth.png
new file mode 100644
index 00000000..9c30e5b4
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_bluetooth.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_check_bold.png b/app/src/main/res/drawable-xxhdpi/ic_check_bold.png
new file mode 100644
index 00000000..f6b50706
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_check_bold.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_usb.png b/app/src/main/res/drawable-xxhdpi/ic_usb.png
new file mode 100644
index 00000000..c78e33af
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_usb.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_wifi.png b/app/src/main/res/drawable-xxhdpi/ic_wifi.png
new file mode 100644
index 00000000..ea9e08a9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_wifi.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_access_point_36.png b/app/src/main/res/drawable-xxxhdpi/ic_access_point_36.png
new file mode 100644
index 00000000..4a2f25c1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_access_point_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bluetooth.png b/app/src/main/res/drawable-xxxhdpi/ic_bluetooth.png
new file mode 100644
index 00000000..6eccbbd6
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_bluetooth.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_check_bold.png b/app/src/main/res/drawable-xxxhdpi/ic_check_bold.png
new file mode 100644
index 00000000..19029a0d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_check_bold.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_usb.png b/app/src/main/res/drawable-xxxhdpi/ic_usb.png
new file mode 100644
index 00000000..4bebd840
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_usb.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_wifi.png b/app/src/main/res/drawable-xxxhdpi/ic_wifi.png
new file mode 100644
index 00000000..b5a05f7a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_wifi.png differ
diff --git a/app/src/main/res/layout/d_list_selection.xml b/app/src/main/res/layout/d_list_selection.xml
new file mode 100644
index 00000000..a9a84c0e
--- /dev/null
+++ b/app/src/main/res/layout/d_list_selection.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="vertical">
+
+        <android.support.v7.widget.AppCompatTextView
+            android:id="@+id/tvTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/standard_margin"
+            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: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"
+            android:textSize="17sp"
+            />
+
+        <android.support.v7.widget.AppCompatTextView
+            android:id="@+id/block_vpn_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_marginTop="@dimen/standard_margin"
+            android:layout_marginBottom="@dimen/standard_margin"
+            android:text="@string/always_on_blocking_vpn_user_message"
+            android:visibility="gone"
+            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/v_icon_select_text_list_item.xml b/app/src/main/res/layout/v_icon_select_text_list_item.xml
new file mode 100644
index 00000000..64cc474a
--- /dev/null
+++ b/app/src/main/res/layout/v_icon_select_text_list_item.xml
@@ -0,0 +1,58 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/item_container"
+    android:layout_height="?android:attr/listPreferredItemHeightSmall"
+    android:layout_width="match_parent"
+    android:orientation="horizontal"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <ImageView
+        android:id="@+id/material_icon"
+        android:layout_width="?android:attr/listPreferredItemHeightSmall"
+        android:layout_height="?android:attr/listPreferredItemHeightSmall"
+        android:layout_gravity="center"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        tools:src="@drawable/ic_add_circle_outline_grey600_24dp"
+        />
+    <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: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"
+        />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@android:color/darker_gray"
+        android:layout_alignParentBottom="true"
+        />
+</RelativeLayout>
-- 
cgit v1.2.3


From 87bdccc31f5fcd10e697d30225105ca40114582c Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 2 Jan 2020 22:57:50 +0100
Subject: add new strings for tethering

---
 app/src/main/res/values/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b52e34dd..f8e6b887 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -105,6 +105,14 @@
   <string name="save_battery_message">Background data connections will hibernate when your phone is inactive.</string>
   <string name="always_on_vpn">Always-on VPN</string>
   <string name="subtitle_always_on_vpn">Open Android System Settings</string>
+  <string name="tethering">VPN Hotspot</string>
+  <string name="subtitle_tethering">Share your VPN</string>
+  <string name="tethering_enabled_message">Please make sure that you have enabled tethering in the %s first!</string>
+  <string name="tethering_system_settings">system settings</string>
+  <string name="tethering_message">Share your VPN with other devices via:</string>
+  <string name="tethering_wifi">Wifi hotspot</string>
+  <string name="tethering_usb">USB tethering</string>
+  <string name="tethering_bluetooth">Bluetooth tethering</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>
   <string name="always_on_blocking_vpn_user_message">To protect your privacy optimally, you should also activate the option \"Block connections without VPN\".</string>
-- 
cgit v1.2.3


From 921ee995ef0f0e7f2076ac3538fed289bcb82ba9 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 2 Jan 2020 23:06:36 +0100
Subject: implement basic UI for VPN tethering

---
 app/src/main/res/layout/d_list_selection.xml       | 26 ++++---------
 app/src/main/res/layout/f_drawer_main.xml          | 10 +++++
 .../res/layout/v_icon_select_text_list_item.xml    | 45 ++++++++++------------
 3 files changed, 37 insertions(+), 44 deletions(-)

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

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
-- 
cgit v1.2.3


From 47f463122392963d81c3e12c7ffbb0443bead6ce Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Fri, 31 Jan 2020 17:59:46 -0600
Subject: add UI in navigation drawer to enable/disable ipv6 firewall and to
 show/hide experimental features

---
 app/src/main/res/layout/f_drawer_main.xml | 41 +++++++++++++++++++++++++------
 app/src/main/res/values/strings.xml       |  7 ++++--
 2 files changed, 39 insertions(+), 9 deletions(-)

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

diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index 505bd714..191d547f 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -88,29 +88,56 @@
             android:visibility="gone"
             />
 
-
         <se.leap.bitmaskclient.views.IconTextEntry
-            android:id="@+id/tethering"
+            android:id="@+id/exclude_apps"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:text="@string/tethering"
-            app:icon="@drawable/ic_access_point_36"
+            app:text="@string/exclude_apps_fragment_title"
+            app:icon="@drawable/ic_shield_remove_grey600_36dp"
             android:visibility="gone"
             />
 
+        <TextView
+            android:id="@+id/show_experimental_features"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/show_experimental"
+            android:textColor="@color/colorPrimaryDark"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp"
+            android:gravity="center"
+            android:background="@color/black800_high_transparent"
+            />
+
+        <se.leap.bitmaskclient.views.IconSwitchEntry
+            android:id="@+id/enableIPv6Firewall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:text="@string/ipv6Firewall"
+            app:subtitle="@string/require_root"
+            app:icon="@drawable/ic_cancel"
+            android:visibility="gone"
+            tools:visibility="visible"
+            />
+
         <se.leap.bitmaskclient.views.IconTextEntry
-            android:id="@+id/exclude_apps"
+            android:id="@+id/tethering"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:text="@string/exclude_apps_fragment_title"
-            app:icon="@drawable/ic_shield_remove_grey600_36dp"
+            app:text="@string/tethering"
+            app:subtitle="@string/require_root"
+            app:icon="@drawable/ic_access_point_36"
             android:visibility="gone"
+            tools:visibility="visible"
             />
 
         <View
+            android:id="@+id/experimental_features_footer"
             android:layout_width="match_parent"
             android:layout_height="20dp"
             android:background="@color/black800_high_transparent"
+            android:visibility="gone"
+            tools:visibility="visible"
             />
 
         <se.leap.bitmaskclient.views.IconTextEntry
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f8e6b887..9b6f3125 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -106,8 +106,11 @@
   <string name="always_on_vpn">Always-on VPN</string>
   <string name="subtitle_always_on_vpn">Open Android System Settings</string>
   <string name="tethering">VPN Hotspot</string>
-  <string name="subtitle_tethering">Share your VPN</string>
-  <string name="tethering_enabled_message">Please make sure that you have enabled tethering in the %s first!</string>
+  <string name="ipv6Firewall">Firewall</string>
+  <string name="require_root">Requires root permissions</string>
+  <string name="show_experimental">Show experimental options</string>
+  <string name="hide_experimental">Hide experimental options</string>
+  <string name="tethering_enabled_message">Please make sure to enable tethering in the %s first!</string>
   <string name="tethering_system_settings">system settings</string>
   <string name="tethering_message">Share your VPN with other devices via:</string>
   <string name="tethering_wifi">Wifi hotspot</string>
-- 
cgit v1.2.3


From 7ebd5e9135709ec6785cb60f4bad02094ea4cb62 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Fri, 31 Jan 2020 18:23:12 -0600
Subject: add missing icons

---
 app/src/main/res/drawable-hdpi/ic_cancel.png    | Bin 0 -> 1780 bytes
 app/src/main/res/drawable-ldpi/ic_cancel.png    | Bin 0 -> 967 bytes
 app/src/main/res/drawable-mdpi/ic_cancel.png    | Bin 0 -> 1288 bytes
 app/src/main/res/drawable-xhdpi/ic_cancel.png   | Bin 0 -> 2264 bytes
 app/src/main/res/drawable-xxhdpi/ic_cancel.png  | Bin 0 -> 3290 bytes
 app/src/main/res/drawable-xxxhdpi/ic_cancel.png | Bin 0 -> 4551 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_cancel.png
 create mode 100644 app/src/main/res/drawable-ldpi/ic_cancel.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_cancel.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_cancel.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_cancel.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_cancel.png

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

diff --git a/app/src/main/res/drawable-hdpi/ic_cancel.png b/app/src/main/res/drawable-hdpi/ic_cancel.png
new file mode 100644
index 00000000..579b1dff
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_cancel.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_cancel.png b/app/src/main/res/drawable-ldpi/ic_cancel.png
new file mode 100644
index 00000000..a396f18e
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_cancel.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_cancel.png b/app/src/main/res/drawable-mdpi/ic_cancel.png
new file mode 100644
index 00000000..125c82f1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_cancel.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_cancel.png b/app/src/main/res/drawable-xhdpi/ic_cancel.png
new file mode 100644
index 00000000..aac09d65
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_cancel.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_cancel.png b/app/src/main/res/drawable-xxhdpi/ic_cancel.png
new file mode 100644
index 00000000..1e9bce6c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_cancel.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cancel.png b/app/src/main/res/drawable-xxxhdpi/ic_cancel.png
new file mode 100644
index 00000000..4ef00efc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_cancel.png differ
-- 
cgit v1.2.3


From 9a4f9c7ae3cf070ef08bff6abcc0a8d7bae52202 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Fri, 31 Jan 2020 19:10:09 -0600
Subject: improve wording for IPv6 Firewall

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9b6f3125..b5fc2fa2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -106,7 +106,7 @@
   <string name="always_on_vpn">Always-on VPN</string>
   <string name="subtitle_always_on_vpn">Open Android System Settings</string>
   <string name="tethering">VPN Hotspot</string>
-  <string name="ipv6Firewall">Firewall</string>
+  <string name="ipv6Firewall">Block IPv6</string>
   <string name="require_root">Requires root permissions</string>
   <string name="show_experimental">Show experimental options</string>
   <string name="hide_experimental">Hide experimental options</string>
-- 
cgit v1.2.3