X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=4d1d5086be5e3acf2c32efad9c9c60c30c63ea76;hp=9b7d8135dfa236095fd49547bf455e07d4b2347b;hb=cd609c9888924549c03cd6509ed889cdb052d5bb;hpb=81179d84ced6b43360d42a4b44eb8fb329532ff4

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 9b7d8135..4d1d5086 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-2019 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -25,20 +25,14 @@
 
         <SwitchPreference
             android:key="javascript"
-            android:title="@string/javascript_preference"
+            android:title="@string/javascript"
             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:key="cookies"
+            android:title="@string/cookies"
+            android:summary="@string/cookies_preference_summary"
             android:defaultValue="false" />
 
         <SwitchPreference
@@ -75,12 +69,6 @@
             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"
@@ -189,17 +177,10 @@
             android:defaultValue="@string/proxy_default_value" />
 
         <EditTextPreference
-            android:key="proxy_custom_host"
-            android:title="@string/proxy_custom_host"
-            android:defaultValue="@string/proxy_custom_host_default_value"
+            android:key="proxy_custom_url"
+            android:title="@string/proxy_custom_url"
+            android:defaultValue="@string/proxy_custom_url_default_value"
             android:inputType="textUri" />
-
-        <!-- `android:inputType="number"` currently doesn't work with AndroidX. -->
-        <EditTextPreference
-            android:key="proxy_custom_port"
-            android:title="@string/proxy_custom_port"
-            android:defaultValue="@string/proxy_custom_port_default_value"
-            android:inputType="number" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -248,6 +229,12 @@
             android:summary="@string/clear_form_data_summary"
             android:defaultValue="true" />
 
+        <SwitchPreference
+            android:key="clear_logcat"
+            android:title="@string/clear_logcat_preference"
+            android:summary="@string/clear_logcat_summary"
+            android:defaultValue="true" />
+
         <SwitchPreference
             android:key="clear_cache"
             android:title="@string/clear_cache"
@@ -286,6 +273,12 @@
             android:summary="@string/swipe_to_refresh_summary"
             android:defaultValue="true" />
 
+        <SwitchPreference
+            android:key="download_with_external_app"
+            android:title="@string/download_with_external_app"
+            android:summary="@string/download_with_external_app_summary"
+            android:defaultValue="false" />
+
         <SwitchPreference
             android:key="scroll_app_bar"
             android:title="@string/scroll_app_bar"
@@ -293,28 +286,31 @@
             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:key="bottom_app_bar"
+            android:title="@string/bottom_app_bar"
+            android:summary="@string/bottom_app_bar_summary"
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="download_with_external_app"
-            android:title="@string/download_with_external_app"
-            android:summary="@string/download_with_external_app_summary"
+            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" />
+        <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" />
 
-        <SwitchPreference
-            android:key="night_mode"
-            android:title="@string/night_mode"
-            android:summary="@string/night_mode_summary"
-            android:defaultValue="false" />
+        <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" />
 
         <SwitchPreference
             android:key="wide_viewport"