Update to gradle

42 files changed, 1219 insertions, 0 deletions

diff --git a/app/src/main/res/menu/abstract_top_menu.xml b/app/src/main/res/menu/abstract_top_menu.xml
new file mode 100644
index 00000000..22499ae9
--- /dev/null
+++ b/app/src/main/res/menu/abstract_top_menu.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/menu_search"
+		android:icon="?attr/search"
+		android:title="@string/menu.search"
+		compat:showAsAction="always|withText"/>
+
+	<group android:id="@+id/not_touchscreen">
+		<item
+			android:id="@+id/menu_refresh"
+			android:icon="?attr/refresh"
+			android:title="@string/menu.refresh"
+			compat:showAsAction="ifRoom|withText"/>
+	</group>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+</menu>
diff --git a/app/src/main/res/menu/admin.xml b/app/src/main/res/menu/admin.xml
new file mode 100644
index 00000000..28c5134b
--- /dev/null
+++ b/app/src/main/res/menu/admin.xml
@@ -0,0 +1,12 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/menu_add_user"
+		android:title="@string/menu.add_user"
+		android:icon="?attr/add_person"
+		compat:showAsAction="always|withText"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/admin_context.xml b/app/src/main/res/menu/admin_context.xml
new file mode 100644
index 00000000..e4c8fdc3
--- /dev/null
+++ b/app/src/main/res/menu/admin_context.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/admin_change_email"
+		android:title="@string/admin.change_email"/>
+
+	<item
+		android:id="@+id/admin_change_password"
+		android:title="@string/admin.change_password"/>
+
+	<item
+		android:id="@+id/admin_delete_user"
+		android:title="@string/admin.delete_user"/>
+</menu>
diff --git a/app/src/main/res/menu/admin_context_user.xml b/app/src/main/res/menu/admin_context_user.xml
new file mode 100644
index 00000000..d53eee49
--- /dev/null
+++ b/app/src/main/res/menu/admin_context_user.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/admin_change_password"
+		android:title="@string/admin.change_password"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/downloading.xml b/app/src/main/res/menu/downloading.xml
new file mode 100644
index 00000000..670a2803
--- /dev/null
+++ b/app/src/main/res/menu/downloading.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item
+        android:id="@+id/menu_remove_all"
+        android:icon="?attr/remove"
+        android:title="@string/download.menu_remove_all"
+        compat:showAsAction="always|withText"/>
+		
+	<item 
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+</menu>
diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml
new file mode 100644
index 00000000..b3e70cfa
--- /dev/null
+++ b/app/src/main/res/menu/drawer_menu.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/menu_search"
+		android:icon="?attr/search"
+		android:title="@string/menu.search"
+		compat:showAsAction="always|withText"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+</menu>
diff --git a/app/src/main/res/menu/empty.xml b/app/src/main/res/menu/empty.xml
new file mode 100644
index 00000000..eae036cf
--- /dev/null
+++ b/app/src/main/res/menu/empty.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+	<group android:id="@+id/not_touchscreen">
+		<item
+			android:id="@+id/menu_refresh"
+			android:icon="?attr/refresh"
+			android:title="@string/menu.refresh"
+			compat:showAsAction="ifRoom|withText"/>
+	</group>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+</menu>
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
new file mode 100644
index 00000000..549c5fb6
--- /dev/null
+++ b/app/src/main/res/menu/main.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item 
+		android:id="@+id/menu_search"
+		android:icon="?attr/search"
+		android:title="@string/menu.search"
+		compat:showAsAction="always|withText"/>
+	
+	<item 
+		android:id="@+id/menu_shuffle"
+		android:icon="?attr/shuffle"
+		android:title="@string/menu.shuffle"
+		compat:showAsAction="always|withText"/>
+
+	<group android:id="@+id/madsonic">
+		<item
+			android:id="@+id/menu_rescan"
+			android:title="@string/menu.rescan"/>
+	</group>
+		
+	<item 
+		android:id="@+id/menu_about"
+		android:title="@string/menu.about"/>
+
+	<item
+		android:id="@+id/menu_faq"
+		android:title="@string/menu.faq"/>
+		
+	<item 
+		android:id="@+id/menu_log"
+		android:title="@string/menu.log"/>
+
+	<item 
+		android:id="@+id/menu_changelog"
+		android:title="@string/changelog_full_title"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+</menu>
diff --git a/app/src/main/res/menu/nowplaying.xml b/app/src/main/res/menu/nowplaying.xml
new file mode 100644
index 00000000..60255692
--- /dev/null
+++ b/app/src/main/res/menu/nowplaying.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto"
+	  android:checkableBehavior="all">
+
+    <item
+        android:id="@+id/menu_shuffle"
+        android:icon="?attr/shuffle"
+        android:title="@string/download.menu_shuffle"
+        compat:showAsAction="ifRoom|withText"/>
+
+	<item
+		android:id="@+id/menu_mediaroute"
+		compat:actionProviderClass="android.support.v7.app.MediaRouteActionProvider"
+		compat:actionViewClass="android.support.v7.app.MediaRouteButton"
+		compat:showAsAction="always"
+		android:title="@string/menu.cast"/>
+		
+	<item
+        android:id="@+id/menu_remove_all"
+        android:icon="?attr/remove"
+        android:title="@string/download.menu_remove_all"
+        compat:showAsAction="ifRoom|withText"/>
+
+    <item
+        android:id="@+id/menu_save_playlist"
+        android:icon="?attr/save"
+        android:title="@string/download.menu_save"
+        compat:showAsAction="ifRoom|withText"/>
+
+	<item
+		android:id="@+id/menu_equalizer"
+		android:title="@string/equalizer.label"
+		android:checkable="true"/>
+
+    <item
+        android:id="@+id/menu_screen_on_off"
+        android:title="@string/download.menu_screen_on"
+		android:checkable="true"/>
+
+	<item
+		android:id="@+id/menu_remove_played"
+		android:title="@string/download.menu_remove_played_songs"
+		android:checkable="true"/>
+		
+	<item
+        android:id="@+id/menu_toggle_timer"
+        android:title="@string/download.start_timer"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+</menu>
diff --git a/app/src/main/res/menu/nowplaying_context.xml b/app/src/main/res/menu/nowplaying_context.xml
new file mode 100644
index 00000000..c9347353
--- /dev/null
+++ b/app/src/main/res/menu/nowplaying_context.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/menu_info"
+		android:title="@string/common.info"
+		/>
+	
+	<item 
+		android:id="@+id/menu_show_artist"
+		android:title="@string/menu.show_artist"/>
+
+	<item 
+		android:id="@+id/menu_show_album"
+		android:title="@string/download.menu_show_album"/>
+
+	<item 
+		android:id="@+id/menu_lyrics"
+		android:title="@string/download.menu_lyrics"/>
+
+	<item 
+		android:id="@+id/menu_remove"
+		android:title="@string/download.menu_remove"/>
+
+	<item 
+		android:id="@+id/menu_delete"
+		android:title="@string/menu.delete_cache"/>
+
+	<group android:id="@+id/hide_star">
+		<item
+			android:id="@+id/menu_star"
+			android:title="@string/common.star"/>
+	</group>
+
+	<group android:id="@+id/hide_share">
+		<item
+			android:id="@+id/menu_share"
+			android:title="@string/menu.share"/>
+	</group>
+	
+	<group android:id="@+id/hide_rating">
+		<item
+			android:id="@+id/menu_rate"
+			android:title="@string/menu.rate"/>
+	</group>
+	
+	<group android:id="@+id/server_1.8">	
+		<item
+			android:id="@+id/menu_add_playlist"
+			android:title="@string/menu.add_playlist"/>
+	</group>
+</menu>
diff --git a/app/src/main/res/menu/nowplaying_context_offline.xml b/app/src/main/res/menu/nowplaying_context_offline.xml
new file mode 100644
index 00000000..24b23a8d
--- /dev/null
+++ b/app/src/main/res/menu/nowplaying_context_offline.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/menu_info"
+		android:title="@string/common.info"
+		/>
+	
+	<item 
+		android:id="@+id/menu_show_artist"
+		android:title="@string/menu.show_artist"/>
+
+	<item 
+		android:id="@+id/menu_show_album"
+		android:title="@string/download.menu_show_album"/>
+
+	<item 
+		android:id="@+id/menu_remove"
+		android:title="@string/download.menu_remove"/>
+
+	<item 
+		android:id="@+id/menu_delete"
+		android:title="@string/menu.delete_cache"/>
+
+	<group android:id="@+id/hide_star">
+		<item
+			android:id="@+id/menu_star"
+			android:title="@string/common.star"/>
+	</group>
+</menu>
diff --git a/app/src/main/res/menu/nowplaying_offline.xml b/app/src/main/res/menu/nowplaying_offline.xml
new file mode 100644
index 00000000..bba5ba00
--- /dev/null
+++ b/app/src/main/res/menu/nowplaying_offline.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_shuffle"
+        android:icon="?attr/shuffle"
+        android:title="@string/download.menu_shuffle"
+        compat:showAsAction="always|withText"/>
+
+	<item
+		android:id="@+id/menu_mediaroute"
+		compat:actionProviderClass="android.support.v7.app.MediaRouteActionProvider"
+		compat:actionViewClass="android.support.v7.app.MediaRouteButton"
+		compat:showAsAction="always"
+		android:title="@string/menu.cast"/>
+		
+	<item
+        android:id="@+id/menu_remove_all"
+        android:icon="?attr/remove"
+        android:title="@string/download.menu_remove_all"
+        compat:showAsAction="ifRoom|withText"/>
+
+	<item
+		android:id="@+id/menu_equalizer"
+		android:title="@string/equalizer.label"
+		android:checkable="true"/>
+	
+	<item
+        android:id="@+id/menu_screen_on_off"
+        android:title="@string/download.menu_screen_on"
+		android:checkable="true"/>
+
+	<item
+		android:id="@+id/menu_remove_played"
+		android:title="@string/download.menu_remove_played_songs"
+		android:checkable="true"/>
+		
+	<item
+        android:id="@+id/menu_toggle_timer"
+        android:title="@string/download.start_timer"/>
+		
+	<item
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+</menu>
diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml
new file mode 100644
index 00000000..cab9c4f6
--- /dev/null
+++ b/app/src/main/res/menu/search.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item 
+		android:id="@+id/menu_search"
+		android:icon="?attr/search"
+		android:title="@string/menu.search"
+		compat:showAsAction="ifRoom|withText"/>
+
+	<item 
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+
+</menu>
diff --git a/app/src/main/res/menu/select_album.xml b/app/src/main/res/menu/select_album.xml
new file mode 100644
index 00000000..3d2228e8
--- /dev/null
+++ b/app/src/main/res/menu/select_album.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item 
+		android:id="@+id/menu_play_now"
+		android:icon="?media_button_start"
+		android:title="@string/menu.play"
+		compat:showAsAction="always|withText"/>
+
+	<item
+		android:id="@+id/menu_radio"
+		android:icon="?attr/radio"
+		android:title="@string/menu.start_radio"
+		compat:showAsAction="ifRoom|withText"/>
+		
+	<item 
+		android:id="@+id/menu_shuffle"
+		android:icon="?attr/shuffle"
+		android:title="@string/menu.shuffle"
+		compat:showAsAction="ifRoom|withText"/>
+
+	<group android:id="@+id/not_touchscreen">
+		<item
+			android:id="@+id/menu_refresh"
+			android:icon="?attr/refresh"
+			android:title="@string/menu.refresh"
+			compat:showAsAction="ifRoom|withText"/>
+	</group>
+
+	<item
+		android:id="@+id/menu_top_tracks"
+		android:title="@string/menu.top_tracks"/>
+
+	<item
+		android:id="@+id/menu_similar_artists"
+		android:title="@string/menu.similar_artists"/>
+
+	<item
+		android:id="@+id/menu_show_all"
+		android:title="@string/menu.show_all"/>
+
+	<item
+		android:id="@+id/menu_download"
+		android:title="@string/common.download"/>
+
+	<item
+		android:id="@+id/menu_cache"
+		android:title="@string/common.pin"/>
+
+	<item
+		android:id="@+id/menu_delete"
+		android:title="@string/menu.delete_cache"/>
+</menu>
diff --git a/app/src/main/res/menu/select_album_context.xml b/app/src/main/res/menu/select_album_context.xml
new file mode 100644
index 00000000..5b2529e7
--- /dev/null
+++ b/app/src/main/res/menu/select_album_context.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+		
+
+	<item
+		android:id="@+id/album_menu_info"
+		android:title="@string/common.info"/>
+
+    <item 
+        android:id="@+id/album_menu_play_now"
+        android:title="@string/common.play_now"
+        />
+		
+	<item 
+        android:id="@+id/album_menu_play_shuffled"
+        android:title="@string/common.play_shuffled"
+        />
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/album_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/album_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
+
+    <item 
+        android:id="@+id/album_menu_download"
+        android:title="@string/common.download"
+        />
+		
+	<item 
+        android:id="@+id/album_menu_pin"
+        android:title="@string/common.pin"
+        />
+
+	<item 
+		android:id="@+id/album_menu_delete"
+		android:title="@string/menu.delete_cache"/>
+
+	<item
+		android:id="@+id/album_menu_show_artist"
+		android:title="@string/menu.show_artist"/>
+
+	<group android:id="@+id/hide_star">
+		<item
+			android:id="@+id/album_menu_star"
+			android:title="@string/common.star"/>
+	</group>
+
+	<group android:id="@+id/hide_share">
+		<item
+			android:id="@+id/album_menu_share"
+			android:title="@string/menu.share"/>
+	</group>
+
+	<group android:id="@+id/hide_rating">
+		<item
+			android:id="@+id/menu_rate"
+			android:title="@string/menu.rate"/>
+	</group>
+</menu>
diff --git a/app/src/main/res/menu/select_album_context_offline.xml b/app/src/main/res/menu/select_album_context_offline.xml
new file mode 100644
index 00000000..a1805f5b
--- /dev/null
+++ b/app/src/main/res/menu/select_album_context_offline.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+    <item 
+        android:id="@+id/album_menu_play_now"
+        android:title="@string/common.play_now"
+        />
+		
+	<item 
+        android:id="@+id/album_menu_play_shuffled"
+        android:title="@string/common.play_shuffled"
+        />
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/album_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/album_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
+
+	<item 
+		android:id="@+id/album_menu_delete"
+		android:title="@string/menu.delete_cache"/>
+
+	<item 
+		android:id="@+id/album_menu_star"
+		android:title="@string/common.star"/>
+</menu>
diff --git a/app/src/main/res/menu/select_album_list.xml b/app/src/main/res/menu/select_album_list.xml
new file mode 100644
index 00000000..a9196d1c
--- /dev/null
+++ b/app/src/main/res/menu/select_album_list.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item 
+		android:id="@+id/menu_play_now"
+		android:icon="?media_button_start"
+		android:title="@string/menu.play"
+		compat:showAsAction="always|withText"/>
+		
+	<item 
+		android:id="@+id/menu_shuffle"
+		android:icon="?attr/shuffle"
+		android:title="@string/menu.shuffle"
+		compat:showAsAction="ifRoom|withText"/>
+
+	<group android:id="@+id/not_touchscreen">
+		<item
+			android:id="@+id/menu_refresh"
+			android:icon="?attr/refresh"
+			android:title="@string/menu.refresh"
+			compat:showAsAction="ifRoom|withText"/>
+	</group>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+</menu>
diff --git a/app/src/main/res/menu/select_artist.xml b/app/src/main/res/menu/select_artist.xml
new file mode 100644
index 00000000..603f0a3b
--- /dev/null
+++ b/app/src/main/res/menu/select_artist.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item 
+		android:id="@+id/menu_shuffle"
+		android:icon="?attr/shuffle"
+		android:title="@string/menu.shuffle"
+		compat:showAsAction="always|withText"/>
+		
+	<item 
+		android:id="@+id/menu_search"
+		android:icon="?attr/search"
+		android:title="@string/menu.search"
+		compat:showAsAction="ifRoom|withText"/>
+
+	<group android:id="@+id/not_touchscreen">
+		<item
+			android:id="@+id/menu_refresh"
+			android:icon="?attr/refresh"
+			android:title="@string/menu.refresh"
+			compat:showAsAction="ifRoom|withText"/>
+	</group>
+
+	<item
+		android:id="@+id/menu_first_level_artist"
+		android:title="@string/menu.first_level_artist"
+		android:checkable="true"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+</menu>
diff --git a/app/src/main/res/menu/select_artist_context.xml b/app/src/main/res/menu/select_artist_context.xml
new file mode 100644
index 00000000..debc07c6
--- /dev/null
+++ b/app/src/main/res/menu/select_artist_context.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+    <item 
+        android:id="@+id/artist_menu_play_now"
+        android:title="@string/common.play_now"
+        />
+		
+	<item 
+        android:id="@+id/artist_menu_play_shuffled"
+        android:title="@string/common.play_shuffled"
+        />
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/artist_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/artist_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
+		
+	<item 
+        android:id="@+id/artist_menu_download"
+        android:title="@string/common.download"
+        />
+
+    <item 
+        android:id="@+id/artist_menu_pin"
+        android:title="@string/common.pin"
+        />
+
+	<item 
+		android:id="@+id/artist_menu_delete"
+		android:title="@string/menu.delete_cache"/>
+
+	<group android:id="@+id/server_1_10">
+		<group android:id="@+id/hide_star">
+			<item
+				android:id="@+id/artist_menu_star"
+				android:title="@string/common.star"/>
+		</group>
+	</group>
+</menu>
diff --git a/app/src/main/res/menu/select_artist_context_offline.xml b/app/src/main/res/menu/select_artist_context_offline.xml
new file mode 100644
index 00000000..17ee97e0
--- /dev/null
+++ b/app/src/main/res/menu/select_artist_context_offline.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+    <item 
+        android:id="@+id/artist_menu_play_now"
+        android:title="@string/common.play_now"
+        />
+		
+	<item 
+        android:id="@+id/artist_menu_play_shuffled"
+        android:title="@string/common.play_shuffled"
+        />
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/artist_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/artist_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
+
+	<item 
+		android:id="@+id/artist_menu_delete"
+		android:title="@string/menu.delete_cache"/>
+</menu>
diff --git a/app/src/main/res/menu/select_bookmark_context.xml b/app/src/main/res/menu/select_bookmark_context.xml
new file mode 100644
index 00000000..2b1b83fd
--- /dev/null
+++ b/app/src/main/res/menu/select_bookmark_context.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	
+	<item
+		android:id="@+id/bookmark_menu_info"
+		android:title="@string/common.info"/>
+
+	<item
+		android:id="@+id/song_menu_show_album"
+		android:title="@string/download.menu_show_album"/>
+		
+	<item
+		android:id="@+id/song_menu_show_artist"
+		android:title="@string/menu.show_artist"/>
+		
+	<item 
+		android:id="@+id/song_menu_download"
+		android:title="@string/common.download"/>
+		
+	<item 
+		android:id="@+id/song_menu_pin"
+		android:title="@string/common.pin"/>
+		
+	<item 
+		android:id="@+id/song_menu_delete"
+		android:title="@string/menu.delete_cache"/>
+		
+	<item 
+		android:id="@+id/bookmark_menu_delete"
+		android:title="@string/bookmark.delete"/>
+</menu>
diff --git a/app/src/main/res/menu/select_playlist_context.xml b/app/src/main/res/menu/select_playlist_context.xml
new file mode 100644
index 00000000..47033d9c
--- /dev/null
+++ b/app/src/main/res/menu/select_playlist_context.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	
+	<item
+		android:id="@+id/playlist_info"
+        android:title="@string/common.info"
+        />
+
+    <item 
+        android:id="@+id/playlist_menu_play_now"
+        android:title="@string/common.play_now"
+        />
+		
+	<item 
+        android:id="@+id/playlist_menu_play_shuffled"
+        android:title="@string/common.play_shuffled"
+        />
+		
+	<item 
+        android:id="@+id/playlist_menu_download"
+        android:title="@string/common.download"
+        />
+
+	<item
+		android:id="@+id/playlist_menu_sync"
+		android:title="@string/menu.keep_synced"/>
+
+	<item
+		android:id="@+id/playlist_menu_stop_sync"
+		android:title="@string/menu.stop_sync"/>
+		
+	<item 
+        android:id="@+id/playlist_update_info"
+        android:title="@string/playlist.update_info"
+        /> 
+	
+	<item 
+        android:id="@+id/playlist_menu_delete"
+        android:title="@string/playlist.delete"
+        /> 
+        
+</menu>
diff --git a/app/src/main/res/menu/select_playlist_context_offline.xml b/app/src/main/res/menu/select_playlist_context_offline.xml
new file mode 100644
index 00000000..d63aec17
--- /dev/null
+++ b/app/src/main/res/menu/select_playlist_context_offline.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+    <item 
+        android:id="@+id/playlist_menu_play_now"
+        android:title="@string/common.play_now"
+        />
+		
+	<item 
+        android:id="@+id/playlist_menu_play_shuffled"
+        android:title="@string/common.play_shuffled"
+        />        
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/select_podcast_episode.xml b/app/src/main/res/menu/select_podcast_episode.xml
new file mode 100644
index 00000000..65cb0555
--- /dev/null
+++ b/app/src/main/res/menu/select_podcast_episode.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+	<group android:id="@+id/not_touchscreen">
+		<item
+			android:id="@+id/menu_refresh"
+			android:icon="?attr/refresh"
+			android:title="@string/menu.refresh"
+			compat:showAsAction="ifRoom|withText"/>
+	</group>
+
+	<item
+		android:id="@+id/menu_download_all"
+		android:title="@string/select_podcasts.server_download"/>
+
+	<item 
+		android:id="@+id/menu_delete"
+		android:title="@string/menu.delete_cache"/>
+</menu>
diff --git a/app/src/main/res/menu/select_podcast_episode_context.xml b/app/src/main/res/menu/select_podcast_episode_context.xml
new file mode 100644
index 00000000..bacccda3
--- /dev/null
+++ b/app/src/main/res/menu/select_podcast_episode_context.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	
+	<item
+		android:id="@+id/song_menu_info"
+		android:title="@string/common.info"
+		/>
+
+    <item 
+        android:id="@+id/song_menu_play_now"
+        android:title="@string/common.play_now"
+        />
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/song_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/song_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
+		
+	<item 
+        android:id="@+id/song_menu_download"
+        android:title="@string/common.download"
+        />
+		
+	<item 
+		android:id="@+id/song_menu_delete"
+		android:title="@string/menu.delete_cache"/>
+		
+	<group android:id="@+id/server_1.9">
+		<item
+			android:id="@+id/bookmark_menu_delete"
+			android:title="@string/bookmark.delete"/>
+	</group>
+        
+	<item 
+		android:id="@+id/song_menu_server_download"
+		android:title="@string/select_podcasts.server_download"/>
+
+	<item 
+		android:id="@+id/song_menu_server_delete"
+		android:title="@string/select_podcasts.server_delete"/>
+</menu>
diff --git a/app/src/main/res/menu/select_podcast_episode_context_offline.xml b/app/src/main/res/menu/select_podcast_episode_context_offline.xml
new file mode 100644
index 00000000..587d01f7
--- /dev/null
+++ b/app/src/main/res/menu/select_podcast_episode_context_offline.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	
+	<item
+		android:id="@+id/song_menu_info"
+		android:title="@string/common.info"
+		/>
+	
+    <item 
+        android:id="@+id/song_menu_play_now"
+        android:title="@string/common.play_now"
+        />
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/song_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/song_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
+		
+	<item 
+		android:id="@+id/song_menu_delete"
+		android:title="@string/menu.delete_cache"/>
+</menu>
diff --git a/app/src/main/res/menu/select_podcast_episode_offline.xml b/app/src/main/res/menu/select_podcast_episode_offline.xml
new file mode 100644
index 00000000..3665d317
--- /dev/null
+++ b/app/src/main/res/menu/select_podcast_episode_offline.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item 
+		android:id="@+id/menu_delete"
+		android:title="@string/menu.delete_cache"/>
+</menu>
diff --git a/app/src/main/res/menu/select_podcasts.xml b/app/src/main/res/menu/select_podcasts.xml
new file mode 100644
index 00000000..f30429ce
--- /dev/null
+++ b/app/src/main/res/menu/select_podcasts.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/menu_search"
+		android:icon="?attr/search"
+		android:title="@string/menu.search"
+		compat:showAsAction="always|withText"/>
+
+	<item 
+		android:id="@+id/menu_add_podcast"
+		android:icon="?attr/add"
+		android:title="@string/menu.add_podcast"
+		compat:showAsAction="always|withText"/>
+
+	<group android:id="@+id/not_touchscreen">
+		<item
+			android:id="@+id/menu_refresh"
+			android:icon="?attr/refresh"
+			android:title="@string/menu.refresh"
+			compat:showAsAction="ifRoom|withText"/>
+	</group>
+
+	<item 
+		android:id="@+id/menu_check"
+		android:title="@string/menu.check_podcasts"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/select_podcasts_context.xml b/app/src/main/res/menu/select_podcasts_context.xml
new file mode 100644
index 00000000..5df9d278
--- /dev/null
+++ b/app/src/main/res/menu/select_podcasts_context.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/podcast_channel_info"
+		android:title="@string/common.info"/>
+	<item 
+		android:id="@+id/podcast_channel_delete"
+		android:title="@string/select_podcasts.delete"/>
+
+	<item
+		android:id="@+id/podcast_menu_sync"
+		android:title="@string/menu.keep_synced"/>
+
+	<item
+		android:id="@+id/podcast_menu_stop_sync"
+		android:title="@string/menu.stop_sync"/>
+</menu>
diff --git a/app/src/main/res/menu/select_podcasts_context_offline.xml b/app/src/main/res/menu/select_podcasts_context_offline.xml
new file mode 100644
index 00000000..cbc76224
--- /dev/null
+++ b/app/src/main/res/menu/select_podcasts_context_offline.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/podcast_channel_info"
+		android:title="@string/common.info"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/select_share_context.xml b/app/src/main/res/menu/select_share_context.xml
new file mode 100644
index 00000000..79eb3d55
--- /dev/null
+++ b/app/src/main/res/menu/select_share_context.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/share_menu_info"
+		android:title="@string/common.info"/>
+
+	<item
+		android:id="@+id/share_menu_share"
+		android:title="@string/menu.share"/>
+
+	<item
+		android:id="@+id/share_update_info"
+		android:title="@string/playlist.update_info"
+		/>
+
+	<item
+		android:id="@+id/share_menu_delete"
+		android:title="@string/share.delete"/>
+</menu>
diff --git a/app/src/main/res/menu/select_song.xml b/app/src/main/res/menu/select_song.xml
new file mode 100644
index 00000000..fc4494cb
--- /dev/null
+++ b/app/src/main/res/menu/select_song.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item 
+		android:id="@+id/menu_play_now"
+		android:icon="?attr/media_button_start"
+		android:title="@string/menu.play"
+		compat:showAsAction="always|withText"/>
+		
+	<item 
+		android:id="@+id/menu_shuffle"
+		android:icon="?attr/shuffle"
+		android:title="@string/menu.shuffle"
+		compat:showAsAction="ifRoom|withText"/>
+
+	<group android:id="@+id/not_touchscreen">
+		<item
+			android:id="@+id/menu_refresh"
+			android:icon="?attr/refresh"
+			android:title="@string/menu.refresh"
+			compat:showAsAction="ifRoom|withText"/>
+	</group>
+		
+	<item 
+		android:id="@+id/menu_download"
+		android:title="@string/common.download"/>
+		
+	<item 
+		android:id="@+id/menu_cache"
+		android:title="@string/common.pin"/>
+		
+	<item 
+		android:id="@+id/menu_delete"
+		android:title="@string/menu.delete_cache"/>
+	
+	<item 
+		android:id="@+id/menu_add_playlist"
+		android:title="@string/menu.add_playlist"/>
+		
+	<item 
+		android:id="@+id/menu_remove_playlist"
+		android:title="@string/menu.remove_playlist"/>
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/menu_play_last"
+			android:title="@string/menu.play_last"/>
+	</group>
+</menu>
diff --git a/app/src/main/res/menu/select_song_context.xml b/app/src/main/res/menu/select_song_context.xml
new file mode 100644
index 00000000..d8fc211c
--- /dev/null
+++ b/app/src/main/res/menu/select_song_context.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	
+	<item
+		android:id="@+id/song_menu_info"
+		android:title="@string/common.info"
+		/>
+
+    <item 
+        android:id="@+id/song_menu_play_now"
+        android:title="@string/common.play_now"
+        />
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/song_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/song_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
+		
+	<item 
+        android:id="@+id/song_menu_download"
+        android:title="@string/common.download"
+        />
+		
+	<item 
+        android:id="@+id/song_menu_pin"
+        android:title="@string/common.pin"
+        />
+		
+	<item 
+		android:id="@+id/song_menu_delete"
+		android:title="@string/menu.delete_cache"/>
+	
+	<group android:id="@+id/server_1.8">
+		<item 
+			android:id="@+id/song_menu_add_playlist"
+			android:title="@string/menu.add_playlist"/>
+	</group>
+		
+	<item 
+		android:id="@+id/song_menu_remove_playlist"
+		android:title="@string/menu.remove_playlist"/>
+
+	<group android:id="@+id/hide_star">
+		<item
+			android:id="@+id/song_menu_star"
+			android:title="@string/common.star"/>
+	</group>
+
+	<group android:id="@+id/hide_share">
+		<item
+			android:id="@+id/song_menu_share"
+			android:title="@string/menu.share"/>
+	</group>
+
+	<group android:id="@+id/hide_rating">
+		<item
+			android:id="@+id/menu_rate"
+			android:title="@string/menu.rate"/>
+	</group>
+	
+	<group android:id="@+id/server_1.9">
+		<item
+			android:id="@+id/bookmark_menu_delete"
+			android:title="@string/bookmark.delete"/>
+	</group>
+</menu>
diff --git a/app/src/main/res/menu/select_song_context_offline.xml b/app/src/main/res/menu/select_song_context_offline.xml
new file mode 100644
index 00000000..49445876
--- /dev/null
+++ b/app/src/main/res/menu/select_song_context_offline.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	
+	<item
+		android:id="@+id/song_menu_info"
+		android:title="@string/common.info"
+		/>
+	
+    <item 
+        android:id="@+id/song_menu_play_now"
+        android:title="@string/common.play_now"
+        />
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/song_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/song_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
+		
+	<item 
+		android:id="@+id/song_menu_delete"
+		android:title="@string/menu.delete_cache"/>
+
+	<item 
+		android:id="@+id/song_menu_star"
+		android:title="@string/common.star"/>
+</menu>
diff --git a/app/src/main/res/menu/select_song_offline.xml b/app/src/main/res/menu/select_song_offline.xml
new file mode 100644
index 00000000..c45405fb
--- /dev/null
+++ b/app/src/main/res/menu/select_song_offline.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item 
+		android:id="@+id/menu_play_now"
+		android:icon="?attr/media_button_start"
+		android:title="@string/menu.play"
+		compat:showAsAction="always|withText"/>
+		
+	<item 
+		android:id="@+id/menu_shuffle"
+		android:icon="?attr/shuffle"
+		android:title="@string/menu.shuffle"
+		compat:showAsAction="ifRoom|withText"/>
+		
+	<item 
+		android:id="@+id/menu_delete"
+		android:title="@string/menu.delete_cache"/>
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/menu_play_last"
+			android:title="@string/menu.play_last"/>
+	</group>
+</menu>
diff --git a/app/src/main/res/menu/select_video_context.xml b/app/src/main/res/menu/select_video_context.xml
new file mode 100644
index 00000000..3eda2df7
--- /dev/null
+++ b/app/src/main/res/menu/select_video_context.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/song_menu_info"
+		android:title="@string/common.info"/>
+	
+	<item 
+		android:id="@+id/song_menu_stream_external"
+		android:title="@string/common.stream_external"/>
+	
+	<item 
+		android:id="@+id/song_menu_play_external"
+		android:title="@string/common.play_external"/>
+
+	<item 
+		android:id="@+id/song_menu_download"
+		android:title="@string/common.download"
+		/>
+
+	<item 
+		android:id="@+id/song_menu_delete"
+		android:title="@string/menu.delete_cache"/>
+</menu>
diff --git a/app/src/main/res/menu/select_video_context_offline.xml b/app/src/main/res/menu/select_video_context_offline.xml
new file mode 100644
index 00000000..3fea9f5e
--- /dev/null
+++ b/app/src/main/res/menu/select_video_context_offline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/song_menu_info"
+		android:title="@string/common.info"/>
+	
+	<item 
+		android:id="@+id/song_menu_play_external"
+		android:title="@string/common.play_external"/>
+		
+	<item 
+		android:id="@+id/song_menu_delete"
+		android:title="@string/menu.delete_cache"/>
+</menu>
diff --git a/app/src/main/res/menu/similar_artists.xml b/app/src/main/res/menu/similar_artists.xml
new file mode 100644
index 00000000..771555b6
--- /dev/null
+++ b/app/src/main/res/menu/similar_artists.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/menu_play_now"
+		android:icon="?media_button_start"
+		android:title="@string/menu.play"
+		compat:showAsAction="always|withText"/>
+
+	<item
+		android:id="@+id/menu_shuffle"
+		android:icon="?attr/shuffle"
+		android:title="@string/menu.shuffle"
+		compat:showAsAction="ifRoom|withText"/>
+
+	<item
+		android:id="@+id/menu_show_missing"
+		android:title="@string/menu.show_missing"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/tasker_configuration.xml b/app/src/main/res/menu/tasker_configuration.xml
new file mode 100644
index 00000000..bb49ba27
--- /dev/null
+++ b/app/src/main/res/menu/tasker_configuration.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/menu_cancel"
+		android:icon="?attr/remove"
+		android:title="@string/common.cancel"
+		compat:showAsAction="always|withText"/>
+
+	<item
+		android:id="@+id/menu_accept"
+		android:icon="?attr/save"
+		android:title="@string/common.ok"
+		compat:showAsAction="always|withText"/>
+</menu>
diff --git a/app/src/main/res/menu/unstar.xml b/app/src/main/res/menu/unstar.xml
new file mode 100644
index 00000000..502e88ab
--- /dev/null
+++ b/app/src/main/res/menu/unstar.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/menu_unstar"
+		android:title="@string/common.unstar"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/user.xml b/app/src/main/res/menu/user.xml
new file mode 100644
index 00000000..eed352e5
--- /dev/null
+++ b/app/src/main/res/menu/user.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/menu_update_permissions"
+		android:title="@string/admin.update_permissions"
+		android:icon="?attr/save"
+		compat:showAsAction="always|withText"/>
+
+	<item
+		android:id="@+id/menu_change_password"
+		android:title="@string/admin.change_password"
+		android:icon="?attr/password"
+		compat:showAsAction="always|withText"/>
+
+	<group android:id="@+id/not_touchscreen">
+		<item
+			android:id="@+id/menu_refresh"
+			android:icon="?attr/refresh"
+			android:title="@string/menu.refresh"
+			compat:showAsAction="ifRoom|withText"/>
+	</group>
+
+	<item
+		android:id="@+id/menu_change_email"
+		android:title="@string/admin.change_email"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/user_user.xml b/app/src/main/res/menu/user_user.xml
new file mode 100644
index 00000000..83465b3e
--- /dev/null
+++ b/app/src/main/res/menu/user_user.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/menu_change_password"
+		android:title="@string/admin.change_password"
+		android:icon="?attr/password"
+		compat:showAsAction="always|withText"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:title="@string/menu.exit"/>
+</menu>
\ No newline at end of file