summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/d_obfuscation_proxy.xml129
-rw-r--r--app/src/main/res/layout/f_settings.xml3
2 files changed, 131 insertions, 1 deletions
diff --git a/app/src/main/res/layout/d_obfuscation_proxy.xml b/app/src/main/res/layout/d_obfuscation_proxy.xml
new file mode 100644
index 00000000..e8f61ebd
--- /dev/null
+++ b/app/src/main/res/layout/d_obfuscation_proxy.xml
@@ -0,0 +1,129 @@
+<?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="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:scrollbars="none">
+ <androidx.appcompat.widget.LinearLayoutCompat
+ android:orientation = "vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:padding="@dimen/activity_margin"
+ >
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Obfuscation Proxy Pinning"
+ android:textStyle="bold"
+ android:gravity="center_horizontal"
+ android:textAppearance="@android:style/TextAppearance.Large"
+ />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Proxy IP"
+ android:paddingTop="@dimen/activity_margin"
+ android:textStyle="bold"
+ android:textAppearance="@android:style/TextAppearance.DeviceDefault" />
+ <androidx.appcompat.widget.AppCompatEditText
+ android:id="@+id/ip_field"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Proxy Port"
+ android:paddingTop="@dimen/activity_margin"
+ android:textStyle="bold"
+ android:textAppearance="@android:style/TextAppearance.DeviceDefault"
+
+ />
+ <androidx.appcompat.widget.AppCompatEditText
+ android:id="@+id/port_field"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Certificate"
+ android:textStyle="bold"
+ android:paddingTop="@dimen/activity_margin"
+ android:textAppearance="@android:style/TextAppearance.DeviceDefault" />
+ <androidx.appcompat.widget.AppCompatEditText
+ android:id="@+id/cert_field"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Gateway Host Name"
+ android:textStyle="bold"
+ android:paddingTop="@dimen/activity_margin"
+ android:textAppearance="@android:style/TextAppearance.DeviceDefault" />
+ <!--<androidx.appcompat.widget.AppCompatEditText
+ android:id="@+id/gateway_ip_field"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>-->
+ <androidx.appcompat.widget.AppCompatSpinner
+ android:id="@+id/gateway_host"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ />
+
+ <se.leap.bitmaskclient.base.views.IconSwitchEntry
+ android:id="@+id/kcp_switch"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:text="KCP"
+ app:subtitle="UDP based network protocol"
+ app:icon="@drawable/ic_multiple_stop"
+ >
+
+ </se.leap.bitmaskclient.base.views.IconSwitchEntry>
+
+ <androidx.appcompat.widget.LinearLayoutCompat
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:layout_marginTop="@dimen/activity_margin"
+ android:gravity="right"
+ android:orientation="vertical">
+ <androidx.appcompat.widget.AppCompatButton
+ android:id="@+id/button_defaults"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Use defaults"
+ android:background="@drawable/cust_button_secondary"
+ android:layout_marginHorizontal="@dimen/stdpadding"
+ />
+ <androidx.appcompat.widget.LinearLayoutCompat
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/stdpadding"
+ android:orientation="horizontal">
+ <androidx.appcompat.widget.AppCompatButton
+ android:id="@+id/button_cancel"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/stdpadding"
+ android:text="@string/cancel"
+ />
+
+ <androidx.appcompat.widget.AppCompatButton
+ android:id="@+id/button_save"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/stdpadding"
+ android:text="@string/save"
+ />
+ </androidx.appcompat.widget.LinearLayoutCompat>
+
+ </androidx.appcompat.widget.LinearLayoutCompat>
+
+ </androidx.appcompat.widget.LinearLayoutCompat>
+</ScrollView> \ 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 d41126b9..3ce19797 100644
--- a/app/src/main/res/layout/f_settings.xml
+++ b/app/src/main/res/layout/f_settings.xml
@@ -124,13 +124,14 @@
app:subtitle="These transports might circumvent censorship, but are still in a testing phase"
/>
- <se.leap.bitmaskclient.base.views.IconTextEntry
+ <se.leap.bitmaskclient.base.views.IconSwitchEntry
android:id="@+id/obfuscation_proxy_pinning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:text="Obfuscation proxy pinning"
app:singleLine="false"
app:subtitle="Connect to a specific obfuscation proxy for debugging purposes"
+ android:visibility="gone"
/>
</LinearLayout>