aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-07-02 18:02:38 -0700
committerScott Jackson <daneren2005@gmail.com>2015-07-02 18:02:38 -0700
commita78354743c4862c8faac3e925176f86a78df9d63 (patch)
treef4e2a22f14964392fc71ee40d19126da70225940 /app/src/main/res
parenta3f294cd6773585fa59753e25101e4029004495f (diff)
downloaddsub-a78354743c4862c8faac3e925176f86a78df9d63.tar.gz
dsub-a78354743c4862c8faac3e925176f86a78df9d63.tar.bz2
dsub-a78354743c4862c8faac3e925176f86a78df9d63.zip
#332 Start of long multi select
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/menu/select_song_context.xml31
-rw-r--r--app/src/main/res/menu/select_song_context_offline.xml21
-rw-r--r--app/src/main/res/values-de/strings.xml3
-rw-r--r--app/src/main/res/values-es/strings.xml3
-rw-r--r--app/src/main/res/values-fr/strings.xml3
-rw-r--r--app/src/main/res/values-hu/strings.xml3
-rw-r--r--app/src/main/res/values-ru/strings.xml1
-rw-r--r--app/src/main/res/values/strings.xml5
-rw-r--r--app/src/main/res/values/themes.xml3
9 files changed, 9 insertions, 64 deletions
diff --git a/app/src/main/res/menu/select_song_context.xml b/app/src/main/res/menu/select_song_context.xml
index d8fc211c..eae8a8bc 100644
--- a/app/src/main/res/menu/select_song_context.xml
+++ b/app/src/main/res/menu/select_song_context.xml
@@ -6,37 +6,6 @@
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
diff --git a/app/src/main/res/menu/select_song_context_offline.xml b/app/src/main/res/menu/select_song_context_offline.xml
index 49445876..77903fb0 100644
--- a/app/src/main/res/menu/select_song_context_offline.xml
+++ b/app/src/main/res/menu/select_song_context_offline.xml
@@ -6,27 +6,6 @@
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"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e77d0aa7..cd387b65 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -142,8 +142,7 @@
<string name="select_album.select">Alle auswählen</string>
<string name="select_album.n_selected">%d Lieder ausgewählt.</string>
- <string name="select_album.n_unselected">%d Lieder deselektiert.</string>
- <string name="select_album.more">Mehr</string>
+ <string name="select_album.more">Mehr</string>
<string name="select_album.offline">Offline</string>
<string name="select_album.searching">Suche...</string>
<string name="select_album.no_sdcard">Fehler: Keine SD-Karte verfügbar.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b91bc929..3c2593e2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -130,8 +130,7 @@
<string name="select_album.select">Seleccionar todo</string>
<string name="select_album.n_selected">Seleccionadas %d canciones</string>
- <string name="select_album.n_unselected">%d canciones deseleccionadas</string>
- <string name="select_album.more">Más</string>
+ <string name="select_album.more">Más</string>
<string name="select_album.offline">Offline</string>
<string name="select_album.searching">Buscando...</string>
<string name="select_album.no_sdcard">Error: No hay tarjeta SD disponible</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d547a261..cea3c77d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -129,8 +129,7 @@
<string name="select_album.select">Tout sélectionner</string>
<string name="select_album.n_selected">%d pistes sélectionnées.</string>
- <string name="select_album.n_unselected">%d pistes désélectionnées.</string>
- <string name="select_album.more">Plus</string>
+ <string name="select_album.more">Plus</string>
<string name="select_album.offline">Déconnecté</string>
<string name="select_album.searching">Recherche en cours...</string>
<string name="select_album.no_sdcard">Erreur : Aucune carte SD card disponible.</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 6a28c051..816e605a 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -139,8 +139,7 @@
<string name="select_album.select">Összes jelölése be/ki</string>
<string name="select_album.n_selected">%d dal kijelölve.</string>
- <string name="select_album.n_unselected">%d dal visszavonva.</string>
- <string name="select_album.more">Továbbiak</string>
+ <string name="select_album.more">Továbbiak</string>
<string name="select_album.offline">Offline</string>
<string name="select_album.searching">Keresés...</string>
<string name="select_album.no_sdcard">Hiba: SD kártya nem áll rendelkezésre!</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a3bb71be..0f904d95 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -89,7 +89,6 @@
<string name="select_album.select">Выбрать все</string>
<string name="select_album.n_selected">%d композиций выбрано.</string>
- <string name="select_album.n_unselected">Выбор снят с %d композиций.</string>
<string name="select_album.more">Еще</string>
<string name="select_album.offline">Оффлайн</string>
<string name="select_album.searching">Выполняется поиск...</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 877b510f..f7c91da3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -141,9 +141,8 @@
<string name="music_library.label_offline">Offline media</string>
<string name="select_album.select">Select all</string>
- <string name="select_album.n_selected">%d tracks selected.</string>
- <string name="select_album.n_unselected">%d tracks unselected.</string>
- <string name="select_album.more">More</string>
+ <string name="select_album.n_selected">%d selected.</string>
+ <string name="select_album.more">More</string>
<string name="select_album.offline">Offline</string>
<string name="select_album.searching">Searching...</string>
<string name="select_album.no_sdcard">Error: No SD card available.</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index fb47af81..76f0250c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -51,6 +51,7 @@
<item name="actionbarSubtitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse</item>
<item name="actionbarPopupStyle">@style/ThemeOverlay.AppCompat.Light</item>
<item name="android:spinnerItemStyle">@style/DarkSpinnerItem</item>
+ <item name="windowActionModeOverlay">true</item>
</style>
<style name="Theme.DSub.Dark.Base" parent="@style/Theme.AppCompat">
<item name="offline_icon">@drawable/main_offline_dark</item>
@@ -102,6 +103,8 @@
<item name="actionbarTitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title</item>
<item name="actionbarSubtitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle</item>
<item name="actionbarPopupStyle">@style/ThemeOverlay.AppCompat.Dark</item>
+ <item name="windowActionModeOverlay">true</item>
+ <item name="actionModeBackground">?attr/colorPrimary</item>
</style>
<style name="Theme.DSub.Light" parent="Theme.DSub.Light.Base">
</style>