Fixed visibility of MenuItems

Use custom namespace for "showAsAction" and "getMenuInflater" instead of "new MenuInflater"

7 files changed, 70 insertions, 51 deletions

diff --git a/res/menu/channelview.xml b/res/menu/channelview.xml
index bdf833469..d7a95559a 100644
--- a/res/menu/channelview.xml
+++ b/res/menu/channelview.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/add_feed" android:icon="?attr/content_new" android:title="@string/add_new_feed_label" android:showAsAction="ifRoom"></item>
-    <item android:id="@+id/visit_website_item" android:title="@string/visit_website_label" android:showAsAction="ifRoom" android:icon="?attr/location_web_site"></item>
-    
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:custom="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/add_feed"
+        android:icon="?attr/content_new"
+        android:title="@string/add_new_feed_label"
+        custom:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/visit_website_item"
+        android:title="@string/visit_website_label"
+        custom:showAsAction="ifRoom"
+        android:icon="?attr/location_web_site"/>
+
 
 </menu>
\ No newline at end of file
diff --git a/res/menu/directory_chooser.xml b/res/menu/directory_chooser.xml
index 2c5eabe37..7735ffd2c 100644
--- a/res/menu/directory_chooser.xml
+++ b/res/menu/directory_chooser.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/new_folder_item" android:title="@string/create_folder_label" android:showAsAction="ifRoom|withText"></item>
-    <item android:id="@+id/set_to_default_folder_item" android:showAsAction="collapseActionView" android:title="@string/set_to_default_folder"></item>
-    
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:custom="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/new_folder_item"
+        android:title="@string/create_folder_label"
+        custom:showAsAction="ifRoom|withText"/>
+    <item
+        android:id="@+id/set_to_default_folder_item"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/set_to_default_folder"/>
+
 
 </menu>
\ No newline at end of file
diff --git a/res/menu/feedinfo.xml b/res/menu/feedinfo.xml
index 66a55dfa7..be50cb87d 100644
--- a/res/menu/feedinfo.xml
+++ b/res/menu/feedinfo.xml
@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:custom="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/visit_website_item"
         android:icon="?attr/location_web_site"
-        android:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="ifRoom|collapseActionView"
         android:title="@string/visit_website_label"
         android:visible="true">
     </item>
     <item
         android:id="@+id/support_item"
-        android:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="ifRoom|collapseActionView"
         android:title="@string/support_label"
         android:visible="false">
     </item>
     <item
         android:id="@+id/share_link_item"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/share_link_label">
     </item>
     <item
         android:id="@+id/share_source_item"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/share_source_label">
     </item>
 
diff --git a/res/menu/feeditem.xml b/res/menu/feeditem.xml
index bba0973a6..5b25e8f2c 100644
--- a/res/menu/feeditem.xml
+++ b/res/menu/feeditem.xml
@@ -1,75 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:custom="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/download_item"
         android:icon="?attr/av_download"
-        android:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="ifRoom|collapseActionView"
         android:title="@string/download_label">
     </item>
     <item
         android:id="@+id/stream_item"
         android:icon="?attr/action_stream"
-        android:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="ifRoom|collapseActionView"
         android:title="@string/stream_label">
     </item>
     <item
         android:id="@+id/play_item"
         android:icon="?attr/av_play"
-        android:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="ifRoom|collapseActionView"
         android:title="@string/play_label">
     </item>
     <item
         android:id="@+id/remove_item"
         android:icon="?attr/content_discard"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/remove_label">
     </item>
     <item
         android:id="@id/skip_episode_item"
         android:title="@string/skip_episode_label"
-        android:showAsAction="collapseActionView">
+        custom:showAsAction="collapseActionView">
     </item>
     <item
         android:id="@+id/cancel_download_item"
         android:icon="?attr/navigation_cancel"
-        android:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="ifRoom|collapseActionView"
         android:title="@string/cancel_download_label">
     </item>
     <item
         android:id="@+id/mark_read_item"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/mark_read_label">
     </item>
     <item
         android:id="@+id/mark_unread_item"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/mark_unread_label">
     </item>
     <item
         android:id="@+id/add_to_queue_item"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/add_to_queue_label">
     </item>
     <item
         android:id="@+id/remove_from_queue_item"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/remove_from_queue_label">
     </item>
     <item
         android:id="@+id/share_link_item"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/share_link_label">
     </item>
     <item
         android:id="@+id/visit_website_item"
         android:icon="?attr/location_web_site"
-        android:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="ifRoom|collapseActionView"
         android:title="@string/visit_website_label">
     </item>
     <item
         android:id="@+id/support_item"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/support_label">
     </item>
 
diff --git a/res/menu/feedlist.xml b/res/menu/feedlist.xml
index 49834c4fa..74f4fc923 100644
--- a/res/menu/feedlist.xml
+++ b/res/menu/feedlist.xml
@@ -1,40 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:custom="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/refresh_item"
         android:icon="?attr/navigation_refresh"
-        android:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="ifRoom|collapseActionView"
         android:title="@string/refresh_label">
     </item>
     <item
         android:id="@+id/mark_all_read_item"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/mark_all_read_label">
     </item>
     <item
         android:id="@+id/show_info_item"
         android:icon="?attr/action_about"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/show_info_label">
     </item>
     <item
         android:id="@+id/remove_item"
         android:icon="?attr/content_discard"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/remove_feed_label"
         android:visible="true">
     </item>
     <item
         android:id="@+id/visit_website_item"
         android:icon="?attr/location_web_site"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/visit_website_label"
         android:visible="true">
     </item>
     <item
         android:id="@+id/support_item"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/support_label"
         android:visible="false">
     </item>
diff --git a/res/menu/main.xml b/res/menu/main.xml
index 0b1b3cbcb..45047fc46 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -1,45 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:custom="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/all_feed_refresh"
         android:title="@string/refresh_label"
         android:icon="?attr/navigation_refresh"
-        android:showAsAction="ifRoom|collapseActionView">
+        custom:showAsAction="ifRoom|collapseActionView">
     </item>
     <item
         android:id="@+id/add_feed"
         android:title="@string/add_feed_label"
         android:icon="?attr/content_new"
-        android:showAsAction="ifRoom|collapseActionView">
+        custom:showAsAction="ifRoom|collapseActionView">
     </item>
-
-
     <item
         android:id="@id/search_item"
         android:icon="?attr/action_search"
         android:title="@string/search_label"
-        android:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="ifRoom|collapseActionView"
         android:actionViewClass="android.support.v7.widget.SearchView"/>
     <item
         android:id="@+id/show_player"
         android:title="@string/show_player_label"
         android:icon="@drawable/av_play"
-        android:showAsAction="collapseActionView"/>
+        custom:showAsAction="collapseActionView"/>
     <item
         android:id="@+id/show_playback_history"
         android:title="@string/playback_history_label"
-        android:showAsAction="collapseActionView"/>
+        custom:showAsAction="collapseActionView"/>
     <item
         android:id="@+id/show_downloads"
         android:title="@string/downloads_label"
         android:icon="@drawable/av_download"
-        android:showAsAction="collapseActionView">
+        custom:showAsAction="collapseActionView">
     </item>
     <item
         android:id="@+id/show_preferences"
         android:title="@string/settings_label"
         android:icon="?attr/action_settings"
-        android:showAsAction="collapseActionView"/>
+        custom:showAsAction="collapseActionView"/>
 
 
 </menu>
diff --git a/res/menu/mediaplayer.xml b/res/menu/mediaplayer.xml
index 2cde6d58a..0eb2ab067 100644
--- a/res/menu/mediaplayer.xml
+++ b/res/menu/mediaplayer.xml
@@ -1,38 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:custom="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/disable_sleeptimer_item"
         android:icon="?attr/device_access_time"
-        android:showAsAction="always"
+        custom:showAsAction="always"
         android:title="@string/sleep_timer_label">
     </item>
     <item
         android:id="@+id/set_sleeptimer_item"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/set_sleeptimer_label">
     </item>
     <item
         android:id="@+id/share_link_item"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/share_link_label">
     </item>
     <item
         android:id="@+id/visit_website_item"
         android:icon="?attr/location_web_site"
-        android:showAsAction="ifRoom|collapseActionView"
+        custom:showAsAction="ifRoom|collapseActionView"
         android:title="@string/visit_website_label"
         android:visible="false">
     </item>
     <item
         android:id="@+id/support_item"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/support_label"
         android:visible="false">
     </item>
     <item
         android:id="@id/skip_episode_item"
-        android:showAsAction="collapseActionView"
+        custom:showAsAction="collapseActionView"
         android:title="@string/skip_episode_label"
         android:visible="true"/>