chore: bootstrap censorship circumvention fragment.

2 files changed, 98 insertions, 31 deletions

diff --git a/app/src/main/res/layout/f_censorship_circumvention.xml b/app/src/main/res/layout/f_censorship_circumvention.xml
new file mode 100644
index 00000000..907b3b02
--- /dev/null
+++ b/app/src/main/res/layout/f_censorship_circumvention.xml
@@ -0,0 +1,65 @@
+<?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="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:padding="@dimen/activity_margin"
+    tools:context=".base.fragments.CensorshipCircumventionFragment">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/censorship_circumvention_description" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/discovery"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/activity_margin"
+        android:text="@string/discovery"
+        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/stdpadding"
+        android:text="@string/discovery_description" />
+
+    <RadioGroup
+        android:id="@+id/discovery_radioGroup"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/stdpadding"/>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tunnelling"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/activity_margin"
+        android:text="@string/tunnelling"
+        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/stdpadding"
+        android:text="@string/tunnelling_description" />
+
+    <RadioGroup
+        android:id="@+id/tunneling_radioGroup"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/stdpadding"/>
+
+    <se.leap.bitmaskclient.base.views.IconSwitchEntry
+        android:id="@+id/port_hopping_switch"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/stdpadding"
+        app:text="@string/port_hopping"
+        app:subtitle="\n"
+        app:singleLine="false" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/f_settings.xml b/app/src/main/res/layout/f_settings.xml
index 3ce19797..70b43dbb 100644
--- a/app/src/main/res/layout/f_settings.xml
+++ b/app/src/main/res/layout/f_settings.xml
@@ -5,8 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:padding="@dimen/stdpadding"
-    tools:viewBindingIgnore="true">
+    android:padding="@dimen/stdpadding">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -20,6 +19,15 @@
             android:text="@string/vpn_settings"
             />
 
+        <se.leap.bitmaskclient.base.views.IconSwitchEntry
+            android:id="@+id/prefer_udp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:text="@string/prefer_udp"
+            app:subtitle="@string/prefer_udp_subtitle"
+            app:icon="@drawable/ic_multiple_stop"
+            app:singleLine="false" />
+
         <se.leap.bitmaskclient.base.views.IconTextEntry
             android:id="@+id/always_on_vpn"
             android:layout_width="match_parent"
@@ -27,8 +35,7 @@
             app:text="@string/always_on_vpn"
             app:subtitle="@string/subtitle_always_on_vpn"
             app:icon="@drawable/ic_always_on_36"
-            android:visibility="visible"
-            />
+            android:visibility="visible" />
 
         <se.leap.bitmaskclient.base.views.IconTextEntry
             android:id="@+id/exclude_apps"
@@ -36,18 +43,7 @@
             android:layout_height="wrap_content"
             app:text="@string/exclude_apps_fragment_title"
             app:icon="@drawable/ic_shield_remove_grey600_36dp"
-            android:visibility="visible"
-            />
-
-        <se.leap.bitmaskclient.base.views.IconSwitchEntry
-            android:id="@+id/prefer_udp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:text="@string/prefer_udp"
-            app:subtitle="@string/prefer_udp_subtitle"
-            app:icon="@drawable/ic_multiple_stop"
-            app:singleLine="false"
-            />
+            android:visibility="visible" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/circumvention_header"
@@ -55,28 +51,34 @@
             android:layout_height="wrap_content"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:text="@string/censorship_circumvention"
-            android:paddingTop="@dimen/activity_margin"
-            />
+            android:paddingTop="@dimen/activity_margin" />
+
         <se.leap.bitmaskclient.base.views.IconSwitchEntry
-            android:id="@+id/bridges_switch"
+            android:id="@+id/bridge_automatic_switch"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:text="@string/nav_drawer_obfuscated_connection"
-            app:subtitle="@string/nav_drawer_subtitle_obfuscated_connection"
-            app:icon="@drawable/ic_bridge_36"
-            app:singleLine="false"
-            />
+            app:text="@string/automatic_bridge"
+            app:subtitle="@string/automatic_bridge_description"
+            app:icon="@drawable/bridge_automatic"
+            app:singleLine="false" />
 
         <se.leap.bitmaskclient.base.views.IconSwitchEntry
-            android:id="@+id/snowflake_switch"
+            android:id="@+id/bridge_manual_switch"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:icon="@drawable/ic_snowflake"
-            app:text="@string/use_snowflake"
-            app:subtitle="@string/snowflake_description"
-            app:singleLine="false"
-            android:visibility="gone"
-            />
+            app:text="@string/manual_bridge"
+            app:subtitle="@string/manual_bridge_description"
+            app:icon="@drawable/bridge_manual"
+            app:singleLine="false" />
+
+        <se.leap.bitmaskclient.base.views.IconSwitchEntry
+            android:id="@+id/bridges_switch"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:text="@string/nav_drawer_obfuscated_connection"
+            app:subtitle="@string/nav_drawer_subtitle_obfuscated_connection"
+            app:icon="@drawable/ic_bridge_36"
+            app:singleLine="false" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/experimental_header"