From fbd1a68042dfc3601eaa0a9e37b3957bbdd51420 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Wed, 22 Jul 2015 20:03:30 -0700 Subject: Update details dialogs, remove play/cache/delete from more menus to keep context menus smaller --- app/src/main/res/layout/details_item.xml | 28 ++++++++++++++ app/src/main/res/menu/select_album_context.xml | 40 +------------------- .../main/res/menu/select_album_context_offline.xml | 30 ++------------- app/src/main/res/menu/select_artist_context.xml | 40 +------------------- .../res/menu/select_artist_context_offline.xml | 30 --------------- app/src/main/res/menu/select_bookmark_context.xml | 12 ------ app/src/main/res/menu/select_playlist_context.xml | 15 -------- .../res/menu/select_playlist_context_offline.xml | 14 ++----- .../res/menu/select_podcast_episode_context.xml | 12 +++--- .../select_podcast_episode_context_offline.xml | 8 ++-- app/src/main/res/values-de/strings.xml | 8 +--- app/src/main/res/values-es/strings.xml | 8 +--- app/src/main/res/values-fr/strings.xml | 6 --- app/src/main/res/values-hu/strings.xml | 6 --- app/src/main/res/values-ru/strings.xml | 6 --- app/src/main/res/values/strings.xml | 44 +++++++++++++++++++--- 16 files changed, 88 insertions(+), 219 deletions(-) create mode 100644 app/src/main/res/layout/details_item.xml delete mode 100644 app/src/main/res/menu/select_artist_context_offline.xml (limited to 'app/src/main/res') 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 @@ + + + + + + + + \ 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 @@ - - + - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - + - - - - - + - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - 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 @@ -14,18 +14,6 @@ android:id="@+id/song_menu_show_artist" android:title="@string/menu.show_artist"/> - - - - - - 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" /> - - - - - - 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 @@ - - + - - \ 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" /> - @@ -23,16 +23,16 @@ android:id="@+id/song_menu_play_last" android:title="@string/common.play_last"/> - - - - - + - - @@ -23,8 +23,8 @@ android:id="@+id/song_menu_play_last" android:title="@string/common.play_last"/> - - 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 @@ Willkommen zu DSub! Die App ist aktuell für den Subsonic-Demo-Server konfiguriert. Nachdem Sie Ihren eigenen Server aufgesetzt haben (verfügbar unter subsonic.org) könne Sie diesen unter Einstellungen konfigurieren. Über DSub - 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 - FAQ + FAQ Cache vs Permanenter Cache: 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 @@ Bienvenido! 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 subsonic.org), accede a Preferencias y cambia la configuración para conectarte. Acerca de DSub - 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 - Seleccionar servidor + Seleccionar servidor Reproducción aleatoria Modo Offline Modo Online 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 @@ Bienvenue ! Bienvenue dans DSub ! L\'application est actuellement configurée pour se connecter au serveur de démo Subsonic (demo.subsonic.org). Vous pouvez configurer votre propre serveur dans les paramètres. Choisir Paramètres et mettre à jour la configuration pour vous y connecter. A propos de DSub - 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 FAQ Ü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ő: subsonic.org), húzza balról jobbra az oldalsávot, lépjen be a Beállítások menüpontba és adja meg a kapcsolódási adatokat! DSub információk - 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 GYIK Добро пожаловать в DSub! Это приложение настроено на работу с демо сервером Subsonic. После настройки Вашего персонального сервера (доступен на subsonic.org), пожалуйста, перейдите в Настройки и измените параметры для подключения. О программе DSub - Автор: Scott Jackson - \nEmail: dsub.android@gmail.com - \nВерсия: %1$s - \nFiles Cached: %2$s - \nИспользовано места: %3$s из %4$s - \nДоступно места: %5$s из %6$s Выбрать сервер Случайное воспроизведение Отключиться 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 @@ cache No data Warning + Close Home Library @@ -42,12 +43,6 @@ Welcome to DSub! The app is currently configured to use the Subsonic demo server. After you\'ve set up your personal server (available from subsonic.org), please go to Settings and change the configuration to connect to it. About DSub - 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 FAQ Toggle offline: Do Nothing + Song Details + Album Details + Podcast Details + Playlist Details + Podcast + Status + Artist + Album + Track + Genre + Year + Server Format + Server Bitrate + Cached Format + Cached Bitrate + Size + Length + Bookmark Position + Rating + Description + Owner + Comments + Song Count + Public + Created + Title + URL + Error Message + Author + Email + Version + Files Cached + Permanent Cached + Used Space + Available Space + %1$s of %2$s + No songs One song -- cgit v1.2.3