X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=49b346f6652711d9f3bcafe7c7f766a7bdc3843f;hp=f5f3eb3fe9d45e151669d86c75deac2def2b5556;hb=eac401700379e6ac5e6b0b696b932354001ef738;hpb=9d621a09cdc72a3ad434084b3aab297f3a7a9d44

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index f5f3eb3f..49b346f6 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,336 +1,324 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2020 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:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory
-        android:key="privacy"
-        android:title="@string/privacy" >
-
-        <SwitchPreference
-            android:key="javascript"
-            android:title="@string/javascript_preference"
-            android:summary="@string/javascript_preference_summary"
-            android:defaultValue="false" />
-
-        <SwitchPreference
-            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"
-            android:title="@string/third_party_cookies_preference"
-            android:summary="@string/third_party_cookies_summary"
-            android:defaultValue="false" />
-
-        <SwitchPreference
-            android:key="dom_storage"
-            android:title="@string/dom_storage_preference"
-            android:summary="@string/dom_storage_preference_summary"
-            android:defaultValue="false" />
+        app:key="@string/privacy_category_key"
+        app:title="@string/privacy" >
+
+        <SwitchPreferenceCompat
+            app:key="@string/javascript_key"
+            app:title="@string/javascript"
+            app:summary="@string/javascript_preference_summary"
+            app:defaultValue="false" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/cookies_key"
+            app:title="@string/cookies"
+            app:summary="@string/cookies_preference_summary"
+            app:defaultValue="false" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/dom_storage_key"
+            app:title="@string/dom_storage_preference"
+            app:summary="@string/dom_storage_preference_summary"
+            app:defaultValue="false" />
 
         <!-- Save form data can be removed once the minimum API >= 26. -->
-        <SwitchPreference
-            android:key="save_form_data"
-            android:title="@string/save_form_data_preference"
-            android:summary="@string/save_form_data_preference_summary"
-            android:defaultValue="false" />
+        <SwitchPreferenceCompat
+            app:key="@string/save_form_data_key"
+            app:title="@string/save_form_data_preference"
+            app:summary="@string/save_form_data_preference_summary"
+            app:defaultValue="false" />
 
         <ListPreference
-            android:key="user_agent"
-            android:title="@string/user_agent"
-            android:entries="@array/translated_user_agent_names"
-            android:entryValues="@array/user_agent_names"
-            android:defaultValue="@string/user_agent_default_value"
-            android:icon="?attr/userAgentIcon" />
+            app:key="@string/user_agent_key"
+            app:title="@string/user_agent"
+            app:entries="@array/translated_user_agent_names"
+            app:entryValues="@array/user_agent_names"
+            app:defaultValue="@string/user_agent_default_value"
+            app: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="@string/custom_user_agent_default_value"
+            app:key="@string/custom_user_agent_key"
+            app:title="@string/custom_user_agent"
+            app:defaultValue="@string/custom_user_agent_default_value"
             android:inputType="textVisiblePassword|textMultiLine" />
 
-        <SwitchPreference
-            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" />
+        <SwitchPreferenceCompat
+            app:key="@string/incognito_mode_key"
+            app:title="@string/incognito_mode"
+            app:summary="@string/incognito_mode_summary"
+            app:defaultValue="false" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/allow_screenshots_key"
+            app:title="@string/allow_screenshots"
+            app:summary="@string/allow_screenshots_summary"
+            app: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="fanboys_annoyance_list"
-            android:title="@string/fanboys_annoyance_list"
-            android:summary="@string/fanboys_annoyance_list_summary"
-            android:defaultValue="true" />
-
-        <SwitchPreference
-            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"
-            android:summary="@string/block_all_third_party_requests_summary"
-            android:defaultValue="false" />
+        app:key="blocklists"
+        app:title="@string/blocklists" >
+
+        <SwitchPreferenceCompat
+            app:key="@string/easylist_key"
+            app:title="@string/easylist"
+            app:summary="@string/easylist_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/easyprivacy_key"
+            app:title="@string/easyprivacy"
+            app:summary="@string/easyprivacy_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/fanboys_annoyance_list_key"
+            app:title="@string/fanboys_annoyance_list"
+            app:summary="@string/fanboys_annoyance_list_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/fanboys_social_blocking_list_key"
+            app:title="@string/fanboys_social_blocking_list"
+            app:summary="@string/fanboys_social_blocking_list_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/ultralist_key"
+            app:title="@string/ultralist"
+            app:summary="@string/ultralist_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/ultraprivacy_key"
+            app:title="@string/ultraprivacy"
+            app:summary="@string/ultraprivacy_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/block_all_third_party_requests_key"
+            app:title="@string/block_all_third_party_requests"
+            app:summary="@string/block_all_third_party_requests_summary"
+            app:defaultValue="false" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="url_modification"
-        android:title="@string/url_modification" >
-
-        <SwitchPreference
-            android:key="google_analytics"
-            android:title="@string/google_analytics"
-            android:summary="@string/google_analytics_summary"
-            android:defaultValue="true" />
-
-        <SwitchPreference
-            android:key="facebook_click_ids"
-            android:title="@string/facebook_click_ids"
-            android:summary="@string/facebook_click_ids_summary"
-            android:defaultValue="true" />
-
-        <SwitchPreference
-            android:key="twitter_amp_redirects"
-            android:title="@string/twitter_amp_redirects"
-            android:summary="@string/twitter_amp_redirects_summary"
-            android:defaultValue="true" />
+        app:key="url_modification"
+        app:title="@string/url_modification" >
+
+        <SwitchPreferenceCompat
+            app:key="@string/tracking_queries_key"
+            app:title="@string/tracking_queries"
+            app:summary="@string/tracking_queries_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/amp_redirects_key"
+            app:title="@string/amp_redirects"
+            app:summary="@string/amp_redirects_summary"
+            app:defaultValue="true" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="search_category"
-        android:title="@string/search" >
+        app:key="search_category"
+        app:title="@string/search" >
 
         <ListPreference
-            android:key="search"
-            android:title="@string/search"
-            android:entries="@array/search_entries"
-            android:entryValues="@array/search_entry_values"
-            android:defaultValue="@string/search_default_value"
-            android:icon="?attr/searchIcon" />
+            app:key="@string/search_key"
+            app:title="@string/search"
+            app:entries="@array/search_entries"
+            app:entryValues="@array/search_entry_values"
+            app:defaultValue="@string/search_default_value"
+            app:icon="@drawable/search" />
 
         <EditTextPreference
-            android:key="search_custom_url"
-            android:title="@string/search_custom_url"
-            android:defaultValue="@string/search_custom_url_default_value"
+            app:key="@string/search_custom_url_key"
+            app:title="@string/search_custom_url"
+            app:defaultValue="@string/search_custom_url_default_value"
             android:inputType="textUri" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="proxy_category"
-        android:title="@string/proxy" >
+        app:key="proxy_category"
+        app: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" />
+            app:key="@string/proxy_key"
+            app:title="@string/proxy"
+            app:entries="@array/proxy_entries"
+            app:entryValues="@array/proxy_entry_values"
+            app: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"
+            app:key="@string/proxy_custom_url_key"
+            app:title="@string/proxy_custom_url"
+            app:defaultValue="@string/proxy_custom_url_default_value"
             android:inputType="textUri" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="full_screen"
-        android:title="@string/full_screen" >
-
-        <SwitchPreference
-            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
-            android:key="hide_app_bar"
-            android:title="@string/hide_app_bar"
-            android:summary="@string/hide_app_bar_summary"
-            android:defaultValue="true" />
+        app:key="full_screen"
+        app:title="@string/full_screen" >
+
+        <SwitchPreferenceCompat
+            app:key="@string/full_screen_browsing_mode_key"
+            app:title="@string/full_screen_browsing_mode"
+            app:summary="@string/full_screen_browsing_mode_summary"
+            app:defaultValue="false" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/hide_app_bar_key"
+            app:title="@string/hide_app_bar"
+            app:summary="@string/hide_app_bar_summary"
+            app:defaultValue="true" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="clear_and_exit"
-        android:title="@string/clear_and_exit" >
-
-        <SwitchPreference
-            android:key="clear_everything"
-            android:title="@string/clear_everything"
-            android:summary="@string/clear_everything_summary"
-            android:defaultValue="true" />
-
-        <SwitchPreference
-            android:key="clear_cookies"
-            android:title="@string/clear_cookies_preference"
-            android:summary="@string/clear_cookies_summary"
-            android:defaultValue="true" />
-
-        <SwitchPreference
-            android:key="clear_dom_storage"
-            android:title="@string/clear_dom_storage_preference"
-            android:summary="@string/clear_dom_storage_summary"
-            android:defaultValue="true" />
+        app:key="@string/clear_and_exit_category_key"
+        app:title="@string/clear_and_exit" >
+
+        <SwitchPreferenceCompat
+            app:key="@string/clear_everything_key"
+            app:title="@string/clear_everything"
+            app:summary="@string/clear_everything_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/clear_cookies_key"
+            app:title="@string/clear_cookies_preference"
+            app:summary="@string/clear_cookies_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/clear_dom_storage_key"
+            app:title="@string/clear_dom_storage_preference"
+            app:summary="@string/clear_dom_storage_summary"
+            app: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_cache"
-            android:title="@string/clear_cache"
-            android:summary="@string/clear_cache_summary"
-            android:defaultValue="true" />
+        <SwitchPreferenceCompat
+            app:key="@string/clear_form_data_key"
+            app:title="@string/clear_form_data_preference"
+            app:summary="@string/clear_form_data_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/clear_logcat_key"
+            app:title="@string/clear_logcat"
+            app:summary="@string/clear_logcat_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/clear_cache_key"
+            app:title="@string/clear_cache"
+            app:summary="@string/clear_cache_summary"
+            app:defaultValue="true" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="general"
-        android:title="@string/general" >
+        app:key="@string/general_category_key"
+        app:title="@string/general" >
 
         <EditTextPreference
-            android:key="homepage"
-            android:title="@string/homepage"
-            android:defaultValue="@string/homepage_default_value"
+            app:key="@string/homepage_key"
+            app:title="@string/homepage"
+            app:defaultValue="@string/homepage_default_value"
             android:inputType="textUri"
-            android:icon="?attr/homepageIcon" />
-
-        <ListPreference
-            android:key="download_location"
-            android:title="@string/download_location"
-            android:entries="@array/download_location_entries"
-            android:entryValues="@array/download_location_entry_values"
-            android:defaultValue="@string/download_location_default_value"
-            android:icon="?attr/downloadIcon" />
-
-        <EditTextPreference
-            android:key="download_custom_location"
-            android:title="@string/download_custom_location"
-            android:defaultValue="@string/download_custom_location_default_value"
-            android:inputType="textUri" />
+            app:icon="@drawable/home" />
 
         <!-- `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"
+            app:key="@string/font_size_key"
+            app:title="@string/font_size_preference"
+            app: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"
-            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"
-            android:summary="@string/display_additional_app_bar_icons_summary"
-            android:defaultValue="false" />
+            app:icon="@drawable/font_size" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/open_intents_in_new_tab_key"
+            app:title="@string/open_intents_in_new_tab"
+            app:summary="@string/open_intents_in_new_tab_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/swipe_to_refresh_key"
+            app:title="@string/swipe_to_refresh"
+            app:summary="@string/swipe_to_refresh_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/download_with_external_app_key"
+            app:title="@string/download_with_external_app"
+            app:summary="@string/download_with_external_app_summary"
+            app:defaultValue="false" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/scroll_app_bar_key"
+            app:title="@string/scroll_app_bar"
+            app:summary="@string/scroll_app_bar_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/bottom_app_bar_key"
+            app:title="@string/bottom_app_bar"
+            app:summary="@string/bottom_app_bar_summary"
+            app:defaultValue="false" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/display_additional_app_bar_icons_key"
+            app:title="@string/display_additional_app_bar_icons"
+            app:summary="@string/display_additional_app_bar_icons_summary"
+            app: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="?attr/appThemeIcon" />
+            app:key="@string/app_theme_key"
+            app:title="@string/app_theme"
+            app:entries="@array/app_theme_entries"
+            app:entryValues="@array/app_theme_entry_values"
+            app:defaultValue="@string/app_theme_default_value"
+            app: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"
-            android:icon="?attr/webViewThemeIcon" />
-
-        <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"
-            android:summary="@string/display_webpage_images_summary"
-            android:defaultValue="true" />
+            app:key="@string/webview_theme_key"
+            app:title="@string/webview_theme"
+            app:entries="@array/webview_theme_entries"
+            app:entryValues="@array/webview_theme_entry_values"
+            app:defaultValue="@string/webview_theme_default_value" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/wide_viewport_key"
+            app:title="@string/wide_viewport_preference"
+            app:summary="@string/wide_viewport_summary"
+            app:defaultValue="true" />
+
+        <SwitchPreferenceCompat
+            app:key="@string/display_webpage_images_key"
+            app:title="@string/display_webpage_images"
+            app:summary="@string/display_webpage_images_summary"
+            app:defaultValue="true" />
     </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>