X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fmenu%2Fwebview_options_menu.xml;h=08946609bda616a88367b7ae246500226d9f8296;hp=a5c5f4f3b88da68ee640b0e42c5ea158bd30a380;hb=d4f39c36beb5e6c3568a1e075274ad66defd8e8e;hpb=dab795a417200c6094da1b1aa25c7bb3e638c686

diff --git a/app/src/main/res/menu/webview_options_menu.xml b/app/src/main/res/menu/webview_options_menu.xml
index a5c5f4f3..08946609 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-2020 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2021 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -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"
@@ -37,37 +37,38 @@
         android:orderInCategory="200"
         app:showAsAction="never" />
 
+    <!-- `android:iconTint` can be used once the minimum API >= 26 instead of including a separate drawable for each theme. -->
     <item
         android:id="@+id/bookmarks"
         android:title="@string/bookmarks"
         android:orderInCategory="300"
+        android:icon="?attr/bookmarksAppBarIcon"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/toggle_first_party_cookies"
+        android:id="@+id/first_party_cookies"
         android:title="@string/first_party_cookies"
         android:orderInCategory="400"
         android:checkable="true"
-        android:icon="@drawable/cookies_disabled_light"
+        android:icon="@drawable/cookies_disabled_day"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/toggle_third_party_cookies"
+        android:id="@+id/third_party_cookies"
         android:title="@string/third_party_cookies"
         android:orderInCategory="500"
         android:checkable="true"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/toggle_dom_storage"
+        android:id="@+id/dom_storage"
         android:title="@string/dom_storage"
         android:orderInCategory="600"
         android:checkable="true"
-        android:icon="@drawable/dom_storage_disabled_light"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/toggle_save_form_data"
+        android:id="@+id/save_form_data"
         android:title="@string/form_data"
         android:orderInCategory="700"
         android:checkable="true"
@@ -311,8 +312,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="1160"
                 android:checkable="true"
                 app:showAsAction="never" />
@@ -347,16 +348,11 @@
                         android:title="@string/save_url"
                         android:orderInCategory="1201"
                         app:showAsAction="never" />
-                    <item
-                        android:id="@+id/save_as_archive"
-                        android:title="@string/save_as_archive"
-                        android:orderInCategory="1202"
-                        app:showAsAction="never" />
 
                     <item
-                        android:id="@+id/save_as_image"
-                        android:title="@string/save_as_image"
-                        android:orderInCategory="1203"
+                        android:id="@+id/save_image"
+                        android:title="@string/save_image"
+                        android:orderInCategory="1202"
                         app:showAsAction="never" />
                 </menu>
             </item>