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

Add library action expand or play all. (#776)

Browse Source 
Like with the expand action it will first try to expand a selected
item. If the item can't be expanded it will use play all instead of play.
This commit is contained in:
Loosefish 2018-05-21 14:10:47 +02:00 committed by Adrian Ulrich
parent 9d12df990f
commit 47dc655ccb
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/ch/blinkenlights/android/vanilla/LibraryActivity.java
View File

@ -108,9 +108,13 @@ public class LibraryActivity
*/ */
public static final int ACTION_PLAY_OR_ENQUEUE = 7; public static final int ACTION_PLAY_OR_ENQUEUE = 7;
/** /**
* Action for row click: queue selection as next item * Action for row click: queue selection as next item.
*/ */
public static final int ACTION_ENQUEUE_AS_NEXT = 8; public static final int ACTION_ENQUEUE_AS_NEXT = 8;
/**
* Action for row click: expand or play all.
*/
public static final int ACTION_EXPAND_OR_PLAY_ALL = 9;
/** /**
* The SongTimeline add song modes corresponding to each relevant action. * The SongTimeline add song modes corresponding to each relevant action.
*/ */
@ -451,13 +455,16 @@ public class LibraryActivity
if (action == ACTION_LAST_USED) if (action == ACTION_LAST_USED)
action = mLastAction; action = mLastAction;
if (action == ACTION_EXPAND && rowData.getBooleanExtra(LibraryAdapter.DATA_EXPANDABLE, false)) { boolean tryExpand = action == ACTION_EXPAND || action == ACTION_EXPAND_OR_PLAY_ALL;
if (tryExpand && rowData.getBooleanExtra(LibraryAdapter.DATA_EXPANDABLE, false)) {
onItemExpanded(rowData); onItemExpanded(rowData);
} else if (action != ACTION_DO_NOTHING) { } else if (action != ACTION_DO_NOTHING) {
if (action == ACTION_EXPAND) { if (action == ACTION_EXPAND) {
// default to playing when trying to expand something that can't // default to playing when trying to expand something that can't
// be expanded // be expanded
action = ACTION_PLAY; action = ACTION_PLAY;
} else if (action == ACTION_EXPAND_OR_PLAY_ALL) {
action = ACTION_PLAY_ALL;
} else if (action == ACTION_PLAY_OR_ENQUEUE) { } else if (action == ACTION_PLAY_OR_ENQUEUE) {
action = (mState & PlaybackService.FLAG_PLAYING) == 0 ? ACTION_PLAY : ACTION_ENQUEUE; action = (mState & PlaybackService.FLAG_PLAYING) == 0 ? ACTION_PLAY : ACTION_ENQUEUE;
} }

1
app/src/main/res/values-de/translatable.xml
View File

@ -49,6 +49,7 @@
<string name="playlist_favorites">Favoriten</string> <string name="playlist_favorites">Favoriten</string>
<string name="new_playlist">Neue Wiedergabeliste …</string> <string name="new_playlist">Neue Wiedergabeliste …</string>
<string name="expand">Aufklappen</string> <string name="expand">Aufklappen</string>
<string name="expand_or_play_all">Aufklappen oder alle wiedergeben</string>
<string name="delete">Löschen</string> <string name="delete">Löschen</string>
<string name="playback_view">Aktueller Titel</string> <string name="playback_view">Aktueller Titel</string>
<string name="sort_by">Sortieren nach</string> <string name="sort_by">Sortieren nach</string>

1
app/src/main/res/values/translatable.xml
View File

@ -73,6 +73,7 @@ THE SOFTWARE.
<string name="playlist_favorites">Favorites</string> <string name="playlist_favorites">Favorites</string>
<string name="new_playlist">New playlist…</string> <string name="new_playlist">New playlist…</string>
<string name="expand">Expand</string> <string name="expand">Expand</string>
<string name="expand_or_play_all">Expand or play all</string>
<string name="delete">Delete</string> <string name="delete">Delete</string>
<string name="playback_view">Now playing</string> <string name="playback_view">Now playing</string>
<string name="sort_by">Sort by</string> <string name="sort_by">Sort by</string>

20
app/src/main/res/values/untranslatable.xml
View File

@ -110,18 +110,20 @@ THE SOFTWARE.
<item>@string/enqueue_all</item> <item>@string/enqueue_all</item>
<item>@string/play_or_enqueue</item> <item>@string/play_or_enqueue</item>
<item>@string/enqueue_as_next</item> <item>@string/enqueue_as_next</item>
<item>@string/expand_or_play_all</item>
<item>@string/do_nothing</item> <item>@string/do_nothing</item>
</string-array> </string-array>
<string-array name="default_action_entry_values"> <string-array name="default_action_entry_values">
<item>6</item> <!-- expand --> <item>6</item> <!-- expand -->
<item>0</item> <!-- play --> <item>0</item> <!-- play -->
<item>1</item> <!-- enqueue --> <item>1</item> <!-- enqueue -->
<item>2</item> <!-- last_action_used --> <item>2</item> <!-- last_action_used -->
<item>3</item> <!-- play_all --> <item>3</item> <!-- play_all -->
<item>4</item> <!-- enqueue_all --> <item>4</item> <!-- enqueue_all -->
<item>7</item> <!-- play_or_enqueue --> <item>7</item> <!-- play_or_enqueue -->
<item>8</item> <!-- enqueue_as_next --> <item>8</item> <!-- enqueue_as_next -->
<item>5</item> <!-- do_nothing --> <item>9</item> <!-- expand_or_play_all -->
<item>5</item> <!-- do_nothing -->
</string-array> </string-array>
<!-- END default action entries definition --> <!-- END default action entries definition -->