X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=5d1abb9b943d2c398290b1eef16f1e9fb24a857a;hp=e38eed8888d1c682f522304727a1a3fba4f74f2d;hb=0b2da52fc661cf302cd94105620e54340d269f1d;hpb=337aebc73ea8d43fd912198e1eff9fe9f8f8f536

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index e38eed88..5d1abb9b 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2018 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
-  Privacy Browser is free software: you can redistribute it and/or modify
+  Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Privacy Browser is distributed in the hope that it will be useful,
+  Privacy Browser Android is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory
@@ -24,32 +24,26 @@
         android:title="@string/privacy" >
 
         <SwitchPreference
-            android:key="javascript_enabled"
-            android:title="@string/javascript_preference"
+            android:key="javascript"
+            android:title="@string/javascript"
             android:summary="@string/javascript_preference_summary"
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="first_party_cookies_enabled"
-            android:title="@string/first_party_cookies_preference"
-            android:summary="@string/first_party_cookies_preference_summary"
+            android:key="cookies"
+            android:title="@string/cookies"
+            android:summary="@string/cookies_preference_summary"
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="third_party_cookies_enabled"
-            android:title="@string/third_party_cookies_preference"
-            android:summary="@string/third_party_cookies_summary"
-            android:defaultValue="false" />
-
-        <SwitchPreference
-            android:key="dom_storage_enabled"
+            android:key="dom_storage"
             android:title="@string/dom_storage_preference"
             android:summary="@string/dom_storage_preference_summary"
             android:defaultValue="false" />
 
         <!-- Save form data can be removed once the minimum API >= 26. -->
         <SwitchPreference
-            android:key="save_form_data_enabled"
+            android:key="save_form_data"
             android:title="@string/save_form_data_preference"
             android:summary="@string/save_form_data_preference_summary"
             android:defaultValue="false" />
@@ -59,14 +53,14 @@
             android:title="@string/user_agent"
             android:entries="@array/translated_user_agent_names"
             android:entryValues="@array/user_agent_names"
-            android:defaultValue="Privacy Browser"
-            android:icon="?attr/userAgentIcon" />
+            android:defaultValue="@string/user_agent_default_value"
+            android:icon="@drawable/user_agent" />
 
         <!-- android:inputType="textVisiblePassword" sets the keyboard to have a dedicated number row.-->
         <EditTextPreference
             android:key="custom_user_agent"
             android:title="@string/custom_user_agent"
-            android:defaultValue="PrivacyBrowser/1.0"
+            android:defaultValue="@string/custom_user_agent_default_value"
             android:inputType="textVisiblePassword|textMultiLine" />
 
         <SwitchPreference
@@ -75,12 +69,6 @@
             android:summary="@string/incognito_mode_summary"
             android:defaultValue="false" />
 
-        <SwitchPreference
-            android:key="do_not_track"
-            android:title="@string/do_not_track"
-            android:summary="@string/do_not_track_summary"
-            android:defaultValue="false" />
-
         <SwitchPreference
             android:key="allow_screenshots"
             android:title="@string/allow_screenshots"
@@ -89,8 +77,8 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="block_lists"
-        android:title="@string/block_lists" >
+        android:key="blocklists"
+        android:title="@string/blocklists" >
 
         <SwitchPreference
             android:key="easylist"
@@ -105,48 +93,51 @@
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="fanboy_annoyance_list"
-            android:title="@string/fanboy_annoyance_list"
-            android:summary="@string/fanboy_annoyance_list_summary"
+            android:key="fanboys_annoyance_list"
+            android:title="@string/fanboys_annoyance_list"
+            android:summary="@string/fanboys_annoyance_list_summary"
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="fanboy_social_blocking_list"
-            android:title="@string/fanboy_social_blocking_list"
-            android:summary="@string/fanboy_social_blocking_list_summary"
+            android:key="fanboys_social_blocking_list"
+            android:title="@string/fanboys_social_blocking_list"
+            android:summary="@string/fanboys_social_blocking_list_summary"
             android:defaultValue="true" />
-    </PreferenceCategory>
 
-    <PreferenceCategory
-        android:key="tor"
-        android:title="@string/tor" >
+        <SwitchPreference
+            android:key="ultralist"
+            android:title="@string/ultralist"
+            android:summary="@string/ultralist_summary"
+            android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="proxy_through_orbot"
-            android:title="@string/proxy_through_orbot"
-            android:summary="@string/proxy_through_orbot_summary"
+            android:key="ultraprivacy"
+            android:title="@string/ultraprivacy"
+            android:summary="@string/ultraprivacy_summary"
+            android:defaultValue="true" />
+
+        <SwitchPreference
+            android:key="block_all_third_party_requests"
+            android:title="@string/block_all_third_party_requests"
+            android:summary="@string/block_all_third_party_requests_summary"
             android:defaultValue="false" />
+    </PreferenceCategory>
 
-        <EditTextPreference
-            android:key="tor_homepage"
-            android:title="@string/tor_homepage"
-            android:defaultValue="https://3g2upl4pq6kufc4m.onion/"
-            android:inputType="textUri" />
+    <PreferenceCategory
+        android:key="url_modification"
+        android:title="@string/url_modification" >
 
-        <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="https://3g2upl4pq6kufc4m.onion/html/?q=" />
-
-        <!--suppress AndroidDomInspection -->
-        <!--`suppress AndroidDomInspection` removes the error about the default value being blank. -->
-        <EditTextPreference
-            android:key="tor_search_custom_url"
-            android:title="@string/tor_search_custom_url"
-            android:defaultValue=""
-            android:inputType="textUri" />
+        <SwitchPreference
+            android:key="tracking_queries"
+            android:title="@string/tracking_queries"
+            android:summary="@string/tracking_queries_summary"
+            android:defaultValue="true" />
+
+        <SwitchPreference
+            android:key="amp_redirects"
+            android:title="@string/amp_redirects"
+            android:summary="@string/amp_redirects_summary"
+            android:defaultValue="true" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -158,15 +149,31 @@
             android:title="@string/search"
             android:entries="@array/search_entries"
             android:entryValues="@array/search_entry_values"
-            android:defaultValue="https://duckduckgo.com/html/?q="
-            android:icon="?attr/searchIcon" />
+            android:defaultValue="@string/search_default_value"
+            android:icon="@drawable/search" />
 
-        <!--suppress AndroidDomInspection -->
-        <!--`suppress AndroidDomInspection` removes the error about the default value being blank. -->
         <EditTextPreference
             android:key="search_custom_url"
             android:title="@string/search_custom_url"
-            android:defaultValue=""
+            android:defaultValue="@string/search_custom_url_default_value"
+            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>
 
@@ -181,15 +188,9 @@
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="hide_system_bars"
-            android:title="@string/hide_system_bars"
-            android:summary="@string/hide_system_bars_summary"
-            android:defaultValue="false" />
-
-        <SwitchPreference
-            android:key="translucent_navigation_bar"
-            android:title="@string/translucent_navigation_bar"
-            android:summary="@string/translucent_navigation_bar_summary"
+            android:key="hide_app_bar"
+            android:title="@string/hide_app_bar"
+            android:summary="@string/hide_app_bar_summary"
             android:defaultValue="true" />
     </PreferenceCategory>
 
@@ -215,12 +216,19 @@
             android:summary="@string/clear_dom_storage_summary"
             android:defaultValue="true" />
 
+        <!-- Clear form data can be removed once the minimum API >= 26. -->
         <SwitchPreference
             android:key="clear_form_data"
             android:title="@string/clear_form_data_preference"
             android:summary="@string/clear_form_data_summary"
             android:defaultValue="true" />
 
+        <SwitchPreference
+            android:key="clear_logcat"
+            android:title="@string/clear_logcat_preference"
+            android:summary="@string/clear_logcat_summary"
+            android:defaultValue="true" />
+
         <SwitchPreference
             android:key="clear_cache"
             android:title="@string/clear_cache"
@@ -235,42 +243,75 @@
         <EditTextPreference
             android:key="homepage"
             android:title="@string/homepage"
-            android:defaultValue="https://duckduckgo.com/?kao=-1&amp;kak=-1"
+            android:defaultValue="@string/homepage_default_value"
             android:inputType="textUri"
-            android:icon="?attr/homepageIcon" />
+            android:icon="@drawable/home" />
 
-        <ListPreference
-            android:key="default_font_size"
-            android:title="@string/default_font_size"
-            android:entries="@array/default_font_size_entries"
-            android:entryValues="@array/default_font_size_entry_values"
-            android:defaultValue="100"
-            android:icon="?attr/fontSizeIcon" />
+        <!-- `android:inputType="number"` currently doesn't work with AndroidX. -->
+        <EditTextPreference
+            android:key="font_size"
+            android:title="@string/font_size_preference"
+            android:defaultValue="@string/font_size_default_value"
+            android:inputType="number"
+            android:icon="@drawable/font_size" />
+
+        <SwitchPreference
+            android:key="open_intents_in_new_tab"
+            android:title="@string/open_intents_in_new_tab"
+            android:summary="@string/open_intents_in_new_tab_summary"
+            android:defaultValue="true" />
 
         <SwitchPreference
             android:key="swipe_to_refresh"
-            android:title="@string/swipe_to_refresh_preference"
+            android:title="@string/swipe_to_refresh"
             android:summary="@string/swipe_to_refresh_summary"
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="display_additional_app_bar_icons"
-            android:title="@string/display_additional_app_bar_icons"
-            android:summary="@string/display_additional_app_bar_icons_summary"
+            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:key="scroll_app_bar"
+            android:title="@string/scroll_app_bar"
+            android:summary="@string/scroll_app_bar_summary"
+            android:defaultValue="true" />
+
+        <SwitchPreference
+            android:key="bottom_app_bar"
+            android:title="@string/bottom_app_bar"
+            android:summary="@string/bottom_app_bar_summary"
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="night_mode"
-            android:title="@string/night_mode"
-            android:summary="@string/night_mode_summary"
+            android:key="display_additional_app_bar_icons"
+            android:title="@string/display_additional_app_bar_icons"
+            android:summary="@string/display_additional_app_bar_icons_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="@drawable/app_theme" />
+
+        <ListPreference
+            android:key="webview_theme"
+            android:title="@string/webview_theme"
+            android:entries="@array/webview_theme_entries"
+            android:entryValues="@array/webview_theme_entry_values"
+            android:defaultValue="@string/webview_theme_default_value" />
+
+        <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"