Funkwhale
/
Audinaut-subsonic-app-android
mirror of https://github.com/nvllsvm/Audinaut
1
0
Fork 0
Code Issues Releases Wiki Activity

Consolidate playNow usage

This commit is contained in:
Andrew Rabert 2018-04-24 00:12:29 -04:00
parent 345b717f86
commit 4a167d3548
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/net/nullsum/audinaut/fragments/SubsonicFragment.java
View File

@ -178,16 +178,16 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR
refresh(); refresh();
return true; return true;
case R.id.menu_play_now: case R.id.menu_play_now:
playNow(false, false); playNow(false, false, false);
return true; return true;
case R.id.menu_play_last: case R.id.menu_play_last:
playNow(false, true); playNow(false, true, false);
return true; return true;
case R.id.menu_play_next: case R.id.menu_play_next:
playNow(false, true, true); playNow(false, true, true);
return true; return true;
case R.id.menu_shuffle: case R.id.menu_shuffle:
playNow(true, false); playNow(true, false, false);
return true; return true;
case R.id.menu_download: case R.id.menu_download:
downloadBackground(false); downloadBackground(false);
@ -1356,11 +1356,7 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR
return getCurrentAdapter().getSelected(); return getCurrentAdapter().getSelected();
} }
private void playNow(final boolean shuffle, final boolean append) { void playNow(final boolean shuffle, final boolean append, final boolean playNext) {
playNow(shuffle, append, false);
}
void playNow(final boolean shuffle, final boolean append, final boolean playNext) {
List<Entry> songs = getSelectedEntries(); List<Entry> songs = getSelectedEntries();
if (!songs.isEmpty()) { if (!songs.isEmpty()) {
download(songs, append, !append, playNext, shuffle); download(songs, append, !append, playNext, shuffle);