X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=a60edb01ee354fd012049341186a3cc1a3e367a5;hb=095201eb04f72863dd606b5d77b5bd4d0f7f0bcd;hp=b211879fda6799fbee3e0282990b2bbc9b5cba30;hpb=c0f2dcca77fffd804c90cee5103795fc3849112b;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index b211879f..a60edb01 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -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"
@@ -152,36 +158,6 @@
             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" />
-
-        <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" />
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:key="search_category"
         android:title="@string/search" >
@@ -201,6 +177,24 @@
             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_url"
+            android:title="@string/proxy_custom_url"
+            android:defaultValue="@string/proxy_custom_url_default_value"
+            android:inputType="textUri" />
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:key="full_screen"
         android:title="@string/full_screen" >
@@ -266,11 +260,25 @@
             android:icon="?attr/homepageIcon" />
 
         <ListPreference
+            android:key="download_location"
+            android:title="@string/download_location"
+            android:entries="@array/download_location_entries"
+            android:entryValues="@array/download_location_entry_values"
+            android:defaultValue="@string/download_location_default_value"
+            android:icon="?attr/downloadIcon" />
+
+        <EditTextPreference
+            android:key="download_custom_location"
+            android:title="@string/download_custom_location"
+            android:defaultValue="@string/download_custom_location_default_value"
+            android:inputType="textUri" />
+
+        <!-- `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
@@ -297,17 +305,13 @@
             android:summary="@string/display_additional_app_bar_icons_summary"
             android:defaultValue="false" />
 
-        <SwitchPreference
-            android:key="download_with_external_app"
-            android:title="@string/download_with_external_app"
-            android:summary="@string/download_with_external_app_summary"
-            android:defaultValue="false" />
-
-        <SwitchPreference
-            android:key="dark_theme"
-            android:title="@string/dark_theme"
-            android:summary="@string/dark_theme_summary"
-            android:defaultValue="false" />
+        <ListPreference
+            android:key="app_theme"
+            android:title="@string/app_theme"
+            android:entries="@array/app_theme_entries"
+            android:entryValues="@array/app_theme_entry_values"
+            android:defaultValue="@string/app_theme_default_value"
+            android:icon="?attr/appThemeIcon" />
 
         <SwitchPreference
             android:key="night_mode"
@@ -315,6 +319,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"