Fixed up menus for podcasts, took away checks, fixed episodes with status error/skipped

5 files changed, 82 insertions, 0 deletions

diff --git a/subsonic-android/res/menu/select_podcast_episode.xml b/subsonic-android/res/menu/select_podcast_episode.xml
new file mode 100644
index 00000000..b6db96aa
--- /dev/null
+++ b/subsonic-android/res/menu/select_podcast_episode.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item 
+		android:id="@+id/menu_refresh"
+		android:icon="@drawable/action_refresh"
+		android:title="@string/menu.refresh"
+		android:showAsAction="always|withText"/>
+</menu>
diff --git a/subsonic-android/res/menu/select_podcast_episode_context.xml b/subsonic-android/res/menu/select_podcast_episode_context.xml
new file mode 100644
index 00000000..2c0d86ff
--- /dev/null
+++ b/subsonic-android/res/menu/select_podcast_episode_context.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	
+	<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"
+        />
+
+    <item 
+        android:id="@+id/song_menu_play_last"
+        android:title="@string/common.play_last"
+        />
+		
+	<item 
+        android:id="@+id/song_menu_download"
+        android:title="@string/common.download"
+        />
+		
+	<item 
+		android:id="@+id/song_menu_delete"
+		android:title="@string/common.delete"/>
+        
+</menu>
diff --git a/subsonic-android/res/menu/select_podcast_episode_context_offline.xml b/subsonic-android/res/menu/select_podcast_episode_context_offline.xml
new file mode 100644
index 00000000..38c4569b
--- /dev/null
+++ b/subsonic-android/res/menu/select_podcast_episode_context_offline.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	
+	<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"
+        />
+
+    <item 
+        android:id="@+id/song_menu_play_last"
+        android:title="@string/common.play_last"
+        />
+		
+	<item 
+		android:id="@+id/song_menu_delete"
+		android:title="@string/common.delete"/>
+</menu>
diff --git a/subsonic-android/res/menu/select_podcast_episode_offline.xml b/subsonic-android/res/menu/select_podcast_episode_offline.xml
new file mode 100644
index 00000000..ce414955
--- /dev/null
+++ b/subsonic-android/res/menu/select_podcast_episode_offline.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item 
+		android:id="@+id/menu_refresh"
+		android:icon="@drawable/action_refresh"
+		android:title="@string/menu.refresh"
+		android:showAsAction="always|withText"/>
+		
+	<item 
+		android:id="@+id/menu_delete"
+		android:icon="@drawable/action_remove_all"
+		android:title="@string/common.delete"
+		android:showAsAction="ifRoom|withText"/>
+		
+	<item 
+		android:id="@+id/menu_play_last"
+		android:icon="@drawable/action_play_all"
+		android:title="@string/menu.play_last"
+		android:showAsAction="ifRoom|withText"/>
+</menu>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index d7c0d089..cc638a23 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -131,6 +131,8 @@
 	<string name="select_genre.blank">Blank</string>

 

 	<string name="select_podcasts.empty">No podcasts found</string>

+	<string name="select_podcasts.error">This podcast had an error while downloading on the server.  The server must download it first.</string>

+	<string name="select_podcasts.skipped">This podcast has not been downloaded on the server.  The server must download it first.</string>

 

     <string name="select_playlist.empty">No saved playlists on server</string>

 

@@ -187,6 +189,8 @@
 

     <string name="song_details.all">%1$s %2$s</string>

     <string name="song_details.kbps">%d kbps</string>

+	<string name="song_details.error">Error</string>

+	<string name="song_details.skipped">Skipped</string>

 

     <string name="lyrics.nomatch">No lyrics found</string>