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