X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fmenu%2Fwebview_options_menu.xml;h=f3d810545ea653efec1662d41dab56a029f79b26;hp=28e0cfe3917e6caf066f6d780f33cbd27d4d37ba;hb=ca7516a7edb9e06d0f9fe9186513986cd82be716;hpb=69b0fea4c49422f5e3c377994c4cf249bdc5a434

diff --git a/app/src/main/res/menu/webview_options_menu.xml b/app/src/main/res/menu/webview_options_menu.xml
index 28e0cfe3..f3d81054 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-2018 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>.
 
@@ -28,6 +28,7 @@
         android:id="@+id/toggle_javascript"
         android:title="@string/javascript"
         android:orderInCategory="100"
+        android:icon="@drawable/privacy_mode"
         app:showAsAction="ifRoom" />
 
     <item
@@ -41,6 +42,7 @@
         android:title="@string/first_party_cookies"
         android:orderInCategory="300"
         android:checkable="true"
+        android:icon="@drawable/cookies_disabled_light"
         app:showAsAction="never" />
 
     <item
@@ -55,6 +57,7 @@
         android:title="@string/dom_storage"
         android:orderInCategory="500"
         android:checkable="true"
+        android:icon="@drawable/dom_storage_disabled_light"
         app:showAsAction="never" />
 
     <item
@@ -126,77 +129,121 @@
                 android:checkable="true"
                 app:showAsAction="never" />
 
+            <item
+                android:id="@+id/ultralist"
+                android:title="@string/ultralist"
+                android:orderInCategory="850"
+                android:checkable="true"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/ultraprivacy"
+                android:title="@string/ultraprivacy"
+                android:orderInCategory="860"
+                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="850"
+                android:orderInCategory="870"
                 android:checkable="true"
                 app:showAsAction="never" />
         </menu>
     </item>
 
     <item
-        android:id="@+id/layout"
-        android:title="@string/layout"
+        android:id="@+id/page"
+        android:title="@string/page"
         android:orderInCategory="900"
         app:showAsAction="never" >
 
         <menu>
             <item
-                android:id="@+id/font_size"
-                android:title="@string/font_size"
+                android:id="@+id/user_agent"
+                android:title="@string/options_user_agent"
                 android:orderInCategory="910"
                 app:showAsAction="never" >
 
                 <menu>
-                    <group android:checkableBehavior="single">
+                    <group android:checkableBehavior ="single">
                         <item
-                            android:id="@+id/font_size_twenty_five_percent"
-                            android:title="@string/twenty_five_percent"
+                            android:id="@+id/user_agent_privacy_browser"
+                            android:title="@string/user_agent_privacy_browser"
                             android:orderInCategory="911"
                             app:showAsAction="never" />
 
                         <item
-                            android:id="@+id/font_size_fifty_percent"
-                            android:title="@string/fifty_percent"
+                            android:id="@+id/user_agent_webview_default"
+                            android:title="@string/user_agent_webview_default"
                             android:orderInCategory="912"
                             app:showAsAction="never" />
 
                         <item
-                            android:id="@+id/font_size_seventy_five_percent"
-                            android:title="@string/seventy_five_percent"
+                            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/font_size_one_hundred_percent"
-                            android:title="@string/one_hundred_percent"
+                            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/font_size_one_hundred_twenty_five_percent"
-                            android:title="@string/one_hundred_twenty_five_percent"
+                            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/font_size_one_hundred_fifty_percent"
-                            android:title="@string/one_hundred_fifty_percent"
+                            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/font_size_one_hundred_seventy_five_percent"
-                            android:title="@string/one_hundred_seventy_five_percent"
+                            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/font_size_two_hundred_percent"
-                            android:title="@string/two_hundred_percent"
+                            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>
@@ -204,21 +251,66 @@
             <item
                 android:id="@+id/swipe_to_refresh"
                 android:title="@string/swipe_to_refresh_options_menu"
-                android:orderInCategory="920"
+                android:orderInCategory="930"
+                android:checkable="true"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/wide_viewport"
+                android:title="@string/wide_viewport"
+                android:orderInCategory="940"
                 android:checkable="true"
                 app:showAsAction="never" />
 
             <item
                 android:id="@+id/display_images"
                 android:title="@string/display_images"
-                android:orderInCategory="930"
+                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/font_size"
+                android:title="@string/font_size"
+                android:orderInCategory="970"
+                app:showAsAction="never" >
+            </item>
+
+            <item
+                android:id="@+id/find_on_page"
+                android:title="@string/find_on_page"
+                android:orderInCategory="980"
+                app:showAsAction="never|collapseActionView" />
+
+            <item
+                android:id="@+id/print"
+                android:title="@string/print"
+                android:orderInCategory="990"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/save_as_image"
+                android:title="@string/save_as_image"
+                android:orderInCategory="1000"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/add_to_homescreen"
+                android:title="@string/add_to_home_screen"
+                android:orderInCategory="1010"
+                app:showAsAction="never" />
+
             <item
                 android:id="@+id/view_source"
                 android:title="@string/view_source"
-                android:orderInCategory="940"
+                android:orderInCategory="1020"
                 app:showAsAction="never" />
         </menu>
     </item>
@@ -226,35 +318,46 @@
     <item
         android:id="@+id/share"
         android:title="@string/share"
-        android:orderInCategory="1000"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/find_on_page"
-        android:title="@string/find_on_page"
         android:orderInCategory="1100"
-        app:showAsAction="never|collapseActionView" />
-    <item
-        android:id="@+id/print"
-        android:title="@string/print"
-        android:orderInCategory="1200"
-        app:showAsAction="never" />
+        app:showAsAction="never" >
+
+        <menu>
+            <item
+                android:id="@+id/share_url"
+                android:title="@string/share_url"
+                android:orderInCategory="1110"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/open_with_app"
+                android:title="@string/open_with_app"
+                android:orderInCategory="1120"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/open_with_browser"
+                android:title="@string/open_with_browser"
+                android:orderInCategory="1130"
+                app:showAsAction="never" />
+        </menu>
+    </item>
 
     <item
-        android:id="@+id/add_to_homescreen"
-        android:title="@string/add_to_home_screen"
-        android:orderInCategory="1300"
+        android:id="@+id/proxy_through_orbot"
+        android:title="@string/proxy_through_orbot"
+        android:orderInCategory="1200"
+        android:checkable="true"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/refresh"
         android:title="@string/refresh"
-        android:orderInCategory="1400"
+        android:orderInCategory="1300"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/ad_consent"
         android:title="@string/ad_consent"
-        android:orderInCategory="1500"
+        android:orderInCategory="1400"
         app:showAsAction="never" />
 </menu>
\ No newline at end of file