X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=c3687d0c1555e4c686d68976e878b5316f6d2f4b;hp=162d932bcfa80196492dbdb979b4cafc4df74efd;hb=5a385f0ba12a7af005761e30155f7fd18767d2f9;hpb=4d7e0bfa2399670591dc585f94a976b904787a9d

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 162d932b..c3687d0c 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-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2018 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -47,6 +47,7 @@
             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:title="@string/save_form_data_preference"
@@ -56,10 +57,10 @@
         <ListPreference
             android:key="user_agent"
             android:title="@string/user_agent"
-            android:entries="@array/user_agent_entries"
-            android:entryValues="@array/user_agent_entry_values"
-            android:defaultValue="PrivacyBrowser/1.0"
-            android:icon="@drawable/user_agent" />
+            android:entries="@array/translated_user_agent_names"
+            android:entryValues="@array/user_agent_names"
+            android:defaultValue="Privacy Browser"
+            android:icon="?attr/userAgentIcon" />
 
         <!-- android:inputType="textVisiblePassword" sets the keyboard to have a dedicated number row.-->
         <EditTextPreference
@@ -68,12 +69,6 @@
             android:defaultValue="PrivacyBrowser/1.0"
             android:inputType="textVisiblePassword|textMultiLine" />
 
-        <SwitchPreference
-            android:key="block_ads"
-            android:title="@string/block_ads"
-            android:summary="@string/block_ads_summary"
-            android:defaultValue="true" />
-
         <SwitchPreference
             android:key="incognito_mode"
             android:title="@string/incognito_mode"
@@ -85,6 +80,41 @@
             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"
+            android:summary="@string/allow_screenshots_summary"
+            android:defaultValue="false" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="blocklists"
+        android:title="@string/blocklists" >
+
+        <SwitchPreference
+            android:key="easylist"
+            android:title="@string/easylist"
+            android:summary="@string/easylist_summary"
+            android:defaultValue="true" />
+
+        <SwitchPreference
+            android:key="easyprivacy"
+            android:title="@string/easyprivacy"
+            android:summary="@string/easyprivacy_summary"
+            android:defaultValue="true" />
+
+        <SwitchPreference
+            android:key="fanboy_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/fanboys_social_blocking_list"
+            android:summary="@string/fanboys_social_blocking_list_summary"
+            android:defaultValue="true" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -100,7 +130,7 @@
         <EditTextPreference
             android:key="tor_homepage"
             android:title="@string/tor_homepage"
-            android:defaultValue="https://3g2upl4pq6kufc4m.onion"
+            android:defaultValue="https://3g2upl4pq6kufc4m.onion/"
             android:inputType="textUri" />
 
         <ListPreference
@@ -110,6 +140,8 @@
             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"
@@ -127,8 +159,10 @@
             android:entries="@array/search_entries"
             android:entryValues="@array/search_entry_values"
             android:defaultValue="https://duckduckgo.com/html/?q="
-            android:icon="@drawable/search_enabled" />
+            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"
@@ -160,7 +194,7 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="clean_and_exit"
+        android:key="clear_and_exit"
         android:title="@string/clear_and_exit" >
 
         <SwitchPreference
@@ -201,9 +235,9 @@
         <EditTextPreference
             android:key="homepage"
             android:title="@string/homepage"
-            android:defaultValue="https://duckduckgo.com"
+            android:defaultValue="https://duckduckgo.com/?kao=-1&amp;kak=-1"
             android:inputType="textUri"
-            android:icon="@drawable/home_enabled" />
+            android:icon="?attr/homepageIcon" />
 
         <ListPreference
             android:key="default_font_size"
@@ -211,13 +245,13 @@
             android:entries="@array/default_font_size_entries"
             android:entryValues="@array/default_font_size_entry_values"
             android:defaultValue="100"
-            android:icon="@drawable/font_size" />
+            android:icon="?attr/fontSizeIcon" />
 
         <SwitchPreference
             android:key="swipe_to_refresh"
-            android:title="@string/swipe_to_refresh_enabled"
-            android:summary="@string/swipe_to_refresh_enabled_summary"
-            android:defaultValue="false" />
+            android:title="@string/swipe_to_refresh_preference"
+            android:summary="@string/swipe_to_refresh_summary"
+            android:defaultValue="true" />
 
         <SwitchPreference
             android:key="display_additional_app_bar_icons"
@@ -225,6 +259,18 @@
             android:summary="@string/display_additional_app_bar_icons_summary"
             android:defaultValue="false" />
 
+        <SwitchPreference
+            android:key="dark_theme"
+            android:title="@string/dark_theme"
+            android:summary="@string/dark_theme_summary"
+            android:defaultValue="false" />
+
+        <SwitchPreference
+            android:key="night_mode"
+            android:title="@string/night_mode"
+            android:summary="@string/night_mode_summary"
+            android:defaultValue="false" />
+
         <SwitchPreference
             android:key="display_webpage_images"
             android:title="@string/display_webpage_images"