Move Clear and Exit to the top of the navigation menu. https://redmine.stoutner...

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

diff --git a/app/src/main/res/menu/webview_navigation_menu.xml b/app/src/main/res/menu/webview_navigation_menu.xml
index 74a9249ce10361b91d80e675385e3e94bf8f218f..6181453cfc234e1113943294547dcfaff77b26eb 100644 (file)
--- a/app/src/main/res/menu/webview_navigation_menu.xml
+++ b/app/src/main/res/menu/webview_navigation_menu.xml
@@ -20,97 +20,108 @@
 
 <menu
     xmlns:android="http://schemas.android.com/apk/res/android">
+
     <item
-        android:id="@+id/home"
-        android:title="@string/home"
-        android:icon="@drawable/home_enabled_light"
+        android:id="@+id/close_tab"
+        android:title="@string/close_tab"
+        android:icon="@drawable/tab"
         android:orderInCategory="10" />
 
     <item
-        android:id="@+id/back"
-        android:title="@string/back"
-        android:icon="@drawable/back"
+        android:id="@+id/clear_and_exit"
+        android:title="@string/clear_and_exit"
+        android:icon="@drawable/open_with_external_app_enabled_light"
         android:orderInCategory="20" />
 
-    <item
-        android:id="@+id/forward"
-        android:title="@string/forward"
-        android:icon="@drawable/forward"
-        android:orderInCategory="30" />
+    <!-- If a group has an id, a line is drawn above it in the navigation view. -->
+    <group
+        android:id="@+id/navigation_group" >
 
-    <item
-        android:id="@+id/history"
-        android:title="@string/history"
-        android:icon="@drawable/history"
-        android:orderInCategory="40" />
+        <item
+            android:id="@+id/home"
+            android:title="@string/home"
+            android:icon="@drawable/home_enabled_light"
+            android:orderInCategory="30" />
+
+        <item
+            android:id="@+id/back"
+            android:title="@string/back"
+            android:icon="@drawable/back"
+            android:orderInCategory="40" />
+
+        <item
+            android:id="@+id/forward"
+            android:title="@string/forward"
+            android:icon="@drawable/forward"
+            android:orderInCategory="50" />
+
+        <item
+            android:id="@+id/history"
+            android:title="@string/history"
+            android:icon="@drawable/history"
+            android:orderInCategory="60" />
+    </group>
 
     <!-- If a group has an id, a line is drawn above it in the navigation view. -->
     <group
         android:id="@+id/features_group" >
+
         <item
             android:id="@+id/requests"
             android:title="@string/requests"
             android:icon="@drawable/block_ads_enabled_light"
-            android:orderInCategory="50" />
+            android:orderInCategory="70" />
 
         <item
             android:id="@+id/downloads"
             android:title="@string/downloads"
             android:icon="@drawable/downloads_light"
-            android:orderInCategory="60" />
+            android:orderInCategory="80" />
     </group>
 
     <!-- If a group has an id, a line is drawn above it in the navigation view. -->
     <group
         android:id="@+id/settings_group" >
+
         <item
             android:id="@+id/domains"
             android:title="@string/domains"
             android:icon="@drawable/domains"
-            android:orderInCategory="70" />
+            android:orderInCategory="90" />
 
         <item
             android:id="@+id/settings"
             android:title="@string/settings"
             android:icon="@drawable/settings"
-            android:orderInCategory="80" />
+            android:orderInCategory="100" />
 
         <item
             android:id="@+id/import_export"
             android:title="@string/import_export"
             android:icon="@drawable/import_export_light"
-            android:orderInCategory="90" />
+            android:orderInCategory="110" />
 
         <item
             android:id="@+id/logcat"
             android:title="@string/logcat"
             android:icon="@drawable/bug"
-            android:orderInCategory="100" />
+            android:orderInCategory="120" />
     </group>
 
     <!-- If a group has an id, a line is drawn above it in the navigation view. -->
     <group
         android:id="@+id/info_group" >
+
         <item
             android:id="@+id/guide"
             android:title="@string/guide"
             android:icon="@drawable/guide"
-            android:orderInCategory="110" />
+            android:orderInCategory="130" />
 
         <item
             android:id="@+id/about"
             android:title="@string/about"
             android:icon="@drawable/about_light"
-            android:orderInCategory="120" />
-    </group>
-
-    <!-- If a group has an id, a line is drawn above it in the navigation view. -->
-    <group
-        android:id="@+id/exit_group" >
-        <item
-            android:id="@+id/clear_and_exit"
-            android:title="@string/clear_and_exit"
-            android:icon="@drawable/open_with_external_app_enabled_light"
-            android:orderInCategory="130" />
+            android:orderInCategory="140" />
     </group>
 </menu>
\ No newline at end of file