Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enqueue: Removed unneeded dialog-entries and strings + adjustments

Browse source
This commit is contained in:
vkay94 2020-10-06 17:22:12 +02:00
parent ed6fc4d848
commit 12f615c6da
61 changed files with 29 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
View file

@ -342,7 +342,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
final ArrayList<StreamDialogEntry> entries = new ArrayList<>();
if (PlayerHolder.getType() != null) {
entries.add(StreamDialogEntry.enqueue_stream);
entries.add(StreamDialogEntry.enqueue);
}
if (item.getStreamType() == StreamType.AUDIO_STREAM) {
entries.addAll(Arrays.asList(

2
app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
View file

@ -156,7 +156,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
final ArrayList<StreamDialogEntry> entries = new ArrayList<>();
if (PlayerHolder.getType() != null) {
entries.add(StreamDialogEntry.enqueue_stream);
entries.add(StreamDialogEntry.enqueue);
}
if (item.getStreamType() == StreamType.AUDIO_STREAM) {
entries.addAll(Arrays.asList(

2
app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
View file

@ -392,7 +392,7 @@ public class StatisticsPlaylistFragment
final ArrayList<StreamDialogEntry> entries = new ArrayList<>();
if (PlayerHolder.getType() != null) {
entries.add(StreamDialogEntry.enqueue_stream);
entries.add(StreamDialogEntry.enqueue);
}
if (infoItem.getStreamType() == StreamType.AUDIO_STREAM) {
entries.addAll(Arrays.asList(

2
app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
View file

@ -761,7 +761,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
final ArrayList<StreamDialogEntry> entries = new ArrayList<>();
if (PlayerHolder.getType() != null) {
entries.add(StreamDialogEntry.enqueue_stream);
entries.add(StreamDialogEntry.enqueue);
}
if (infoItem.getStreamType() == StreamType.AUDIO_STREAM) {
entries.addAll(Arrays.asList(

4
app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
View file

@ -2094,6 +2094,10 @@ public class VideoPlayerImpl extends VideoPlayer
return popupLayoutParams;
}
public MainPlayer.PlayerType getPlayerType() {
return playerType;
}
public float getScreenWidth() {
return screenWidth;
}

6
app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
View file

@ -46,11 +46,7 @@ public final class PlayerHolder {
if (player == null) {
return null;
}
return player.videoPlayerSelected() ? MainPlayer.PlayerType.VIDEO
: player.popupPlayerSelected() ? MainPlayer.PlayerType.POPUP
: player.audioPlayerSelected() ? MainPlayer.PlayerType.AUDIO
: null;
return player.getPlayerType();
}
public static void setListener(final PlayerServiceExtendedEventListener newListener) {

5
app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
View file

@ -196,6 +196,7 @@ public final class NavigationHelper {
final boolean selectOnAppend,
final boolean resumePlayback) {
Toast.makeText(context, R.string.player_append, Toast.LENGTH_SHORT).show();
final Intent intent = getPlayerEnqueueIntent(
context, MainPlayer.class, queue, selectOnAppend, resumePlayback);
@ -216,7 +217,7 @@ public final class NavigationHelper {
return;
}
Toast.makeText(context, R.string.popup_playing_append, Toast.LENGTH_SHORT).show();
Toast.makeText(context, R.string.player_append, Toast.LENGTH_SHORT).show();
final Intent intent = getPlayerEnqueueIntent(
context, MainPlayer.class, queue, selectOnAppend, resumePlayback);
intent.putExtra(VideoPlayer.PLAYER_TYPE, VideoPlayer.PLAYER_TYPE_POPUP);
@ -232,7 +233,7 @@ public final class NavigationHelper {
final PlayQueue queue,
final boolean selectOnAppend,
final boolean resumePlayback) {
Toast.makeText(context, R.string.background_player_append, Toast.LENGTH_SHORT).show();
Toast.makeText(context, R.string.player_append, Toast.LENGTH_SHORT).show();
final Intent intent = getPlayerEnqueueIntent(
context, MainPlayer.class, queue, selectOnAppend, resumePlayback);
intent.putExtra(VideoPlayer.PLAYER_TYPE, VideoPlayer.PLAYER_TYPE_AUDIO);

52
app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
View file

@ -1,7 +1,6 @@
package org.schabi.newpipe.util;
import android.content.Context;
import android.widget.Toast;
import androidx.fragment.app.Fragment;
@ -12,8 +11,11 @@ import org.schabi.newpipe.player.MainPlayer;
import org.schabi.newpipe.player.helper.PlayerHolder;
import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import static org.schabi.newpipe.player.MainPlayer.PlayerType.AUDIO;
import static org.schabi.newpipe.player.MainPlayer.PlayerType.POPUP;
public enum StreamDialogEntry {
//////////////////////////////////////
@ -25,45 +27,21 @@ public enum StreamDialogEntry {
* <br>
* Info: Add this entry within showStreamDialog.
*/
enqueue_stream(R.string.enqueue_stream, (fragment, item) -> {
enqueue(R.string.enqueue_stream, (fragment, item) -> {
final MainPlayer.PlayerType type = PlayerHolder.getType();
if (type == null) {
// This code shouldn't be reached since the checks for appending this entry should be
// done within the showStreamDialog calls.
Toast.makeText(fragment.getContext(),
"No player currently playing", Toast.LENGTH_SHORT).show();
return;
}
switch (type) {
case AUDIO:
NavigationHelper.enqueueOnBackgroundPlayer(fragment.getContext(),
new SinglePlayQueue(item), false);
break;
case POPUP:
NavigationHelper.enqueueOnPopupPlayer(fragment.getContext(),
new SinglePlayQueue(item), false);
break;
case VIDEO:
NavigationHelper.enqueueOnVideoPlayer(fragment.getContext(),
new SinglePlayQueue(item), false);
break;
default:
// Same as above, but keep it for now for debugging.
Toast.makeText(fragment.getContext(),
"Unreachable code executed", Toast.LENGTH_SHORT).show();
break;
if (type == AUDIO) {
NavigationHelper.enqueueOnBackgroundPlayer(fragment.getContext(),
new SinglePlayQueue(item), false);
} else if (type == POPUP) {
NavigationHelper.enqueueOnPopupPlayer(fragment.getContext(),
new SinglePlayQueue(item), false);
} else /* type == VIDEO */ {
NavigationHelper.enqueueOnVideoPlayer(fragment.getContext(),
new SinglePlayQueue(item), false);
}
}),
enqueue_on_background(R.string.enqueue_on_background, (fragment, item) ->
NavigationHelper.enqueueOnBackgroundPlayer(fragment.getContext(),
new SinglePlayQueue(item), false)),
enqueue_on_popup(R.string.enqueue_on_popup, (fragment, item) ->
NavigationHelper.enqueueOnPopupPlayer(fragment.getContext(),
new SinglePlayQueue(item), false)),
start_here_on_background(R.string.start_here_on_background, (fragment, item) ->
NavigationHelper.playOnBackgroundPlayer(fragment.getContext(),
new SinglePlayQueue(item), true)),
@ -109,7 +87,7 @@ public enum StreamDialogEntry {
// non-static methods to initialize and edit entries //
///////////////////////////////////////////////////////
public static void setEnabledEntries(final ArrayList<StreamDialogEntry> entries) {
public static void setEnabledEntries(final List<StreamDialogEntry> entries) {
setEnabledEntries(entries.toArray(new StreamDialogEntry[0]));
}