From 30508dd7e1b1291eb91dde7af8fc037ee86c5f2b Mon Sep 17 00:00:00 2001
From: Hardcore Sushi <hardcore.sushi@disroot.org>
Date: Fri, 11 Jun 2021 16:30:40 +0200
Subject: [PATCH] Add title to menu items

---
 app/src/main/res/menu/explorer.xml      | 19 +++++++++++--------
 app/src/main/res/menu/explorer_drop.xml | 12 +++++++-----
 app/src/main/res/menu/explorer_pick.xml | 10 ++++++----
 app/src/main/res/menu/text_editor.xml   |  2 ++
 app/src/main/res/values/strings.xml     |  3 +++
 5 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/menu/explorer.xml b/app/src/main/res/menu/explorer.xml
index 6bfc8c6..9370b7f 100644
--- a/app/src/main/res/menu/explorer.xml
+++ b/app/src/main/res/menu/explorer.xml
@@ -8,12 +8,6 @@
         android:visible="false"
         android:icon="@drawable/icon_select_all"/>
 
-    <item
-        android:id="@+id/cut"
-        app:showAsAction="always"
-        android:visible="false"
-        android:icon="@drawable/icon_cut"/>
-
     <item
         android:id="@+id/delete"
         app:showAsAction="always"
@@ -27,6 +21,13 @@
         android:icon="@drawable/icon_copy"
         android:title="@string/copy_menu_title"/>
 
+    <item
+        android:id="@+id/cut"
+        app:showAsAction="ifRoom"
+        android:visible="false"
+        android:title="@string/cut"
+        android:icon="@drawable/icon_cut"/>
+
     <item
         android:id="@+id/decrypt"
         app:showAsAction="ifRoom"
@@ -61,12 +62,14 @@
 
     <item
         android:id="@+id/sort"
-        app:showAsAction="always"
+        app:showAsAction="ifRoom"
+        android:title="@string/sort_by"
         android:icon="@drawable/icon_sort"/>
 
     <item
         android:id="@+id/close"
-        app:showAsAction="always"
+        app:showAsAction="ifRoom"
+        android:title="@string/close_volume"
         android:icon="@drawable/icon_close"/>
 
 </menu>
diff --git a/app/src/main/res/menu/explorer_drop.xml b/app/src/main/res/menu/explorer_drop.xml
index 3577a36..6296cc8 100644
--- a/app/src/main/res/menu/explorer_drop.xml
+++ b/app/src/main/res/menu/explorer_drop.xml
@@ -3,30 +3,32 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-	android:id="@+id/external_open"
+	    android:id="@+id/external_open"
         app:showAsAction="never"
         android:visible="false"
         android:title="@string/external_open"/>
 
     <item
-	android:id="@+id/rename"
+	    android:id="@+id/rename"
         app:showAsAction="never"
         android:visible="false"
         android:title="@string/rename"/>
 
     <item
         android:id="@+id/validate"
-        app:showAsAction="ifRoom"
+        app:showAsAction="always"
         android:icon="@drawable/icon_check"/>
 
     <item
         android:id="@+id/sort"
-        app:showAsAction="always"
+        app:showAsAction="ifRoom"
+        android:title="@string/sort_by"
         android:icon="@drawable/icon_sort"/>
 
     <item
         android:id="@+id/close"
-        app:showAsAction="always"
+        app:showAsAction="ifRoom"
+        android:title="@string/close_volume"
         android:icon="@drawable/icon_close"/>
 
 </menu>
diff --git a/app/src/main/res/menu/explorer_pick.xml b/app/src/main/res/menu/explorer_pick.xml
index d01e433..b687b38 100644
--- a/app/src/main/res/menu/explorer_pick.xml
+++ b/app/src/main/res/menu/explorer_pick.xml
@@ -4,13 +4,13 @@
 
     <item
         android:id="@+id/validate"
-        app:showAsAction="ifRoom"
+        app:showAsAction="always"
         android:visible="false"
         android:icon="@drawable/icon_check"/>
 
     <item
         android:id="@+id/select_all"
-        app:showAsAction="ifRoom"
+        app:showAsAction="always"
         android:visible="false"
         android:icon="@drawable/icon_select_all"/>
 
@@ -22,12 +22,14 @@
 
     <item
         android:id="@+id/sort"
-        app:showAsAction="always"
+        app:showAsAction="ifRoom"
+        android:title="@string/sort_by"
         android:icon="@drawable/icon_sort"/>
 
     <item
         android:id="@+id/close"
-        app:showAsAction="always"
+        app:showAsAction="ifRoom"
+        android:title="@string/close_volume"
         android:icon="@drawable/icon_close"/>
 
 </menu>
diff --git a/app/src/main/res/menu/text_editor.xml b/app/src/main/res/menu/text_editor.xml
index 7ee2294..4bc278d 100644
--- a/app/src/main/res/menu/text_editor.xml
+++ b/app/src/main/res/menu/text_editor.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <item
         android:id="@+id/menu_save"
         app:showAsAction="always"
         android:icon="@drawable/icon_save"/>
+
     <item
         android:id="@+id/word_wrap"
         app:showAsAction="never"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index df5fc75..56dc83f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -195,4 +195,7 @@
     <string name="auto_fit_title">Video player screen auto-rotation</string>
     <string name="auto_fit_summary">Auto-rotate the screen to fit video dimensions</string>
     <string name="open_tree_failed">No file explorer found. Please install one and retry.</string>
+    <string name="close_volume">Close volume</string>
+    <string name="sort_by">Sort By</string>
+    <string name="cut">Cut</string>
 </resources>