From cd515993f5ee47edd17aa737b537ab3c614b671d Mon Sep 17 00:00:00 2001 From: vkay94 Date: Tue, 6 Oct 2020 13:33:44 +0200 Subject: [PATCH 1/4] Enqueue: Add auto-select StreamDialogEntry for current PlayerType --- .../newpipe/player/helper/PlayerHolder.java | 20 ++++++++++ .../schabi/newpipe/util/NavigationHelper.java | 20 +++++++++- .../newpipe/util/StreamDialogEntry.java | 39 +++++++++++++++++++ app/src/main/res/values/strings.xml | 1 + 4 files changed, 78 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java index a5760eddc..f337080a4 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java @@ -6,8 +6,12 @@ import android.content.Intent; import android.content.ServiceConnection; import android.os.IBinder; import android.util.Log; + +import androidx.annotation.Nullable; + import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.PlaybackParameters; + import org.schabi.newpipe.App; import org.schabi.newpipe.MainActivity; import org.schabi.newpipe.extractor.stream.StreamInfo; @@ -31,6 +35,22 @@ public final class PlayerHolder { private static MainPlayer playerService; private static VideoPlayerImpl player; + /** + * Returns the current {@link MainPlayer.PlayerType} of the {@link MainPlayer} service, + * otherwise `null` if no service running. + */ + @Nullable + public static MainPlayer.PlayerType getType() { + if (player == null) { + return null; + } + + return player.videoPlayerSelected() ? MainPlayer.PlayerType.VIDEO + : player.popupPlayerSelected() ? MainPlayer.PlayerType.POPUP + : player.audioPlayerSelected() ? MainPlayer.PlayerType.AUDIO + : null; + } + public static void setListener(final PlayerServiceExtendedEventListener newListener) { listener = newListener; // Force reload data from service diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java index eef70c1e5..3387a86d7 100644 --- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java @@ -7,17 +7,17 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Build; -import androidx.preference.PreferenceManager; import android.util.Log; import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; +import androidx.preference.PreferenceManager; import com.nostra13.universalimageloader.core.ImageLoader; @@ -187,6 +187,22 @@ public final class NavigationHelper { startService(context, intent); } + public static void enqueueOnVideoPlayer(final Context context, final PlayQueue queue, + final boolean resumePlayback) { + enqueueOnVideoPlayer(context, queue, false, resumePlayback); + } + + public static void enqueueOnVideoPlayer(final Context context, final PlayQueue queue, + final boolean selectOnAppend, + final boolean resumePlayback) { + + final Intent intent = getPlayerEnqueueIntent( + context, MainPlayer.class, queue, selectOnAppend, resumePlayback); + + intent.putExtra(VideoPlayer.PLAYER_TYPE, VideoPlayer.PLAYER_TYPE_VIDEO); + startService(context, intent); + } + public static void enqueueOnPopupPlayer(final Context context, final PlayQueue queue, final boolean resumePlayback) { enqueueOnPopupPlayer(context, queue, false, resumePlayback); diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java index a1e2e6eb9..6c7be293e 100644 --- a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java +++ b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java @@ -1,12 +1,15 @@ package org.schabi.newpipe.util; import android.content.Context; +import android.widget.Toast; import androidx.fragment.app.Fragment; import org.schabi.newpipe.R; import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.local.dialog.PlaylistAppendDialog; +import org.schabi.newpipe.player.MainPlayer; +import org.schabi.newpipe.player.helper.PlayerHolder; import org.schabi.newpipe.player.playqueue.SinglePlayQueue; import java.util.Collections; @@ -16,6 +19,42 @@ public enum StreamDialogEntry { // enum values with DEFAULT actions // ////////////////////////////////////// + /** + * Enqueues the stream automatically to the current PlayerType.
+ *
+ * Info: Add this entry within showStreamDialog. + */ + enqueue_stream(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; + } + }), + enqueue_on_background(R.string.enqueue_on_background, (fragment, item) -> NavigationHelper.enqueueOnBackgroundPlayer(fragment.getContext(), new SinglePlayQueue(item), false)), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5b95d110c..aae569fa9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -445,6 +445,7 @@ Details Audio Settings Hold to enqueue + Enqueue stream Enqueue in the background Enqueue in a popup Start playing here From ed6fc4d848ba113c1087ca453541af08752e4316 Mon Sep 17 00:00:00 2001 From: vkay94 Date: Tue, 6 Oct 2020 14:38:48 +0200 Subject: [PATCH 2/4] Enqueue: Replaced specific StreamDialogEntry items with one The enqueue options won't be shown in the dialogs if the Player service is not running. When it's running one item (enqueue stream) will be shown and enqueues the item into the Player type which is currently selected. --- .../fragments/list/BaseListFragment.java | 26 +++++++++++------- .../list/playlist/PlaylistFragment.java | 27 ++++++++++--------- .../history/StatisticsPlaylistFragment.java | 27 ++++++++++--------- .../local/playlist/LocalPlaylistFragment.java | 27 ++++++++++--------- .../newpipe/player/helper/PlayerHolder.java | 2 ++ .../newpipe/util/StreamDialogEntry.java | 5 ++++ 6 files changed, 69 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java index 37598eb1a..d82566440 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java @@ -6,7 +6,6 @@ import android.content.SharedPreferences; import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; -import androidx.preference.PreferenceManager; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; @@ -15,6 +14,7 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; +import androidx.preference.PreferenceManager; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -29,6 +29,7 @@ import org.schabi.newpipe.fragments.BaseStateFragment; import org.schabi.newpipe.fragments.OnScrollBelowItemsListener; import org.schabi.newpipe.info_list.InfoItemDialog; import org.schabi.newpipe.info_list.InfoListAdapter; +import org.schabi.newpipe.player.helper.PlayerHolder; import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.OnClickGesture; @@ -36,6 +37,8 @@ import org.schabi.newpipe.util.StateSaver; import org.schabi.newpipe.util.StreamDialogEntry; import org.schabi.newpipe.views.SuperScrollLayoutManager; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Queue; @@ -336,21 +339,26 @@ public abstract class BaseListFragment extends BaseStateFragment return; } + final ArrayList entries = new ArrayList<>(); + + if (PlayerHolder.getType() != null) { + entries.add(StreamDialogEntry.enqueue_stream); + } if (item.getStreamType() == StreamType.AUDIO_STREAM) { - StreamDialogEntry.setEnabledEntries( - StreamDialogEntry.enqueue_on_background, + entries.addAll(Arrays.asList( StreamDialogEntry.start_here_on_background, StreamDialogEntry.append_playlist, - StreamDialogEntry.share); - } else { - StreamDialogEntry.setEnabledEntries( - StreamDialogEntry.enqueue_on_background, - StreamDialogEntry.enqueue_on_popup, + StreamDialogEntry.share + )); + } else { + entries.addAll(Arrays.asList( StreamDialogEntry.start_here_on_background, StreamDialogEntry.start_here_on_popup, StreamDialogEntry.append_playlist, - StreamDialogEntry.share); + StreamDialogEntry.share + )); } + StreamDialogEntry.setEnabledEntries(entries); new InfoItemDialog(activity, item, StreamDialogEntry.getCommands(context), (dialog, which) -> StreamDialogEntry.clickOn(which, this, item)).show(); diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java index 38594553b..d52012491 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java @@ -33,6 +33,7 @@ import org.schabi.newpipe.extractor.stream.StreamType; import org.schabi.newpipe.fragments.list.BaseListInfoFragment; import org.schabi.newpipe.info_list.InfoItemDialog; import org.schabi.newpipe.local.playlist.RemotePlaylistManager; +import org.schabi.newpipe.player.helper.PlayerHolder; import org.schabi.newpipe.player.playqueue.PlayQueue; import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue; import org.schabi.newpipe.report.ErrorActivity; @@ -46,6 +47,7 @@ import org.schabi.newpipe.util.StreamDialogEntry; import org.schabi.newpipe.util.ThemeHelper; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; @@ -151,25 +153,26 @@ public class PlaylistFragment extends BaseListInfoFragment { return; } + final ArrayList entries = new ArrayList<>(); + + if (PlayerHolder.getType() != null) { + entries.add(StreamDialogEntry.enqueue_stream); + } if (item.getStreamType() == StreamType.AUDIO_STREAM) { - StreamDialogEntry.setEnabledEntries( - StreamDialogEntry.enqueue_on_background, + entries.addAll(Arrays.asList( StreamDialogEntry.start_here_on_background, StreamDialogEntry.append_playlist, - StreamDialogEntry.share); - } else { - StreamDialogEntry.setEnabledEntries( - StreamDialogEntry.enqueue_on_background, - StreamDialogEntry.enqueue_on_popup, + StreamDialogEntry.share + )); + } else { + entries.addAll(Arrays.asList( StreamDialogEntry.start_here_on_background, StreamDialogEntry.start_here_on_popup, StreamDialogEntry.append_playlist, - StreamDialogEntry.share); - - StreamDialogEntry.start_here_on_popup.setCustomAction((fragment, infoItem) -> - NavigationHelper.playOnPopupPlayer(context, - getPlayQueueStartingAt(infoItem), true)); + StreamDialogEntry.share + )); } + StreamDialogEntry.setEnabledEntries(entries); StreamDialogEntry.start_here_on_background.setCustomAction((fragment, infoItem) -> NavigationHelper.playOnBackgroundPlayer(context, diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java index 887e5d124..ff4b74a01 100644 --- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java @@ -29,6 +29,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.extractor.stream.StreamType; import org.schabi.newpipe.info_list.InfoItemDialog; import org.schabi.newpipe.local.BaseLocalListFragment; +import org.schabi.newpipe.player.helper.PlayerHolder; import org.schabi.newpipe.player.playqueue.PlayQueue; import org.schabi.newpipe.player.playqueue.SinglePlayQueue; import org.schabi.newpipe.report.ErrorActivity; @@ -40,6 +41,7 @@ import org.schabi.newpipe.util.StreamDialogEntry; import org.schabi.newpipe.util.ThemeHelper; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -387,27 +389,28 @@ public class StatisticsPlaylistFragment } final StreamInfoItem infoItem = item.toStreamInfoItem(); + final ArrayList entries = new ArrayList<>(); + + if (PlayerHolder.getType() != null) { + entries.add(StreamDialogEntry.enqueue_stream); + } if (infoItem.getStreamType() == StreamType.AUDIO_STREAM) { - StreamDialogEntry.setEnabledEntries( - StreamDialogEntry.enqueue_on_background, + entries.addAll(Arrays.asList( StreamDialogEntry.start_here_on_background, StreamDialogEntry.delete, StreamDialogEntry.append_playlist, - StreamDialogEntry.share); - } else { - StreamDialogEntry.setEnabledEntries( - StreamDialogEntry.enqueue_on_background, - StreamDialogEntry.enqueue_on_popup, + StreamDialogEntry.share + )); + } else { + entries.addAll(Arrays.asList( StreamDialogEntry.start_here_on_background, StreamDialogEntry.start_here_on_popup, StreamDialogEntry.delete, StreamDialogEntry.append_playlist, - StreamDialogEntry.share); - - StreamDialogEntry.start_here_on_popup.setCustomAction((fragment, infoItemDuplicate) -> - NavigationHelper - .playOnPopupPlayer(context, getPlayQueueStartingAt(item), true)); + StreamDialogEntry.share + )); } + StreamDialogEntry.setEnabledEntries(entries); StreamDialogEntry.start_here_on_background.setCustomAction((fragment, infoItemDuplicate) -> NavigationHelper diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java index 3b66fd73f..26b1d3be6 100644 --- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java @@ -36,6 +36,7 @@ import org.schabi.newpipe.extractor.stream.StreamType; import org.schabi.newpipe.info_list.InfoItemDialog; import org.schabi.newpipe.local.BaseLocalListFragment; import org.schabi.newpipe.local.history.HistoryRecordManager; +import org.schabi.newpipe.player.helper.PlayerHolder; import org.schabi.newpipe.player.playqueue.PlayQueue; import org.schabi.newpipe.player.playqueue.SinglePlayQueue; import org.schabi.newpipe.report.UserAction; @@ -45,6 +46,7 @@ import org.schabi.newpipe.util.OnClickGesture; import org.schabi.newpipe.util.StreamDialogEntry; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -756,29 +758,30 @@ public class LocalPlaylistFragment extends BaseLocalListFragment entries = new ArrayList<>(); + + if (PlayerHolder.getType() != null) { + entries.add(StreamDialogEntry.enqueue_stream); + } if (infoItem.getStreamType() == StreamType.AUDIO_STREAM) { - StreamDialogEntry.setEnabledEntries( - StreamDialogEntry.enqueue_on_background, + entries.addAll(Arrays.asList( StreamDialogEntry.start_here_on_background, StreamDialogEntry.set_as_playlist_thumbnail, StreamDialogEntry.delete, StreamDialogEntry.append_playlist, - StreamDialogEntry.share); - } else { - StreamDialogEntry.setEnabledEntries( - StreamDialogEntry.enqueue_on_background, - StreamDialogEntry.enqueue_on_popup, + StreamDialogEntry.share + )); + } else { + entries.addAll(Arrays.asList( StreamDialogEntry.start_here_on_background, StreamDialogEntry.start_here_on_popup, StreamDialogEntry.set_as_playlist_thumbnail, StreamDialogEntry.delete, StreamDialogEntry.append_playlist, - StreamDialogEntry.share); - - StreamDialogEntry.start_here_on_popup.setCustomAction( - (fragment, infoItemDuplicate) -> NavigationHelper. - playOnPopupPlayer(context, getPlayQueueStartingAt(item), true)); + StreamDialogEntry.share + )); } + StreamDialogEntry.setEnabledEntries(entries); StreamDialogEntry.start_here_on_background.setCustomAction((fragment, infoItemDuplicate) -> NavigationHelper.playOnBackgroundPlayer(context, diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java index f337080a4..d3844c941 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java @@ -38,6 +38,8 @@ public final class PlayerHolder { /** * Returns the current {@link MainPlayer.PlayerType} of the {@link MainPlayer} service, * otherwise `null` if no service running. + * + * @return Current PlayerType */ @Nullable public static MainPlayer.PlayerType getType() { diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java index 6c7be293e..26e3b440c 100644 --- a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java +++ b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java @@ -12,6 +12,7 @@ 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; public enum StreamDialogEntry { @@ -108,6 +109,10 @@ public enum StreamDialogEntry { // non-static methods to initialize and edit entries // /////////////////////////////////////////////////////// + public static void setEnabledEntries(final ArrayList entries) { + setEnabledEntries(entries.toArray(new StreamDialogEntry[0])); + } + /** * To be called before using {@link #setCustomAction(StreamDialogEntryAction)}. * From 12f615c6da39b7220569c5172899dc8e1c17bbd1 Mon Sep 17 00:00:00 2001 From: vkay94 Date: Tue, 6 Oct 2020 17:22:12 +0200 Subject: [PATCH 3/4] Enqueue: Removed unneeded dialog-entries and strings + adjustments --- .../fragments/list/BaseListFragment.java | 2 +- .../list/playlist/PlaylistFragment.java | 2 +- .../history/StatisticsPlaylistFragment.java | 2 +- .../local/playlist/LocalPlaylistFragment.java | 2 +- .../newpipe/player/VideoPlayerImpl.java | 4 ++ .../newpipe/player/helper/PlayerHolder.java | 6 +-- .../schabi/newpipe/util/NavigationHelper.java | 5 +- .../newpipe/util/StreamDialogEntry.java | 52 ++++++------------- app/src/main/res/values-ar/strings.xml | 2 - .../main/res/values-b+zh+HANS+CN/strings.xml | 2 - app/src/main/res/values-be/strings.xml | 2 - app/src/main/res/values-bg/strings.xml | 2 - app/src/main/res/values-ca/strings.xml | 2 - app/src/main/res/values-ckb/strings.xml | 2 - app/src/main/res/values-cs/strings.xml | 2 - app/src/main/res/values-da/strings.xml | 2 - app/src/main/res/values-de/strings.xml | 2 - app/src/main/res/values-el/strings.xml | 2 - app/src/main/res/values-eo/strings.xml | 2 - app/src/main/res/values-es/strings.xml | 2 - app/src/main/res/values-et/strings.xml | 2 - app/src/main/res/values-eu/strings.xml | 2 - app/src/main/res/values-fa/strings.xml | 2 - app/src/main/res/values-fi/strings.xml | 2 - app/src/main/res/values-fr/strings.xml | 2 - app/src/main/res/values-gl/strings.xml | 2 - app/src/main/res/values-he/strings.xml | 2 - app/src/main/res/values-hi/strings.xml | 2 - app/src/main/res/values-hr/strings.xml | 2 - app/src/main/res/values-in/strings.xml | 2 - app/src/main/res/values-it/strings.xml | 2 - app/src/main/res/values-ja/strings.xml | 2 - app/src/main/res/values-ko/strings.xml | 2 - app/src/main/res/values-ku/strings.xml | 2 - app/src/main/res/values-lt/strings.xml | 2 - app/src/main/res/values-mk/strings.xml | 2 - app/src/main/res/values-ml/strings.xml | 2 - app/src/main/res/values-ms/strings.xml | 2 - app/src/main/res/values-nb-rNO/strings.xml | 2 - app/src/main/res/values-ne/strings.xml | 2 - app/src/main/res/values-nl-rBE/strings.xml | 2 - app/src/main/res/values-nl/strings.xml | 2 - app/src/main/res/values-pa/strings.xml | 2 - app/src/main/res/values-pl/strings.xml | 2 - app/src/main/res/values-pt-rBR/strings.xml | 2 - app/src/main/res/values-pt-rPT/strings.xml | 2 - app/src/main/res/values-pt/strings.xml | 2 - app/src/main/res/values-ro/strings.xml | 2 - app/src/main/res/values-ru/strings.xml | 2 - app/src/main/res/values-sc/strings.xml | 2 - app/src/main/res/values-sk/strings.xml | 2 - app/src/main/res/values-sq/strings.xml | 2 - app/src/main/res/values-sv/strings.xml | 2 - app/src/main/res/values-th/strings.xml | 2 - app/src/main/res/values-tr/strings.xml | 2 - app/src/main/res/values-uk/strings.xml | 2 - app/src/main/res/values-ur/strings.xml | 2 - app/src/main/res/values-vi/strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 2 - app/src/main/res/values-zh-rTW/strings.xml | 2 - app/src/main/res/values/strings.xml | 5 +- 61 files changed, 29 insertions(+), 155 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java index d82566440..6a8611d0e 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java @@ -342,7 +342,7 @@ public abstract class BaseListFragment extends BaseStateFragment final ArrayList 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( diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java index d52012491..67f1a007a 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java @@ -156,7 +156,7 @@ public class PlaylistFragment extends BaseListInfoFragment { final ArrayList 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( diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java index ff4b74a01..8eb6dcb55 100644 --- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java @@ -392,7 +392,7 @@ public class StatisticsPlaylistFragment final ArrayList 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( diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java index 26b1d3be6..32fac9de0 100644 --- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java @@ -761,7 +761,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment 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( diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java index 2ee1b7121..c31d34f7b 100644 --- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java +++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java @@ -2094,6 +2094,10 @@ public class VideoPlayerImpl extends VideoPlayer return popupLayoutParams; } + public MainPlayer.PlayerType getPlayerType() { + return playerType; + } + public float getScreenWidth() { return screenWidth; } diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java index d3844c941..6d0f5fff7 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java @@ -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) { diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java index 3387a86d7..3269bc72d 100644 --- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java @@ -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); diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java index 26e3b440c..aee24fc03 100644 --- a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java +++ b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java @@ -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 { *
* 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 entries) { + public static void setEnabledEntries(final List entries) { setEnabledEntries(entries.toArray(new StreamDialogEntry[0])); } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index bc51d6871..c6a773261 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -253,8 +253,6 @@ صفحة الكشك حدد كشك الكشك - إدراج في قائمة الانتظار في الخلفية - إدراج في قائمة الانتظار على المنبثقة ابدأ التشغيل في الخلفية المحتوى الإفتراضي حسب البلد تغيير الإتجاه diff --git a/app/src/main/res/values-b+zh+HANS+CN/strings.xml b/app/src/main/res/values-b+zh+HANS+CN/strings.xml index 9e4c8f3cc..1a5f7f5f8 100644 --- a/app/src/main/res/values-b+zh+HANS+CN/strings.xml +++ b/app/src/main/res/values-b+zh+HANS+CN/strings.xml @@ -276,8 +276,6 @@ 音频设置 长按队列 [未知] - 添加到后台部分队列 - 加入悬浮窗队列 开始在此处开始播放 开始后台播放 开始在悬浮窗中播放 diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 545861888..869e22366 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -316,8 +316,6 @@ Падрабязнасці Налады аўдыё Зацісніце, каб дадаць у чаргу - Дадаць ў чаргу \"У фоне\" - Дадаць ў чаргу \"У акне\" Пачаць адсюль у плэеры Пачаць адсюль у фоне Пачаць адсюль у акне diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 5a1484ddb..70305509c 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -309,8 +309,6 @@ Детайли Аудио настройки Задръжте, за да поставите на опашката - На опашката при „фонов режим“ - На опашката при „режим в прозорец“ Възпроизвеждане от тук Възпроизвеждане от тук при фонов режим Възпроизвеждане от тук при прозорец diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 8dcc07653..0735a4b74 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -257,8 +257,6 @@ Quiosc Tendències Els millors 50 - Afegeix a la cua de reproducció en rerefons - Afegeix a la cua de reproducció emergent Reprodueix aquí Obre el calaix Tanca el calaix diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml index d33c527b4..6495a05bb 100644 --- a/app/src/main/res/values-ckb/strings.xml +++ b/app/src/main/res/values-ckb/strings.xml @@ -188,7 +188,6 @@ داگرتن ژێرنووسەکان بەستەر هەڵەیە - ڕیزنەبوون لە پاشبنەما کۆنترۆڵی دەنگ بەجوڵەی پەنجە ڕیزکردنی خۆکاری کارپێکردنی دواتر کارپێکەرە ڤیدیۆییە دەرەکییەکان پشتگیری ئەم جۆرە بەستەرانە ناکەن @@ -370,7 +369,6 @@ هیچ داوانامەیەک دانەمەزراوە بۆ کارپێکردنی ئەم پەڕگەیە كردنه‌وه‌ له‌ په‌نجه‌ره‌ی بچووک سنووری قەبارە لەکاتی بەکارهێنانی داتای مۆبایل - ڕیزنەبوون لە پەنجەرەی بچووک داخستنی پلیکانە کەناڵ کۆد diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 1096f8b61..8ade81827 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -237,8 +237,6 @@ Nastavení zvuku Podrž pro zařazení do fronty [Neznámý] - Do fronty na pozadí - Do fronty v pop-upu Začne hrát zde Začít přehrávat na pozadí Začít přehrávat v pop-upu diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 5bdc1a23c..0bafffe75 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -317,7 +317,6 @@ Detaljer Lydindstillinger Hold for at føje til kø - Føj til kø når baggrundstilstand aktiveres Start afspilning her Noget vil dukke op her snart ;D Foretrukket \'åbn\'-handling @@ -393,7 +392,6 @@ Kunne ikke eksportere abonnementer Brugerrapport Konferencer - Føj til kø ved ny pop op Start her når i baggrunden Start her ved ny pop op Åbn skuffe diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a692a4ca2..2b0e93693 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -236,8 +236,6 @@ Halten, um zur Wiedergabeliste hinzuzufügen „Zum Anhängen gedrückt halten“ Tipp anzeigen [Unbekannt] - In Warteschlange für Hintergrundwiedergabe - In Warteschlange in einem Pop-up Ab hier wiedergeben Wiedergabe im Hintergrund starten Wiedergabe in einem Pop-up starten diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c76505f94..a7b67c837 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -309,8 +309,6 @@ Λεπτομέρειες Ρυθμίσεις ήχου Πιέστε για να προστεθεί στην ουρά - Προσθήκη στη λίστα αναπαραγωγής του παρασκηνίου - Προσθήκη στη λίστα αναπαραγωγής αναδυόμενου παραθύρου Εκκίνηση Αναπαραγωγής εδώ Εκκίνηση αναπαραγωγής στο παρασκήνιο Εκκίνηση αναπαραγωγής σε ένα αναδυόμενο παράθυρο diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 7ecef1d50..a028faee3 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -165,8 +165,6 @@ Sonaj parametroj Teni por viciĝi [Nekonata] - Viciĝi en la fona ludilo - Viciĝi en ŝprucfenestro Komenci ludi en nova ŝprucfenestro Preferata enhavlando Ŝangi Orientiĝon diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 86c8a890d..620d26705 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -232,8 +232,6 @@ Detalles Configuración de audio [Desconocido] - Añadir a cola en segundo plano - Añadir al reproductor emergente Comenzar a reproducir aquí Comenzar a reproducir en segundo plano Reproducir en modo emergente diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index f6c89020d..70f8d7aa6 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -297,8 +297,6 @@ Üksikasjad Heli seaded Hoia järjekorda lisamiseks - Lisa järjekorda taustal - Lisa järjekorda uue hüpikaknaga Alusta taasesitust siit Alusta siit olles taustal Alusta siit uue hüpikaknaga diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 14f68ece0..0de896d90 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -245,8 +245,6 @@ Xehetasunak Audio ezarpenak Mantendu ilaran jartzeko - Jarri ilaran bigarren planoan - Jarri ilaran laster-leihoan Hasi hemen erreproduzitzen Hasi erreproduzitzen bigarren planoan Hasi erreproduzitzen laster-leihoan diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index eb6107c52..a531ee4ce 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -368,8 +368,6 @@ قرار دادن در صف پخش به صورت تصویر در تصویر خطای عدم احیای پخش‌کننده رخ داد در حال احیا از خطای پخش‌کننده - در صف پخش پس‌زمینه قرار بده - در صف پخش تصویر در تصویر قرار بده شروع پخش در اینجا شروع پخش در پس‌زمینه شروع پخش در حالت تصویر در تصویر diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 656a87494..50f5d2e67 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -234,8 +234,6 @@ Pidä pohjassa lisätäksesi jonoon Näytä vihje soittolistaan lisäämiseksi [Tuntematon] - Lisää taustatoistojonoon - Lisää ponnahdusikkunajonoon Aloita toistaminen tässä Aloita toisto taustalla Aloita toisto ponnahdusikkunassa diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0b81689af..0cabac109 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -233,8 +233,6 @@ Sélectionner un kiosque Kiosque Maintenir pour mettre en liste de lecture - Mettre en liste du lecteur en arrière-plan - Mettre en liste d’une fenêtre flottante Démarrer la lecture ici Démarrer la lecture en arrière-plan Démarrer la lecture dans une fenêtre flottante diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 4f2f54c67..81974bac6 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -312,8 +312,6 @@ Detalles Opcións de audio Manteña para colocalo na cola - Colocar na cola en segundo plano - Executa nunha xanela emerxente Comezar a reprodución aquí Comezar a reproducir en segundo plano Comezar reproducindo nunha xanela emerxente diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 07a32bbaa..9dbaf8d47 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -245,8 +245,6 @@ פרטים אפשרויות שמע להחזיק כדי להוסיף לרשימת נגינה - להוסיף לרשימת הנגינה ברקע - הוספה לתור בנגן צף להתחיל לנגן מכאן להתחיל לנגן ברקע להתחיל לנגן בנגן צף diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index c6d83e63d..7d9a911e9 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -233,8 +233,6 @@ निकाले विवरण जोड़ने के लिए पकड़ें रहे - पृष्टभूमि की कतार में लगाए - नए पॉपअप कि कतार में लगाए यंहा से चलाना शुरू करे पृष्टभूमि में चलाना शुरू करे पॉपअप में चलाना शुरू करे diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 6621d379a..ac09596e3 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -241,8 +241,6 @@ Web stranica Ovdje započni reprodukciju Započni reprodukciju u pozadini - Dodaj na red čekanja u pozadini - Dodaj na red u novom skočnom prozoru Započni reprodukciju u skočnom prozoru Otvori ladicu Zatvori ladicu diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 338f9e044..729fe3436 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -272,8 +272,6 @@ Detail Pengaturan Audio Tahan untuk mengantre - Antre di latar belakang - Antrekan di popup Mulai putar di sini Mulai putar di latar belakang Mulai putar di popup diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d81a8837d..de83639b6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -234,8 +234,6 @@ Impostazioni Audio Tenere premuto per accodare [Sconosciuto] - Accoda in Sottofondo - Accoda in Popup Inizia la riproduzione qui Avvia in Sottofondo Avvia in Popup diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9449d6141..375dbb3ed 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -344,8 +344,6 @@ NewPipe バックグラウンドおよびポップアップのプレイヤーの通知 新着と人気 長押ししてキューに追加 - バックグラウンドのキューに追加 - ポップアップのキューに追加 ポップアップで連続再生を開始 すぐにここに表示されます;D お好みの \'開く\' アクション diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 8d81f182a..411903cc3 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -232,8 +232,6 @@ 상세 정보 오디오 설정 눌러서 대기열에 추가 - 백그라운드 대기열에 추가 - 새 팝업으로 대기열에 추가 여기서부터 재생 백그라운드에서 재생 새 팝업에서 재생 diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml index eee6f6bfe..958ae82bc 100644 --- a/app/src/main/res/values-ku/strings.xml +++ b/app/src/main/res/values-ku/strings.xml @@ -431,8 +431,6 @@ باشترین 50 نوێ & چالاک پەنجەت داگرە بۆ ڕیزنەبوون - ڕیزنەبوون لە پاشبنەما - ڕیزنەبوون لە پەنجەرەی بچووک کردنەوەی پلیکانە داخستنی پلیکانە چاودێری دزەکردنی بیرگە ڕەنگە ببێتە هۆی وەڵامنەدانەوەی لەکاتی گەرمبوون diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index a729c372b..89b9de561 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -242,8 +242,6 @@ Detalės Garso nustatymai Laikykite kad įtraukti į eilę - Įtrauktį į foninio grotuvo eilę - Įtraukti į langelio rėžimo grotuvo eilę Pradėti groti čia Pradėti groti čia foniniame rėžime Pradėti groti čia langelio grotuvo rėžime diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index f29bd8df0..606561495 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -292,8 +292,6 @@ Детали Звучни поставки Задржи за ставање во листа - Додај во листата за заднинско пуштање - Додај во листата за пуштање во прозорче Пушти тука Пушти тука во позадина Пушти тука во прозорче diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 85e2c6292..a0f9bb2c8 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -72,8 +72,6 @@ ഒരു പുതിയ പോപ്പ്അപ്പിൽ പ്ലേ ചെയ്യാൻ ആരംഭിക്കുക പശ്ചാത്തലത്തിൽ പ്ലേ ആരംഭിക്കുക ഇവിടെ പ്ലേ ആരംഭിക്കുക - ഒരു പുതിയ പോപ്പ്അപ്പിൽ എൻ‌ക്യൂ ചെയ്യുക - പശ്ചാത്തലത്തിൽ എൻക്യൂ ചെയ്യുക എൻക്യൂ ചെയ്യാൻ പിടിക്കുക ഓഡിയോ ക്രമീകരണങ്ങൾ വിശദാംശങ്ങൾ diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index fd59e3e14..4a459c685 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -330,8 +330,6 @@ Butiran Tetapan Audio Pegang untuk beratur - Beratur apabila di latar belakang - Beratur pada popup baru Mula bermain di sini Mula di sini apabila di latar belakang Mula di sini pada popup baru diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index dffb0ccce..00750a337 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -234,8 +234,6 @@ Strømside Abonnerer ikke på noen kanaler enda På vei opp - Legg i kø i bakgrunnen - Legg i kø i et oppsprett Start avspilling her Start avspilling i bakgrunnen Start avspilling i et oppsprett diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 5eb558d3b..910a45cf6 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -336,8 +336,6 @@ विवरण अडियो सेटिङहरू लामबद्ध गर्न पकड - पृष्ठभूमिमा लामबद्ध - नयाँ पपअपमा लामबद्ध यहाँ प्ले सुरु पृष्ठभूमिमा बजाउन सुरु गर्नुहोस पपअपमा बजाउन सुरु गर्नुहोस diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml index 4cb27c46c..5bd4662cf 100644 --- a/app/src/main/res/values-nl-rBE/strings.xml +++ b/app/src/main/res/values-nl-rBE/strings.xml @@ -293,8 +293,6 @@ Details Audio-instellingen Houdt ingedrukt voor toe te voegen aan wachtrij - Toevoegen aan wachtrij in de achtergrond - Toevoegen aan wachtrij in nieuwe pop-up Begint hier met afspelen Begint met afspelen in de achtergrond Begint met afspelen in nieuwe pop-up diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 447693608..5694230a0 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -234,8 +234,6 @@ Audio-instellingen Houd ingedrukt om toe te voegen aan de wachtrij [Onbekend] - Toevoegen aan wachtrij in de achtergrond - Toevoegen aan wachtrij in pop-up Begin hier met afspelen Begin hier met afspelen in de achtergrond Begin met afspelen in pop-up diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml index 25d3342d5..ee8f477be 100644 --- a/app/src/main/res/values-pa/strings.xml +++ b/app/src/main/res/values-pa/strings.xml @@ -301,8 +301,6 @@ ਵੇਰਵੇ ਆਡੀਓ ਸੈਟਿੰਗਾਂ ਕਤਾਰਬੱਧ ਕਰਨ ਵਾਸਤੇ ਦਬਾ ਕੇ ਰੱਖੋ - ਬੈਕਗ੍ਰਆਊਂਡ ਵਿੱਚ ਕਤਾਰਬੱਧ ਕਰੋ - ਨਵੇਂ ਪੌਪ-ਅਪ ਵਿੱਚ ਕਤਾਰਬੱਧ ਕਰੋ ਇਥੇ ਚਲਾਉ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚਲਾਉ ਨਵੇਂ ਪੌਪ-ਅਪ ਵਿੱਚ ਚਲਾਓ diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 53e6faf45..f6e09af12 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -242,8 +242,6 @@ Szczegóły Ustawienia dźwięku Przytrzymaj, aby zakolejkować - Kolejkuj w tle - Kolejkuj w wyskakującym okienku Zacznij odtwarzać tutaj Zacznij odtwarzać w tle Zacznij odtwarzać w wyskakującym okienku diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index b292b6a00..6b1e52b2f 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -234,8 +234,6 @@ Configurações de áudio Segure para pôr na fila [Desconhecido] - Pôr na fila em segundo plano - Pôr na fila em um popup Reproduzir daqui Reproduzir em segundo plano Reproduzir em um popup diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index e3be61ed7..393ac3e89 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -91,7 +91,6 @@ Falha ao validar a instância Eliminar todos Limpar histórico de transferências - Colocar em fila em segundo plano Eliminar todas as posições de reprodução\? Mudar visualização Limitar a fila de transferências @@ -359,7 +358,6 @@ Página da lista de reprodução Definições Mais reproduzido - Pôr na fila num popup Mostrando resultados para: %s Mudar para segundo plano Álbuns diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 08032ea07..fc138a3f2 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -364,8 +364,6 @@ NewPipe é um software livre \"copyleft\": pode utilizar, estudar, partilhar e melhorar a aplicação. Especificamente, pode redistribuir e/ou modificar a aplicação nos termos da Licença Pública Geral GNU, conforme publicada pela Fundação de Software Livre, tanto a versão 3 da licença ou (por sua opção) qualquer versão superior. Também deseja importar as definições\? Toque longo para enfileirar - Colocar em fila em segundo plano - Pôr na fila num popup Ação de \'abrir\' preferida Ação predefinida ao abrir o conteúdo — %s Definir como Miniatura da Lista de Reprodução diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 4e30faa6e..0d7a0e2c5 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -288,8 +288,6 @@ pentru a deschide în mod pop-up Detalii Setări Audio Apăsaţi pentru a adăuga în lista de redare - Adăugaţi în fundal - Adăugaţi în Popup Începeţi să redaţi de aici Începe redarea în fundal Începe redarea în popup diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 68fcd914f..331f261d9 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -241,8 +241,6 @@ [Неизвестно] Восстановление после ошибки плеера Зажмите, чтобы добавить в очередь - В очередь в фоне - В очередь в окне Играть отсюда в плеере Играть отсюда в фоне Играть отсюда в окне diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index 5e61d122b..e422632bd 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -56,8 +56,6 @@ Incumintza a riproduire in una ventanedda Incumintza a riproduire in s\'isfundu Incumintza a riproduire inoghe - Pone in s\'elencu in una ventanedda - Pone in s\'elencu in s\'isfundu Mantene incarcadu pro pònnere in s\'elencu Impostatziones àudio Detàllios diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 8ac12ea0f..ad5f9b22a 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -278,8 +278,6 @@ Podrobnosti Nastavenie zvuku Podržaním pridať do zoznamu - Zaradiť do zoznamu na pozadí - Zaradiť do zoznamu pre mini okno Prehrať odtiaľto Prehrať (zvuk) odtiaľto na pozadí Začať prehrávanie v mini okne diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index 52af5dd36..3589b89e9 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -217,8 +217,6 @@ Nis luajtjen në një popup të ri Nis luajtjen në sfond Nis luajtjen këtu - Shtoje në radhën e një popup të ri - Shtoje në radhën në sfond Mbaj shtypur për të shtuar në radhë Aranzhimet Audio Detaje diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0376bbda2..0667f31ef 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -234,8 +234,6 @@ Detaljer Ljudinställningar Håll för att placera i kön - Placera i bakgrunds-kön - Bifoga i en popup Börja spela här Börja spela i bakgrunden Börja spela i en popup diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index c24949ebb..6995217f1 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -313,8 +313,6 @@ รายละเอียด การตั้งค่าเสียง กดค้างไว้เพื่อเพิ่มลงในคิว - เพิ่มคิวในโหมดพื้นหลัง - เพิ่มคิวในโหมดป๊อปอัพ เริ่มเล่นจากตรงนี้ เล่นจากจุดนี้ในโหมดพื้นหลัง เล่นจากจุดนี้ในโหมดป๊อปอัพ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index df00b8044..bf9e61065 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -230,8 +230,6 @@ Ayrıntılar Ses Ayarları Kuyruğa eklemek için basılı tutun - Arka planda kuyruğa ekle - Açılır pencerede kuyruğa ekle Burada oynatmaya başla Arka planda oynatmayı başlat Açılır pencerede oynatmayı başlat diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 361ce8560..f7b647e5d 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -289,8 +289,6 @@ Набуває популярності Видалити Утримуйте, щоб додати в чергу - Додати до фону - Додати до вікна Розпочати програвання звідси Розпочати програвання на фоні Розпочати програванні у вікні diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index 9aac3609c..9abe2c50a 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -290,8 +290,6 @@ تفصیلات آڈیو کی ترتیبات انقطار کو پکڑو - پس منظر میں قطار - ایک نئی پوپ اپ میں انقطار یہاں چلانا شروع کریں پس منظر میں چلانا شروع کریں نئے پاپ اپ میں چلانا شروع کریں diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 293364fbe..161e34677 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -309,8 +309,6 @@ Chi tiết Cài đặt âm thanh Giữ để nối tiếp - Thêm vào trình phát nền - Thêm vào trình phát popup mới Bắt đầu phát ở đây Bắt đầu phát từ đây trong nền Bắt đầu phát từ đây trên trình phát popup mới diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 885b5ae57..0a9f3492b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -276,8 +276,6 @@ 音频设置 长按队列 [未知] - 添加到后台部分队列 - 添加至新悬浮窗列表 开始在此处开始播放 开始后台播放 开始在新悬浮窗中播放 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index a712710ca..99f4b3e9d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -253,8 +253,6 @@ 移除 詳細資訊 音訊設定 - 在背景加入佇列 - 在彈出式視窗中加入佇列 從這裡開始播放 在背景開始播放 在彈出式視窗中開始播放 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aae569fa9..3c86144e9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -445,9 +445,8 @@ Details Audio Settings Hold to enqueue - Enqueue stream - Enqueue in the background - Enqueue in a popup + Enqueue + Enqueued Start playing here Start playing in the background Start playing in a popup From cbf364f24f775122555122d2705332a086b27eba Mon Sep 17 00:00:00 2001 From: vkay94 Date: Tue, 6 Oct 2020 21:17:52 +0200 Subject: [PATCH 4/4] Enqueue: Renamed string resource --- .../main/java/org/schabi/newpipe/util/NavigationHelper.java | 6 +++--- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java index 3269bc72d..ccc102a19 100644 --- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java @@ -196,7 +196,7 @@ public final class NavigationHelper { final boolean selectOnAppend, final boolean resumePlayback) { - Toast.makeText(context, R.string.player_append, Toast.LENGTH_SHORT).show(); + Toast.makeText(context, R.string.enqueued, Toast.LENGTH_SHORT).show(); final Intent intent = getPlayerEnqueueIntent( context, MainPlayer.class, queue, selectOnAppend, resumePlayback); @@ -217,7 +217,7 @@ public final class NavigationHelper { return; } - Toast.makeText(context, R.string.player_append, Toast.LENGTH_SHORT).show(); + Toast.makeText(context, R.string.enqueued, Toast.LENGTH_SHORT).show(); final Intent intent = getPlayerEnqueueIntent( context, MainPlayer.class, queue, selectOnAppend, resumePlayback); intent.putExtra(VideoPlayer.PLAYER_TYPE, VideoPlayer.PLAYER_TYPE_POPUP); @@ -233,7 +233,7 @@ public final class NavigationHelper { final PlayQueue queue, final boolean selectOnAppend, final boolean resumePlayback) { - Toast.makeText(context, R.string.player_append, Toast.LENGTH_SHORT).show(); + Toast.makeText(context, R.string.enqueued, Toast.LENGTH_SHORT).show(); final Intent intent = getPlayerEnqueueIntent( context, MainPlayer.class, queue, selectOnAppend, resumePlayback); intent.putExtra(VideoPlayer.PLAYER_TYPE, VideoPlayer.PLAYER_TYPE_AUDIO); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3c86144e9..4a3893d7b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -446,7 +446,7 @@ Audio Settings Hold to enqueue Enqueue - Enqueued + Enqueued Start playing here Start playing in the background Start playing in a popup