From 0ccec2d3bd7c7f890f7b651110ea10a8933eab29 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 25 Nov 2021 12:23:04 +0100
Subject: implement UI, logic and test for prefer UDP preferences

---
 app/src/main/res/drawable/ic_multiple_stop.xml | 10 ++++++++++
 app/src/main/res/layout/f_settings.xml         |  3 +--
 app/src/main/res/values/strings.xml            |  3 +++
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_multiple_stop.xml

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

diff --git a/app/src/main/res/drawable/ic_multiple_stop.xml b/app/src/main/res/drawable/ic_multiple_stop.xml
new file mode 100644
index 00000000..c43c84f3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_multiple_stop.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17,4l4,4l-4,4V9h-4V7h4V4zM10,7C9.45,7 9,7.45 9,8s0.45,1 1,1s1,-0.45 1,-1S10.55,7 10,7zM6,7C5.45,7 5,7.45 5,8s0.45,1 1,1s1,-0.45 1,-1S6.55,7 6,7zM7,17h4v-2H7v-3l-4,4l4,4V17zM14,17c0.55,0 1,-0.45 1,-1c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1C13,16.55 13.45,17 14,17zM18,17c0.55,0 1,-0.45 1,-1c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1C17,16.55 17.45,17 18,17z"/>
+</vector>
diff --git a/app/src/main/res/layout/f_settings.xml b/app/src/main/res/layout/f_settings.xml
index b625d548..1851fb54 100644
--- a/app/src/main/res/layout/f_settings.xml
+++ b/app/src/main/res/layout/f_settings.xml
@@ -35,7 +35,7 @@
         android:visibility="visible"
         />
 
-  <!--  <se.leap.bitmaskclient.base.views.IconSwitchEntry
+    <se.leap.bitmaskclient.base.views.IconSwitchEntry
         android:id="@+id/prefer_udp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -44,7 +44,6 @@
         app:icon="@drawable/ic_multiple_stop"
         app:singleLine="false"
         />
-        -->
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/circumvention_header"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c49a456e..9ef0b9a5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -188,5 +188,8 @@
   <string name="use_snowflake">Use Snowflake</string>
   <string name="snowflake_description">Circumvent blocking of the provider\'s configuration server.</string>
   <string name="vpn_settings">VPN settings</string>
+  <string name="prefer_udp">Use UDP if available</string>
+  <string name="prefer_udp_subtitle">UDP can be faster and better for streaming, but does not work for all networks.</string>
+
 
 </resources>
-- 
cgit v1.2.3


From d71f36119410e5463f76a45ac555d4dd3a510b74 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 25 Nov 2021 12:59:31 +0100
Subject: make settings fragment scrollable

---
 app/src/main/res/layout/f_settings.xml | 177 +++++++++++++++++----------------
 1 file changed, 91 insertions(+), 86 deletions(-)

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

diff --git a/app/src/main/res/layout/f_settings.xml b/app/src/main/res/layout/f_settings.xml
index 1851fb54..a4d86fa6 100644
--- a/app/src/main/res/layout/f_settings.xml
+++ b/app/src/main/res/layout/f_settings.xml
@@ -1,104 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="@dimen/stdpadding"
     >
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/general_header"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-        android:text="@string/vpn_settings"
-        android:paddingTop="@dimen/activity_margin"
-        />
+        android:orientation="vertical">
 
-    <se.leap.bitmaskclient.base.views.IconTextEntry
-        android:id="@+id/always_on_vpn"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:text="@string/always_on_vpn"
-        app:subtitle="@string/subtitle_always_on_vpn"
-        app:icon="@drawable/ic_always_on_36"
-        android:visibility="visible"
-        />
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/general_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:text="@string/vpn_settings"
+            android:paddingTop="@dimen/activity_margin"
+            />
 
-    <se.leap.bitmaskclient.base.views.IconTextEntry
-        android:id="@+id/exclude_apps"
-        android:layout_width="match_parent"
-        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.IconTextEntry
+            android:id="@+id/always_on_vpn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:text="@string/always_on_vpn"
+            app:subtitle="@string/subtitle_always_on_vpn"
+            app:icon="@drawable/ic_always_on_36"
+            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"
-        />
+        <se.leap.bitmaskclient.base.views.IconTextEntry
+            android:id="@+id/exclude_apps"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:text="@string/exclude_apps_fragment_title"
+            app:icon="@drawable/ic_shield_remove_grey600_36dp"
+            android:visibility="visible"
+            />
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/circumvention_header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-        android:text="@string/censorship_circumvention"
-        android:paddingTop="@dimen/activity_margin"
-        />
-    <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"
-        />
+        <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.IconSwitchEntry
-        android:id="@+id/snowflake_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"
-        />
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/circumvention_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:text="@string/censorship_circumvention"
+            android:paddingTop="@dimen/activity_margin"
+            />
+        <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"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-        android:text="@string/experimental_features"
-        android:paddingTop="@dimen/activity_margin"
-        />
+        <se.leap.bitmaskclient.base.views.IconSwitchEntry
+            android:id="@+id/snowflake_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"
+            />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/experimental_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:text="@string/experimental_features"
+            android:paddingTop="@dimen/activity_margin"
+            />
 
-    <se.leap.bitmaskclient.base.views.IconSwitchEntry
-        android:id="@+id/enableIPv6Firewall"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:text="@string/ipv6Firewall"
-        app:subtitle="@string/require_root"
-        app:icon="@drawable/ic_cancel"
-        />
 
-    <se.leap.bitmaskclient.base.views.IconTextEntry
-        android:id="@+id/tethering"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:text="@string/tethering"
-        app:subtitle="@string/require_root"
-        app:icon="@drawable/ic_access_point_36"
-        />
+        <se.leap.bitmaskclient.base.views.IconSwitchEntry
+            android:id="@+id/enableIPv6Firewall"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:text="@string/ipv6Firewall"
+            app:subtitle="@string/require_root"
+            app:icon="@drawable/ic_cancel"
+            />
+
+        <se.leap.bitmaskclient.base.views.IconTextEntry
+            android:id="@+id/tethering"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:text="@string/tethering"
+            app:subtitle="@string/require_root"
+            app:icon="@drawable/ic_access_point_36"
+            />
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
-- 
cgit v1.2.3


From d939fc28aaa8f9992d296ddf596fa703ffd5ccb0 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 25 Nov 2021 13:54:45 +0100
Subject: use pngs instead of vector graphics to avoid crashes on Android4

---
 app/src/main/res/drawable-hdpi/ic_multiple_stop.png    | Bin 0 -> 472 bytes
 app/src/main/res/drawable-ldpi/ic_multiple_stop.png    | Bin 0 -> 311 bytes
 app/src/main/res/drawable-mdpi/ic_multiple_stop.png    | Bin 0 -> 311 bytes
 app/src/main/res/drawable-xhdpi/ic_multiple_stop.png   | Bin 0 -> 455 bytes
 app/src/main/res/drawable-xxhdpi/ic_multiple_stop.png  | Bin 0 -> 663 bytes
 app/src/main/res/drawable-xxxhdpi/ic_multiple_stop.png | Bin 0 -> 837 bytes
 app/src/main/res/drawable/ic_multiple_stop.xml         |  10 ----------
 7 files changed, 10 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_multiple_stop.png
 create mode 100644 app/src/main/res/drawable-ldpi/ic_multiple_stop.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_multiple_stop.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_multiple_stop.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_multiple_stop.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_multiple_stop.png
 delete mode 100644 app/src/main/res/drawable/ic_multiple_stop.xml

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

diff --git a/app/src/main/res/drawable-hdpi/ic_multiple_stop.png b/app/src/main/res/drawable-hdpi/ic_multiple_stop.png
new file mode 100644
index 00000000..cd67c160
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_multiple_stop.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_multiple_stop.png b/app/src/main/res/drawable-ldpi/ic_multiple_stop.png
new file mode 100644
index 00000000..fc0a47e1
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_multiple_stop.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_multiple_stop.png b/app/src/main/res/drawable-mdpi/ic_multiple_stop.png
new file mode 100644
index 00000000..fc0a47e1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_multiple_stop.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_multiple_stop.png b/app/src/main/res/drawable-xhdpi/ic_multiple_stop.png
new file mode 100644
index 00000000..c16a18c1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_multiple_stop.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_multiple_stop.png b/app/src/main/res/drawable-xxhdpi/ic_multiple_stop.png
new file mode 100644
index 00000000..b6fe22a8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_multiple_stop.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_multiple_stop.png b/app/src/main/res/drawable-xxxhdpi/ic_multiple_stop.png
new file mode 100644
index 00000000..6cf3f58b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_multiple_stop.png differ
diff --git a/app/src/main/res/drawable/ic_multiple_stop.xml b/app/src/main/res/drawable/ic_multiple_stop.xml
deleted file mode 100644
index c43c84f3..00000000
--- a/app/src/main/res/drawable/ic_multiple_stop.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M17,4l4,4l-4,4V9h-4V7h4V4zM10,7C9.45,7 9,7.45 9,8s0.45,1 1,1s1,-0.45 1,-1S10.55,7 10,7zM6,7C5.45,7 5,7.45 5,8s0.45,1 1,1s1,-0.45 1,-1S6.55,7 6,7zM7,17h4v-2H7v-3l-4,4l4,4V17zM14,17c0.55,0 1,-0.45 1,-1c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1C13,16.55 13.45,17 14,17zM18,17c0.55,0 1,-0.45 1,-1c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1C17,16.55 17.45,17 18,17z"/>
-</vector>
-- 
cgit v1.2.3