X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fmenu%2Fwebview_options_menu.xml;h=66c1498057b2c5dd3f8cf92e3a676dc7f9c1fc07;hp=89f1bfbd46c532e09f5d7661fa0680133451a074;hb=f68d82ddcd76aafdba7f215c6a731b19beb35711;hpb=9a1be859899abe1eb75637c1ea6b817afee723b1

diff --git a/app/src/main/res/menu/webview_options_menu.xml b/app/src/main/res/menu/webview_options_menu.xml
index 89f1bfbd..66c14980 100644
--- a/app/src/main/res/menu/webview_options_menu.xml
+++ b/app/src/main/res/menu/webview_options_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2019 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -22,134 +22,374 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".MainWebViewActivity">
+    tools:context=".activities.MainWebViewActivity" >
 
     <item
-        android:id="@+id/toggleJavaScript"
+        android:id="@+id/toggle_javascript"
         android:title="@string/javascript"
-        android:orderInCategory="10"
+        android:orderInCategory="100"
+        android:icon="@drawable/privacy_mode"
         app:showAsAction="ifRoom" />
 
     <item
-        android:id="@+id/toggleFirstPartyCookies"
+        android:id="@+id/add_or_edit_domain"
+        android:title="@string/add_domain_settings"
+        android:orderInCategory="200"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/toggle_first_party_cookies"
         android:title="@string/first_party_cookies"
-        android:orderInCategory="20"
+        android:orderInCategory="300"
         android:checkable="true"
+        android:icon="@drawable/cookies_disabled_light"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/toggleThirdPartyCookies"
+        android:id="@+id/toggle_third_party_cookies"
         android:title="@string/third_party_cookies"
-        android:orderInCategory="30"
+        android:orderInCategory="400"
         android:checkable="true"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/toggleDomStorage"
+        android:id="@+id/toggle_dom_storage"
         android:title="@string/dom_storage"
-        android:orderInCategory="40"
+        android:orderInCategory="500"
         android:checkable="true"
+        android:icon="@drawable/dom_storage_disabled_light"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/toggleSaveFormData"
+        android:id="@+id/toggle_save_form_data"
         android:title="@string/form_data"
-        android:orderInCategory="50"
+        android:orderInCategory="600"
         android:checkable="true"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/clearCookies"
-        android:title="@string/clear_cookies"
-        android:orderInCategory="60"
-        app:showAsAction="never" />
+        android:id="@+id/clear_data"
+        android:title="@string/clear_data"
+        android:orderInCategory="700"
+        app:showAsAction="never" >
 
-    <item
-        android:id="@+id/clearDomStorage"
-        android:title="@string/clear_dom_storage"
-        android:orderInCategory="70"
-        app:showAsAction="never" />
+        <menu>
+            <item
+                android:id="@+id/clear_cookies"
+                android:title="@string/clear_cookies"
+                android:orderInCategory="710"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/clear_dom_storage"
+                android:title="@string/clear_dom_storage"
+                android:orderInCategory="720"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/clear_form_data"
+                android:title="@string/clear_form_data"
+                android:orderInCategory="730"
+                app:showAsAction="never" />
+        </menu>
+    </item>
 
     <item
-        android:id="@+id/clearFormData"
-        android:title="@string/clear_form_data"
-        android:orderInCategory="80"
-        app:showAsAction="never" />
+        android:id="@+id/blocklists"
+        android:title="@string/blocklists"
+        android:orderInCategory="800"
+        app:showAsAction="never" >
+
+        <menu>
+            <item
+                android:id="@+id/easylist"
+                android:title="@string/easylist"
+                android:orderInCategory="810"
+                android:checkable="true"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/easyprivacy"
+                android:title="@string/easyprivacy"
+                android:orderInCategory="820"
+                android:checkable="true"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/fanboys_annoyance_list"
+                android:title="@string/options_fanboys_annoyance_list"
+                android:orderInCategory="830"
+                android:checkable="true"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/fanboys_social_blocking_list"
+                android:title="@string/options_fanboys_social_blocking_list"
+                android:orderInCategory="840"
+                android:checkable="true"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/ultraprivacy"
+                android:title="@string/ultraprivacy"
+                android:orderInCategory="850"
+                android:checkable="true"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/block_all_third_party_requests"
+                android:title="@string/options_block_all_third_party_requests"
+                android:orderInCategory="860"
+                android:checkable="true"
+                app:showAsAction="never" />
+        </menu>
+    </item>
 
     <item
-        android:id="@+id/fontSize"
-        android:title="@string/font_size"
-        android:orderInCategory="90"
+        android:id="@+id/layout"
+        android:title="@string/layout"
+        android:orderInCategory="900"
         app:showAsAction="never" >
 
         <menu>
-            <group android:checkableBehavior="single">
-                <item
-                    android:id="@+id/fontSizeFiftyPercent"
-                    android:title="@string/fifty_percent"
-                    android:orderInCategory="91"
-                    app:showAsAction="never" />
-
-                <item
-                    android:id="@+id/fontSizeSeventyFivePercent"
-                    android:title="@string/seventy_five_percent"
-                    android:orderInCategory="92"
-                    app:showAsAction="never" />
-
-                <item
-                    android:id="@+id/fontSizeOneHundredPercent"
-                    android:title="@string/one_hundred_percent"
-                    android:orderInCategory="93"
-                    app:showAsAction="never" />
-
-                <item
-                    android:id="@+id/fontSizeOneHundredTwentyFivePercent"
-                    android:title="@string/one_hundred_twenty_five_percent"
-                    android:orderInCategory="94"
-                    app:showAsAction="never" />
-
-                <item
-                    android:id="@+id/fontSizeOneHundredFiftyPercent"
-                    android:title="@string/one_hundred_fifty_percent"
-                    android:orderInCategory="95"
-                    app:showAsAction="never" />
-
-                <item
-                    android:id="@+id/fontSizeOneHundredSeventyFivePercent"
-                    android:title="@string/one_hundred_seventy_five_percent"
-                    android:orderInCategory="96"
-                    app:showAsAction="never" />
-
-                <item
-                    android:id="@+id/fontSizeTwoHundredPercent"
-                    android:title="@string/two_hundred_percent"
-                    android:orderInCategory="97"
-                    app:showAsAction="never" />
-            </group>
+            <item
+                android:id="@+id/user_agent"
+                android:title="@string/options_user_agent"
+                android:orderInCategory="910"
+                app:showAsAction="never" >
+
+                <menu>
+                    <group android:checkableBehavior ="single">
+                        <item
+                            android:id="@+id/user_agent_privacy_browser"
+                            android:title="@string/user_agent_privacy_browser"
+                            android:orderInCategory="911"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/user_agent_webview_default"
+                            android:title="@string/user_agent_webview_default"
+                            android:orderInCategory="912"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/user_agent_firefox_on_android"
+                            android:title="@string/user_agent_firefox_on_android"
+                            android:orderInCategory="913"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/user_agent_chrome_on_android"
+                            android:title="@string/user_agent_chrome_on_android"
+                            android:orderInCategory="914"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/user_agent_safari_on_ios"
+                            android:title="@string/user_agent_safari_on_ios"
+                            android:orderInCategory="915"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/user_agent_firefox_on_linux"
+                            android:title="@string/user_agent_firefox_on_linux"
+                            android:orderInCategory="916"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/user_agent_chromium_on_linux"
+                            android:title="@string/user_agent_chromium_on_linux"
+                            android:orderInCategory="917"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/user_agent_firefox_on_windows"
+                            android:title="@string/user_agent_firefox_on_windows"
+                            android:orderInCategory="918"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/user_agent_chrome_on_windows"
+                            android:title="@string/user_agent_chrome_on_windows"
+                            android:orderInCategory="919"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/user_agent_edge_on_windows"
+                            android:title="@string/user_agent_edge_on_windows"
+                            android:orderInCategory="920"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/user_agent_internet_explorer_on_windows"
+                            android:title="@string/user_agent_internet_explorer_on_windows"
+                            android:orderInCategory="921"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/user_agent_safari_on_macos"
+                            android:title="@string/user_agent_safari_on_macos"
+                            android:orderInCategory="922"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/user_agent_custom"
+                            android:title="@string/user_agent_custom"
+                            android:orderInCategory="923"
+                            app:showAsAction="never" />
+                    </group>
+                </menu>
+            </item>
+
+            <item
+                android:id="@+id/font_size"
+                android:title="@string/font_size"
+                android:orderInCategory="930"
+                app:showAsAction="never" >
+
+                <menu>
+                    <group android:checkableBehavior="single">
+                        <item
+                            android:id="@+id/font_size_twenty_five_percent"
+                            android:title="@string/twenty_five_percent"
+                            android:orderInCategory="931"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/font_size_fifty_percent"
+                            android:title="@string/fifty_percent"
+                            android:orderInCategory="932"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/font_size_seventy_five_percent"
+                            android:title="@string/seventy_five_percent"
+                            android:orderInCategory="933"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/font_size_one_hundred_percent"
+                            android:title="@string/one_hundred_percent"
+                            android:orderInCategory="934"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/font_size_one_hundred_twenty_five_percent"
+                            android:title="@string/one_hundred_twenty_five_percent"
+                            android:orderInCategory="935"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/font_size_one_hundred_fifty_percent"
+                            android:title="@string/one_hundred_fifty_percent"
+                            android:orderInCategory="936"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/font_size_one_hundred_seventy_five_percent"
+                            android:title="@string/one_hundred_seventy_five_percent"
+                            android:orderInCategory="937"
+                            app:showAsAction="never" />
+
+                        <item
+                            android:id="@+id/font_size_two_hundred_percent"
+                            android:title="@string/two_hundred_percent"
+                            android:orderInCategory="938"
+                            app:showAsAction="never" />
+                    </group>
+                </menu>
+            </item>
+
+            <item
+                android:id="@+id/swipe_to_refresh"
+                android:title="@string/swipe_to_refresh_options_menu"
+                android:orderInCategory="940"
+                android:checkable="true"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/display_images"
+                android:title="@string/display_images"
+                android:orderInCategory="950"
+                android:checkable="true"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/night_mode"
+                android:title="@string/options_night_mode"
+                android:orderInCategory="960"
+                android:checkable="true"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/find_on_page"
+                android:title="@string/find_on_page"
+                android:orderInCategory="970"
+                app:showAsAction="never|collapseActionView" />
+
+            <item
+                android:id="@+id/view_source"
+                android:title="@string/view_source"
+                android:orderInCategory="980"
+                app:showAsAction="never" />
         </menu>
     </item>
 
     <item
         android:id="@+id/share"
         android:title="@string/share"
-        android:orderInCategory="100"
-        app:showAsAction="never" />
+        android:orderInCategory="1000"
+        app:showAsAction="never" >
 
-    <item
-        android:id="@+id/addToHomescreen"
-        android:title="@string/add_to_home_screen"
-        android:orderInCategory="110"
-        app:showAsAction="never" />
+        <menu>
+            <item
+                android:id="@+id/share_url"
+                android:title="@string/share_url"
+                android:orderInCategory="1010"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/print"
+                android:title="@string/print"
+                android:orderInCategory="1020"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/open_with_app"
+                android:title="@string/open_with_app"
+                android:orderInCategory="1030"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/open_with_browser"
+                android:title="@string/open_with_browser"
+                android:orderInCategory="1040"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/add_to_homescreen"
+                android:title="@string/add_to_home_screen"
+                android:orderInCategory="1050"
+                app:showAsAction="never" />
+        </menu>
+    </item>
 
     <item
-        android:id="@+id/print"
-        android:title="@string/print"
-        android:orderInCategory="120"
+        android:id="@+id/proxy_through_orbot"
+        android:title="@string/proxy_through_orbot"
+        android:orderInCategory="1100"
+        android:checkable="true"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/refresh"
         android:title="@string/refresh"
-        android:orderInCategory="120"
+        android:orderInCategory="1200"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/ad_consent"
+        android:title="@string/ad_consent"
+        android:orderInCategory="1600"
         app:showAsAction="never" />
-</menu>
+</menu>
\ No newline at end of file