aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-11-26 22:44:57 -0800
committerScott Jackson <daneren2005@gmail.com>2013-11-26 22:44:57 -0800
commitfe8a39adf6fd989b687a63ca44359b27753d8b5b (patch)
treee76c62f97fdb47266c55903f05f0a1d226eede36
parentac7887a9c965ca94c89fcbad897a37c533ee314f (diff)
downloaddsub-fe8a39adf6fd989b687a63ca44359b27753d8b5b.tar.gz
dsub-fe8a39adf6fd989b687a63ca44359b27753d8b5b.tar.bz2
dsub-fe8a39adf6fd989b687a63ca44359b27753d8b5b.zip
Added play next to options applicable to selection
-rw-r--r--res/menu/select_song.xml4
-rw-r--r--res/menu/select_song_offline.xml4
-rw-r--r--src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java8
3 files changed, 15 insertions, 1 deletions
diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml
index d60dedac..c2c0b437 100644
--- a/res/menu/select_song.xml
+++ b/res/menu/select_song.xml
@@ -42,6 +42,10 @@
<item
android:id="@+id/menu_remove_playlist"
android:title="@string/menu.remove_playlist"/>
+
+ <item
+ android:id="@+id/menu_play_next"
+ android:title="@string/common.play_next"/>
<item
android:id="@+id/menu_play_last"
diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml
index 88e9758d..c379714a 100644
--- a/res/menu/select_song_offline.xml
+++ b/res/menu/select_song_offline.xml
@@ -26,6 +26,10 @@
<item
android:id="@+id/menu_delete"
android:title="@string/common.delete"/>
+
+ <item
+ android:id="@+id/menu_play_next"
+ android:title="@string/common.play_next"/>
<item
android:id="@+id/menu_play_last"
diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
index fdcb4648..47e842c7 100644
--- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
@@ -196,6 +196,9 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
case R.id.menu_play_last:
playNow(false, true);
return true;
+ case R.id.menu_play_next:
+ playNow(false, true, true);
+ return true;
case R.id.menu_shuffle:
playNow(true, false);
return true;
@@ -498,8 +501,11 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
}
private void playNow(final boolean shuffle, final boolean append) {
+ playNow(shuffle, append, false);
+ }
+ private void playNow(final boolean shuffle, final boolean append, final boolean playNext) {
if(getSelectedSongs().size() > 0) {
- download(append, false, !append, false, shuffle);
+ download(append, false, !append, playNext, shuffle);
selectAll(false, false);
}
else {