From e1fa97b98f909806dd6c4d84edc098c2f1d392ae Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <egorr.berd@gmail.com>
Date: Sat, 11 Feb 2017 18:02:10 +0100
Subject: [PATCH] Fix some actionbar menu items are not shown as icons.

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
---
 ultrasonic/src/main/res/menu/main.xml         |  7 +++--
 ultrasonic/src/main/res/menu/nowplaying.xml   | 27 ++++++++++---------
 ultrasonic/src/main/res/menu/select_album.xml |  9 ++++---
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/ultrasonic/src/main/res/menu/main.xml b/ultrasonic/src/main/res/menu/main.xml
index 72338b95..78713454 100644
--- a/ultrasonic/src/main/res/menu/main.xml
+++ b/ultrasonic/src/main/res/menu/main.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:a="http://schemas.android.com/apk/res/android" >
+<menu
+    xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
 
     <item
         a:id="@+id/main_shuffle"
         a:icon="?attr/media_shuffle"
-        a:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         a:title="@string/main.shuffle"/>
 
 </menu>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/menu/nowplaying.xml b/ultrasonic/src/main/res/menu/nowplaying.xml
index 24ddb18d..ae1e1e32 100644
--- a/ultrasonic/src/main/res/menu/nowplaying.xml
+++ b/ultrasonic/src/main/res/menu/nowplaying.xml
@@ -1,56 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:a="http://schemas.android.com/apk/res/android" >
+<menu
+    xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
 
     <item
         a:id="@+id/menu_item_toggle_list"
         a:icon="?attr/media_toggle"
-        a:showAsAction="always"
+        app:showAsAction="always"
         a:title="@string/download.toggle_playlist"/>
     <item
         a:id="@+id/menu_item_star"
         a:icon="?attr/star_hollow"
-        a:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         a:title="@string/download.menu_star"/>
     <item
         a:id="@+id/menu_item_share"
         a:icon="?attr/share"
-        a:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         a:title="@string/download.share_playlist"/>
     <item
         a:id="@+id/menu_item_save_playlist"
         a:icon="?attr/save"
-        a:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         a:title="@string/download.menu_save"/>
     <item
         a:id="@+id/menu_item_clear_playlist"
         a:icon="?attr/remove_all"
-        a:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         a:title="@string/download.menu_clear_playlist"/>
     <item
         a:id="@+id/menu_item_bookmark_set"
         a:icon="?attr/bookmark"
-        a:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         a:title="@string/download.bookmark_set"/>
     <item
         a:id="@+id/menu_item_bookmark_delete"
         a:icon="?attr/bookmark"
-        a:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         a:title="@string/download.bookmark_delete"/>
     <item
         a:id="@+id/menu_item_equalizer"
-        a:showAsAction="never"
+        app:showAsAction="never"
         a:title="@string/download.menu_equalizer"/>
     <item
         a:id="@+id/menu_item_visualizer"
-        a:showAsAction="never"
+        app:showAsAction="never"
         a:title="@string/download.menu_visualizer"/>
     <item
         a:id="@+id/menu_item_jukebox"
-        a:showAsAction="never"
+        app:showAsAction="never"
         a:title="@string/download.menu_jukebox_on"/>
     <item
         a:id="@+id/menu_item_screen_on_off"
-        a:showAsAction="never"
+        app:showAsAction="never"
         a:title="@string/download.menu_screen_on"/>
 
 </menu>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/menu/select_album.xml b/ultrasonic/src/main/res/menu/select_album.xml
index 63c08fd4..8246d460 100644
--- a/ultrasonic/src/main/res/menu/select_album.xml
+++ b/ultrasonic/src/main/res/menu/select_album.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:a="http://schemas.android.com/apk/res/android" >
+<menu
+    xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
 
     <item
         a:id="@+id/menu_item_share"
-        a:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         a:title="@string/menu.share"
         a:icon="?attr/share"/>
 
     <item
         a:id="@+id/select_album_play_all"
         a:icon="?attr/media_play"
-        a:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         a:title="@string/select_album.play_all"/>
 
 </menu>
\ No newline at end of file