Bye bye ShowQueueActivity, you did well.
This commit is contained in:
Adrian Ulrich
parent
1c5a0eb0c2
commit
d9957be6d5
@ -55,10 +55,6 @@ THE SOFTWARE.
|
|||||||
<activity
|
<activity
|
||||||
android:name="PlaylistActivity"
|
android:name="PlaylistActivity"
|
||||||
android:launchMode="singleTask" />
|
android:launchMode="singleTask" />
|
||||||
<activity
|
|
||||||
android:name="ShowQueueActivity"
|
|
||||||
android:launchMode="singleTask"
|
|
||||||
/>
|
|
||||||
<activity
|
<activity
|
||||||
android:name="MiniPlaybackActivity"
|
android:name="MiniPlaybackActivity"
|
||||||
android:theme="@style/Dialog"
|
android:theme="@style/Dialog"
|
||||||
|
|||||||
@ -51,7 +51,6 @@ THE SOFTWARE.
|
|||||||
<item>EnqueueArtist</item>
|
<item>EnqueueArtist</item>
|
||||||
<item>EnqueueGenre</item>
|
<item>EnqueueGenre</item>
|
||||||
<item>ClearQueue</item>
|
<item>ClearQueue</item>
|
||||||
<item>ShowQueue</item>
|
|
||||||
<item>ToggleControls</item>
|
<item>ToggleControls</item>
|
||||||
<item>SeekForward</item>
|
<item>SeekForward</item>
|
||||||
<item>SeekBackward</item>
|
<item>SeekBackward</item>
|
||||||
@ -71,7 +70,6 @@ THE SOFTWARE.
|
|||||||
<item>@string/preferences_action_enqueue_current_artist</item>
|
<item>@string/preferences_action_enqueue_current_artist</item>
|
||||||
<item>@string/preferences_action_enqueue_current_genre</item>
|
<item>@string/preferences_action_enqueue_current_genre</item>
|
||||||
<item>@string/preferences_action_clear_queue</item>
|
<item>@string/preferences_action_clear_queue</item>
|
||||||
<item>@string/show_queue</item>
|
|
||||||
<item>@string/toggle_controls</item>
|
<item>@string/toggle_controls</item>
|
||||||
<item>@string/seek_10s_forward</item>
|
<item>@string/seek_10s_forward</item>
|
||||||
<item>@string/seek_10s_backward</item>
|
<item>@string/seek_10s_backward</item>
|
||||||
|
|||||||
@ -80,10 +80,6 @@ enum Action {
|
|||||||
* Clear the queue of all remaining songs.
|
* Clear the queue of all remaining songs.
|
||||||
*/
|
*/
|
||||||
ClearQueue,
|
ClearQueue,
|
||||||
/**
|
|
||||||
* Show the queue.
|
|
||||||
*/
|
|
||||||
ShowQueue,
|
|
||||||
/**
|
/**
|
||||||
* Toggle the controls in the playback activity.
|
* Toggle the controls in the playback activity.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -2260,11 +2260,6 @@ public final class PlaybackService extends Service
|
|||||||
clearQueue();
|
clearQueue();
|
||||||
showMirrorLinkSafeToast(R.string.queue_cleared, Toast.LENGTH_SHORT);
|
showMirrorLinkSafeToast(R.string.queue_cleared, Toast.LENGTH_SHORT);
|
||||||
break;
|
break;
|
||||||
case ShowQueue:
|
|
||||||
Intent intentShowQueue = new Intent(this, ShowQueueActivity.class);
|
|
||||||
intentShowQueue.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
|
|
||||||
startActivity(intentShowQueue);
|
|
||||||
break;
|
|
||||||
case ToggleControls:
|
case ToggleControls:
|
||||||
// Handled in FullPlaybackActivity.performAction
|
// Handled in FullPlaybackActivity.performAction
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -1,232 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2013-2015 Adrian Ulrich <adrian@blinkenlights.ch>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package ch.blinkenlights.android.vanilla;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
|
||||||
import android.content.DialogInterface;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.os.Message;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.Menu;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import android.widget.AdapterView;
|
|
||||||
import android.widget.AdapterView.OnItemClickListener;
|
|
||||||
import android.widget.AdapterView.OnItemLongClickListener;
|
|
||||||
import com.mobeta.android.dslv.DragSortListView;
|
|
||||||
|
|
||||||
public class ShowQueueActivity extends PlaybackActivity
|
|
||||||
implements DialogInterface.OnDismissListener,
|
|
||||||
DragSortListView.DropListener,
|
|
||||||
DragSortListView.RemoveListener
|
|
||||||
{
|
|
||||||
private DragSortListView mListView;
|
|
||||||
private ShowQueueAdapter listAdapter;
|
|
||||||
private PlaybackService mService;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
ThemeHelper.setTheme(this, R.style.BackActionBar);
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
|
|
||||||
setTitle(R.string.queue);
|
|
||||||
setContentView(R.layout.showqueue_listview);
|
|
||||||
|
|
||||||
mService = PlaybackService.get(this);
|
|
||||||
mListView = (DragSortListView) findViewById(R.id.list);
|
|
||||||
listAdapter = new ShowQueueAdapter(this, R.layout.draggable_row);
|
|
||||||
mListView.setAdapter(listAdapter);
|
|
||||||
mListView.setDropListener(this);
|
|
||||||
mListView.setRemoveListener(this);
|
|
||||||
|
|
||||||
mListView.setOnItemClickListener(new OnItemClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
|
||||||
mService.jumpToQueuePosition(position);
|
|
||||||
finish();
|
|
||||||
}});
|
|
||||||
mListView.setOnItemLongClickListener(new OnItemLongClickListener() {
|
|
||||||
@Override
|
|
||||||
public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
|
|
||||||
mService.jumpToQueuePosition(position);
|
|
||||||
return true;
|
|
||||||
}});
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inflate the ActionBar menu
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
|
||||||
menu.add(0, MENU_CLEAR_QUEUE, 0, R.string.dequeue_rest);
|
|
||||||
menu.add(0, MENU_EMPTY_QUEUE, 0, R.string.empty_the_queue);
|
|
||||||
menu.add(0, MENU_SAVE_AS_PLAYLIST, 0, R.string.save_as_playlist).setIcon(R.drawable.ic_menu_preferences);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called after the user selected an action from the ActionBar
|
|
||||||
*
|
|
||||||
* @param item The selected menu item
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
|
||||||
switch (item.getItemId()) {
|
|
||||||
case android.R.id.home:
|
|
||||||
finish();
|
|
||||||
break;
|
|
||||||
case MENU_SAVE_AS_PLAYLIST:
|
|
||||||
NewPlaylistDialog dialog = new NewPlaylistDialog(this, null, R.string.create, null);
|
|
||||||
dialog.setOnDismissListener(this);
|
|
||||||
dialog.show();
|
|
||||||
break;
|
|
||||||
case MENU_EMPTY_QUEUE:
|
|
||||||
PlaybackService.get(this).emptyQueue();
|
|
||||||
finish();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return super.onOptionsItemSelected(item);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
** Called when we are displayed (again)
|
|
||||||
** This will always refresh the whole song list
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
refreshSongQueueList(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired from adapter listview if user moved an item
|
|
||||||
* @param from the item index that was dragged
|
|
||||||
* @param to the index where the item was dropped
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void drop(int from, int to) {
|
|
||||||
if (from != to) {
|
|
||||||
mService.moveSongPosition(from, to);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired from adapter listview after user removed a song
|
|
||||||
* @param which index to remove from queue
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void remove(int which) {
|
|
||||||
mService.removeSongPosition(which);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Saves the current queue as a playlist
|
|
||||||
*/
|
|
||||||
protected static final int MSG_SAVE_QUEUE_AS_PLAYLIST = 30;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean handleMessage(Message message) {
|
|
||||||
switch (message.what) {
|
|
||||||
case MSG_SAVE_QUEUE_AS_PLAYLIST:
|
|
||||||
String playlistName = (String)message.obj;
|
|
||||||
long playlistId = Playlist.createPlaylist(getContentResolver(), playlistName);
|
|
||||||
PlaylistTask playlistTask = new PlaylistTask(playlistId, playlistName);
|
|
||||||
playlistTask.audioIds = new ArrayList<Long>();
|
|
||||||
|
|
||||||
Song song;
|
|
||||||
for (int i=0; ; i++) {
|
|
||||||
song = mService.getSongByQueuePosition(i);
|
|
||||||
if (song == null)
|
|
||||||
break;
|
|
||||||
playlistTask.audioIds.add(song.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
addToPlaylist(playlistTask);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return super.handleMessage(message);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired if user dismisses the create-playlist dialog
|
|
||||||
*
|
|
||||||
* @param dialogInterface the dismissed interface dialog
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void onDismiss(DialogInterface dialogInterface) {
|
|
||||||
NewPlaylistDialog dialog = (NewPlaylistDialog)dialogInterface;
|
|
||||||
if (dialog.isAccepted()) {
|
|
||||||
String playlistName = dialog.getText();
|
|
||||||
mHandler.sendMessage(mHandler.obtainMessage(MSG_SAVE_QUEUE_AS_PLAYLIST, playlistName));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called when the song timeline has changed
|
|
||||||
*/
|
|
||||||
public void onTimelineChanged() {
|
|
||||||
refreshSongQueueList(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Triggers a refresh of the queueview
|
|
||||||
* @param scroll enable or disable jumping to the currently playing item
|
|
||||||
*/
|
|
||||||
public void refreshSongQueueList(final boolean scroll) {
|
|
||||||
runOnUiThread(new Runnable(){
|
|
||||||
public void run() {
|
|
||||||
int i, stotal, spos;
|
|
||||||
stotal = mService.getTimelineLength(); /* Total number of songs in queue */
|
|
||||||
spos = mService.getTimelinePosition(); /* Current position in queue */
|
|
||||||
|
|
||||||
listAdapter.clear(); /* Flush all existing entries... */
|
|
||||||
listAdapter.highlightRow(spos); /* and highlight current position */
|
|
||||||
|
|
||||||
for(i=0 ; i<stotal; i++) {
|
|
||||||
listAdapter.add(mService.getSongByQueuePosition(i));
|
|
||||||
}
|
|
||||||
|
|
||||||
if(scroll)
|
|
||||||
scrollToCurrentSong(spos);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Scrolls to the current song<br/>
|
|
||||||
* We suppress the new api lint check as lint thinks
|
|
||||||
* {@link android.widget.AbsListView#setSelectionFromTop(int, int)} was only added in
|
|
||||||
* {@link Build.VERSION_CODES#JELLY_BEAN}, but it was actually added in API
|
|
||||||
* level 1<br/>
|
|
||||||
* <a href="https://developer.android.com/reference/android/widget/AbsListView.html#setSelectionFromTop%28int,%20int%29">
|
|
||||||
* Android reference: AbsListView.setSelectionFromTop()</a>
|
|
||||||
* @param currentSongPosition The position in {@link #mListView} of the current song
|
|
||||||
*/
|
|
||||||
@SuppressLint("NewApi")
|
|
||||||
private void scrollToCurrentSong(int currentSongPosition){
|
|
||||||
mListView.setSelectionFromTop(currentSongPosition, 0); /* scroll to currently playing song */
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user