Update details dialogs, remove play/cache/delete from more menus to keep context menus smaller

16 files changed, 88 insertions, 219 deletions

diff --git a/app/src/main/res/layout/details_item.xml b/app/src/main/res/layout/details_item.xml
new file mode 100644
index 00000000..4ef5fef0
--- /dev/null
+++ b/app/src/main/res/layout/details_item.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="horizontal"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:padding="8dp">
+
+	<TextView
+		android:id="@+id/detail_name"
+		android:layout_width="0dip"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textColor="?android:textColorPrimary"
+		android:paddingLeft="14dp"
+		android:layout_gravity="center_vertical"/>
+
+	<TextView
+		android:id="@+id/detail_value"
+		android:layout_width="0dip"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textColor="?android:textColorSecondary"
+		android:paddingLeft="14dp"
+		android:layout_gravity="center_vertical"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/select_album_context.xml b/app/src/main/res/menu/select_album_context.xml
index 5b2529e7..388fd1f5 100644
--- a/app/src/main/res/menu/select_album_context.xml
+++ b/app/src/main/res/menu/select_album_context.xml
@@ -1,48 +1,10 @@
 <?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">
-		
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<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"/>
diff --git a/app/src/main/res/menu/select_album_context_offline.xml b/app/src/main/res/menu/select_album_context_offline.xml
index a1805f5b..60858d91 100644
--- a/app/src/main/res/menu/select_album_context_offline.xml
+++ b/app/src/main/res/menu/select_album_context_offline.xml
@@ -1,31 +1,9 @@
 <?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>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-	<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_info"
+		android:title="@string/common.info"/>
 
 	<item 
 		android:id="@+id/album_menu_star"
diff --git a/app/src/main/res/menu/select_artist_context.xml b/app/src/main/res/menu/select_artist_context.xml
index debc07c6..b8bce32d 100644
--- a/app/src/main/res/menu/select_artist_context.xml
+++ b/app/src/main/res/menu/select_artist_context.xml
@@ -1,43 +1,5 @@
 <?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"/>
-
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<group android:id="@+id/server_1_10">
 		<group android:id="@+id/hide_star">
 			<item
diff --git a/app/src/main/res/menu/select_artist_context_offline.xml b/app/src/main/res/menu/select_artist_context_offline.xml
deleted file mode 100644
index 17ee97e0..00000000
--- a/app/src/main/res/menu/select_artist_context_offline.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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
index 2b1b83fd..d52db105 100644
--- a/app/src/main/res/menu/select_bookmark_context.xml
+++ b/app/src/main/res/menu/select_bookmark_context.xml
@@ -15,18 +15,6 @@
 		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
index 47033d9c..4941e94b 100644
--- a/app/src/main/res/menu/select_playlist_context.xml
+++ b/app/src/main/res/menu/select_playlist_context.xml
@@ -7,21 +7,6 @@
         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"/>
diff --git a/app/src/main/res/menu/select_playlist_context_offline.xml b/app/src/main/res/menu/select_playlist_context_offline.xml
index d63aec17..6745d850 100644
--- a/app/src/main/res/menu/select_playlist_context_offline.xml
+++ b/app/src/main/res/menu/select_playlist_context_offline.xml
@@ -1,13 +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/playlist_menu_play_now"
-        android:title="@string/common.play_now"
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/playlist_info"
+        android:title="@string/common.info"
         />
-		
-	<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_context.xml b/app/src/main/res/menu/select_podcast_episode_context.xml
index bacccda3..31f2a051 100644
--- a/app/src/main/res/menu/select_podcast_episode_context.xml
+++ b/app/src/main/res/menu/select_podcast_episode_context.xml
@@ -7,7 +7,7 @@
 		android:title="@string/common.info"
 		/>
 
-    <item 
+    <item
         android:id="@+id/song_menu_play_now"
         android:title="@string/common.play_now"
         />
@@ -23,16 +23,16 @@
 			android:id="@+id/song_menu_play_last"
 			android:title="@string/common.play_last"/>
 	</group>
-		
-	<item 
+
+	<item
         android:id="@+id/song_menu_download"
         android:title="@string/common.download"
         />
-		
-	<item 
+
+	<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"
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
index 587d01f7..301746f4 100644
--- a/app/src/main/res/menu/select_podcast_episode_context_offline.xml
+++ b/app/src/main/res/menu/select_podcast_episode_context_offline.xml
@@ -6,8 +6,8 @@
 		android:id="@+id/song_menu_info"
 		android:title="@string/common.info"
 		/>
-	
-    <item 
+
+    <item
         android:id="@+id/song_menu_play_now"
         android:title="@string/common.play_now"
         />
@@ -23,8 +23,8 @@
 			android:id="@+id/song_menu_play_last"
 			android:title="@string/common.play_last"/>
 	</group>
-		
-	<item 
+
+	<item
 		android:id="@+id/song_menu_delete"
 		android:title="@string/menu.delete_cache"/>
 </menu>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index cd387b65..d4a239a6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -42,13 +42,7 @@
     <string name="main.welcome_text">Willkommen zu DSub! Die App ist aktuell für den Subsonic-Demo-Server konfiguriert. Nachdem Sie Ihren eigenen Server
         aufgesetzt haben (verfügbar unter <b>subsonic.org</b>) könne Sie diesen unter <b>Einstellungen</b> konfigurieren.</string>
 	<string name="main.about_title">Über DSub</string>
-	<string name="main.about_text">Autor: Scott Jackson
-		\nEmail: dsub.android@gmail.com
-		\nVersion: %1$s
-		\nLokal gespeicherte Titel: %2$s
-		\nGenutzter Speicher: %3$s von %4$s
-		\nVerfügbarer Speicher: %5$s von %6$s</string>
-        <string name="main.faq_title">FAQ</string>
+	<string name="main.faq_title">FAQ</string>
         <string name="main.faq_text">
         <![CDATA[
                 <font color="red">Cache vs Permanenter Cache</font>:
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3c2593e2..e4d80211 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -41,13 +41,7 @@
     <string name="main.welcome_title">Bienvenido!</string>
     <string name="main.welcome_text">Bienvenido a DSub! Ahora la aplicación está configurada para usar el servidor de demostración de Subsonic. Cuando configures tu servidor personal (disponible en <b>subsonic.org</b>), accede a <b>Preferencias</b> y cambia la configuración para conectarte.</string>
 	<string name="main.about_title">Acerca de DSub</string>
-	<string name="main.about_text">Autor: Scott Jackson
-		\nEmail: dsub.android@gmail.com
-		\nVersión: %1$s
-		\nArchivos en caché: %2$s
-		\nEspacio usado: %3$s of %4$s
-		\nEspacio disponible: %5$s of %6$s</string>
-    <string name="main.select_server">Seleccionar servidor</string>
+	<string name="main.select_server">Seleccionar servidor</string>
     <string name="main.shuffle">Reproducción aleatoria</string>
     <string name="main.offline">Modo Offline</string>
 	<string name="main.online">Modo Online</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index cea3c77d..84e3dd75 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -41,12 +41,6 @@
     <string name="main.welcome_title">Bienvenue !</string>
     <string name="main.welcome_text">Bienvenue dans DSub ! L\'application est actuellement configurée pour se connecter au serveur de démo Subsonic (<b>demo.subsonic.org</b>). Vous pouvez configurer votre propre serveur dans les paramètres. Choisir <b>Paramètres</b> et mettre à jour la configuration pour vous y connecter.</string>
     	<string name="main.about_title">A propos de DSub</string>
-	<string name="main.about_text">Auteur : Scott Jackson
-		\nEmail : dsub.android@gmail.com
-		\nVersion : %1$s
-		\nFichiers en cache : %2$s
-		\nEspace utilisé : %3$s de %4$s
-		\nEspace dispo. : %5$s de %6$s</string>
 	<string name="main.faq_title">FAQ</string>
 	<string name="main.faq_text">
 	<![CDATA[
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 816e605a..481a4c99 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -42,12 +42,6 @@
     <string name="main.welcome_text">Üdvözli a DSub! Az alkalmazás még nincs beállítva. Miután konfigurálta saját kiszolgálóját 
 	(elérhető: <b>subsonic.org</b>), húzza balról jobbra az oldalsávot, lépjen be a <b>Beállítások</b> menüpontba és adja meg a kapcsolódási adatokat!</string>
 	<string name="main.about_title">DSub információk</string>
-	<string name="main.about_text">Fejlesztő: Scott Jackson
-		\nEmail: dsub.android@gmail.com
-		\nVerzió: %1$s
-		\nGyorsítótárazott fájlok: %2$s
-		\nFelhasznált tároló: %3$s/%4$s
-		\nFelhasználható tároló: %5$s/%6$s</string>
 	<string name="main.faq_title">GYIK</string>
 	<string name="main.faq_text">
 	<![CDATA[
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 0f904d95..15c79a69 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -32,12 +32,6 @@
     <string name="main.welcome_text">Добро пожаловать в DSub! Это приложение настроено на работу с демо сервером Subsonic. После настройки Вашего персонального сервера (доступен на <b>subsonic.org</b>), пожалуйста, перейдите в <b>Настройки</b> и измените параметры для подключения.</string>
 	
 	<string name="main.about_title">О программе DSub</string>
-	<string name="main.about_text">Автор: Scott Jackson
-		\nEmail: dsub.android@gmail.com
-		\nВерсия: %1$s
-		\nFiles Cached: %2$s
-		\nИспользовано места: %3$s из %4$s
-		\nДоступно места: %5$s из %6$s</string>
     <string name="main.select_server">Выбрать сервер</string>
     <string name="main.shuffle">Случайное воспроизведение</string>
     <string name="main.offline">Отключиться</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f7c91da3..74d69e5e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,6 +25,7 @@
 	<string name="common.confirm_message_cache">cache</string>
 	<string name="common.empty">No data</string>
 	<string name="common.warning">Warning</string>
+	<string name="common.close">Close</string>
 
     <string name="button_bar.home">Home</string>
     <string name="button_bar.browse">Library</string>
@@ -42,12 +43,6 @@
     <string name="main.welcome_text">Welcome to DSub! The app is currently configured to use the Subsonic demo server. After you\'ve
         set up your personal server (available from <b>subsonic.org</b>), please go to <b>Settings</b> and change the configuration to connect to it.</string>
 	<string name="main.about_title">About DSub</string>
-	<string name="main.about_text">Author: Scott Jackson
-		\nEmail: dsub.android@gmail.com
-		\nVersion: %1$s
-		\nFiles Cached: %2$s
-		\nUsed Space: %3$s of %4$s
-		\nAvailable Space: %5$s of %6$s</string>
 	<string name="main.faq_title">FAQ</string>
 	<string name="main.faq_text">
 	<![CDATA[
@@ -589,6 +584,43 @@
 	<string name="tasker.edit_server_offline">Toggle offline: </string>
 	<string name="tasker.edit_do_nothing">Do Nothing</string>
 
+	<string name="details.title.song">Song Details</string>
+	<string name="details.title.album">Album Details</string>
+	<string name="details.title.podcast">Podcast Details</string>
+	<string name="details.title.playlist">Playlist Details</string>
+	<string name="details.podcast">Podcast</string>
+	<string name="details.status">Status</string>
+	<string name="details.artist">Artist</string>
+	<string name="details.album">Album</string>
+	<string name="details.track">Track</string>
+	<string name="details.genre">Genre</string>
+	<string name="details.year">Year</string>
+	<string name="details.server_format">Server Format</string>
+	<string name="details.server_bitrate">Server Bitrate</string>
+	<string name="details.cached_format">Cached Format</string>
+	<string name="details.cached_bitrate">Cached Bitrate</string>
+	<string name="details.size">Size</string>
+	<string name="details.length">Length</string>
+	<string name="details.bookmark_position">Bookmark Position</string>
+	<string name="details.rating">Rating</string>
+	<string name="details.description">Description</string>
+	<string name="details.owner">Owner</string>
+	<string name="details.comments">Comments</string>
+	<string name="details.song_count">Song Count</string>
+	<string name="details.public">Public</string>
+	<string name="details.created">Created</string>
+	<string name="details.title">Title</string>
+	<string name="details.url">URL</string>
+	<string name="details.error">Error Message</string>
+	<string name="details.author">Author</string>
+	<string name="details.email">Email</string>
+	<string name="details.version">Version</string>
+	<string name="details.files_cached">Files Cached</string>
+	<string name="details.files_permanent">Permanent Cached</string>
+	<string name="details.used_space">Used Space</string>
+	<string name="details.available_space">Available Space</string>
+	<string name="details.of">%1$s of %2$s</string>
+
     <plurals name="select_album_n_songs">
         <item quantity="zero">No songs</item>
         <item quantity="one">One song</item>