X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=9b7d8135dfa236095fd49547bf455e07d4b2347b;hb=81179d84ced6b43360d42a4b44eb8fb329532ff4;hp=dc8ffcba3db3e496cf51e3beb808fc7ec198d40e;hpb=0d5f4763ba83016e32a91379ceb66baac63cc0c9;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index dc8ffcba..9b7d8135 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -116,6 +116,12 @@
             android:summary="@string/fanboys_social_blocking_list_summary"
             android:defaultValue="true" />
 
+        <SwitchPreference
+            android:key="ultralist"
+            android:title="@string/ultralist"
+            android:summary="@string/ultralist_summary"
+            android:defaultValue="true" />
+
         <SwitchPreference
             android:key="ultraprivacy"
             android:title="@string/ultraprivacy"
@@ -138,36 +144,18 @@
             android:title="@string/google_analytics"
             android:summary="@string/google_analytics_summary"
             android:defaultValue="true" />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="tor"
-        android:title="@string/tor" >
 
         <SwitchPreference
-            android:key="proxy_through_orbot"
-            android:title="@string/proxy_through_orbot"
-            android:summary="@string/proxy_through_orbot_summary"
-            android:defaultValue="false" />
-
-        <EditTextPreference
-            android:key="tor_homepage"
-            android:title="@string/tor_homepage"
-            android:defaultValue="@string/tor_homepage_default_value"
-            android:inputType="textUri" />
-
-        <ListPreference
-            android:key="tor_search"
-            android:title="@string/tor_search"
-            android:entries="@array/tor_search_entries"
-            android:entryValues="@array/tor_search_entry_values"
-            android:defaultValue="@string/tor_search_default_value" />
+            android:key="facebook_click_ids"
+            android:title="@string/facebook_click_ids"
+            android:summary="@string/facebook_click_ids_summary"
+            android:defaultValue="true" />
 
-        <EditTextPreference
-            android:key="tor_search_custom_url"
-            android:title="@string/tor_search_custom_url"
-            android:defaultValue="@string/tor_search_custom_url_default_value"
-            android:inputType="textUri" />
+        <SwitchPreference
+            android:key="twitter_amp_redirects"
+            android:title="@string/twitter_amp_redirects"
+            android:summary="@string/twitter_amp_redirects_summary"
+            android:defaultValue="true" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -189,6 +177,31 @@
             android:inputType="textUri" />
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:key="proxy_category"
+        android:title="@string/proxy" >
+
+        <ListPreference
+            android:key="proxy"
+            android:title="@string/proxy"
+            android:entries="@array/proxy_entries"
+            android:entryValues="@array/proxy_entry_values"
+            android:defaultValue="@string/proxy_default_value" />
+
+        <EditTextPreference
+            android:key="proxy_custom_host"
+            android:title="@string/proxy_custom_host"
+            android:defaultValue="@string/proxy_custom_host_default_value"
+            android:inputType="textUri" />
+
+        <!-- `android:inputType="number"` currently doesn't work with AndroidX. -->
+        <EditTextPreference
+            android:key="proxy_custom_port"
+            android:title="@string/proxy_custom_port"
+            android:defaultValue="@string/proxy_custom_port_default_value"
+            android:inputType="number" />
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:key="full_screen"
         android:title="@string/full_screen" >
@@ -253,12 +266,12 @@
             android:inputType="textUri"
             android:icon="?attr/homepageIcon" />
 
-        <ListPreference
+        <!-- `android:inputType="number"` currently doesn't work with AndroidX. -->
+        <EditTextPreference
             android:key="font_size"
             android:title="@string/font_size_preference"
-            android:entries="@array/font_size_entries"
-            android:entryValues="@array/font_size_entry_values"
             android:defaultValue="@string/font_size_default_value"
+            android:inputType="number"
             android:icon="?attr/fontSizeIcon" />
 
         <SwitchPreference
@@ -303,6 +316,12 @@
             android:summary="@string/night_mode_summary"
             android:defaultValue="false" />
 
+        <SwitchPreference
+            android:key="wide_viewport"
+            android:title="@string/wide_viewport_preference"
+            android:summary="@string/wide_viewport_summary"
+            android:defaultValue="true" />
+
         <SwitchPreference
             android:key="display_webpage_images"
             android:title="@string/display_webpage_images"