mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2025-12-24 08:46:02 +00:00
Add enqueue option to router dialog
- This allows users to enqueue a stream directly to the current player queue when sharing a link with the app, improving the user experience for queue management. - The 'Enqueue' option is now available in the action selection dialog and can also be set as the preferred open action in the settings.
This commit is contained in:
@@ -316,7 +316,8 @@ public class RouterActivity extends AppCompatActivity {
|
||||
if (choiceChecker.isAvailableAndSelected(
|
||||
R.string.video_player_key,
|
||||
R.string.background_player_key,
|
||||
R.string.popup_player_key)) {
|
||||
R.string.popup_player_key,
|
||||
R.string.enqueue_key)) {
|
||||
|
||||
final String selectedChoice = choiceChecker.getSelectedChoiceKey();
|
||||
|
||||
@@ -329,6 +330,8 @@ public class RouterActivity extends AppCompatActivity {
|
||||
|| selectedChoice.equals(getString(R.string.popup_player_key));
|
||||
final boolean isAudioPlayerSelected =
|
||||
selectedChoice.equals(getString(R.string.background_player_key));
|
||||
final boolean isEnqueueSelected =
|
||||
selectedChoice.equals(getString(R.string.enqueue_key));
|
||||
|
||||
if (currentLinkType != LinkType.STREAM
|
||||
&& ((isExtAudioEnabled && isAudioPlayerSelected)
|
||||
@@ -345,7 +348,9 @@ public class RouterActivity extends AppCompatActivity {
|
||||
|
||||
// Check if the service supports the choice
|
||||
if ((isVideoPlayerSelected && capabilities.contains(VIDEO))
|
||||
|| (isAudioPlayerSelected && capabilities.contains(AUDIO))) {
|
||||
|| (isAudioPlayerSelected && capabilities.contains(AUDIO))
|
||||
|| (isEnqueueSelected && (capabilities.contains(VIDEO)
|
||||
|| capabilities.contains(AUDIO)))) {
|
||||
handleChoice(selectedChoice);
|
||||
} else {
|
||||
handleChoice(getString(R.string.show_info_key));
|
||||
@@ -544,7 +549,10 @@ public class RouterActivity extends AppCompatActivity {
|
||||
// not be added to a playlist
|
||||
returnedItems.add(new AdapterChoiceItem(getString(R.string.add_to_playlist_key),
|
||||
getString(R.string.add_to_playlist),
|
||||
R.drawable.ic_add));
|
||||
R.drawable.ic_playlist_add));
|
||||
|
||||
returnedItems.add(new AdapterChoiceItem(getString(R.string.enqueue_key),
|
||||
getString(R.string.enqueue_stream), R.drawable.ic_add));
|
||||
} else {
|
||||
// LinkType.NONE is never present because it's filtered out before
|
||||
// channels and playlist can be played as they contain a list of videos
|
||||
@@ -1016,6 +1024,8 @@ public class RouterActivity extends AppCompatActivity {
|
||||
NavigationHelper.playOnBackgroundPlayer(this, playQueue, true);
|
||||
} else if (choice.playerChoice.equals(popupPlayerKey)) {
|
||||
NavigationHelper.playOnPopupPlayer(this, playQueue, true);
|
||||
} else if (choice.playerChoice.equals(getString(R.string.enqueue_key))) {
|
||||
NavigationHelper.enqueueOnPlayer(this, playQueue);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -479,6 +479,7 @@
|
||||
<string name="popup_player_key">popup_player</string>
|
||||
<string name="download_key">download</string>
|
||||
<string name="add_to_playlist_key">add_to_playlist</string>
|
||||
<string name="enqueue_key">enqueue</string>
|
||||
<string name="always_ask_open_action_key">always_ask_player</string>
|
||||
|
||||
<string-array name="preferred_open_action_description_list">
|
||||
@@ -488,6 +489,7 @@
|
||||
<item>@string/popup_player</item>
|
||||
<item>@string/download</item>
|
||||
<item>@string/add_to_playlist</item>
|
||||
<item>@string/enqueue_stream</item>
|
||||
<item>@string/always_ask_open_action</item>
|
||||
</string-array>
|
||||
<string-array name="preferred_open_action_values_list">
|
||||
@@ -498,6 +500,7 @@
|
||||
<item>@string/download_key</item>
|
||||
<item>@string/add_to_playlist_key</item>
|
||||
<item>@string/always_ask_open_action_key</item>
|
||||
<item>@string/enqueue_key</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Updates -->
|
||||
|
||||
Reference in New Issue
Block a user