norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

show queue is (again) a swipe option

Browse Source
This commit is contained in:
Adrian Ulrich 2016-05-10 19:07:56 +02:00
parent 6d1382dc57
commit 2ae7e3123d
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/untranslatable.xml
View File

@ -51,6 +51,7 @@ 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>
@ -70,6 +71,7 @@ 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/preferences_action_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>

4
src/ch/blinkenlights/android/vanilla/Action.java
View File

@ -80,6 +80,10 @@ enum Action {
* Clear the queue of all remaining songs. * Clear the queue of all remaining songs.
*/ */
ClearQueue, ClearQueue,
/**
* Displays the queue
*/
ShowQueue,
/** /**
* Toggle the controls in the playback activity. * Toggle the controls in the playback activity.
*/ */

12
src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
View File

@ -613,12 +613,16 @@ public class FullPlaybackActivity extends SlidingPlaybackActivity
} }
@Override @Override
protected void performAction(Action action) protected void performAction(Action action) {
{ switch (action) {
if (action == Action.ToggleControls) { case ToggleControls:
setControlsVisible(!mControlsVisible); setControlsVisible(!mControlsVisible);
mHandler.sendEmptyMessage(MSG_SAVE_CONTROLS); mHandler.sendEmptyMessage(MSG_SAVE_CONTROLS);
} else { break;
case ShowQueue:
mSlidingView.expandSlide();
break;
default:
super.performAction(action); super.performAction(action);
} }
} }

3
src/ch/blinkenlights/android/vanilla/PlaybackService.java
View File

@ -2264,7 +2264,8 @@ public final class PlaybackService extends Service
showMirrorLinkSafeToast(R.string.queue_cleared, Toast.LENGTH_SHORT); showMirrorLinkSafeToast(R.string.queue_cleared, Toast.LENGTH_SHORT);
break; break;
case ToggleControls: case ToggleControls:
// Handled in FullPlaybackActivity.performAction case ShowQueue:
// These are NOOPs here and should be handled in FullPlaybackActivity
break; break;
case SeekForward: case SeekForward:
if (mCurrentSong != null) { if (mCurrentSong != null) {