X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=0348df7fb0fb0ed4272a6631a28e2233f4e131cd;hp=2b0c713d64ecfd4a46dd6b5c9bb1f3432f6748bc;hb=6ccecb3374c1988aef2650a87dac20923ce3aa2f;hpb=a2a4b36a691762bac757ec32f2a19264f89382e0

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 2b0c713d..0348df7f 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>.
 
@@ -56,9 +56,9 @@
         <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: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.-->
@@ -68,12 +68,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"
@@ -87,6 +81,35 @@
             android:defaultValue="false" />
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:key="block_lists"
+        android:title="@string/block_lists" >
+
+        <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/fanboy_annoyance_list"
+            android:summary="@string/fanboy_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:defaultValue="true" />
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:key="tor"
         android:title="@string/tor" >
@@ -100,7 +123,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 +133,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"
@@ -129,6 +154,8 @@
             android:defaultValue="https://duckduckgo.com/html/?q="
             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"
@@ -201,7 +228,7 @@
         <EditTextPreference
             android:key="homepage"
             android:title="@string/homepage"
-            android:defaultValue="https://start.duckduckgo.com"
+            android:defaultValue="https://duckduckgo.com/?kao=-1&amp;kak=-1"
             android:inputType="textUri"
             android:icon="?attr/homepageIcon" />
 
@@ -215,9 +242,9 @@
 
         <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"
@@ -231,6 +258,12 @@
             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"