X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=dafe62e6d232805e2d9739b6c0bf98823a91346e;hb=8f7e9b7db429568e26f00bc2eef88402d722bec7;hp=4549040a27a32f1bd34a79ec3c87ad36d627e797;hpb=69b0fea4c49422f5e3c377994c4cf249bdc5a434;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 4549040a..dafe62e6 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-2018 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -24,32 +24,32 @@
         android:title="@string/privacy" >
 
         <SwitchPreference
-            android:key="javascript_enabled"
+            android:key="javascript"
             android:title="@string/javascript_preference"
             android:summary="@string/javascript_preference_summary"
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="first_party_cookies_enabled"
+            android:key="first_party_cookies"
             android:title="@string/first_party_cookies_preference"
             android:summary="@string/first_party_cookies_preference_summary"
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="third_party_cookies_enabled"
+            android:key="third_party_cookies"
             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 +59,14 @@
             android:title="@string/user_agent"
             android:entries="@array/translated_user_agent_names"
             android:entryValues="@array/user_agent_names"
-            android:defaultValue="Privacy Browser"
+            android:defaultValue="@string/user_agent_default_value"
             android:icon="?attr/userAgentIcon" />
 
         <!-- 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
@@ -105,17 +105,29 @@
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="fanboy_annoyance_list"
+            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:key="fanboys_social_blocking_list"
             android:title="@string/fanboys_social_blocking_list"
             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"
+            android:summary="@string/ultraprivacy_summary"
+            android:defaultValue="true" />
+
         <SwitchPreference
             android:key="block_all_third_party_requests"
             android:title="@string/block_all_third_party_requests"
@@ -124,35 +136,26 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="tor"
-        android:title="@string/tor" >
+        android:key="url_modification"
+        android:title="@string/url_modification" >
 
         <SwitchPreference
-            android:key="proxy_through_orbot"
-            android:title="@string/proxy_through_orbot"
-            android:summary="@string/proxy_through_orbot_summary"
-            android:defaultValue="false" />
+            android:key="google_analytics"
+            android:title="@string/google_analytics"
+            android:summary="@string/google_analytics_summary"
+            android:defaultValue="true" />
 
-        <EditTextPreference
-            android:key="tor_homepage"
-            android:title="@string/tor_homepage"
-            android:defaultValue="https://3g2upl4pq6kufc4m.onion/"
-            android:inputType="textUri" />
+        <SwitchPreference
+            android:key="facebook_click_ids"
+            android:title="@string/facebook_click_ids"
+            android:summary="@string/facebook_click_ids_summary"
+            android:defaultValue="true" />
 
-        <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="twitter_amp_redirects"
+            android:title="@string/twitter_amp_redirects"
+            android:summary="@string/twitter_amp_redirects_summary"
+            android:defaultValue="true" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -164,15 +167,31 @@
             android:title="@string/search"
             android:entries="@array/search_entries"
             android:entryValues="@array/search_entry_values"
-            android:defaultValue="https://duckduckgo.com/html/?q="
+            android:defaultValue="@string/search_default_value"
             android:icon="?attr/searchIcon" />
 
-        <!--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>
 
@@ -187,15 +206,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>
 
@@ -221,6 +234,7 @@
             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"
@@ -241,24 +255,36 @@
         <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" />
 
-        <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: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="?attr/fontSizeIcon" />
 
+        <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="scroll_app_bar"
+            android:title="@string/scroll_app_bar"
+            android:summary="@string/scroll_app_bar_summary"
+            android:defaultValue="true" />
+
         <SwitchPreference
             android:key="display_additional_app_bar_icons"
             android:title="@string/display_additional_app_bar_icons"
@@ -277,6 +303,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"