First wrong button text in View Headers in night theme. https://redmine.stoutner...

[PrivacyBrowserAndroid.git] / app / src / main / res / menu / webview_options_menu.xml

diff --git a/app/src/main/res/menu/webview_options_menu.xml b/app/src/main/res/menu/webview_options_menu.xml
index df2a6f207cb265caa4d1ab59c5c65425c13b09bd..49ac11aef4627f9f30236670b3ca188ccc7dea31 100644 (file)
--- a/app/src/main/res/menu/webview_options_menu.xml
+++ b/app/src/main/res/menu/webview_options_menu.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2015-2020 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2015-2024 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/>. -->
 
 <menu
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -25,7 +25,7 @@
     tools:context=".activities.MainWebViewActivity" >
 
     <item
-        android:id="@+id/toggle_javascript"
+        android:id="@+id/javascript"
         android:title="@string/javascript"
         android:orderInCategory="100"
         android:icon="@drawable/privacy_mode"
@@ -38,31 +38,23 @@
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/toggle_first_party_cookies"
-        android:title="@string/first_party_cookies"
+        android:id="@+id/bookmarks"
+        android:title="@string/bookmarks"
         android:orderInCategory="300"
-        android:checkable="true"
-        android:icon="@drawable/cookies_disabled_light"
+        android:icon="@drawable/bookmarks"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/toggle_third_party_cookies"
-        android:title="@string/third_party_cookies"
+        android:id="@+id/cookies"
+        android:title="@string/cookies"
         android:orderInCategory="400"
         android:checkable="true"
+        android:icon="@drawable/cookies_disabled"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/toggle_dom_storage"
+        android:id="@+id/dom_storage"
         android:title="@string/dom_storage"
-        android:orderInCategory="500"
-        android:checkable="true"
-        android:icon="@drawable/dom_storage_disabled_light"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/toggle_save_form_data"
-        android:title="@string/form_data"
         android:orderInCategory="600"
         android:checkable="true"
         app:showAsAction="never" />
@@ -85,18 +77,12 @@
                 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/blocklists"
-        android:title="@string/blocklists"
+        android:id="@+id/filterlists"
+        android:title="@string/filterlists"
         android:orderInCategory="800"
         app:showAsAction="never" >
 
@@ -262,22 +248,16 @@
                             android:orderInCategory="1020"
                             app:showAsAction="never" />
 
-                        <item
-                            android:id="@+id/user_agent_internet_explorer_on_windows"
-                            android:title="@string/user_agent_internet_explorer_on_windows"
-                            android:orderInCategory="1021"
-                            app:showAsAction="never" />
-
                         <item
                             android:id="@+id/user_agent_safari_on_macos"
                             android:title="@string/user_agent_safari_on_macos"
-                            android:orderInCategory="1022"
+                            android:orderInCategory="1021"
                             app:showAsAction="never" />
 
                         <item
                             android:id="@+id/user_agent_custom"
                             android:title="@string/user_agent_custom"
-                            android:orderInCategory="1023"
+                            android:orderInCategory="1022"
                             app:showAsAction="never" />
                     </group>
                 </menu>
@@ -305,8 +285,8 @@
                 app:showAsAction="never" />
 
             <item
-                android:id="@+id/night_mode"
-                android:title="@string/options_night_mode"
+                android:id="@+id/dark_webview"
+                android:title="@string/dark_webview"
                 android:orderInCategory="1060"
                 android:checkable="true"
                 app:showAsAction="never" />
@@ -341,15 +321,16 @@
                         android:title="@string/save_url"
                         android:orderInCategory="1101"
                         app:showAsAction="never" />
+
                     <item
-                        android:id="@+id/save_as_archive"
-                        android:title="@string/save_as_archive"
+                        android:id="@+id/save_archive"
+                        android:title="@string/save_archive"
                         android:orderInCategory="1102"
                         app:showAsAction="never" />
 
                     <item
-                        android:id="@+id/save_as_image"
-                        android:title="@string/save_as_image"
+                        android:id="@+id/save_image"
+                        android:title="@string/save_image"
                         android:orderInCategory="1103"
                         app:showAsAction="never" />
                 </menu>
@@ -366,6 +347,12 @@
                 android:title="@string/view_source"
                 android:orderInCategory="1120"
                 app:showAsAction="never" />
+
+            <item
+                android:id="@+id/view_headers"
+                android:title="@string/view_headers"
+                android:orderInCategory="1130"
+                app:showAsAction="never" />
         </menu>
     </item>
 
@@ -376,22 +363,28 @@
         app:showAsAction="never" >
 
         <menu>
+            <item
+                android:id="@+id/share_message"
+                android:title="@string/share_message"
+                android:orderInCategory="1210"
+                app:showAsAction="never" />
+
             <item
                 android:id="@+id/share_url"
                 android:title="@string/share_url"
-                android:orderInCategory="1210"
+                android:orderInCategory="1220"
                 app:showAsAction="never" />
 
             <item
                 android:id="@+id/open_with_app"
                 android:title="@string/open_with_app"
-                android:orderInCategory="1220"
+                android:orderInCategory="1230"
                 app:showAsAction="never" />
 
             <item
                 android:id="@+id/open_with_browser"
                 android:title="@string/open_with_browser"
-                android:orderInCategory="1230"
+                android:orderInCategory="1240"
                 app:showAsAction="never" />
         </menu>
     </item>
@@ -401,10 +394,4 @@
         android:title="@string/add_domain_settings"
         android:orderInCategory="1300"
         app:showAsAction="never" />
-
-    <item
-        android:id="@+id/ad_consent"
-        android:title="@string/ad_consent"
-        android:orderInCategory="1400"
-        app:showAsAction="never" />
-</menu>
\ No newline at end of file
+</menu>