X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=ace949a9b597d983479e871665eaf255a42c68e3;hb=0a5d2eabceeafb49a957598538aa74d4f11dfce0;hp=b978d8f9c1ed42cf6a057ec8a76f4561fd6db8e0;hpb=17174f4ceb49bbdb01e2700b2c4d3b3aa670e18e;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index b978d8f9..ace949a9 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 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,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: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,57 +69,114 @@
             android:inputType="textVisiblePassword|textMultiLine" />
 
         <SwitchPreference
-            android:key="block_ads"
-            android:title="@string/block_ads"
-            android:summary="@string/block_ads_summary"
-            android:defaultValue="true" />
+            android:key="incognito_mode"
+            android:title="@string/incognito_mode"
+            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"
+            android:summary="@string/allow_screenshots_summary"
+            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="search"
-        android:title="@string/search">
+        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="https://3g2upl4pq6kufc4m.onion/"
+            android:inputType="textUri" />
 
         <ListPreference
-            android:key="javascript_disabled_search"
-            android:title="@string/javascript_disabled_search"
-            android:entries="@array/javascript_disabled_search_entries"
-            android:entryValues="@array/javascript_disabled_search_entry_values"
-            android:defaultValue="https://duckduckgo.com/html/?q=" />
+            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="javascript_disabled_search_custom_url"
-            android:title="@string/javascript_disabled_search_custom_url"
+            android:key="tor_search_custom_url"
+            android:title="@string/tor_search_custom_url"
             android:defaultValue=""
             android:inputType="textUri" />
+    </PreferenceCategory>
 
-        <ListPreference
-            android:key="javascript_enabled_search"
-            android:title="@string/javascript_enabled_search"
-            android:entries="@array/javascript_enabled_search_entries"
-            android:entryValues="@array/javascript_enabled_search_entry_values"
-            android:defaultValue="https://duckduckgo.com/?q=" />
+    <PreferenceCategory
+        android:key="search_category"
+        android:title="@string/search" >
 
+        <ListPreference
+            android:key="search"
+            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" />
+
+        <!--suppress AndroidDomInspection -->
+        <!--`suppress AndroidDomInspection` removes the error about the default value being blank. -->
         <EditTextPreference
-            android:key="javascript_enabled_search_custom_url"
-            android:title="@string/javascript_enabled_search_custom_url"
+            android:key="search_custom_url"
+            android:title="@string/search_custom_url"
             android:defaultValue=""
             android:inputType="textUri" />
     </PreferenceCategory>
 
     <PreferenceCategory
         android:key="full_screen"
-        android:title="@string/full_screen">
+        android:title="@string/full_screen" >
 
         <SwitchPreference
-            android:key="enable_full_screen_browsing_mode"
-            android:title="@string/enable_full_screen_browsing_mode"
-            android:summary="@string/enable_full_screen_browsing_mode_summary"
+            android:key="full_screen_browsing_mode"
+            android:title="@string/full_screen_browsing_mode"
+            android:summary="@string/full_screen_browsing_mode_summary"
             android:defaultValue="false" />
 
         <SwitchPreference
@@ -135,46 +193,38 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="tor"
-        android:title="@string/tor" >
+        android:key="clean_and_exit"
+        android:title="@string/clear_and_exit" >
 
         <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="https://3g2upl4pq6kufc4m.onion"
-            android:inputType="textUri" />
+            android:key="clear_everything"
+            android:title="@string/clear_everything"
+            android:summary="@string/clear_everything_summary"
+            android:defaultValue="true" />
 
-        <ListPreference
-            android:key="tor_javascript_disabled_search"
-            android:title="@string/tor_javascript_disabled_search"
-            android:entries="@array/tor_javascript_disabled_search_entries"
-            android:entryValues="@array/tor_javascript_disabled_search_entry_values"
-            android:defaultValue="https://3g2upl4pq6kufc4m.onion/html/?q=" />
+        <SwitchPreference
+            android:key="clear_cookies"
+            android:title="@string/clear_cookies_preference"
+            android:summary="@string/clear_cookies_summary"
+            android:defaultValue="true" />
 
-        <EditTextPreference
-            android:key="tor_javascript_disabled_search_custom_url"
-            android:title="@string/tor_javascript_disabled_search_custom_url"
-            android:defaultValue=""
-            android:inputType="textUri" />
+        <SwitchPreference
+            android:key="clear_dom_storage"
+            android:title="@string/clear_dom_storage_preference"
+            android:summary="@string/clear_dom_storage_summary"
+            android:defaultValue="true" />
 
-        <ListPreference
-            android:key="tor_javascript_enabled_search"
-            android:title="@string/tor_javascript_enabled_search"
-            android:entries="@array/tor_javascript_enabled_search_entries"
-            android:entryValues="@array/tor_javascript_enabled_search_entry_values"
-            android:defaultValue="https://3g2upl4pq6kufc4m.onion/?q=" />
+        <SwitchPreference
+            android:key="clear_form_data"
+            android:title="@string/clear_form_data_preference"
+            android:summary="@string/clear_form_data_summary"
+            android:defaultValue="true" />
 
-        <EditTextPreference
-            android:key="tor_javascript_enabled_search_custom_url"
-            android:title="@string/tor_javascript_enabled_search_custom_url"
-            android:defaultValue=""
-            android:inputType="textUri" />
+        <SwitchPreference
+            android:key="clear_cache"
+            android:title="@string/clear_cache"
+            android:summary="@string/clear_cache_summary"
+            android:defaultValue="true" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -184,26 +234,46 @@
         <EditTextPreference
             android:key="homepage"
             android:title="@string/homepage"
-            android:defaultValue="https://duckduckgo.com"
-            android:inputType="textUri" />
+            android:defaultValue="https://duckduckgo.com/?kao=-1&amp;kak=-1"
+            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:defaultValue="100"
+            android:icon="?attr/fontSizeIcon" />
 
         <SwitchPreference
-            android:key="swipe_to_refresh_enabled"
-            android:title="@string/swipe_to_refresh_enabled"
-            android:summary="@string/swipe_to_refresh_enabled_summary"
-            android:defaultValue="false" />
+            android:key="swipe_to_refresh"
+            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"
             android:title="@string/display_additional_app_bar_icons"
             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"
+            android:summary="@string/display_webpage_images_summary"
+            android:defaultValue="true" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file