Builder to generate a {@link InfoItemDialog} for a {@link StreamInfoItem}.
+ * Use {@link #addEntry(StreamDialogDefaultEntry)}
+ * and {@link #addAllEntries(StreamDialogDefaultEntry...)} to add options to the dialog.
+ * entries = new ArrayList<>();
+ private final boolean addDefaultEntriesAutomatically;
+
+ /**
+ * Create a {@link Builder builder} instance for a {@link StreamInfoItem}
+ * that automatically adds the some default entries
+ * at the top and bottom of the dialog.
+ * The dialog has the following structure:
+ *
+ * + - - - - - - - - - - - - - - - - - - - - - -+
+ * | ENQUEUE |
+ * | ENQUEUE_NEXT |
+ * | START_ON_BACKGROUND |
+ * | START_ON_POPUP |
+ * + - - - - - - - - - - - - - - - - - - - - - -+
+ * | entries added manually with |
+ * | addEntry() and addAllEntries() |
+ * + - - - - - - - - - - - - - - - - - - - - - -+
+ * | APPEND_PLAYLIST |
+ * | SHARE |
+ * | OPEN_IN_BROWSER |
+ * | PLAY_WITH_KODI |
+ * | MARK_AS_WATCHED |
+ * | SHOW_CHANNEL_DETAILS |
+ * + - - - - - - - - - - - - - - - - - - - - - -+
+ *
+ * Please note that some entries are not added depending on the user's preferences,
+ * the item's {@link StreamType} and the current player state.
+ *
+ * @param activity
+ * @param context
+ * @param fragment
+ * @param infoItem the item for this dialog; all entries and their actions work with
+ * this {@link StreamInfoItem}
+ * @throws IllegalArgumentException if activity, context
+ * or resources is null
+ */
+ public Builder(final Activity activity,
+ final Context context,
+ @NonNull final Fragment fragment,
+ @NonNull final StreamInfoItem infoItem) {
+ this(activity, context, fragment, infoItem, true);
+ }
+
+ /**
+ * Create an instance of this {@link Builder} for a {@link StreamInfoItem}.
+ * If {@code addDefaultEntriesAutomatically} is set to {@code true},
+ * some default entries are added to the top and bottom of the dialog.
+ * The dialog has the following structure:
+ *
+ * + - - - - - - - - - - - - - - - - - - - - - -+
+ * | ENQUEUE |
+ * | ENQUEUE_NEXT |
+ * | START_ON_BACKGROUND |
+ * | START_ON_POPUP |
+ * + - - - - - - - - - - - - - - - - - - - - - -+
+ * | entries added manually with |
+ * | addEntry() and addAllEntries() |
+ * + - - - - - - - - - - - - - - - - - - - - - -+
+ * | APPEND_PLAYLIST |
+ * | SHARE |
+ * | OPEN_IN_BROWSER |
+ * | PLAY_WITH_KODI |
+ * | MARK_AS_WATCHED |
+ * | SHOW_CHANNEL_DETAILS |
+ * + - - - - - - - - - - - - - - - - - - - - - -+
+ *
+ * Please note that some entries are not added depending on the user's preferences,
+ * the item's {@link StreamType} and the current player state.
+ *
+ * @param activity
+ * @param context
+ * @param fragment
+ * @param infoItem
+ * @param addDefaultEntriesAutomatically
+ * whether default entries added with {@link #addDefaultBeginningEntries()}
+ * and {@link #addDefaultEndEntries()} are added automatically when generating
+ * the {@link InfoItemDialog}.
+ *
+ * Entries added with {@link #addEntry(StreamDialogDefaultEntry)} and
+ * {@link #addAllEntries(StreamDialogDefaultEntry...)} are added in between.
+ * @throws IllegalArgumentException if activity, context
+ * or resources is null
+ */
+ public Builder(final Activity activity,
+ final Context context,
+ @NonNull final Fragment fragment,
+ @NonNull final StreamInfoItem infoItem,
+ final boolean addDefaultEntriesAutomatically) {
+ if (activity == null || context == null || context.getResources() == null) {
+ if (DEBUG) {
+ Log.d(TAG, "activity, context or resources is null: activity = "
+ + activity + ", context = " + context);
+ }
+ throw new IllegalArgumentException("activity, context or resources is null");
+ }
+ this.activity = activity;
+ this.context = context;
+ this.fragment = fragment;
+ this.infoItem = infoItem;
+ this.addDefaultEntriesAutomatically = addDefaultEntriesAutomatically;
+ if (addDefaultEntriesAutomatically) {
+ addDefaultBeginningEntries();
+ }
+ }
+
+ /**
+ * Adds a new entry and appends it to the current entry list.
+ * @param entry the entry to add
+ * @return the current {@link Builder} instance
+ */
+ public Builder addEntry(@NonNull final StreamDialogDefaultEntry entry) {
+ entries.add(entry.toStreamDialogEntry());
+ return this;
+ }
+
+ /**
+ * Adds new entries. These are appended to the current entry list.
+ * @param newEntries the entries to add
+ * @return the current {@link Builder} instance
+ */
+ public Builder addAllEntries(@NonNull final StreamDialogDefaultEntry... newEntries) {
+ Stream.of(newEntries).forEach(this::addEntry);
+ return this;
+ }
+
+ /**
+ * Change an entries' action that is called when the entry is selected.
+ * Warning: Only use this method when the entry has been already added.
+ * Changing the action of an entry which has not been added to the Builder yet
+ * does not have an effect.
+ * @param entry the entry to change
+ * @param action the action to perform when the entry is selected
+ * @return the current {@link Builder} instance
+ */
+ public Builder setAction(@NonNull final StreamDialogDefaultEntry entry,
+ @NonNull final StreamDialogEntry.StreamDialogEntryAction action) {
+ for (int i = 0; i < entries.size(); i++) {
+ if (entries.get(i).resource == entry.resource) {
+ entries.set(i, new StreamDialogEntry(entry.resource, action));
+ return this;
+ }
+ }
+ return this;
+ }
+
+ /**
+ * Adds {@link StreamDialogDefaultEntry#ENQUEUE} if the player is open and
+ * {@link StreamDialogDefaultEntry#ENQUEUE_NEXT} if there are multiple streams
+ * in the play queue.
+ * @return the current {@link Builder} instance
+ */
+ public Builder addEnqueueEntriesIfNeeded() {
+ if (PlayerHolder.getInstance().isPlayQueueReady()) {
+ addEntry(StreamDialogDefaultEntry.ENQUEUE);
+
+ if (PlayerHolder.getInstance().getQueueSize() > 1) {
+ addEntry(StreamDialogDefaultEntry.ENQUEUE_NEXT);
+ }
+ }
+ return this;
+ }
+
+ /**
+ * Adds the {@link StreamDialogDefaultEntry#START_HERE_ON_BACKGROUND}.
+ * If the {@link #infoItem} is not a pure audio (live) stream,
+ * {@link StreamDialogDefaultEntry#START_HERE_ON_POPUP} is added, too.
+ * @return the current {@link Builder} instance
+ */
+ public Builder addStartHereEntries() {
+ addEntry(StreamDialogDefaultEntry.START_HERE_ON_BACKGROUND);
+ if (infoItem.getStreamType() != StreamType.AUDIO_STREAM
+ && infoItem.getStreamType() != StreamType.AUDIO_LIVE_STREAM) {
+ addEntry(StreamDialogDefaultEntry.START_HERE_ON_POPUP);
+ }
+ return this;
+ }
+
+ /**
+ * Adds {@link StreamDialogDefaultEntry#MARK_AS_WATCHED} if the watch history is enabled
+ * and the stream is not a livestream.
+ * @return the current {@link Builder} instance
+ */
+ public Builder addMarkAsWatchedEntryIfNeeded() {
+ final boolean isWatchHistoryEnabled = PreferenceManager
+ .getDefaultSharedPreferences(context)
+ .getBoolean(context.getString(R.string.enable_watch_history_key), false);
+ if (isWatchHistoryEnabled
+ && infoItem.getStreamType() != StreamType.LIVE_STREAM
+ && infoItem.getStreamType() != StreamType.AUDIO_LIVE_STREAM) {
+ addEntry(StreamDialogDefaultEntry.MARK_AS_WATCHED);
+ }
+ return this;
+ }
+
+ /**
+ * Adds the {@link StreamDialogDefaultEntry#PLAY_WITH_KODI} entry if it is needed.
+ * @return the current {@link Builder} instance
+ */
+ public Builder addPlayWithKodiEntryIfNeeded() {
+ if (KoreUtils.shouldShowPlayWithKodi(context, infoItem.getServiceId())) {
+ addEntry(StreamDialogDefaultEntry.PLAY_WITH_KODI);
+ }
+ return this;
+ }
+
+ /**
+ * Add the entries which are usually at the top of the action list.
+ *
+ * This method adds the "enqueue" (see {@link #addEnqueueEntriesIfNeeded()})
+ * and "start here" (see {@link #addStartHereEntries()} entries.
+ * @return the current {@link Builder} instance
+ */
+ public Builder addDefaultBeginningEntries() {
+ addEnqueueEntriesIfNeeded();
+ addStartHereEntries();
+ return this;
+ }
+
+ /**
+ * Add the entries which are usually at the bottom of the action list.
+ * @return the current {@link Builder} instance
+ */
+ public Builder addDefaultEndEntries() {
+ addAllEntries(
+ StreamDialogDefaultEntry.APPEND_PLAYLIST,
+ StreamDialogDefaultEntry.SHARE,
+ StreamDialogDefaultEntry.OPEN_IN_BROWSER
+ );
+ addPlayWithKodiEntryIfNeeded();
+ addMarkAsWatchedEntryIfNeeded();
+ addEntry(StreamDialogDefaultEntry.SHOW_CHANNEL_DETAILS);
+ return this;
+ }
+
+ /**
+ * Creates the {@link InfoItemDialog}.
+ * @return a new instance of {@link InfoItemDialog}
+ */
+ public InfoItemDialog create() {
+ if (addDefaultEntriesAutomatically) {
+ addDefaultEndEntries();
+ }
+ return new InfoItemDialog(this.activity, this.fragment, this.infoItem, this.entries);
+ }
+
+ public static void reportErrorDuringInitialization(final Throwable throwable,
+ final InfoItem item) {
+ ErrorUtil.showSnackbar(App.getApp().getBaseContext(), new ErrorInfo(
+ throwable,
+ UserAction.OPEN_INFO_ITEM_DIALOG,
+ "none",
+ item.getServiceId()));
+ }
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogDefaultEntry.java b/app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogDefaultEntry.java
new file mode 100644
index 000000000..7e87318ee
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogDefaultEntry.java
@@ -0,0 +1,142 @@
+package org.schabi.newpipe.info_list.dialog;
+
+import static org.schabi.newpipe.util.NavigationHelper.openChannelFragment;
+import static org.schabi.newpipe.util.SparseItemUtil.fetchItemInfoIfSparse;
+import static org.schabi.newpipe.util.SparseItemUtil.fetchUploaderUrlIfSparse;
+
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.external_communication.KoreUtils;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
+
+import java.util.Collections;
+
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+
+/**
+ *
+ * This enum provides entries that are accepted
+ * by the {@link InfoItemDialog.Builder}.
+ *
+ *
+ * These entries contain a String {@link #resource} which is displayed in the dialog and
+ * a default {@link #action} that is executed
+ * when the entry is selected (via onClick()).
+ *
+ * They action can be overridden by using the Builder's
+ * {@link InfoItemDialog.Builder#setAction(
+ * StreamDialogDefaultEntry, StreamDialogEntry.StreamDialogEntryAction)}
+ * method.
+ *
+ */
+public enum StreamDialogDefaultEntry {
+ SHOW_CHANNEL_DETAILS(R.string.show_channel_details, (fragment, item) ->
+ fetchUploaderUrlIfSparse(fragment.requireContext(), item.getServiceId(), item.getUrl(),
+ item.getUploaderUrl(), url -> openChannelFragment(fragment, item, url))
+ ),
+
+ /**
+ * Enqueues the stream automatically to the current PlayerType.
+ */
+ ENQUEUE(R.string.enqueue_stream, (fragment, item) ->
+ fetchItemInfoIfSparse(fragment.requireContext(), item, singlePlayQueue ->
+ NavigationHelper.enqueueOnPlayer(fragment.getContext(), singlePlayQueue))
+ ),
+
+ /**
+ * Enqueues the stream automatically to the current PlayerType
+ * after the currently playing stream.
+ */
+ ENQUEUE_NEXT(R.string.enqueue_next_stream, (fragment, item) ->
+ fetchItemInfoIfSparse(fragment.requireContext(), item, singlePlayQueue ->
+ NavigationHelper.enqueueNextOnPlayer(fragment.getContext(), singlePlayQueue))
+ ),
+
+ START_HERE_ON_BACKGROUND(R.string.start_here_on_background, (fragment, item) ->
+ fetchItemInfoIfSparse(fragment.requireContext(), item, singlePlayQueue ->
+ NavigationHelper.playOnBackgroundPlayer(
+ fragment.getContext(), singlePlayQueue, true))),
+
+ START_HERE_ON_POPUP(R.string.start_here_on_popup, (fragment, item) ->
+ fetchItemInfoIfSparse(fragment.requireContext(), item, singlePlayQueue ->
+ NavigationHelper.playOnPopupPlayer(fragment.getContext(), singlePlayQueue, true))),
+
+ SET_AS_PLAYLIST_THUMBNAIL(R.string.set_as_playlist_thumbnail, (fragment, item) -> {
+ throw new UnsupportedOperationException("This needs to be implemented manually "
+ + "by using InfoItemDialog.Builder.setAction()");
+ }),
+
+ DELETE(R.string.delete, (fragment, item) -> {
+ throw new UnsupportedOperationException("This needs to be implemented manually "
+ + "by using InfoItemDialog.Builder.setAction()");
+ }),
+
+ /**
+ * Opens a {@link PlaylistDialog} to either append the stream to a playlist
+ * or create a new playlist if there are no local playlists.
+ */
+ APPEND_PLAYLIST(R.string.add_to_playlist, (fragment, item) ->
+ PlaylistDialog.createCorrespondingDialog(
+ fragment.getContext(),
+ Collections.singletonList(new StreamEntity(item)),
+ dialog -> dialog.show(
+ fragment.getParentFragmentManager(),
+ "StreamDialogEntry@"
+ + (dialog instanceof PlaylistAppendDialog ? "append" : "create")
+ + "_playlist"
+ )
+ )
+ ),
+
+ PLAY_WITH_KODI(R.string.play_with_kodi_title, (fragment, item) -> {
+ final Uri videoUrl = Uri.parse(item.getUrl());
+ try {
+ NavigationHelper.playWithKore(fragment.requireContext(), videoUrl);
+ } catch (final Exception e) {
+ KoreUtils.showInstallKoreDialog(fragment.requireActivity());
+ }
+ }),
+
+ SHARE(R.string.share, (fragment, item) ->
+ ShareUtils.shareText(fragment.requireContext(), item.getName(), item.getUrl(),
+ item.getThumbnailUrl())),
+
+ OPEN_IN_BROWSER(R.string.open_in_browser, (fragment, item) ->
+ ShareUtils.openUrlInBrowser(fragment.requireContext(), item.getUrl())),
+
+
+ MARK_AS_WATCHED(R.string.mark_as_watched, (fragment, item) ->
+ new HistoryRecordManager(fragment.getContext())
+ .markAsWatched(item)
+ .onErrorComplete()
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe()
+ );
+
+
+ @StringRes
+ public final int resource;
+ @NonNull
+ public final StreamDialogEntry.StreamDialogEntryAction action;
+
+ StreamDialogDefaultEntry(@StringRes final int resource,
+ @NonNull final StreamDialogEntry.StreamDialogEntryAction action) {
+ this.resource = resource;
+ this.action = action;
+ }
+
+ @NonNull
+ public StreamDialogEntry toStreamDialogEntry() {
+ return new StreamDialogEntry(resource, action);
+ }
+
+}
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogEntry.java
new file mode 100644
index 000000000..9d82e3b58
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogEntry.java
@@ -0,0 +1,31 @@
+package org.schabi.newpipe.info_list.dialog;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
+
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+
+public class StreamDialogEntry {
+
+ @StringRes
+ public final int resource;
+ @NonNull
+ public final StreamDialogEntryAction action;
+
+ public StreamDialogEntry(@StringRes final int resource,
+ @NonNull final StreamDialogEntryAction action) {
+ this.resource = resource;
+ this.action = action;
+ }
+
+ public String getString(@NonNull final Context context) {
+ return context.getString(resource);
+ }
+
+ public interface StreamDialogEntryAction {
+ void onClick(Fragment fragment, StreamInfoItem infoItem);
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
index 78acb752b..aa4f4c9f0 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
@@ -1,6 +1,7 @@
package org.schabi.newpipe.info_list.holder;
import android.view.ViewGroup;
+import android.widget.ImageView;
import android.widget.TextView;
import org.schabi.newpipe.R;
@@ -11,10 +12,8 @@ import org.schabi.newpipe.local.history.HistoryRecordManager;
import org.schabi.newpipe.util.PicassoHelper;
import org.schabi.newpipe.util.Localization;
-import de.hdodenhof.circleimageview.CircleImageView;
-
public class ChannelMiniInfoItemHolder extends InfoItemHolder {
- public final CircleImageView itemThumbnailView;
+ public final ImageView itemThumbnailView;
public final TextView itemTitleView;
private final TextView itemAdditionalDetailView;
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
index cb47efa92..6e4773c09 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
@@ -7,6 +7,7 @@ import android.text.util.Linkify;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
@@ -28,8 +29,6 @@ import org.schabi.newpipe.util.PicassoHelper;
import java.util.regex.Matcher;
-import de.hdodenhof.circleimageview.CircleImageView;
-
public class CommentsMiniInfoItemHolder extends InfoItemHolder {
private static final String TAG = "CommentsMiniIIHolder";
@@ -40,7 +39,7 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
private final int commentVerticalPadding;
private final RelativeLayout itemRoot;
- public final CircleImageView itemThumbnailView;
+ public final ImageView itemThumbnailView;
private final TextView itemContentView;
private final TextView itemLikesCountView;
private final TextView itemPublishedTime;
diff --git a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
index 5d81c0069..05e2fdac0 100644
--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
@@ -228,6 +228,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter() {
@@ -143,7 +138,7 @@ class FeedFragment : BaseStateFragment() {
val factory = FeedViewModel.Factory(requireContext(), groupId)
viewModel = ViewModelProvider(this, factory).get(FeedViewModel::class.java)
showPlayedItems = viewModel.getShowPlayedItemsFromPreferences()
- viewModel.stateLiveData.observe(viewLifecycleOwner, { it?.let(::handleResult) })
+ viewModel.stateLiveData.observe(viewLifecycleOwner) { it?.let(::handleResult) }
groupAdapter = GroupieAdapter().apply {
setOnItemClickListener(listenerStreamItem)
@@ -356,53 +351,12 @@ class FeedFragment : BaseStateFragment() {
feedBinding.loadingProgressBar.max = progressState.maxProgress
}
- private fun showStreamDialog(item: StreamInfoItem) {
+ private fun showInfoItemDialog(item: StreamInfoItem) {
val context = context
val activity: Activity? = getActivity()
if (context == null || context.resources == null || activity == null) return
- val entries = ArrayList()
- if (PlayerHolder.getInstance().isPlayQueueReady) {
- entries.add(StreamDialogEntry.enqueue)
-
- if (PlayerHolder.getInstance().queueSize > 1) {
- entries.add(StreamDialogEntry.enqueue_next)
- }
- }
-
- if (item.streamType == StreamType.AUDIO_STREAM) {
- entries.addAll(
- listOf(
- StreamDialogEntry.start_here_on_background,
- StreamDialogEntry.append_playlist,
- StreamDialogEntry.share,
- StreamDialogEntry.open_in_browser
- )
- )
- } else {
- entries.addAll(
- listOf(
- StreamDialogEntry.start_here_on_background,
- StreamDialogEntry.start_here_on_popup,
- StreamDialogEntry.append_playlist,
- StreamDialogEntry.share,
- StreamDialogEntry.open_in_browser
- )
- )
- }
-
- // show "mark as watched" only when watch history is enabled
- if (StreamDialogEntry.shouldAddMarkAsWatched(item.streamType, context)) {
- entries.add(
- StreamDialogEntry.mark_as_watched
- )
- }
- entries.add(StreamDialogEntry.show_channel_details)
-
- StreamDialogEntry.setEnabledEntries(entries)
- InfoItemDialog(activity, item, StreamDialogEntry.getCommands(context)) { _, which ->
- StreamDialogEntry.clickOn(which, this, item)
- }.show()
+ InfoItemDialog.Builder(activity, context, this, item).create().show()
}
private val listenerStreamItem = object : OnItemClickListener, OnItemLongClickListener {
@@ -418,7 +372,7 @@ class FeedFragment : BaseStateFragment() {
override fun onItemLongClick(item: Item<*>, view: View): Boolean {
if (item is StreamItem && !isRefreshing) {
- showStreamDialog(item.streamWithState.stream.toStreamInfoItem())
+ showInfoItemDialog(item.streamWithState.stream.toStreamInfoItem())
return true
}
return false
@@ -438,14 +392,11 @@ class FeedFragment : BaseStateFragment() {
// This need to be saved in a variable as the update occurs async
val oldOldestSubscriptionUpdate = oldestSubscriptionUpdate
- groupAdapter.updateAsync(
- loadedState.items, false,
- OnAsyncUpdateListener {
- oldOldestSubscriptionUpdate?.run {
- highlightNewItemsAfter(oldOldestSubscriptionUpdate)
- }
+ groupAdapter.updateAsync(loadedState.items, false) {
+ oldOldestSubscriptionUpdate?.run {
+ highlightNewItemsAfter(oldOldestSubscriptionUpdate)
}
- )
+ }
listState?.run {
feedBinding.itemsList.layoutManager?.onRestoreInstanceState(listState)
@@ -497,8 +448,7 @@ class FeedFragment : BaseStateFragment() {
}.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
- {
- subscriptionEntity ->
+ { subscriptionEntity ->
handleFeedNotAvailable(
subscriptionEntity,
t.cause,
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt
index 2cbf9ad05..e21963c16 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt
@@ -56,7 +56,7 @@ class FeedViewModel(
.subscribeOn(Schedulers.io())
.observeOn(Schedulers.io())
.map { (event, showPlayedItems, notLoadedCount, oldestUpdate) ->
- var streamItems = if (event is SuccessResultEvent || event is IdleEvent)
+ val streamItems = if (event is SuccessResultEvent || event is IdleEvent)
feedDatabaseManager
.getStreams(groupId, showPlayedItems)
.blockingGet(arrayListOf())
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt
index 61e5c7d9e..6b9580802 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt
@@ -3,7 +3,6 @@ package org.schabi.newpipe.local.feed.notifications
import android.content.Context
import android.util.Log
import androidx.core.app.NotificationCompat
-import androidx.work.BackoffPolicy
import androidx.work.Constraints
import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.ForegroundInfo
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java b/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java
index e7ccd07d2..709a16b68 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java
@@ -84,7 +84,7 @@ public abstract class HistoryEntryAdapter
}
@Override
- public void onViewRecycled(final VH holder) {
+ public void onViewRecycled(@NonNull final VH holder) {
super.onViewRecycled(holder);
holder.itemView.setOnClickListener(null);
}
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 73682d5d5..01df34292 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
@@ -1,6 +1,5 @@
package org.schabi.newpipe.local.history;
-import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.os.Parcelable;
@@ -29,20 +28,16 @@ import org.schabi.newpipe.databinding.StatisticPlaylistControlBinding;
import org.schabi.newpipe.error.ErrorInfo;
import org.schabi.newpipe.error.UserAction;
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.info_list.dialog.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.settings.HistorySettingsFragment;
-import org.schabi.newpipe.util.external_communication.KoreUtils;
import org.schabi.newpipe.util.NavigationHelper;
import org.schabi.newpipe.util.OnClickGesture;
-import org.schabi.newpipe.util.StreamDialogEntry;
+import org.schabi.newpipe.info_list.dialog.StreamDialogDefaultEntry;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -154,7 +149,7 @@ public class StatisticsPlaylistFragment
@Override
public void held(final LocalItem selectedItem) {
if (selectedItem instanceof StreamStatisticsEntry) {
- showStreamDialog((StreamStatisticsEntry) selectedItem);
+ showInfoItemDialog((StreamStatisticsEntry) selectedItem);
}
}
});
@@ -328,66 +323,30 @@ public class StatisticsPlaylistFragment
return getPlayQueue(Math.max(itemListAdapter.getItemsList().indexOf(infoItem), 0));
}
- private void showStreamDialog(final StreamStatisticsEntry item) {
+ private void showInfoItemDialog(final StreamStatisticsEntry item) {
final Context context = getContext();
- final Activity activity = getActivity();
- if (context == null || context.getResources() == null || activity == null) {
- return;
- }
final StreamInfoItem infoItem = item.toStreamInfoItem();
- final ArrayList entries = new ArrayList<>();
+ try {
+ final InfoItemDialog.Builder dialogBuilder =
+ new InfoItemDialog.Builder(getActivity(), context, this, infoItem);
- if (PlayerHolder.getInstance().isPlayQueueReady()) {
- entries.add(StreamDialogEntry.enqueue);
-
- if (PlayerHolder.getInstance().getQueueSize() > 1) {
- entries.add(StreamDialogEntry.enqueue_next);
- }
+ // set entries in the middle; the others are added automatically
+ dialogBuilder
+ .addEntry(StreamDialogDefaultEntry.DELETE)
+ .setAction(
+ StreamDialogDefaultEntry.DELETE,
+ (f, i) -> deleteEntry(
+ Math.max(itemListAdapter.getItemsList().indexOf(item), 0)))
+ .setAction(
+ StreamDialogDefaultEntry.START_HERE_ON_BACKGROUND,
+ (f, i) -> NavigationHelper.playOnBackgroundPlayer(
+ context, getPlayQueueStartingAt(item), true))
+ .create()
+ .show();
+ } catch (final IllegalArgumentException e) {
+ InfoItemDialog.Builder.reportErrorDuringInitialization(e, infoItem);
}
-
- if (infoItem.getStreamType() == StreamType.AUDIO_STREAM) {
- entries.addAll(Arrays.asList(
- StreamDialogEntry.start_here_on_background,
- StreamDialogEntry.delete,
- StreamDialogEntry.append_playlist,
- StreamDialogEntry.share
- ));
- } else {
- entries.addAll(Arrays.asList(
- StreamDialogEntry.start_here_on_background,
- StreamDialogEntry.start_here_on_popup,
- StreamDialogEntry.delete,
- StreamDialogEntry.append_playlist,
- StreamDialogEntry.share
- ));
- }
- entries.add(StreamDialogEntry.open_in_browser);
- if (KoreUtils.shouldShowPlayWithKodi(context, infoItem.getServiceId())) {
- entries.add(StreamDialogEntry.play_with_kodi);
- }
-
- // show "mark as watched" only when watch history is enabled
- if (StreamDialogEntry.shouldAddMarkAsWatched(
- item.getStreamEntity().getStreamType(),
- context
- )) {
- entries.add(
- StreamDialogEntry.mark_as_watched
- );
- }
- entries.add(StreamDialogEntry.show_channel_details);
-
- StreamDialogEntry.setEnabledEntries(entries);
-
- StreamDialogEntry.start_here_on_background.setCustomAction((fragment, infoItemDuplicate) ->
- NavigationHelper
- .playOnBackgroundPlayer(context, getPlayQueueStartingAt(item), true));
- StreamDialogEntry.delete.setCustomAction((fragment, infoItemDuplicate) ->
- deleteEntry(Math.max(itemListAdapter.getItemsList().indexOf(item), 0)));
-
- new InfoItemDialog(activity, infoItem, StreamDialogEntry.getCommands(context),
- (dialog, which) -> StreamDialogEntry.clickOn(which, this, infoItem)).show();
}
private void deleteEntry(final int index) {
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 feb5b2f96..0eb56d716 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
@@ -1,6 +1,8 @@
package org.schabi.newpipe.local.playlist;
-import android.app.Activity;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
+import static org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout;
+
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
@@ -38,22 +40,18 @@ import org.schabi.newpipe.databinding.PlaylistControlBinding;
import org.schabi.newpipe.error.ErrorInfo;
import org.schabi.newpipe.error.UserAction;
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.info_list.dialog.InfoItemDialog;
import org.schabi.newpipe.local.BaseLocalListFragment;
import org.schabi.newpipe.local.history.HistoryRecordManager;
import org.schabi.newpipe.player.MainPlayer.PlayerType;
-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.util.external_communication.KoreUtils;
import org.schabi.newpipe.util.Localization;
import org.schabi.newpipe.util.NavigationHelper;
import org.schabi.newpipe.util.OnClickGesture;
-import org.schabi.newpipe.util.StreamDialogEntry;
+import org.schabi.newpipe.info_list.dialog.StreamDialogDefaultEntry;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -68,9 +66,6 @@ import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.schedulers.Schedulers;
import io.reactivex.rxjava3.subjects.PublishSubject;
-import static org.schabi.newpipe.ktx.ViewUtils.animate;
-import static org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout;
-
public class LocalPlaylistFragment extends BaseLocalListFragment, Void> {
// Save the list 10 seconds after the last change occurred
private static final long SAVE_DEBOUNCE_MILLIS = 10000;
@@ -182,7 +177,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment removeWatchedStreams(false))
.setNeutralButton(
R.string.remove_watched_popup_yes_and_partially_watched_videos,
@@ -743,70 +738,39 @@ public class LocalPlaylistFragment extends BaseLocalListFragment entries = new ArrayList<>();
+ try {
+ final Context context = getContext();
+ final InfoItemDialog.Builder dialogBuilder =
+ new InfoItemDialog.Builder(getActivity(), context, this, infoItem);
- if (PlayerHolder.getInstance().isPlayQueueReady()) {
- entries.add(StreamDialogEntry.enqueue);
-
- if (PlayerHolder.getInstance().getQueueSize() > 1) {
- entries.add(StreamDialogEntry.enqueue_next);
- }
- }
- if (infoItem.getStreamType() == StreamType.AUDIO_STREAM) {
- entries.addAll(Arrays.asList(
- StreamDialogEntry.start_here_on_background,
- StreamDialogEntry.set_as_playlist_thumbnail,
- StreamDialogEntry.delete,
- StreamDialogEntry.append_playlist,
- 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
- ));
- }
- entries.add(StreamDialogEntry.open_in_browser);
- if (KoreUtils.shouldShowPlayWithKodi(context, infoItem.getServiceId())) {
- entries.add(StreamDialogEntry.play_with_kodi);
- }
-
- // show "mark as watched" only when watch history is enabled
- if (StreamDialogEntry.shouldAddMarkAsWatched(
- item.getStreamEntity().getStreamType(),
- context
- )) {
- entries.add(
- StreamDialogEntry.mark_as_watched
+ // add entries in the middle
+ dialogBuilder.addAllEntries(
+ StreamDialogDefaultEntry.SET_AS_PLAYLIST_THUMBNAIL,
+ StreamDialogDefaultEntry.DELETE
);
+
+ // set custom actions
+ // all entries modified below have already been added within the builder
+ dialogBuilder
+ .setAction(
+ StreamDialogDefaultEntry.START_HERE_ON_BACKGROUND,
+ (f, i) -> NavigationHelper.playOnBackgroundPlayer(
+ context, getPlayQueueStartingAt(item), true))
+ .setAction(
+ StreamDialogDefaultEntry.SET_AS_PLAYLIST_THUMBNAIL,
+ (f, i) ->
+ changeThumbnailUrl(item.getStreamEntity().getThumbnailUrl()))
+ .setAction(
+ StreamDialogDefaultEntry.DELETE,
+ (f, i) -> deleteItem(item))
+ .create()
+ .show();
+ } catch (final IllegalArgumentException e) {
+ InfoItemDialog.Builder.reportErrorDuringInitialization(e, infoItem);
}
- entries.add(StreamDialogEntry.show_channel_details);
-
- StreamDialogEntry.setEnabledEntries(entries);
-
- StreamDialogEntry.start_here_on_background.setCustomAction((fragment, infoItemDuplicate) ->
- NavigationHelper.playOnBackgroundPlayer(context,
- getPlayQueueStartingAt(item), true));
- StreamDialogEntry.set_as_playlist_thumbnail.setCustomAction(
- (fragment, infoItemDuplicate) ->
- changeThumbnailUrl(item.getStreamEntity().getThumbnailUrl()));
- StreamDialogEntry.delete.setCustomAction((fragment, infoItemDuplicate) ->
- deleteItem(item));
-
- new InfoItemDialog(activity, infoItem, StreamDialogEntry.getCommands(context),
- (dialog, which) -> StreamDialogEntry.clickOn(which, this, infoItem)).show();
}
private void setInitialData(final long pid, final String title) {
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java b/app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java
index a3d8b0567..da8e1070a 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java
@@ -61,7 +61,7 @@ public class ImportConfirmationDialog extends DialogFragment {
}
@Override
- public void onSaveInstanceState(final Bundle outState) {
+ public void onSaveInstanceState(@NonNull final Bundle outState) {
super.onSaveInstanceState(outState);
Icepick.saveInstanceState(this, outState);
}
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialogViewModel.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialogViewModel.kt
index d49df6303..54ba1c6dc 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialogViewModel.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialogViewModel.kt
@@ -8,7 +8,6 @@ import androidx.lifecycle.ViewModelProvider
import io.reactivex.rxjava3.core.Completable
import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.disposables.Disposable
-import io.reactivex.rxjava3.functions.BiFunction
import io.reactivex.rxjava3.processors.BehaviorProcessor
import io.reactivex.rxjava3.schedulers.Schedulers
import org.schabi.newpipe.database.feed.model.FeedGroupEntity
@@ -33,9 +32,8 @@ class FeedGroupDialogViewModel(
private var subscriptionsFlowable = Flowable
.combineLatest(
filterSubscriptions.startWithItem(initialQuery),
- toggleShowOnlyUngrouped.startWithItem(initialShowOnlyUngrouped),
- BiFunction { t1: String, t2: Boolean -> Filter(t1, t2) }
- )
+ toggleShowOnlyUngrouped.startWithItem(initialShowOnlyUngrouped)
+ ) { t1: String, t2: Boolean -> Filter(t1, t2) }
.distinctUntilChanged()
.switchMap { (query, showOnlyUngrouped) ->
subscriptionManager.getSubscriptions(groupId, query, showOnlyUngrouped)
@@ -56,9 +54,8 @@ class FeedGroupDialogViewModel(
private var subscriptionsDisposable = Flowable
.combineLatest(
- subscriptionsFlowable, feedDatabaseManager.subscriptionIdsForGroup(groupId),
- BiFunction { t1: List, t2: List -> t1 to t2.toSet() }
- )
+ subscriptionsFlowable, feedDatabaseManager.subscriptionIdsForGroup(groupId)
+ ) { t1: List, t2: List -> t1 to t2.toSet() }
.subscribeOn(Schedulers.io())
.subscribe(mutableSubscriptionsLiveData::postValue)
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt
index 50e8aae6a..1f3ab71eb 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt
@@ -57,15 +57,12 @@ class FeedGroupReorderDialog : DialogFragment() {
viewModel = ViewModelProvider(this).get(FeedGroupReorderDialogViewModel::class.java)
viewModel.groupsLiveData.observe(viewLifecycleOwner, Observer(::handleGroups))
- viewModel.dialogEventLiveData.observe(
- viewLifecycleOwner,
- Observer {
- when (it) {
- ProcessingEvent -> disableInput()
- SuccessEvent -> dismiss()
- }
+ viewModel.dialogEventLiveData.observe(viewLifecycleOwner) {
+ when (it) {
+ ProcessingEvent -> disableInput()
+ SuccessEvent -> dismiss()
}
- )
+ }
binding.feedGroupsList.layoutManager = LinearLayoutManager(requireContext())
binding.feedGroupsList.adapter = groupAdapter
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelper.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelper.java
index 8e3aad893..611a1cd30 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelper.java
@@ -25,7 +25,6 @@ import com.grack.nanojson.JsonAppendableWriter;
import com.grack.nanojson.JsonArray;
import com.grack.nanojson.JsonObject;
import com.grack.nanojson.JsonParser;
-import com.grack.nanojson.JsonSink;
import com.grack.nanojson.JsonWriter;
import org.schabi.newpipe.BuildConfig;
@@ -125,10 +124,11 @@ public final class ImportExportJsonHelper {
/**
* @see #writeTo(List, OutputStream, ImportExportEventListener)
* @param items the list of subscriptions items
- * @param writer the output {@link JsonSink}
+ * @param writer the output {@link JsonAppendableWriter}
* @param eventListener listener for the events generated
*/
- public static void writeTo(final List items, final JsonSink writer,
+ public static void writeTo(final List items,
+ final JsonAppendableWriter writer,
@Nullable final ImportExportEventListener eventListener) {
if (eventListener != null) {
eventListener.onSizeReceived(items.size());
diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
index e0c5ab083..53e6ce591 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
@@ -1,7 +1,10 @@
package org.schabi.newpipe.player;
+import static org.schabi.newpipe.QueueItemMenuUtil.openPopupMenu;
+import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
import android.content.ComponentName;
-import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.Bundle;
@@ -23,11 +26,9 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.exoplayer2.PlaybackParameters;
import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.stream.model.StreamEntity;
import org.schabi.newpipe.databinding.ActivityPlayerQueueControlBinding;
import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
-import org.schabi.newpipe.local.dialog.PlaylistDialog;
import org.schabi.newpipe.player.event.PlayerEventListener;
import org.schabi.newpipe.player.helper.PlaybackParameterDialog;
import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -42,13 +43,6 @@ import org.schabi.newpipe.util.PermissionHelper;
import org.schabi.newpipe.util.ServiceHelper;
import org.schabi.newpipe.util.ThemeHelper;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.schabi.newpipe.QueueItemMenuUtil.openPopupMenu;
-import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
-
public final class PlayQueueActivity extends AppCompatActivity
implements PlayerEventListener, SeekBar.OnSeekBarChangeListener,
View.OnClickListener, PlaybackParameterDialog.Callback {
@@ -129,7 +123,7 @@ public final class PlayQueueActivity extends AppCompatActivity
NavigationHelper.openSettings(this);
return true;
case R.id.action_append_playlist:
- appendAllToPlaylist();
+ player.onAddToPlaylistClicked(getSupportFragmentManager());
return true;
case R.id.action_playback_speed:
openPlaybackParameterDialog();
@@ -443,24 +437,6 @@ public final class PlayQueueActivity extends AppCompatActivity
seeking = false;
}
- ////////////////////////////////////////////////////////////////////////////
- // Playlist append
- ////////////////////////////////////////////////////////////////////////////
-
- private void appendAllToPlaylist() {
- if (player != null && player.getPlayQueue() != null) {
- openPlaylistAppendDialog(player.getPlayQueue().getStreams());
- }
- }
-
- private void openPlaylistAppendDialog(final List playQueueItems) {
- PlaylistDialog.createCorrespondingDialog(
- getApplicationContext(),
- playQueueItems.stream().map(StreamEntity::new).collect(Collectors.toList()),
- dialog -> dialog.show(getSupportFragmentManager(), TAG)
- );
- }
-
////////////////////////////////////////////////////////////////////////////
// Binding Service Listener
////////////////////////////////////////////////////////////////////////////
@@ -624,7 +600,6 @@ public final class PlayQueueActivity extends AppCompatActivity
//2) Icon change accordingly to current App Theme
// using rootView.getContext() because getApplicationContext() didn't work
- final Context context = queueControlBinding.getRoot().getContext();
item.setIcon(player.isMuted() ? R.drawable.ic_volume_off : R.drawable.ic_volume_up);
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index e0debc4e7..1051f678f 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -73,7 +73,6 @@ import android.provider.Settings;
import android.util.DisplayMetrics;
import android.util.Log;
import android.util.TypedValue;
-import android.view.ContextThemeWrapper;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@@ -89,7 +88,6 @@ import android.widget.FrameLayout;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
-import android.widget.PopupMenu;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.SeekBar;
@@ -99,12 +97,15 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.view.ContextThemeWrapper;
import androidx.appcompat.widget.AppCompatImageButton;
+import androidx.appcompat.widget.PopupMenu;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.Insets;
import androidx.core.view.GestureDetectorCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
+import androidx.fragment.app.FragmentManager;
import androidx.preference.PreferenceManager;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView;
@@ -112,6 +113,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.DefaultRenderersFactory;
import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.PlaybackParameters;
import com.google.android.exoplayer2.Player.PositionInfo;
import com.google.android.exoplayer2.RenderersFactory;
@@ -122,6 +124,7 @@ import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.TrackGroup;
import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.text.Cue;
+import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
import com.google.android.exoplayer2.ui.CaptionStyleCompat;
@@ -136,6 +139,7 @@ import com.squareup.picasso.Target;
import org.schabi.newpipe.DownloaderImpl;
import org.schabi.newpipe.MainActivity;
import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
import org.schabi.newpipe.databinding.PlayerBinding;
import org.schabi.newpipe.databinding.PlayerPopupCloseOverlayBinding;
import org.schabi.newpipe.error.ErrorInfo;
@@ -144,11 +148,13 @@ import org.schabi.newpipe.error.UserAction;
import org.schabi.newpipe.extractor.MediaFormat;
import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.extractor.stream.StreamSegment;
+import org.schabi.newpipe.extractor.stream.StreamType;
import org.schabi.newpipe.extractor.stream.VideoStream;
import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
import org.schabi.newpipe.info_list.StreamSegmentAdapter;
import org.schabi.newpipe.ktx.AnimationType;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
import org.schabi.newpipe.local.history.HistoryRecordManager;
import org.schabi.newpipe.player.MainPlayer.PlayerType;
import org.schabi.newpipe.player.event.DisplayPortion;
@@ -158,9 +164,10 @@ import org.schabi.newpipe.player.event.PlayerServiceEventListener;
import org.schabi.newpipe.player.helper.AudioReactor;
import org.schabi.newpipe.player.helper.LoadController;
import org.schabi.newpipe.player.helper.MediaSessionManager;
-import org.schabi.newpipe.player.helper.PlaybackParameterDialog;
import org.schabi.newpipe.player.helper.PlayerDataSource;
import org.schabi.newpipe.player.helper.PlayerHelper;
+import org.schabi.newpipe.player.listeners.view.PlaybackSpeedClickListener;
+import org.schabi.newpipe.player.listeners.view.QualityClickListener;
import org.schabi.newpipe.player.playback.CustomTrackSelector;
import org.schabi.newpipe.player.playback.MediaSourceManager;
import org.schabi.newpipe.player.playback.PlaybackListener;
@@ -175,6 +182,7 @@ import org.schabi.newpipe.player.playqueue.PlayQueueItemTouchCallback;
import org.schabi.newpipe.player.resolver.AudioPlaybackResolver;
import org.schabi.newpipe.player.resolver.MediaSourceTag;
import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
+import org.schabi.newpipe.player.resolver.VideoPlaybackResolver.SourceType;
import org.schabi.newpipe.player.seekbarpreview.SeekbarPreviewThumbnailHelper;
import org.schabi.newpipe.player.seekbarpreview.SeekbarPreviewThumbnailHolder;
import org.schabi.newpipe.util.DeviceUtils;
@@ -193,6 +201,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.core.Observable;
@@ -521,9 +531,12 @@ public final class Player implements
}
private void initListeners() {
+ binding.qualityTextView.setOnClickListener(
+ new QualityClickListener(this, qualityPopupMenu));
+ binding.playbackSpeed.setOnClickListener(
+ new PlaybackSpeedClickListener(this, playbackSpeedPopupMenu));
+
binding.playbackSeekBar.setOnSeekBarChangeListener(this);
- binding.playbackSpeed.setOnClickListener(this);
- binding.qualityTextView.setOnClickListener(this);
binding.captionTextView.setOnClickListener(this);
binding.resizeTextView.setOnClickListener(this);
binding.playbackLiveSync.setOnClickListener(this);
@@ -532,10 +545,15 @@ public final class Player implements
gestureDetector = new GestureDetectorCompat(context, playerGestureListener);
binding.getRoot().setOnTouchListener(playerGestureListener);
- binding.queueButton.setOnClickListener(this);
- binding.segmentsButton.setOnClickListener(this);
- binding.repeatButton.setOnClickListener(this);
- binding.shuffleButton.setOnClickListener(this);
+ binding.queueButton.setOnClickListener(v -> onQueueClicked());
+ binding.segmentsButton.setOnClickListener(v -> onSegmentsClicked());
+ binding.repeatButton.setOnClickListener(v -> onRepeatClicked());
+ binding.shuffleButton.setOnClickListener(v -> onShuffleClicked());
+ binding.addToPlaylistButton.setOnClickListener(v -> {
+ if (getParentActivity() != null) {
+ onAddToPlaylistClicked(getParentActivity().getSupportFragmentManager());
+ }
+ });
binding.playPauseButton.setOnClickListener(this);
binding.playPreviousButton.setOnClickListener(this);
@@ -580,11 +598,17 @@ public final class Player implements
v.getPaddingTop(),
v.getPaddingRight(),
v.getPaddingBottom());
- binding.fastSeekOverlay.setPadding(
- v.getPaddingLeft(),
- v.getPaddingTop(),
- v.getPaddingRight(),
- v.getPaddingBottom());
+
+ // If we added padding to the fast seek overlay, too, it would not go under the
+ // system ui. Instead we apply negative margins equal to the window insets of
+ // the opposite side, so that the view covers all of the player (overflowing on
+ // some sides) and its center coincides with the center of other controls.
+ final RelativeLayout.LayoutParams fastSeekParams = (RelativeLayout.LayoutParams)
+ binding.fastSeekOverlay.getLayoutParams();
+ fastSeekParams.leftMargin = -v.getPaddingRight();
+ fastSeekParams.topMargin = -v.getPaddingBottom();
+ fastSeekParams.rightMargin = -v.getPaddingLeft();
+ fastSeekParams.bottomMargin = -v.getPaddingTop();
});
}
@@ -593,8 +617,7 @@ public final class Player implements
*/
private void setupPlayerSeekOverlay() {
binding.fastSeekOverlay
- .seekSecondsSupplier(
- () -> (int) (retrieveSeekDurationFromPreferences(this) / 1000.0f))
+ .seekSecondsSupplier(() -> retrieveSeekDurationFromPreferences(this) / 1000)
.performListener(new PlayerFastSeekOverlay.PerformListener() {
@Override
@@ -607,6 +630,7 @@ public final class Player implements
animate(binding.fastSeekOverlay, false, SEEK_OVERLAY_DURATION);
}
+ @NonNull
@Override
public FastSeekDirection getFastSeekDirection(
@NonNull final DisplayPortion portion
@@ -658,6 +682,7 @@ public final class Player implements
//////////////////////////////////////////////////////////////////////////*/
//region Playback initialization via intent
+ @SuppressWarnings("MethodLength")
public void handleIntent(@NonNull final Intent intent) {
// fail fast if no play queue was provided
final String queueCache = intent.getStringExtra(PLAY_QUEUE_KEY);
@@ -1910,7 +1935,7 @@ public final class Player implements
}, delay);
}
- private void showHideShadow(final boolean show, final long duration) {
+ public void showHideShadow(final boolean show, final long duration) {
animate(binding.playbackControlsShadow, show, duration, AnimationType.ALPHA, 0, null);
animate(binding.playerTopShadow, show, duration, AnimationType.ALPHA, 0, null);
animate(binding.playerBottomShadow, show, duration, AnimationType.ALPHA, 0, null);
@@ -2378,6 +2403,32 @@ public final class Player implements
+ /*//////////////////////////////////////////////////////////////////////////
+ // Playlist append
+ //////////////////////////////////////////////////////////////////////////*/
+ //region Playlist append
+
+ public void onAddToPlaylistClicked(@NonNull final FragmentManager fragmentManager) {
+ if (DEBUG) {
+ Log.d(TAG, "onAddToPlaylistClicked() called");
+ }
+
+ if (getPlayQueue() != null) {
+ PlaylistDialog.createCorrespondingDialog(
+ getContext(),
+ getPlayQueue()
+ .getStreams()
+ .stream()
+ .map(StreamEntity::new)
+ .collect(Collectors.toList()),
+ dialog -> dialog.show(fragmentManager, TAG)
+ );
+ }
+ }
+ //endregion
+
+
+
/*//////////////////////////////////////////////////////////////////////////
// Mute / Unmute
//////////////////////////////////////////////////////////////////////////*/
@@ -2443,9 +2494,9 @@ public final class Player implements
}
@Override
- public void onPositionDiscontinuity(
- final PositionInfo oldPosition, final PositionInfo newPosition,
- @DiscontinuityReason final int discontinuityReason) {
+ public void onPositionDiscontinuity(@NonNull final PositionInfo oldPosition,
+ @NonNull final PositionInfo newPosition,
+ @DiscontinuityReason final int discontinuityReason) {
if (DEBUG) {
Log.d(TAG, "ExoPlayer - onPositionDiscontinuity() called with "
+ "discontinuityReason = [" + discontinuityReason + "]");
@@ -2493,7 +2544,7 @@ public final class Player implements
}
@Override
- public void onCues(final List cues) {
+ public void onCues(@NonNull final List cues) {
binding.subtitleView.onCues(cues);
}
//endregion
@@ -2999,18 +3050,19 @@ public final class Player implements
final MediaSourceTag metadata;
try {
- metadata = (MediaSourceTag) simpleExoPlayer.getCurrentTag();
- } catch (IndexOutOfBoundsException | ClassCastException error) {
+ final MediaItem currentMediaItem = simpleExoPlayer.getCurrentMediaItem();
+ if (currentMediaItem == null || currentMediaItem.playbackProperties == null
+ || currentMediaItem.playbackProperties.tag == null) {
+ return;
+ }
+ metadata = (MediaSourceTag) currentMediaItem.playbackProperties.tag;
+ } catch (final IndexOutOfBoundsException | ClassCastException ex) {
if (DEBUG) {
- Log.d(TAG, "Could not update metadata: " + error.getMessage());
- error.printStackTrace();
+ Log.d(TAG, "Could not update metadata", ex);
}
return;
}
- if (metadata == null) {
- return;
- }
maybeAutoQueueNextStream(metadata);
if (currentMetadata == metadata) {
@@ -3119,6 +3171,7 @@ public final class Player implements
binding.itemsListHeaderDuration.setVisibility(View.VISIBLE);
binding.shuffleButton.setVisibility(View.VISIBLE);
binding.repeatButton.setVisibility(View.VISIBLE);
+ binding.addToPlaylistButton.setVisibility(View.VISIBLE);
hideControls(0, 0);
binding.itemsListPanel.requestFocus();
@@ -3156,6 +3209,7 @@ public final class Player implements
binding.itemsListHeaderDuration.setVisibility(View.GONE);
binding.shuffleButton.setVisibility(View.GONE);
binding.repeatButton.setVisibility(View.GONE);
+ binding.addToPlaylistButton.setVisibility(View.GONE);
hideControls(0, 0);
binding.itemsListPanel.requestFocus();
@@ -3184,6 +3238,7 @@ public final class Player implements
binding.shuffleButton.setVisibility(View.GONE);
binding.repeatButton.setVisibility(View.GONE);
+ binding.addToPlaylistButton.setVisibility(View.GONE);
binding.itemsListClose.setOnClickListener(view -> closeItemsList());
}
@@ -3203,6 +3258,9 @@ public final class Player implements
binding.itemsListPanel.setTranslationY(
-binding.itemsListPanel.getHeight() * 5);
});
+
+ // clear focus, otherwise a white rectangle remains on top of the player
+ binding.itemsListClose.clearFocus();
binding.playPauseButton.requestFocus();
}
}
@@ -3286,7 +3344,27 @@ public final class Player implements
@Override // own playback listener
@Nullable
public MediaSource sourceOf(final PlayQueueItem item, final StreamInfo info) {
- return (isAudioOnly ? audioResolver : videoResolver).resolve(info);
+ if (audioPlayerSelected()) {
+ return audioResolver.resolve(info);
+ }
+
+ if (isAudioOnly && videoResolver.getStreamSourceType().orElse(
+ SourceType.VIDEO_WITH_AUDIO_OR_AUDIO_ONLY)
+ == SourceType.VIDEO_WITH_AUDIO_OR_AUDIO_ONLY) {
+ // If the current info has only video streams with audio and if the stream is played as
+ // audio, we need to use the audio resolver, otherwise the video stream will be played
+ // in background.
+ return audioResolver.resolve(info);
+ }
+
+ // Even if the stream is played in background, we need to use the video resolver if the
+ // info played is separated video-only and audio-only streams; otherwise, if the audio
+ // resolver was called when the app was in background, the app will only stream audio when
+ // the user come back to the app and will never fetch the video stream.
+ // Note that the video is not fetched when the app is in background because the video
+ // renderer is fully disabled (see useVideoSource method), except for HLS streams
+ // (see https://github.com/google/ExoPlayer/issues/9282).
+ return videoResolver.resolve(info);
}
public void disablePreloadingOfCurrentTrack() {
@@ -3538,37 +3616,6 @@ public final class Player implements
}
}
- private void onQualitySelectorClicked() {
- if (DEBUG) {
- Log.d(TAG, "onQualitySelectorClicked() called");
- }
- qualityPopupMenu.show();
- isSomePopupMenuVisible = true;
-
- final VideoStream videoStream = getSelectedVideoStream();
- if (videoStream != null) {
- final String qualityText = MediaFormat.getNameById(videoStream.getFormatId()) + " "
- + videoStream.resolution;
- binding.qualityTextView.setText(qualityText);
- }
-
- saveWasPlaying();
- }
-
- private void onPlaybackSpeedClicked() {
- if (DEBUG) {
- Log.d(TAG, "onPlaybackSpeedClicked() called");
- }
- if (videoPlayerSelected()) {
- PlaybackParameterDialog.newInstance(getPlaybackSpeed(), getPlaybackPitch(),
- getPlaybackSkipSilence(), this::setPlaybackParameters)
- .show(getParentActivity().getSupportFragmentManager(), null);
- } else {
- playbackSpeedPopupMenu.show();
- isSomePopupMenuVisible = true;
- }
- }
-
private void onCaptionClicked() {
if (DEBUG) {
Log.d(TAG, "onCaptionClicked() called");
@@ -3673,11 +3720,7 @@ public final class Player implements
if (DEBUG) {
Log.d(TAG, "onClick() called with: v = [" + v + "]");
}
- if (v.getId() == binding.qualityTextView.getId()) {
- onQualitySelectorClicked();
- } else if (v.getId() == binding.playbackSpeed.getId()) {
- onPlaybackSpeedClicked();
- } else if (v.getId() == binding.resizeTextView.getId()) {
+ if (v.getId() == binding.resizeTextView.getId()) {
onResizeClicked();
} else if (v.getId() == binding.captionTextView.getId()) {
onCaptionClicked();
@@ -3689,18 +3732,6 @@ public final class Player implements
playPrevious();
} else if (v.getId() == binding.playNextButton.getId()) {
playNext();
- } else if (v.getId() == binding.queueButton.getId()) {
- onQueueClicked();
- return;
- } else if (v.getId() == binding.segmentsButton.getId()) {
- onSegmentsClicked();
- return;
- } else if (v.getId() == binding.repeatButton.getId()) {
- onRepeatClicked();
- return;
- } else if (v.getId() == binding.shuffleButton.getId()) {
- onShuffleClicked();
- return;
} else if (v.getId() == binding.moreOptionsButton.getId()) {
onMoreOptionsClicked();
} else if (v.getId() == binding.share.getId()) {
@@ -3729,23 +3760,33 @@ public final class Player implements
context.sendBroadcast(new Intent(VideoDetailFragment.ACTION_HIDE_MAIN_PLAYER));
}
- if (currentState != STATE_COMPLETED) {
- controlsVisibilityHandler.removeCallbacksAndMessages(null);
- showHideShadow(true, DEFAULT_CONTROLS_DURATION);
- animate(binding.playbackControlRoot, true, DEFAULT_CONTROLS_DURATION,
- AnimationType.ALPHA, 0, () -> {
- if (currentState == STATE_PLAYING && !isSomePopupMenuVisible) {
- if (v.getId() == binding.playPauseButton.getId()
- // Hide controls in fullscreen immediately
- || (v.getId() == binding.screenRotationButton.getId()
- && isFullscreen)) {
- hideControls(0, 0);
- } else {
- hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
- }
- }
- });
+ manageControlsAfterOnClick(v);
+ }
+
+ /**
+ * Manages the controls after a click occurred on the player UI.
+ * @param v – The view that was clicked
+ */
+ public void manageControlsAfterOnClick(@NonNull final View v) {
+ if (currentState == STATE_COMPLETED) {
+ return;
}
+
+ controlsVisibilityHandler.removeCallbacksAndMessages(null);
+ showHideShadow(true, DEFAULT_CONTROLS_DURATION);
+ animate(binding.playbackControlRoot, true, DEFAULT_CONTROLS_DURATION,
+ AnimationType.ALPHA, 0, () -> {
+ if (currentState == STATE_PLAYING && !isSomePopupMenuVisible) {
+ if (v.getId() == binding.playPauseButton.getId()
+ // Hide controls in fullscreen immediately
+ || (v.getId() == binding.screenRotationButton.getId()
+ && isFullscreen)) {
+ hideControls(0, 0);
+ } else {
+ hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
+ }
+ }
+ });
}
@Override
@@ -3767,6 +3808,10 @@ public final class Player implements
case KeyEvent.KEYCODE_SPACE:
if (isFullscreen) {
playPause();
+ if (isPlaying()) {
+ hideControls(0, 0);
+ }
+ return true;
}
break;
case KeyEvent.KEYCODE_BACK:
@@ -3780,8 +3825,9 @@ public final class Player implements
case KeyEvent.KEYCODE_DPAD_DOWN:
case KeyEvent.KEYCODE_DPAD_RIGHT:
case KeyEvent.KEYCODE_DPAD_CENTER:
- if (binding.getRoot().hasFocus() && !binding.playbackControlRoot.hasFocus()) {
- // do not interfere with focus in playlist etc.
+ if ((binding.getRoot().hasFocus() && !binding.playbackControlRoot.hasFocus())
+ || isQueueVisible) {
+ // do not interfere with focus in playlist and play queue etc.
return false;
}
@@ -3789,15 +3835,13 @@ public final class Player implements
return true;
}
- if (!isControlsVisible()) {
- if (!isQueueVisible) {
- binding.playPauseButton.requestFocus();
- }
+ if (isControlsVisible()) {
+ hideControls(DEFAULT_CONTROLS_DURATION, DPAD_CONTROLS_HIDE_TIME);
+ } else {
+ binding.playPauseButton.requestFocus();
showControlsThenHide();
showSystemUIPartially();
return true;
- } else {
- hideControls(DEFAULT_CONTROLS_DURATION, DPAD_CONTROLS_HIDE_TIME);
}
break;
}
@@ -4141,19 +4185,125 @@ public final class Player implements
return (AppCompatActivity) ((ViewGroup) binding.getRoot().getParent()).getContext();
}
- private void useVideoSource(final boolean video) {
- if (playQueue == null || isAudioOnly == !video || audioPlayerSelected()) {
+ private void useVideoSource(final boolean videoEnabled) {
+ if (playQueue == null || isAudioOnly == !videoEnabled || audioPlayerSelected()) {
return;
}
- isAudioOnly = !video;
- // When a user returns from background controls could be hidden
- // but systemUI will be shown 100%. Hide it
+ isAudioOnly = !videoEnabled;
+ // When a user returns from background, controls could be hidden but SystemUI will be shown
+ // 100%. Hide it.
if (!isAudioOnly && !isControlsVisible()) {
hideSystemUIIfNeeded();
}
+
+ // The current metadata may be null sometimes (for e.g. when using an unstable connection
+ // in livestreams) so we will be not able to execute the block below.
+ // Reload the play queue manager in this case, which is the behavior when we don't know the
+ // index of the video renderer or playQueueManagerReloadingNeeded returns true.
+ if (currentMetadata == null) {
+ reloadPlayQueueManager();
+ setRecovery();
+ return;
+ }
+
+ final int videoRenderIndex = getVideoRendererIndex();
+ final StreamInfo info = currentMetadata.getMetadata();
+
+ // In the case we don't know the source type, fallback to the one with video with audio or
+ // audio-only source.
+ final SourceType sourceType = videoResolver.getStreamSourceType().orElse(
+ SourceType.VIDEO_WITH_AUDIO_OR_AUDIO_ONLY);
+
+ if (playQueueManagerReloadingNeeded(sourceType, info, videoRenderIndex)) {
+ reloadPlayQueueManager();
+ } else {
+ final StreamType streamType = info.getStreamType();
+ if (streamType == StreamType.AUDIO_STREAM
+ || streamType == StreamType.AUDIO_LIVE_STREAM) {
+ // Nothing to do more than setting the recovery position
+ setRecovery();
+ return;
+ }
+
+ final TrackGroupArray videoTrackGroupArray = Objects.requireNonNull(
+ trackSelector.getCurrentMappedTrackInfo()).getTrackGroups(videoRenderIndex);
+ if (videoEnabled) {
+ // Clearing the null selection override enable again the video stream (and its
+ // fetching).
+ trackSelector.setParameters(trackSelector.buildUponParameters()
+ .clearSelectionOverride(videoRenderIndex, videoTrackGroupArray));
+ } else {
+ // Using setRendererDisabled still fetch the video stream in background, contrary
+ // to setSelectionOverride with a null override.
+ trackSelector.setParameters(trackSelector.buildUponParameters()
+ .setSelectionOverride(videoRenderIndex, videoTrackGroupArray, null));
+ }
+ }
+
setRecovery();
- reloadPlayQueueManager();
+ }
+
+ /**
+ * Return whether the play queue manager needs to be reloaded when switching player type.
+ *
+ *
+ * The play queue manager needs to be reloaded if the video renderer index is not known and if
+ * the content is not an audio content, but also if none of the following cases is met:
+ *
+ *
+ * - the content is an {@link StreamType#AUDIO_STREAM audio stream} or an
+ * {@link StreamType#AUDIO_LIVE_STREAM audio live stream};
+ * - the content is a {@link StreamType#LIVE_STREAM live stream} and the source type is a
+ * {@link SourceType#LIVE_STREAM live source};
+ * - the content's source is {@link SourceType#VIDEO_WITH_SEPARATED_AUDIO a video stream
+ * with a separated audio source} or has no audio-only streams available and is a
+ * {@link StreamType#LIVE_STREAM live stream} or a
+ * {@link StreamType#LIVE_STREAM live stream}.
+ *
+ *
+ *
+ *
+ * @param sourceType the {@link SourceType} of the stream
+ * @param streamInfo the {@link StreamInfo} of the stream
+ * @param videoRendererIndex the video renderer index of the video source, if that's a video
+ * source (or {@link #RENDERER_UNAVAILABLE})
+ * @return whether the play queue manager needs to be reloaded
+ */
+ private boolean playQueueManagerReloadingNeeded(final SourceType sourceType,
+ @NonNull final StreamInfo streamInfo,
+ final int videoRendererIndex) {
+ final StreamType streamType = streamInfo.getStreamType();
+
+ if (videoRendererIndex == RENDERER_UNAVAILABLE && streamType != StreamType.AUDIO_STREAM
+ && streamType != StreamType.AUDIO_LIVE_STREAM) {
+ return true;
+ }
+
+ // The content is an audio stream, an audio live stream, or a live stream with a live
+ // source: it's not needed to reload the play queue manager because the stream source will
+ // be the same
+ if ((streamType == StreamType.AUDIO_STREAM || streamType == StreamType.AUDIO_LIVE_STREAM)
+ || (streamType == StreamType.LIVE_STREAM
+ && sourceType == SourceType.LIVE_STREAM)) {
+ return false;
+ }
+
+ // The content's source is a video with separated audio or a video with audio -> the video
+ // and its fetch may be disabled
+ // The content's source is a video with embedded audio and the content has no separated
+ // audio stream available: it's probably not needed to reload the play queue manager
+ // because the stream source will be probably the same as the current played
+ if (sourceType == SourceType.VIDEO_WITH_SEPARATED_AUDIO
+ || (sourceType == SourceType.VIDEO_WITH_AUDIO_OR_AUDIO_ONLY
+ && isNullOrEmpty(streamInfo.getAudioStreams()))) {
+ // It's not needed to reload the play queue manager only if the content's stream type
+ // is a video stream or a live stream
+ return streamType != StreamType.VIDEO_STREAM && streamType != StreamType.LIVE_STREAM;
+ }
+
+ // Other cases: the play queue manager reload is needed
+ return true;
}
//endregion
@@ -4191,7 +4341,7 @@ public final class Player implements
private boolean isLive() {
try {
return !exoPlayerIsNull() && simpleExoPlayer.isCurrentWindowDynamic();
- } catch (@NonNull final IndexOutOfBoundsException e) {
+ } catch (final IndexOutOfBoundsException e) {
// Why would this even happen =(... but lets log it anyway, better safe than sorry
if (DEBUG) {
Log.d(TAG, "player.isCurrentWindowDynamic() failed: ", e);
@@ -4263,6 +4413,10 @@ public final class Player implements
return isSomePopupMenuVisible;
}
+ public void setSomePopupMenuVisible(final boolean somePopupMenuVisible) {
+ isSomePopupMenuVisible = somePopupMenuVisible;
+ }
+
public ImageButton getPlayPauseButton() {
return binding.playPauseButton;
}
@@ -4344,6 +4498,11 @@ public final class Player implements
public PlayQueueAdapter getPlayQueueAdapter() {
return playQueueAdapter;
}
+
+ public PlayerBinding getBinding() {
+ return binding;
+ }
+
//endregion
@@ -4369,15 +4528,42 @@ public final class Player implements
}
private void cleanupVideoSurface() {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { // >=API23
- if (surfaceHolderCallback != null) {
- if (binding != null) {
- binding.surfaceView.getHolder().removeCallback(surfaceHolderCallback);
- }
- surfaceHolderCallback.release();
- surfaceHolderCallback = null;
+ // Only for API >= 23
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && surfaceHolderCallback != null) {
+ if (binding != null) {
+ binding.surfaceView.getHolder().removeCallback(surfaceHolderCallback);
}
+ surfaceHolderCallback.release();
+ surfaceHolderCallback = null;
}
}
//endregion
+
+ /**
+ * Get the video renderer index of the current playing stream.
+ *
+ * This method returns the video renderer index of the current
+ * {@link MappingTrackSelector.MappedTrackInfo} or {@link #RENDERER_UNAVAILABLE} if the current
+ * {@link MappingTrackSelector.MappedTrackInfo} is null or if there is no video renderer index.
+ *
+ * @return the video renderer index or {@link #RENDERER_UNAVAILABLE} if it cannot be get
+ */
+ private int getVideoRendererIndex() {
+ final MappingTrackSelector.MappedTrackInfo mappedTrackInfo = trackSelector
+ .getCurrentMappedTrackInfo();
+
+ if (mappedTrackInfo == null) {
+ return RENDERER_UNAVAILABLE;
+ }
+
+ // Check every renderer
+ return IntStream.range(0, mappedTrackInfo.getRendererCount())
+ // Check the renderer is a video renderer and has at least one track
+ .filter(i -> !mappedTrackInfo.getTrackGroups(i).isEmpty()
+ && simpleExoPlayer.getRendererType(i) == C.TRACK_TYPE_VIDEO)
+ // Return the first index found (there is at most one renderer per renderer type)
+ .findFirst()
+ // No video renderer index with at least one track found: return unavailable index
+ .orElse(RENDERER_UNAVAILABLE);
+ }
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
index b36f9f234..087a3bc76 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
@@ -149,7 +149,8 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener, An
//////////////////////////////////////////////////////////////////////////*/
@Override
- public void onAudioSessionIdChanged(final EventTime eventTime, final int audioSessionId) {
+ public void onAudioSessionIdChanged(@NonNull final EventTime eventTime,
+ final int audioSessionId) {
notifyAudioSessionUpdate(true, audioSessionId);
}
private void notifyAudioSessionUpdate(final boolean active, final int audioSessionId) {
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java b/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java
index 9703a3588..bcab92787 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java
@@ -63,6 +63,7 @@ import java.io.File;
}
}
+ @NonNull
@Override
public DataSource createDataSource() {
Log.d(TAG, "initExoPlayerCache: cacheDir = " + cacheDir.getAbsolutePath());
@@ -86,8 +87,8 @@ import java.io.File;
Log.d(TAG, "tryDeleteCacheFiles: " + filePath + " deleted = " + deleteSuccessful);
}
- } catch (final Exception ignored) {
- Log.e(TAG, "Failed to delete file.", ignored);
+ } catch (final Exception e) {
+ Log.e(TAG, "Failed to delete file.", e);
}
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java b/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
index 8d344c877..cd04bc2eb 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
@@ -135,9 +135,7 @@ public class MediaSessionManager {
lastTitleHashCode = title.hashCode();
lastArtistHashCode = artist.hashCode();
lastDuration = duration;
- if (optAlbumArt.isPresent()) {
- lastAlbumArtHashCode = optAlbumArt.get().hashCode();
- }
+ optAlbumArt.ifPresent(bitmap -> lastAlbumArtHashCode = bitmap.hashCode());
}
private boolean checkIfMetadataShouldBeSet(
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
index 5139ef9cd..1a55c21c3 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
@@ -9,6 +9,7 @@ import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.CheckBox;
+import android.widget.RelativeLayout;
import android.widget.SeekBar;
import android.widget.TextView;
@@ -19,6 +20,7 @@ import androidx.fragment.app.DialogFragment;
import androidx.preference.PreferenceManager;
import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.SimpleOnSeekBarChangeListener;
import org.schabi.newpipe.util.SliderStrategy;
public class PlaybackParameterDialog extends DialogFragment {
@@ -37,6 +39,7 @@ public class PlaybackParameterDialog extends DialogFragment {
private static final double DEFAULT_TEMPO = 1.00f;
private static final double DEFAULT_PITCH = 1.00f;
+ private static final int DEFAULT_SEMITONES = 0;
private static final double DEFAULT_STEP = STEP_TWENTY_FIVE_PERCENT_VALUE;
private static final boolean DEFAULT_SKIP_SILENCE = false;
@@ -64,10 +67,11 @@ public class PlaybackParameterDialog extends DialogFragment {
private double initialTempo = DEFAULT_TEMPO;
private double initialPitch = DEFAULT_PITCH;
+ private int initialSemitones = DEFAULT_SEMITONES;
private boolean initialSkipSilence = DEFAULT_SKIP_SILENCE;
private double tempo = DEFAULT_TEMPO;
private double pitch = DEFAULT_PITCH;
- private double stepSize = DEFAULT_STEP;
+ private int semitones = DEFAULT_SEMITONES;
@Nullable
private SeekBar tempoSlider;
@@ -86,9 +90,19 @@ public class PlaybackParameterDialog extends DialogFragment {
@Nullable
private TextView pitchStepUpText;
@Nullable
+ private SeekBar semitoneSlider;
+ @Nullable
+ private TextView semitoneCurrentText;
+ @Nullable
+ private TextView semitoneStepDownText;
+ @Nullable
+ private TextView semitoneStepUpText;
+ @Nullable
private CheckBox unhookingCheckbox;
@Nullable
private CheckBox skipSilenceCheckbox;
+ @Nullable
+ private CheckBox adjustBySemitonesCheckbox;
public static PlaybackParameterDialog newInstance(final double playbackTempo,
final double playbackPitch,
@@ -101,6 +115,7 @@ public class PlaybackParameterDialog extends DialogFragment {
dialog.tempo = playbackTempo;
dialog.pitch = playbackPitch;
+ dialog.semitones = dialog.percentToSemitones(playbackPitch);
dialog.initialSkipSilence = playbackSkipSilence;
return dialog;
@@ -111,7 +126,7 @@ public class PlaybackParameterDialog extends DialogFragment {
//////////////////////////////////////////////////////////////////////////*/
@Override
- public void onAttach(final Context context) {
+ public void onAttach(@NonNull final Context context) {
super.onAttach(context);
if (context instanceof Callback) {
callback = (Callback) context;
@@ -127,22 +142,22 @@ public class PlaybackParameterDialog extends DialogFragment {
if (savedInstanceState != null) {
initialTempo = savedInstanceState.getDouble(INITIAL_TEMPO_KEY, DEFAULT_TEMPO);
initialPitch = savedInstanceState.getDouble(INITIAL_PITCH_KEY, DEFAULT_PITCH);
+ initialSemitones = percentToSemitones(initialPitch);
tempo = savedInstanceState.getDouble(TEMPO_KEY, DEFAULT_TEMPO);
pitch = savedInstanceState.getDouble(PITCH_KEY, DEFAULT_PITCH);
- stepSize = savedInstanceState.getDouble(STEP_SIZE_KEY, DEFAULT_STEP);
+ semitones = percentToSemitones(pitch);
}
}
@Override
- public void onSaveInstanceState(final Bundle outState) {
+ public void onSaveInstanceState(@NonNull final Bundle outState) {
super.onSaveInstanceState(outState);
outState.putDouble(INITIAL_TEMPO_KEY, initialTempo);
outState.putDouble(INITIAL_PITCH_KEY, initialPitch);
outState.putDouble(TEMPO_KEY, getCurrentTempo());
outState.putDouble(PITCH_KEY, getCurrentPitch());
- outState.putDouble(STEP_SIZE_KEY, getCurrentStepSize());
}
/*//////////////////////////////////////////////////////////////////////////
@@ -160,9 +175,11 @@ public class PlaybackParameterDialog extends DialogFragment {
.setView(view)
.setCancelable(true)
.setNegativeButton(R.string.cancel, (dialogInterface, i) ->
- setPlaybackParameters(initialTempo, initialPitch, initialSkipSilence))
+ setPlaybackParameters(initialTempo, initialPitch,
+ initialSemitones, initialSkipSilence))
.setNeutralButton(R.string.playback_reset, (dialogInterface, i) ->
- setPlaybackParameters(DEFAULT_TEMPO, DEFAULT_PITCH, DEFAULT_SKIP_SILENCE))
+ setPlaybackParameters(DEFAULT_TEMPO, DEFAULT_PITCH,
+ DEFAULT_SEMITONES, DEFAULT_SKIP_SILENCE))
.setPositiveButton(R.string.ok, (dialogInterface, i) ->
setCurrentPlaybackParameters());
@@ -176,14 +193,49 @@ public class PlaybackParameterDialog extends DialogFragment {
private void setupControlViews(@NonNull final View rootView) {
setupHookingControl(rootView);
setupSkipSilenceControl(rootView);
+ setupAdjustBySemitonesControl(rootView);
setupTempoControl(rootView);
setupPitchControl(rootView);
+ setupSemitoneControl(rootView);
+
+ togglePitchSliderType(rootView);
- setStepSize(stepSize);
setupStepSizeSelector(rootView);
}
+ private void togglePitchSliderType(@NonNull final View rootView) {
+ final RelativeLayout pitchControl = rootView.findViewById(R.id.pitchControl);
+ final RelativeLayout semitoneControl = rootView.findViewById(R.id.semitoneControl);
+
+ final View separatorStepSizeSelector =
+ rootView.findViewById(R.id.separatorStepSizeSelector);
+ final RelativeLayout.LayoutParams params =
+ (RelativeLayout.LayoutParams) separatorStepSizeSelector.getLayoutParams();
+ if (pitchControl != null && semitoneControl != null && unhookingCheckbox != null) {
+ if (getCurrentAdjustBySemitones()) {
+ // replaces pitchControl slider with semitoneControl slider
+ pitchControl.setVisibility(View.GONE);
+ semitoneControl.setVisibility(View.VISIBLE);
+ params.addRule(RelativeLayout.BELOW, R.id.semitoneControl);
+
+ // forces unhook for semitones
+ unhookingCheckbox.setChecked(true);
+ unhookingCheckbox.setEnabled(false);
+
+ setupTempoStepSizeSelector(rootView);
+ } else {
+ semitoneControl.setVisibility(View.GONE);
+ pitchControl.setVisibility(View.VISIBLE);
+ params.addRule(RelativeLayout.BELOW, R.id.pitchControl);
+
+ // (re)enables hooking selection
+ unhookingCheckbox.setEnabled(true);
+ setupCombinedStepSizeSelector(rootView);
+ }
+ }
+ }
+
private void setupTempoControl(@NonNull final View rootView) {
tempoSlider = rootView.findViewById(R.id.tempoSeekbar);
final TextView tempoMinimumText = rootView.findViewById(R.id.tempoMinimumText);
@@ -234,23 +286,40 @@ public class PlaybackParameterDialog extends DialogFragment {
}
}
+ private void setupSemitoneControl(@NonNull final View rootView) {
+ semitoneSlider = rootView.findViewById(R.id.semitoneSeekbar);
+ semitoneCurrentText = rootView.findViewById(R.id.semitoneCurrentText);
+ semitoneStepDownText = rootView.findViewById(R.id.semitoneStepDown);
+ semitoneStepUpText = rootView.findViewById(R.id.semitoneStepUp);
+
+ if (semitoneCurrentText != null) {
+ semitoneCurrentText.setText(getSignedSemitonesString(semitones));
+ }
+
+ if (semitoneSlider != null) {
+ setSemitoneSlider(semitones);
+ semitoneSlider.setOnSeekBarChangeListener(getOnSemitoneChangedListener());
+ }
+
+ }
+
private void setupHookingControl(@NonNull final View rootView) {
unhookingCheckbox = rootView.findViewById(R.id.unhookCheckbox);
if (unhookingCheckbox != null) {
- // restore whether pitch and tempo are unhooked or not
+ // restores whether pitch and tempo are unhooked or not
unhookingCheckbox.setChecked(PreferenceManager
.getDefaultSharedPreferences(requireContext())
.getBoolean(getString(R.string.playback_unhook_key), true));
unhookingCheckbox.setOnCheckedChangeListener((compoundButton, isChecked) -> {
- // save whether pitch and tempo are unhooked or not
+ // saves whether pitch and tempo are unhooked or not
PreferenceManager.getDefaultSharedPreferences(requireContext())
.edit()
.putBoolean(getString(R.string.playback_unhook_key), isChecked)
.apply();
if (!isChecked) {
- // when unchecked, slide back to the minimum of current tempo or pitch
+ // when unchecked, slides back to the minimum of current tempo or pitch
final double minimum = Math.min(getCurrentPitch(), getCurrentTempo());
setSliders(minimum);
setCurrentPlaybackParameters();
@@ -268,7 +337,51 @@ public class PlaybackParameterDialog extends DialogFragment {
}
}
+ private void setupAdjustBySemitonesControl(@NonNull final View rootView) {
+ adjustBySemitonesCheckbox = rootView.findViewById(R.id.adjustBySemitonesCheckbox);
+ if (adjustBySemitonesCheckbox != null) {
+ // restores whether semitone adjustment is used or not
+ adjustBySemitonesCheckbox.setChecked(PreferenceManager
+ .getDefaultSharedPreferences(requireContext())
+ .getBoolean(getString(R.string.playback_adjust_by_semitones_key), true));
+
+ // stores whether semitone adjustment is used or not
+ adjustBySemitonesCheckbox.setOnCheckedChangeListener((compoundButton, isChecked) -> {
+ PreferenceManager.getDefaultSharedPreferences(requireContext())
+ .edit()
+ .putBoolean(getString(R.string.playback_adjust_by_semitones_key), isChecked)
+ .apply();
+ togglePitchSliderType(rootView);
+ if (isChecked) {
+ setPlaybackParameters(
+ getCurrentTempo(),
+ getCurrentPitch(),
+ Integer.min(12,
+ Integer.max(-12, percentToSemitones(getCurrentPitch())
+ )),
+ getCurrentSkipSilence()
+ );
+ setSemitoneSlider(Integer.min(12,
+ Integer.max(-12, percentToSemitones(getCurrentPitch()))
+ ));
+ } else {
+ setPlaybackParameters(
+ getCurrentTempo(),
+ semitonesToPercent(getCurrentSemitones()),
+ getCurrentSemitones(),
+ getCurrentSkipSilence()
+ );
+ setPitchSlider(semitonesToPercent(getCurrentSemitones()));
+ }
+ });
+ }
+ }
+
private void setupStepSizeSelector(@NonNull final View rootView) {
+ setStepSize(PreferenceManager
+ .getDefaultSharedPreferences(requireContext())
+ .getFloat(getString(R.string.adjustment_step_key), (float) DEFAULT_STEP));
+
final TextView stepSizeOnePercentText = rootView.findViewById(R.id.stepSizeOnePercent);
final TextView stepSizeFivePercentText = rootView.findViewById(R.id.stepSizeFivePercent);
final TextView stepSizeTenPercentText = rootView.findViewById(R.id.stepSizeTenPercent);
@@ -310,8 +423,27 @@ public class PlaybackParameterDialog extends DialogFragment {
}
}
+ private void setupTempoStepSizeSelector(@NonNull final View rootView) {
+ final TextView playbackStepTypeText = rootView.findViewById(R.id.playback_step_type);
+ if (playbackStepTypeText != null) {
+ playbackStepTypeText.setText(R.string.playback_tempo_step);
+ }
+ setupStepSizeSelector(rootView);
+ }
+
+ private void setupCombinedStepSizeSelector(@NonNull final View rootView) {
+ final TextView playbackStepTypeText = rootView.findViewById(R.id.playback_step_type);
+ if (playbackStepTypeText != null) {
+ playbackStepTypeText.setText(R.string.playback_step);
+ }
+ setupStepSizeSelector(rootView);
+ }
+
private void setStepSize(final double stepSize) {
- this.stepSize = stepSize;
+ PreferenceManager.getDefaultSharedPreferences(requireContext())
+ .edit()
+ .putFloat(getString(R.string.adjustment_step_key), (float) stepSize)
+ .apply();
if (tempoStepUpText != null) {
tempoStepUpText.setText(getStepUpPercentString(stepSize));
@@ -344,16 +476,30 @@ public class PlaybackParameterDialog extends DialogFragment {
setCurrentPlaybackParameters();
});
}
+
+ if (semitoneStepDownText != null) {
+ semitoneStepDownText.setOnClickListener(view -> {
+ onSemitoneSliderUpdated(getCurrentSemitones() - 1);
+ setCurrentPlaybackParameters();
+ });
+ }
+
+ if (semitoneStepUpText != null) {
+ semitoneStepUpText.setOnClickListener(view -> {
+ onSemitoneSliderUpdated(getCurrentSemitones() + 1);
+ setCurrentPlaybackParameters();
+ });
+ }
}
/*//////////////////////////////////////////////////////////////////////////
// Sliders
//////////////////////////////////////////////////////////////////////////*/
- private SeekBar.OnSeekBarChangeListener getOnTempoChangedListener() {
- return new SeekBar.OnSeekBarChangeListener() {
+ private SimpleOnSeekBarChangeListener getOnTempoChangedListener() {
+ return new SimpleOnSeekBarChangeListener() {
@Override
- public void onProgressChanged(final SeekBar seekBar, final int progress,
+ public void onProgressChanged(@NonNull final SeekBar seekBar, final int progress,
final boolean fromUser) {
final double currentTempo = strategy.valueOf(progress);
if (fromUser) {
@@ -361,23 +507,13 @@ public class PlaybackParameterDialog extends DialogFragment {
setCurrentPlaybackParameters();
}
}
-
- @Override
- public void onStartTrackingTouch(final SeekBar seekBar) {
- // Do Nothing.
- }
-
- @Override
- public void onStopTrackingTouch(final SeekBar seekBar) {
- // Do Nothing.
- }
};
}
- private SeekBar.OnSeekBarChangeListener getOnPitchChangedListener() {
- return new SeekBar.OnSeekBarChangeListener() {
+ private SimpleOnSeekBarChangeListener getOnPitchChangedListener() {
+ return new SimpleOnSeekBarChangeListener() {
@Override
- public void onProgressChanged(final SeekBar seekBar, final int progress,
+ public void onProgressChanged(@NonNull final SeekBar seekBar, final int progress,
final boolean fromUser) {
final double currentPitch = strategy.valueOf(progress);
if (fromUser) { // this change is first in chain
@@ -385,23 +521,27 @@ public class PlaybackParameterDialog extends DialogFragment {
setCurrentPlaybackParameters();
}
}
+ };
+ }
+ private SimpleOnSeekBarChangeListener getOnSemitoneChangedListener() {
+ return new SimpleOnSeekBarChangeListener() {
@Override
- public void onStartTrackingTouch(final SeekBar seekBar) {
- // Do Nothing.
- }
-
- @Override
- public void onStopTrackingTouch(final SeekBar seekBar) {
- // Do Nothing.
+ public void onProgressChanged(@NonNull final SeekBar seekBar, final int progress,
+ final boolean fromUser) {
+ // semitone slider supplies values 0 to 24, subtraction by 12 is required
+ final int currentSemitones = progress - 12;
+ if (fromUser) { // this change is first in chain
+ onSemitoneSliderUpdated(currentSemitones);
+ // line below also saves semitones as pitch percentages
+ onPitchSliderUpdated(semitonesToPercent(currentSemitones));
+ setCurrentPlaybackParameters();
+ }
}
};
}
private void onTempoSliderUpdated(final double newTempo) {
- if (unhookingCheckbox == null) {
- return;
- }
if (!unhookingCheckbox.isChecked()) {
setSliders(newTempo);
} else {
@@ -410,9 +550,6 @@ public class PlaybackParameterDialog extends DialogFragment {
}
private void onPitchSliderUpdated(final double newPitch) {
- if (unhookingCheckbox == null) {
- return;
- }
if (!unhookingCheckbox.isChecked()) {
setSliders(newPitch);
} else {
@@ -420,6 +557,10 @@ public class PlaybackParameterDialog extends DialogFragment {
}
}
+ private void onSemitoneSliderUpdated(final int newSemitone) {
+ setSemitoneSlider(newSemitone);
+ }
+
private void setSliders(final double newValue) {
setTempoSlider(newValue);
setPitchSlider(newValue);
@@ -439,25 +580,49 @@ public class PlaybackParameterDialog extends DialogFragment {
pitchSlider.setProgress(strategy.progressOf(newPitch));
}
+ private void setSemitoneSlider(final int newSemitone) {
+ if (semitoneSlider == null) {
+ return;
+ }
+ semitoneSlider.setProgress(newSemitone + 12);
+ }
+
/*//////////////////////////////////////////////////////////////////////////
// Helper
//////////////////////////////////////////////////////////////////////////*/
private void setCurrentPlaybackParameters() {
- setPlaybackParameters(getCurrentTempo(), getCurrentPitch(), getCurrentSkipSilence());
+ if (getCurrentAdjustBySemitones()) {
+ setPlaybackParameters(
+ getCurrentTempo(),
+ semitonesToPercent(getCurrentSemitones()),
+ getCurrentSemitones(),
+ getCurrentSkipSilence()
+ );
+ } else {
+ setPlaybackParameters(
+ getCurrentTempo(),
+ getCurrentPitch(),
+ percentToSemitones(getCurrentPitch()),
+ getCurrentSkipSilence()
+ );
+ }
}
private void setPlaybackParameters(final double newTempo, final double newPitch,
- final boolean skipSilence) {
- if (callback != null && tempoCurrentText != null && pitchCurrentText != null) {
+ final int newSemitones, final boolean skipSilence) {
+ if (callback != null && tempoCurrentText != null
+ && pitchCurrentText != null && semitoneCurrentText != null) {
if (DEBUG) {
Log.d(TAG, "Setting playback parameters to "
+ "tempo=[" + newTempo + "], "
- + "pitch=[" + newPitch + "]");
+ + "pitch=[" + newPitch + "], "
+ + "semitones=[" + newSemitones + "]");
}
tempoCurrentText.setText(PlayerHelper.formatSpeed(newTempo));
pitchCurrentText.setText(PlayerHelper.formatPitch(newPitch));
+ semitoneCurrentText.setText(getSignedSemitonesString(newSemitones));
callback.onPlaybackParameterChanged((float) newTempo, (float) newPitch, skipSilence);
}
}
@@ -470,14 +635,19 @@ public class PlaybackParameterDialog extends DialogFragment {
return pitchSlider == null ? pitch : strategy.valueOf(pitchSlider.getProgress());
}
- private double getCurrentStepSize() {
- return stepSize;
+ private int getCurrentSemitones() {
+ // semitoneSlider is absolute, that's why - 12
+ return semitoneSlider == null ? semitones : semitoneSlider.getProgress() - 12;
}
private boolean getCurrentSkipSilence() {
return skipSilenceCheckbox != null && skipSilenceCheckbox.isChecked();
}
+ private boolean getCurrentAdjustBySemitones() {
+ return adjustBySemitonesCheckbox != null && adjustBySemitonesCheckbox.isChecked();
+ }
+
@NonNull
private static String getStepUpPercentString(final double percent) {
return STEP_UP_SIGN + getPercentString(percent);
@@ -493,8 +663,21 @@ public class PlaybackParameterDialog extends DialogFragment {
return PlayerHelper.formatPitch(percent);
}
+ @NonNull
+ private static String getSignedSemitonesString(final int semitones) {
+ return semitones > 0 ? "+" + semitones : "" + semitones;
+ }
+
public interface Callback {
void onPlaybackParameterChanged(float playbackTempo, float playbackPitch,
boolean playbackSkipSilence);
}
+
+ public double semitonesToPercent(final int inSemitones) {
+ return Math.pow(2, inSemitones / 12.0);
+ }
+
+ public int percentToSemitones(final double inPercent) {
+ return (int) Math.round(12 * Math.log(inPercent) / Math.log(2));
+ }
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java
index a2f0d7149..d7a9ffc3d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java
@@ -31,11 +31,13 @@ public class PlayerDataSource {
private static final int MANIFEST_MINIMUM_RETRY = 5;
private static final int EXTRACTOR_MINIMUM_RETRY = Integer.MAX_VALUE;
+ private final int continueLoadingCheckIntervalBytes;
private final DataSource.Factory cacheDataSourceFactory;
private final DataSource.Factory cachelessDataSourceFactory;
public PlayerDataSource(@NonNull final Context context, @NonNull final String userAgent,
@NonNull final TransferListener transferListener) {
+ continueLoadingCheckIntervalBytes = PlayerHelper.getProgressiveLoadIntervalBytes(context);
cacheDataSourceFactory = new CacheFactory(context, userAgent, transferListener);
cachelessDataSourceFactory
= new DefaultDataSourceFactory(context, userAgent, transferListener);
@@ -91,6 +93,7 @@ public class PlayerDataSource {
public ProgressiveMediaSource.Factory getExtractorMediaSourceFactory() {
return new ProgressiveMediaSource.Factory(cacheDataSourceFactory)
+ .setContinueLoadingCheckIntervalBytes(continueLoadingCheckIntervalBytes)
.setLoadErrorHandlingPolicy(
new DefaultLoadErrorHandlingPolicy(EXTRACTOR_MINIMUM_RETRY));
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
index c51b6d5dd..6a7c27bdc 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
@@ -34,6 +34,7 @@ import androidx.preference.PreferenceManager;
import com.google.android.exoplayer2.PlaybackParameters;
import com.google.android.exoplayer2.Player.RepeatMode;
import com.google.android.exoplayer2.SeekParameters;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
@@ -391,6 +392,19 @@ public final class PlayerHelper {
context.getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, 0) == 0;
}
+ public static int getProgressiveLoadIntervalBytes(@NonNull final Context context) {
+ final String preferredIntervalBytes = getPreferences(context).getString(
+ context.getString(R.string.progressive_load_interval_key),
+ context.getString(R.string.progressive_load_interval_default_value));
+
+ if (context.getString(R.string.progressive_load_interval_default_value)
+ .equals(preferredIntervalBytes)) {
+ return ProgressiveMediaSource.DEFAULT_LOADING_CHECK_INTERVAL_BYTES;
+ }
+ // Keeping the same KiB unit used by ProgressiveMediaSource
+ return Integer.parseInt(preferredIntervalBytes) * 1024;
+ }
+
////////////////////////////////////////////////////////////////////////////
// Private helpers
////////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/player/listeners/view/PlaybackSpeedClickListener.kt b/app/src/main/java/org/schabi/newpipe/player/listeners/view/PlaybackSpeedClickListener.kt
new file mode 100644
index 000000000..52eff5a1c
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/player/listeners/view/PlaybackSpeedClickListener.kt
@@ -0,0 +1,47 @@
+package org.schabi.newpipe.player.listeners.view
+
+import android.util.Log
+import android.view.View
+import androidx.appcompat.widget.PopupMenu
+import org.schabi.newpipe.MainActivity
+import org.schabi.newpipe.player.Player
+import org.schabi.newpipe.player.helper.PlaybackParameterDialog
+
+/**
+ * Click listener for the playbackSpeed textview of the player
+ */
+class PlaybackSpeedClickListener(
+ private val player: Player,
+ private val playbackSpeedPopupMenu: PopupMenu
+) : View.OnClickListener {
+
+ companion object {
+ private const val TAG: String = "PlaybSpeedClickListener"
+ }
+
+ override fun onClick(v: View) {
+ if (MainActivity.DEBUG) {
+ Log.d(TAG, "onPlaybackSpeedClicked() called")
+ }
+
+ if (player.videoPlayerSelected()) {
+ PlaybackParameterDialog.newInstance(
+ player.playbackSpeed.toDouble(),
+ player.playbackPitch.toDouble(),
+ player.playbackSkipSilence
+ ) { speed: Float, pitch: Float, skipSilence: Boolean ->
+ player.setPlaybackParameters(
+ speed,
+ pitch,
+ skipSilence
+ )
+ }
+ .show(player.parentActivity!!.supportFragmentManager, null)
+ } else {
+ playbackSpeedPopupMenu.show()
+ player.isSomePopupMenuVisible = true
+ }
+
+ player.manageControlsAfterOnClick(v)
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/player/listeners/view/QualityClickListener.kt b/app/src/main/java/org/schabi/newpipe/player/listeners/view/QualityClickListener.kt
new file mode 100644
index 000000000..b103ac0e6
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/player/listeners/view/QualityClickListener.kt
@@ -0,0 +1,41 @@
+package org.schabi.newpipe.player.listeners.view
+
+import android.annotation.SuppressLint
+import android.util.Log
+import android.view.View
+import androidx.appcompat.widget.PopupMenu
+import org.schabi.newpipe.MainActivity
+import org.schabi.newpipe.extractor.MediaFormat
+import org.schabi.newpipe.player.Player
+
+/**
+ * Click listener for the qualityTextView of the player
+ */
+class QualityClickListener(
+ private val player: Player,
+ private val qualityPopupMenu: PopupMenu
+) : View.OnClickListener {
+
+ companion object {
+ private const val TAG: String = "QualityClickListener"
+ }
+
+ @SuppressLint("SetTextI18n") // we don't need I18N because of a " "
+ override fun onClick(v: View) {
+ if (MainActivity.DEBUG) {
+ Log.d(TAG, "onQualitySelectorClicked() called")
+ }
+
+ qualityPopupMenu.show()
+ player.isSomePopupMenuVisible = true
+
+ val videoStream = player.selectedVideoStream
+ if (videoStream != null) {
+ player.binding.qualityTextView.text =
+ MediaFormat.getNameById(videoStream.formatId) + " " + videoStream.resolution
+ }
+
+ player.saveWasPlaying()
+ player.manageControlsAfterOnClick(v)
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java b/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java
index 9dcb12344..ee0a6f118 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java
@@ -88,6 +88,8 @@ public class PlayerMediaSession implements MediaSessionCallback {
@Override
public void play() {
player.play();
+ // hide the player controls even if the play command came from the media session
+ player.hideControls(0, 0);
}
@Override
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java
index 07c8d9f90..df2747c3b 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java
@@ -4,20 +4,19 @@ import android.util.Log;
import androidx.annotation.NonNull;
-import org.schabi.newpipe.extractor.InfoItem;
import org.schabi.newpipe.extractor.ListExtractor;
import org.schabi.newpipe.extractor.ListInfo;
import org.schabi.newpipe.extractor.Page;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
+import java.util.stream.Collectors;
import io.reactivex.rxjava3.core.SingleObserver;
import io.reactivex.rxjava3.disposables.Disposable;
-abstract class AbstractInfoPlayQueue extends PlayQueue {
+abstract class AbstractInfoPlayQueue>
+ extends PlayQueue {
boolean isInitial;
private boolean isComplete;
@@ -27,12 +26,15 @@ abstract class AbstractInfoPlayQueue ext
private transient Disposable fetchReactor;
- AbstractInfoPlayQueue(final U item) {
- this(item.getServiceId(), item.getUrl(), null, Collections.emptyList(), 0);
+ protected AbstractInfoPlayQueue(final T info) {
+ this(info.getServiceId(), info.getUrl(), info.getNextPage(), info.getRelatedItems(), 0);
}
- AbstractInfoPlayQueue(final int serviceId, final String url, final Page nextPage,
- final List streams, final int index) {
+ protected AbstractInfoPlayQueue(final int serviceId,
+ final String url,
+ final Page nextPage,
+ final List streams,
+ final int index) {
super(index, extractListItems(streams));
this.baseUrl = url;
@@ -51,7 +53,7 @@ abstract class AbstractInfoPlayQueue ext
}
SingleObserver getHeadListObserver() {
- return new SingleObserver() {
+ return new SingleObserver<>() {
@Override
public void onSubscribe(@NonNull final Disposable d) {
if (isComplete || !isInitial || (fetchReactor != null
@@ -85,8 +87,8 @@ abstract class AbstractInfoPlayQueue ext
};
}
- SingleObserver getNextPageObserver() {
- return new SingleObserver() {
+ SingleObserver> getNextPageObserver() {
+ return new SingleObserver<>() {
@Override
public void onSubscribe(@NonNull final Disposable d) {
if (isComplete || isInitial || (fetchReactor != null
@@ -98,7 +100,8 @@ abstract class AbstractInfoPlayQueue ext
}
@Override
- public void onSuccess(@NonNull final ListExtractor.InfoItemsPage result) {
+ public void onSuccess(
+ @NonNull final ListExtractor.InfoItemsPage result) {
if (!result.hasNextPage()) {
isComplete = true;
}
@@ -129,12 +132,6 @@ abstract class AbstractInfoPlayQueue ext
}
private static List extractListItems(final List infoItems) {
- final List result = new ArrayList<>();
- for (final InfoItem stream : infoItems) {
- if (stream instanceof StreamInfoItem) {
- result.add(new PlayQueueItem((StreamInfoItem) stream));
- }
- }
- return result;
+ return infoItems.stream().map(PlayQueueItem::new).collect(Collectors.toList());
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/ChannelPlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/ChannelPlayQueue.java
index f85349797..1e1fef85e 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/ChannelPlayQueue.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/ChannelPlayQueue.java
@@ -3,7 +3,6 @@ package org.schabi.newpipe.player.playqueue;
import org.schabi.newpipe.extractor.Page;
import org.schabi.newpipe.extractor.channel.ChannelInfo;
-import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
import org.schabi.newpipe.util.ExtractorHelper;
@@ -12,13 +11,10 @@ import java.util.List;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.schedulers.Schedulers;
-public final class ChannelPlayQueue extends AbstractInfoPlayQueue {
- public ChannelPlayQueue(final ChannelInfoItem item) {
- super(item);
- }
+public final class ChannelPlayQueue extends AbstractInfoPlayQueue {
public ChannelPlayQueue(final ChannelInfo info) {
- this(info.getServiceId(), info.getUrl(), info.getNextPage(), info.getRelatedItems(), 0);
+ super(info);
}
public ChannelPlayQueue(final int serviceId,
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
index f2259b120..f46c9d72f 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
@@ -528,7 +528,19 @@ public abstract class PlayQueue implements Serializable {
return false;
}
final PlayQueue other = (PlayQueue) obj;
- return streams.equals(other.streams);
+ if (size() != other.size()) {
+ return false;
+ }
+ for (int i = 0; i < size(); i++) {
+ final PlayQueueItem stream = streams.get(i);
+ final PlayQueueItem otherStream = other.streams.get(i);
+ // Check is based on serviceId and URL
+ if (stream.getServiceId() != otherStream.getServiceId()
+ || !stream.getUrl().equals(otherStream.getUrl())) {
+ return false;
+ }
+ }
+ return true;
}
@Override
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java
index f7dfc562e..bf31ea9b1 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java
@@ -52,6 +52,7 @@ public class PlayQueueItem implements Serializable {
item.getUploaderUrl(), item.getStreamType());
}
+ @SuppressWarnings("ParameterNumber")
private PlayQueueItem(@Nullable final String name, @Nullable final String url,
final int serviceId, final long duration,
@Nullable final String thumbnailUrl, @Nullable final String uploader,
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlaylistPlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlaylistPlayQueue.java
index ac5dce9ba..01883d7d9 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlaylistPlayQueue.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlaylistPlayQueue.java
@@ -2,7 +2,6 @@ package org.schabi.newpipe.player.playqueue;
import org.schabi.newpipe.extractor.Page;
import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
-import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
import org.schabi.newpipe.util.ExtractorHelper;
@@ -11,13 +10,10 @@ import java.util.List;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.schedulers.Schedulers;
-public final class PlaylistPlayQueue extends AbstractInfoPlayQueue {
- public PlaylistPlayQueue(final PlaylistInfoItem item) {
- super(item);
- }
+public final class PlaylistPlayQueue extends AbstractInfoPlayQueue {
public PlaylistPlayQueue(final PlaylistInfo info) {
- this(info.getServiceId(), info.getUrl(), info.getNextPage(), info.getRelatedItems(), 0);
+ super(info);
}
public PlaylistPlayQueue(final int serviceId,
diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java
index 245a85e71..11949f55d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java
+++ b/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java
@@ -21,6 +21,7 @@ import org.schabi.newpipe.util.ListHelper;
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
import static com.google.android.exoplayer2.C.TIME_UNSET;
@@ -31,10 +32,17 @@ public class VideoPlaybackResolver implements PlaybackResolver {
private final PlayerDataSource dataSource;
@NonNull
private final QualityResolver qualityResolver;
+ private SourceType streamSourceType;
@Nullable
private String playbackQuality;
+ public enum SourceType {
+ LIVE_STREAM,
+ VIDEO_WITH_SEPARATED_AUDIO,
+ VIDEO_WITH_AUDIO_OR_AUDIO_ONLY
+ }
+
public VideoPlaybackResolver(@NonNull final Context context,
@NonNull final PlayerDataSource dataSource,
@NonNull final QualityResolver qualityResolver) {
@@ -48,6 +56,7 @@ public class VideoPlaybackResolver implements PlaybackResolver {
public MediaSource resolve(@NonNull final StreamInfo info) {
final MediaSource liveSource = maybeBuildLiveMediaSource(dataSource, info);
if (liveSource != null) {
+ streamSourceType = SourceType.LIVE_STREAM;
return liveSource;
}
@@ -55,7 +64,7 @@ public class VideoPlaybackResolver implements PlaybackResolver {
// Create video stream source
final List videos = ListHelper.getSortedStreamVideosList(context,
- info.getVideoStreams(), info.getVideoOnlyStreams(), false);
+ info.getVideoStreams(), info.getVideoOnlyStreams(), false, true);
final int index;
if (videos.isEmpty()) {
index = -1;
@@ -85,6 +94,9 @@ public class VideoPlaybackResolver implements PlaybackResolver {
PlayerHelper.cacheKeyOf(info, audio),
MediaFormat.getSuffixById(audio.getFormatId()), tag);
mediaSources.add(audioSource);
+ streamSourceType = SourceType.VIDEO_WITH_SEPARATED_AUDIO;
+ } else {
+ streamSourceType = SourceType.VIDEO_WITH_AUDIO_OR_AUDIO_ONLY;
}
// If there is no audio or video sources, then this media source cannot be played back
@@ -118,6 +130,16 @@ public class VideoPlaybackResolver implements PlaybackResolver {
}
}
+ /**
+ * Returns the last resolved {@link StreamInfo}'s {@link SourceType source type}.
+ *
+ * @return {@link Optional#empty()} if nothing was resolved, otherwise the {@link SourceType}
+ * of the last resolved {@link StreamInfo} inside an {@link Optional}
+ */
+ public Optional getStreamSourceType() {
+ return Optional.ofNullable(streamSourceType);
+ }
+
@Nullable
public String getPlaybackQuality() {
return playbackQuality;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java
index e08562908..70ac5cdcc 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java
@@ -50,7 +50,7 @@ public class AppearanceSettingsFragment extends BasePreferenceFragment {
@Override
public boolean onPreferenceTreeClick(final Preference preference) {
- if (preference.getKey().equals(getString(R.string.caption_settings_key))) {
+ if (getString(R.string.caption_settings_key).equals(preference.getKey())) {
try {
startActivity(new Intent(Settings.ACTION_CAPTIONING_SETTINGS));
} catch (final ActivityNotFoundException e) {
diff --git a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
index fe327e1b5..ec98b865e 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
@@ -185,7 +185,7 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
}
@Override
- public boolean onPreferenceTreeClick(final Preference preference) {
+ public boolean onPreferenceTreeClick(@NonNull final Preference preference) {
if (DEBUG) {
Log.d(TAG, "onPreferenceTreeClick() called with: "
+ "preference = [" + preference + "]");
diff --git a/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java
index d7fb559d6..3776d78f6 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java
@@ -7,10 +7,9 @@ import android.view.MenuItem;
import androidx.annotation.NonNull;
-import org.schabi.newpipe.App;
-import org.schabi.newpipe.CheckForNewAppVersion;
import org.schabi.newpipe.MainActivity;
import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.ReleaseVersionUtil;
public class MainSettingsFragment extends BasePreferenceFragment {
public static final boolean DEBUG = MainActivity.DEBUG;
@@ -24,7 +23,7 @@ public class MainSettingsFragment extends BasePreferenceFragment {
setHasOptionsMenu(true); // Otherwise onCreateOptionsMenu is not called
// Check if the app is updatable
- if (!CheckForNewAppVersion.isReleaseApk(App.getApp())) {
+ if (!ReleaseVersionUtil.isReleaseApk()) {
getPreferenceScreen().removePreference(
findPreference(getString(R.string.update_pref_screen_key)));
diff --git a/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java b/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
index dfc053a62..5767d266f 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
@@ -21,7 +21,6 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.content.res.AppCompatResources;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceManager;
@@ -51,8 +50,6 @@ import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.schedulers.Schedulers;
public class PeertubeInstanceListFragment extends Fragment {
- private static final int MENU_ITEM_RESTORE_ID = 123456;
-
private final List instanceList = new ArrayList<>();
private PeertubeInstance selectedInstance;
private String savedInstanceListKey;
@@ -142,17 +139,12 @@ public class PeertubeInstanceListFragment extends Fragment {
public void onCreateOptionsMenu(@NonNull final Menu menu,
@NonNull final MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
-
- final MenuItem restoreItem = menu
- .add(Menu.NONE, MENU_ITEM_RESTORE_ID, Menu.NONE, R.string.restore_defaults);
- restoreItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
- restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(),
- R.drawable.ic_settings_backup_restore));
+ inflater.inflate(R.menu.menu_chooser_fragment, menu);
}
@Override
public boolean onOptionsItemSelected(final MenuItem item) {
- if (item.getItemId() == MENU_ITEM_RESTORE_ID) {
+ if (item.getItemId() == R.id.menu_item_restore_default) {
restoreDefaults();
return true;
}
@@ -191,7 +183,7 @@ public class PeertubeInstanceListFragment extends Fragment {
.setTitle(R.string.restore_defaults)
.setMessage(R.string.restore_defaults_confirmation)
.setNegativeButton(R.string.cancel, null)
- .setPositiveButton(R.string.yes, (dialog, which) -> {
+ .setPositiveButton(R.string.ok, (dialog, which) -> {
sharedPreferences.edit().remove(savedInstanceListKey).apply();
selectInstance(PeertubeInstance.defaultInstance);
updateInstanceList();
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java
index 116807cbc..0f25be630 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -24,7 +25,6 @@ import org.schabi.newpipe.util.ThemeHelper;
import java.util.List;
import java.util.Vector;
-import de.hdodenhof.circleimageview.CircleImageView;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.core.Observer;
import io.reactivex.rxjava3.disposables.Disposable;
@@ -200,7 +200,7 @@ public class SelectChannelFragment extends DialogFragment {
public class SelectChannelItemHolder extends RecyclerView.ViewHolder {
public final View view;
- final CircleImageView thumbnailView;
+ final ImageView thumbnailView;
final TextView titleView;
SelectChannelItemHolder(final View v) {
super(v);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
index 7510bb3bc..3ee6668bf 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
@@ -23,8 +23,6 @@ import androidx.preference.PreferenceFragmentCompat;
import com.jakewharton.rxbinding4.widget.RxTextView;
-import org.schabi.newpipe.App;
-import org.schabi.newpipe.CheckForNewAppVersion;
import org.schabi.newpipe.MainActivity;
import org.schabi.newpipe.R;
import org.schabi.newpipe.databinding.SettingsLayoutBinding;
@@ -37,6 +35,7 @@ import org.schabi.newpipe.settings.preferencesearch.PreferenceSearchResultListen
import org.schabi.newpipe.settings.preferencesearch.PreferenceSearcher;
import org.schabi.newpipe.util.DeviceUtils;
import org.schabi.newpipe.util.KeyboardUtil;
+import org.schabi.newpipe.util.ReleaseVersionUtil;
import org.schabi.newpipe.util.ThemeHelper;
import org.schabi.newpipe.views.FocusOverlayView;
@@ -170,7 +169,7 @@ public class SettingsActivity extends AppCompatActivity implements
}
@Override
- public boolean onPreferenceStartFragment(final PreferenceFragmentCompat caller,
+ public boolean onPreferenceStartFragment(@NonNull final PreferenceFragmentCompat caller,
final Preference preference) {
showSettingsFragment(instantiateFragment(preference.getFragment()));
return true;
@@ -267,7 +266,7 @@ public class SettingsActivity extends AppCompatActivity implements
*/
private void ensureSearchRepresentsApplicationState() {
// Check if the update settings are available
- if (!CheckForNewAppVersion.isReleaseApk(App.getApp())) {
+ if (!ReleaseVersionUtil.isReleaseApk()) {
SettingsResourceRegistry.getInstance()
.getEntryByPreferencesResId(R.xml.update_settings)
.setSearchable(false);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java
index 1d4badcac..78ddb3786 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java
@@ -116,6 +116,7 @@ public final class SettingsResourceRegistry {
return this;
}
+ @NonNull
public Class getFragmentClass() {
return fragmentClass;
}
diff --git a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
index 04bad3815..1043e88c2 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
@@ -1,12 +1,11 @@
package org.schabi.newpipe.settings;
-import static org.schabi.newpipe.CheckForNewAppVersion.startNewVersionCheckService;
-
import android.os.Bundle;
import android.widget.Toast;
import androidx.preference.Preference;
+import org.schabi.newpipe.NewVersionWorker;
import org.schabi.newpipe.R;
public class UpdateSettingsFragment extends BasePreferenceFragment {
@@ -33,7 +32,7 @@ public class UpdateSettingsFragment extends BasePreferenceFragment {
// Reset the expire time. This is necessary to check for an update immediately.
defaultPreferences.edit()
.putLong(getString(R.string.update_expiry_key), 0).apply();
- startNewVersionCheckService();
+ NewVersionWorker.enqueueNewVersionCheckingWork(getContext());
}
@Override
diff --git a/app/src/main/java/org/schabi/newpipe/settings/custom/DurationListPreference.kt b/app/src/main/java/org/schabi/newpipe/settings/custom/DurationListPreference.kt
index 14801c01c..f0b89c677 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/custom/DurationListPreference.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/custom/DurationListPreference.kt
@@ -14,10 +14,10 @@ import org.schabi.newpipe.util.Localization
* If the entry values array have anything other than numbers in it, an exception will be raised.
*/
class DurationListPreference : ListPreference {
- constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes)
- constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
- constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
- constructor(context: Context?) : super(context)
+ constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes)
+ constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+ constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+ constructor(context: Context) : super(context)
override fun onAttached() {
super.onAttached()
diff --git a/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java b/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java
index 045e574be..62455d682 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java
@@ -50,7 +50,7 @@ public class NotificationActionsPreference extends Preference {
////////////////////////////////////////////////////////////////////////////
@Override
- public void onBindViewHolder(final PreferenceViewHolder holder) {
+ public void onBindViewHolder(@NonNull final PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
holder.itemView.setClickable(false);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchConfiguration.java b/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchConfiguration.java
index 5835dcab5..a445ea309 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchConfiguration.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchConfiguration.java
@@ -4,6 +4,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.stream.Stream;
@@ -11,7 +12,7 @@ import java.util.stream.Stream;
public class PreferenceSearchConfiguration {
private PreferenceSearchFunction searcher = new PreferenceFuzzySearchFunction();
- private final List parserIgnoreElements = Arrays.asList(
+ private final List parserIgnoreElements = Collections.singletonList(
PreferenceCategory.class.getSimpleName());
private final List parserContainerElements = Arrays.asList(
PreferenceCategory.class.getSimpleName(),
diff --git a/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchItem.java b/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchItem.java
index 52935ef8e..98d2a5d84 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchItem.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchItem.java
@@ -58,22 +58,27 @@ public class PreferenceSearchItem {
this.searchIndexItemResId = searchIndexItemResId;
}
+ @NonNull
public String getKey() {
return key;
}
+ @NonNull
public String getTitle() {
return title;
}
+ @NonNull
public String getSummary() {
return summary;
}
+ @NonNull
public String getEntries() {
return entries;
}
+ @NonNull
public String getBreadcrumbs() {
return breadcrumbs;
}
@@ -94,7 +99,7 @@ public class PreferenceSearchItem {
getBreadcrumbs());
}
-
+ @NonNull
@Override
public String toString() {
return "PreferenceItem: " + title + " " + summary + " " + key;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
index 490e299bd..73aec4a7b 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
@@ -7,7 +7,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
-import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
@@ -17,7 +16,6 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.content.res.AppCompatResources;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.ItemTouchHelper;
@@ -107,12 +105,8 @@ public class ChooseTabsFragment extends Fragment {
public void onCreateOptionsMenu(@NonNull final Menu menu,
@NonNull final MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
-
- final MenuItem restoreItem = menu.add(R.string.restore_defaults);
- restoreItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
- restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(),
- R.drawable.ic_settings_backup_restore));
- restoreItem.setOnMenuItemClickListener(ev -> {
+ inflater.inflate(R.menu.menu_chooser_fragment, menu);
+ menu.findItem(R.id.menu_item_restore_default).setOnMenuItemClickListener(item -> {
restoreDefaults();
return true;
});
@@ -136,7 +130,7 @@ public class ChooseTabsFragment extends Fragment {
.setTitle(R.string.restore_defaults)
.setMessage(R.string.restore_defaults_confirmation)
.setNegativeButton(R.string.cancel, null)
- .setPositiveButton(R.string.yes, (dialog, which) -> {
+ .setPositiveButton(R.string.ok, (dialog, which) -> {
tabsManager.resetTabs();
updateTabList();
selectedTabsAdapter.notifyDataSetChanged();
diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
index aa03bbfa6..6b1d70a86 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
@@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import com.grack.nanojson.JsonObject;
-import com.grack.nanojson.JsonSink;
+import com.grack.nanojson.JsonStringWriter;
import org.schabi.newpipe.R;
import org.schabi.newpipe.database.LocalItem.LocalItemType;
@@ -132,7 +132,7 @@ public abstract class Tab {
// JSON Handling
//////////////////////////////////////////////////////////////////////////*/
- public void writeJsonOn(final JsonSink jsonSink) {
+ public void writeJsonOn(final JsonStringWriter jsonSink) {
jsonSink.object();
jsonSink.value(JSON_TAB_ID_KEY, getTabId());
@@ -141,7 +141,7 @@ public abstract class Tab {
jsonSink.end();
}
- protected void writeDataToJson(final JsonSink writerSink) {
+ protected void writeDataToJson(final JsonStringWriter writerSink) {
// No-op
}
@@ -340,7 +340,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- final int kioskIcon = KioskTranslator.getKioskIcon(kioskId, context);
+ final int kioskIcon = KioskTranslator.getKioskIcon(kioskId);
if (kioskIcon <= 0) {
throw new IllegalStateException("Kiosk ID is not valid: \"" + kioskId + "\"");
@@ -355,7 +355,7 @@ public abstract class Tab {
}
@Override
- protected void writeDataToJson(final JsonSink writerSink) {
+ protected void writeDataToJson(final JsonStringWriter writerSink) {
writerSink.value(JSON_KIOSK_SERVICE_ID_KEY, kioskServiceId)
.value(JSON_KIOSK_ID_KEY, kioskId);
}
@@ -437,7 +437,7 @@ public abstract class Tab {
}
@Override
- protected void writeDataToJson(final JsonSink writerSink) {
+ protected void writeDataToJson(final JsonStringWriter writerSink) {
writerSink.value(JSON_CHANNEL_SERVICE_ID_KEY, channelServiceId)
.value(JSON_CHANNEL_URL_KEY, channelUrl)
.value(JSON_CHANNEL_NAME_KEY, channelName);
@@ -496,7 +496,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return KioskTranslator.getKioskIcon(getDefaultKioskId(context), context);
+ return KioskTranslator.getKioskIcon(getDefaultKioskId(context));
}
@Override
@@ -584,7 +584,7 @@ public abstract class Tab {
}
@Override
- protected void writeDataToJson(final JsonSink writerSink) {
+ protected void writeDataToJson(final JsonStringWriter writerSink) {
writerSink.value(JSON_PLAYLIST_SERVICE_ID_KEY, playlistServiceId)
.value(JSON_PLAYLIST_URL_KEY, playlistUrl)
.value(JSON_PLAYLIST_NAME_KEY, playlistName)
diff --git a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
index ca3da9d24..889cc85e6 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
@@ -142,6 +142,7 @@ public class Mp4FromDashWriter {
outStream = null;
}
+ @SuppressWarnings("MethodLength")
public void build(final SharpStream output) throws IOException {
if (done) {
throw new RuntimeException("already done");
diff --git a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
index ebae3812c..2b69f23ac 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
@@ -121,6 +121,7 @@ public class WebMWriter implements Closeable {
clustersOffsetsSizes = null;
}
+ @SuppressWarnings("MethodLength")
public void build(final SharpStream out) throws IOException, RuntimeException {
if (!out.canRewind()) {
throw new IOException("The output stream must be allow seek");
diff --git a/app/src/main/java/org/schabi/newpipe/util/BitmapUtils.java b/app/src/main/java/org/schabi/newpipe/util/BitmapUtils.java
deleted file mode 100644
index b6f1eaf49..000000000
--- a/app/src/main/java/org/schabi/newpipe/util/BitmapUtils.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.schabi.newpipe.util;
-
-import android.graphics.Bitmap;
-
-import androidx.annotation.Nullable;
-
-public final class BitmapUtils {
- private BitmapUtils() { }
-
- @Nullable
- public static Bitmap centerCrop(final Bitmap inputBitmap, final int newWidth,
- final int newHeight) {
- if (inputBitmap == null || inputBitmap.isRecycled()) {
- return null;
- }
-
- final float sourceWidth = inputBitmap.getWidth();
- final float sourceHeight = inputBitmap.getHeight();
-
- final float xScale = newWidth / sourceWidth;
- final float yScale = newHeight / sourceHeight;
-
- final float newXScale;
- final float newYScale;
-
- if (yScale > xScale) {
- newXScale = xScale / yScale;
- newYScale = 1.0f;
- } else {
- newXScale = 1.0f;
- newYScale = yScale / xScale;
- }
-
- final float scaledWidth = newXScale * sourceWidth;
- final float scaledHeight = newYScale * sourceHeight;
-
- final int left = (int) ((sourceWidth - scaledWidth) / 2);
- final int top = (int) ((sourceHeight - scaledHeight) / 2);
- final int width = (int) scaledWidth;
- final int height = (int) scaledHeight;
-
- return Bitmap.createBitmap(inputBitmap, left, top, width, height);
- }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
index af94e3366..27009efd1 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
@@ -19,6 +19,8 @@
package org.schabi.newpipe.util;
+import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
+
import android.content.Context;
import android.util.Log;
import android.view.View;
@@ -30,7 +32,6 @@ import androidx.preference.PreferenceManager;
import org.schabi.newpipe.MainActivity;
import org.schabi.newpipe.R;
-import org.schabi.newpipe.util.external_communication.TextLinkifier;
import org.schabi.newpipe.extractor.Info;
import org.schabi.newpipe.extractor.InfoItem;
import org.schabi.newpipe.extractor.ListExtractor.InfoItemsPage;
@@ -41,6 +42,7 @@ import org.schabi.newpipe.extractor.Page;
import org.schabi.newpipe.extractor.StreamingService;
import org.schabi.newpipe.extractor.channel.ChannelInfo;
import org.schabi.newpipe.extractor.comments.CommentsInfo;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
import org.schabi.newpipe.extractor.feed.FeedExtractor;
import org.schabi.newpipe.extractor.feed.FeedInfo;
import org.schabi.newpipe.extractor.kiosk.KioskInfo;
@@ -49,6 +51,7 @@ import org.schabi.newpipe.extractor.search.SearchInfo;
import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
+import org.schabi.newpipe.util.external_communication.TextLinkifier;
import java.util.Collections;
import java.util.List;
@@ -57,8 +60,6 @@ import io.reactivex.rxjava3.core.Maybe;
import io.reactivex.rxjava3.core.Single;
import io.reactivex.rxjava3.disposables.CompositeDisposable;
-import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
-
public final class ExtractorHelper {
private static final String TAG = ExtractorHelper.class.getSimpleName();
private static final InfoCache CACHE = InfoCache.getInstance();
@@ -84,11 +85,12 @@ public final class ExtractorHelper {
.fromQuery(searchString, contentFilter, sortFilter)));
}
- public static Single getMoreSearchItems(final int serviceId,
- final String searchString,
- final List contentFilter,
- final String sortFilter,
- final Page page) {
+ public static Single> getMoreSearchItems(
+ final int serviceId,
+ final String searchString,
+ final List contentFilter,
+ final String sortFilter,
+ final Page page) {
checkServiceId(serviceId);
return Single.fromCallable(() ->
SearchInfo.getMoreItems(NewPipe.getService(serviceId),
@@ -124,8 +126,9 @@ public final class ExtractorHelper {
ChannelInfo.getInfo(NewPipe.getService(serviceId), url)));
}
- public static Single getMoreChannelItems(final int serviceId, final String url,
- final Page nextPage) {
+ public static Single> getMoreChannelItems(final int serviceId,
+ final String url,
+ final Page nextPage) {
checkServiceId(serviceId);
return Single.fromCallable(() ->
ChannelInfo.getMoreItems(NewPipe.getService(serviceId), url, nextPage));
@@ -155,15 +158,17 @@ public final class ExtractorHelper {
CommentsInfo.getInfo(NewPipe.getService(serviceId), url)));
}
- public static Single getMoreCommentItems(final int serviceId,
- final CommentsInfo info,
- final Page nextPage) {
+ public static Single> getMoreCommentItems(
+ final int serviceId,
+ final CommentsInfo info,
+ final Page nextPage) {
checkServiceId(serviceId);
return Single.fromCallable(() ->
CommentsInfo.getMoreItems(NewPipe.getService(serviceId), info, nextPage));
}
- public static Single getPlaylistInfo(final int serviceId, final String url,
+ public static Single getPlaylistInfo(final int serviceId,
+ final String url,
final boolean forceLoad) {
checkServiceId(serviceId);
return checkCache(forceLoad, serviceId, url, InfoItem.InfoType.PLAYLIST,
@@ -171,8 +176,9 @@ public final class ExtractorHelper {
PlaylistInfo.getInfo(NewPipe.getService(serviceId), url)));
}
- public static Single getMorePlaylistItems(final int serviceId, final String url,
- final Page nextPage) {
+ public static Single> getMorePlaylistItems(final int serviceId,
+ final String url,
+ final Page nextPage) {
checkServiceId(serviceId);
return Single.fromCallable(() ->
PlaylistInfo.getMoreItems(NewPipe.getService(serviceId), url, nextPage));
@@ -184,8 +190,9 @@ public final class ExtractorHelper {
Single.fromCallable(() -> KioskInfo.getInfo(NewPipe.getService(serviceId), url)));
}
- public static Single getMoreKioskItems(final int serviceId, final String url,
- final Page nextPage) {
+ public static Single> getMoreKioskItems(final int serviceId,
+ final String url,
+ final Page nextPage) {
return Single.fromCallable(() ->
KioskInfo.getMoreItems(NewPipe.getService(serviceId), url, nextPage));
}
diff --git a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
index f77aa0fda..b8c2ff236 100644
--- a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
+++ b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
@@ -57,7 +57,7 @@ public final class KioskTranslator {
}
}
- public static int getKioskIcon(final String kioskId, final Context c) {
+ public static int getKioskIcon(final String kioskId) {
switch (kioskId) {
case "Trending":
case "Top 50":
diff --git a/app/src/main/java/org/schabi/newpipe/util/LayoutManagerSmoothScroller.java b/app/src/main/java/org/schabi/newpipe/util/LayoutManagerSmoothScroller.java
deleted file mode 100644
index fd50d2edb..000000000
--- a/app/src/main/java/org/schabi/newpipe/util/LayoutManagerSmoothScroller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.schabi.newpipe.util;
-
-import android.content.Context;
-import android.graphics.PointF;
-
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.LinearSmoothScroller;
-import androidx.recyclerview.widget.RecyclerView;
-
-public class LayoutManagerSmoothScroller extends LinearLayoutManager {
- public LayoutManagerSmoothScroller(final Context context) {
- super(context, VERTICAL, false);
- }
-
- public LayoutManagerSmoothScroller(final Context context, final int orientation,
- final boolean reverseLayout) {
- super(context, orientation, reverseLayout);
- }
-
- @Override
- public void smoothScrollToPosition(final RecyclerView recyclerView,
- final RecyclerView.State state, final int position) {
- final RecyclerView.SmoothScroller smoothScroller
- = new TopSnappedSmoothScroller(recyclerView.getContext());
- smoothScroller.setTargetPosition(position);
- startSmoothScroll(smoothScroller);
- }
-
- private class TopSnappedSmoothScroller extends LinearSmoothScroller {
- TopSnappedSmoothScroller(final Context context) {
- super(context);
-
- }
-
- @Override
- public PointF computeScrollVectorForPosition(final int targetPosition) {
- return LayoutManagerSmoothScroller.this
- .computeScrollVectorForPosition(targetPosition);
- }
-
- @Override
- protected int getVerticalSnapPreference() {
- return SNAP_TO_START;
- }
- }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
index eb3c21827..c3ccef87c 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
@@ -4,6 +4,7 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.net.ConnectivityManager;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.core.content.ContextCompat;
@@ -19,7 +20,11 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
public final class ListHelper {
// Video format in order of quality. 0=lowest quality, n=highest quality
@@ -33,8 +38,9 @@ public final class ListHelper {
private static final List AUDIO_FORMAT_EFFICIENCY_RANKING =
Arrays.asList(MediaFormat.WEBMA, MediaFormat.M4A, MediaFormat.MP3);
- private static final List HIGH_RESOLUTION_LIST
- = Arrays.asList("1440p", "2160p", "1440p60", "2160p60");
+ private static final Set HIGH_RESOLUTION_LIST
+ // Uses a HashSet for better performance
+ = new HashSet<>(Arrays.asList("1440p", "2160p", "1440p60", "2160p60"));
private ListHelper() { }
@@ -108,17 +114,21 @@ public final class ListHelper {
* Join the two lists of video streams (video_only and normal videos),
* and sort them according with default format chosen by the user.
*
- * @param context context to search for the format to give preference
- * @param videoStreams normal videos list
- * @param videoOnlyStreams video only stream list
- * @param ascendingOrder true -> smallest to greatest | false -> greatest to smallest
+ * @param context the context to search for the format to give preference
+ * @param videoStreams the normal videos list
+ * @param videoOnlyStreams the video-only stream list
+ * @param ascendingOrder true -> smallest to greatest | false -> greatest to smallest
+ * @param preferVideoOnlyStreams if video-only streams should preferred when both video-only
+ * streams and normal video streams are available
* @return the sorted list
*/
- public static List getSortedStreamVideosList(final Context context,
- final List videoStreams,
- final List
- videoOnlyStreams,
- final boolean ascendingOrder) {
+ @NonNull
+ public static List getSortedStreamVideosList(
+ @NonNull final Context context,
+ @Nullable final List videoStreams,
+ @Nullable final List videoOnlyStreams,
+ final boolean ascendingOrder,
+ final boolean preferVideoOnlyStreams) {
final SharedPreferences preferences
= PreferenceManager.getDefaultSharedPreferences(context);
@@ -128,7 +138,7 @@ public final class ListHelper {
R.string.default_video_format_key, R.string.default_video_format_value);
return getSortedStreamVideosList(defaultFormat, showHigherResolutions, videoStreams,
- videoOnlyStreams, ascendingOrder);
+ videoOnlyStreams, ascendingOrder, preferVideoOnlyStreams);
}
/*//////////////////////////////////////////////////////////////////////////
@@ -192,56 +202,55 @@ public final class ListHelper {
* Join the two lists of video streams (video_only and normal videos),
* and sort them according with default format chosen by the user.
*
- * @param defaultFormat format to give preference
- * @param showHigherResolutions show >1080p resolutions
- * @param videoStreams normal videos list
- * @param videoOnlyStreams video only stream list
- * @param ascendingOrder true -> smallest to greatest | false -> greatest to smallest
+ * @param defaultFormat format to give preference
+ * @param showHigherResolutions show >1080p resolutions
+ * @param videoStreams normal videos list
+ * @param videoOnlyStreams video only stream list
+ * @param ascendingOrder true -> smallest to greatest | false -> greatest to smallest
+ * @param preferVideoOnlyStreams if video-only streams should preferred when both video-only
+ * streams and normal video streams are available
* @return the sorted list
*/
- static List getSortedStreamVideosList(final MediaFormat defaultFormat,
- final boolean showHigherResolutions,
- final List videoStreams,
- final List videoOnlyStreams,
- final boolean ascendingOrder) {
- final ArrayList retList = new ArrayList<>();
+ @NonNull
+ static List getSortedStreamVideosList(
+ @Nullable final MediaFormat defaultFormat,
+ final boolean showHigherResolutions,
+ @Nullable final List videoStreams,
+ @Nullable final List videoOnlyStreams,
+ final boolean ascendingOrder,
+ final boolean preferVideoOnlyStreams
+ ) {
+ // Determine order of streams
+ // The last added list is preferred
+ final List> videoStreamsOrdered =
+ preferVideoOnlyStreams
+ ? Arrays.asList(videoStreams, videoOnlyStreams)
+ : Arrays.asList(videoOnlyStreams, videoStreams);
+
+ final List allInitialStreams = videoStreamsOrdered.stream()
+ // Ignore lists that are null
+ .filter(Objects::nonNull)
+ .flatMap(List::stream)
+ // Filter out higher resolutions (or not if high resolutions should always be shown)
+ .filter(stream -> showHigherResolutions
+ || !HIGH_RESOLUTION_LIST.contains(stream.getResolution()))
+ .collect(Collectors.toList());
+
final HashMap hashMap = new HashMap<>();
-
- if (videoOnlyStreams != null) {
- for (final VideoStream stream : videoOnlyStreams) {
- if (!showHigherResolutions
- && HIGH_RESOLUTION_LIST.contains(stream.getResolution())) {
- continue;
- }
- retList.add(stream);
- }
- }
- if (videoStreams != null) {
- for (final VideoStream stream : videoStreams) {
- if (!showHigherResolutions
- && HIGH_RESOLUTION_LIST.contains(stream.getResolution())) {
- continue;
- }
- retList.add(stream);
- }
- }
-
// Add all to the hashmap
- for (final VideoStream videoStream : retList) {
+ for (final VideoStream videoStream : allInitialStreams) {
hashMap.put(videoStream.getResolution(), videoStream);
}
// Override the values when the key == resolution, with the defaultFormat
- for (final VideoStream videoStream : retList) {
+ for (final VideoStream videoStream : allInitialStreams) {
if (videoStream.getFormat() == defaultFormat) {
hashMap.put(videoStream.getResolution(), videoStream);
}
}
- retList.clear();
- retList.addAll(hashMap.values());
- sortStreamList(retList, ascendingOrder);
- return retList;
+ // Return the sorted list
+ return sortStreamList(new ArrayList<>(hashMap.values()), ascendingOrder);
}
/**
@@ -257,16 +266,18 @@ public final class ListHelper {
* 1080p -> 1080
* 1080p60 -> 1081
*
- * ascendingOrder ? 360 < 720 < 721 < 1080 < 1081
- * !ascendingOrder ? 1081 < 1080 < 721 < 720 < 360
+ * ascendingOrder ? 360 < 720 < 721 < 1080 < 1081
+ * !ascendingOrder ? 1081 < 1080 < 721 < 720 < 360
*
* @param videoStreams list that the sorting will be applied
* @param ascendingOrder true -> smallest to greatest | false -> greatest to smallest
+ * @return The sorted list (same reference as parameter videoStreams)
*/
- private static void sortStreamList(final List videoStreams,
- final boolean ascendingOrder) {
+ private static List sortStreamList(final List videoStreams,
+ final boolean ascendingOrder) {
final Comparator comparator = ListHelper::compareVideoStreamResolution;
Collections.sort(videoStreams, ascendingOrder ? comparator : comparator.reversed());
+ return videoStreams;
}
/**
@@ -277,28 +288,12 @@ public final class ListHelper {
* @param audioStreams List of audio streams
* @return Index of audio stream that produces the most compact results or -1 if not found
*/
- static int getHighestQualityAudioIndex(@Nullable MediaFormat format,
- final List audioStreams) {
- int result = -1;
- if (audioStreams != null) {
- while (result == -1) {
- AudioStream prevStream = null;
- for (int idx = 0; idx < audioStreams.size(); idx++) {
- final AudioStream stream = audioStreams.get(idx);
- if ((format == null || stream.getFormat() == format)
- && (prevStream == null || compareAudioStreamBitrate(prevStream, stream,
- AUDIO_FORMAT_QUALITY_RANKING) < 0)) {
- prevStream = stream;
- result = idx;
- }
- }
- if (result == -1 && format == null) {
- break;
- }
- format = null;
- }
- }
- return result;
+ static int getHighestQualityAudioIndex(@Nullable final MediaFormat format,
+ @Nullable final List audioStreams) {
+ return getAudioIndexByHighestRank(format, audioStreams,
+ // Compares descending (last = highest rank)
+ (s1, s2) -> compareAudioStreamBitrate(s1, s2, AUDIO_FORMAT_QUALITY_RANKING)
+ );
}
/**
@@ -309,28 +304,47 @@ public final class ListHelper {
* @param audioStreams List of audio streams
* @return Index of audio stream that produces the most compact results or -1 if not found
*/
- static int getMostCompactAudioIndex(@Nullable MediaFormat format,
- final List audioStreams) {
- int result = -1;
- if (audioStreams != null) {
- while (result == -1) {
- AudioStream prevStream = null;
- for (int idx = 0; idx < audioStreams.size(); idx++) {
- final AudioStream stream = audioStreams.get(idx);
- if ((format == null || stream.getFormat() == format)
- && (prevStream == null || compareAudioStreamBitrate(prevStream, stream,
- AUDIO_FORMAT_EFFICIENCY_RANKING) > 0)) {
- prevStream = stream;
- result = idx;
- }
- }
- if (result == -1 && format == null) {
- break;
- }
- format = null;
- }
+ static int getMostCompactAudioIndex(@Nullable final MediaFormat format,
+ @Nullable final List audioStreams) {
+
+ return getAudioIndexByHighestRank(format, audioStreams,
+ // The "-" is important -> Compares ascending (first = highest rank)
+ (s1, s2) -> -compareAudioStreamBitrate(s1, s2, AUDIO_FORMAT_EFFICIENCY_RANKING)
+ );
+ }
+
+ /**
+ * Get the audio-stream from the list with the highest rank, depending on the comparator.
+ * Format will be ignored if it yields no results.
+ *
+ * @param targetedFormat The target format type or null if it doesn't matter
+ * @param audioStreams List of audio streams
+ * @param comparator The comparator used for determining the max/best/highest ranked value
+ * @return Index of audio stream that produces the highest ranked result or -1 if not found
+ */
+ private static int getAudioIndexByHighestRank(@Nullable final MediaFormat targetedFormat,
+ @Nullable final List audioStreams,
+ final Comparator comparator) {
+ if (audioStreams == null || audioStreams.isEmpty()) {
+ return -1;
}
- return result;
+
+ final AudioStream highestRankedAudioStream = audioStreams.stream()
+ .filter(audioStream -> targetedFormat == null
+ || audioStream.getFormat() == targetedFormat)
+ .max(comparator)
+ .orElse(null);
+
+ if (highestRankedAudioStream == null) {
+ // Fallback: Ignore targetedFormat if not null
+ if (targetedFormat != null) {
+ return getAudioIndexByHighestRank(null, audioStreams, comparator);
+ }
+ // targetedFormat is already null -> return -1
+ return -1;
+ }
+
+ return audioStreams.indexOf(highestRankedAudioStream);
}
/**
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 80d1b25ae..e55114a2d 100644
--- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
@@ -35,6 +35,7 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException;
import org.schabi.newpipe.extractor.stream.AudioStream;
import org.schabi.newpipe.extractor.stream.Stream;
import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
import org.schabi.newpipe.extractor.stream.VideoStream;
import org.schabi.newpipe.fragments.MainFragment;
import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
@@ -214,7 +215,8 @@ public final class NavigationHelper {
// External Players
//////////////////////////////////////////////////////////////////////////*/
- public static void playOnExternalAudioPlayer(final Context context, final StreamInfo info) {
+ public static void playOnExternalAudioPlayer(@NonNull final Context context,
+ @NonNull final StreamInfo info) {
final int index = ListHelper.getDefaultAudioFormat(context, info.getAudioStreams());
if (index == -1) {
@@ -226,9 +228,11 @@ public final class NavigationHelper {
playOnExternalPlayer(context, info.getName(), info.getUploaderName(), audioStream);
}
- public static void playOnExternalVideoPlayer(final Context context, final StreamInfo info) {
+ public static void playOnExternalVideoPlayer(@NonNull final Context context,
+ @NonNull final StreamInfo info) {
final ArrayList videoStreamsList = new ArrayList<>(
- ListHelper.getSortedStreamVideosList(context, info.getVideoStreams(), null, false));
+ ListHelper.getSortedStreamVideosList(context, info.getVideoStreams(), null, false,
+ false));
final int index = ListHelper.getDefaultResolutionIndex(context, videoStreamsList);
if (index == -1) {
@@ -240,8 +244,10 @@ public final class NavigationHelper {
playOnExternalPlayer(context, info.getName(), info.getUploaderName(), videoStream);
}
- public static void playOnExternalPlayer(final Context context, final String name,
- final String artist, final Stream stream) {
+ public static void playOnExternalPlayer(@NonNull final Context context,
+ @Nullable final String name,
+ @Nullable final String artist,
+ @NonNull final Stream stream) {
final Intent intent = new Intent();
intent.setAction(Intent.ACTION_VIEW);
intent.setDataAndType(Uri.parse(stream.getUrl()), stream.getFormat().getMimeType());
@@ -253,7 +259,8 @@ public final class NavigationHelper {
resolveActivityOrAskToInstall(context, intent);
}
- public static void resolveActivityOrAskToInstall(final Context context, final Intent intent) {
+ public static void resolveActivityOrAskToInstall(@NonNull final Context context,
+ @NonNull final Intent intent) {
if (intent.resolveActivity(context.getPackageManager()) != null) {
ShareUtils.openIntentInApp(context, intent, false);
} else {
@@ -402,6 +409,15 @@ public final class NavigationHelper {
.commit();
}
+ public static void openChannelFragment(@NonNull final Fragment fragment,
+ @NonNull final StreamInfoItem item,
+ final String uploaderUrl) {
+ // For some reason `getParentFragmentManager()` doesn't work, but this does.
+ openChannelFragment(
+ fragment.requireActivity().getSupportFragmentManager(),
+ item.getServiceId(), uploaderUrl, item.getUploaderName());
+ }
+
public static void openPlaylistFragment(final FragmentManager fragmentManager,
final int serviceId, final String url,
@NonNull final String name) {
diff --git a/app/src/main/java/org/schabi/newpipe/util/ReleaseVersionUtil.kt b/app/src/main/java/org/schabi/newpipe/util/ReleaseVersionUtil.kt
new file mode 100644
index 000000000..21a9059e2
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/util/ReleaseVersionUtil.kt
@@ -0,0 +1,116 @@
+package org.schabi.newpipe.util
+
+import android.content.pm.PackageManager
+import android.content.pm.Signature
+import androidx.core.content.pm.PackageInfoCompat
+import org.schabi.newpipe.App
+import org.schabi.newpipe.error.ErrorInfo
+import org.schabi.newpipe.error.ErrorUtil.Companion.createNotification
+import org.schabi.newpipe.error.UserAction
+import java.io.ByteArrayInputStream
+import java.io.InputStream
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+import java.security.cert.CertificateEncodingException
+import java.security.cert.CertificateException
+import java.security.cert.CertificateFactory
+import java.security.cert.X509Certificate
+import java.time.Instant
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+
+object ReleaseVersionUtil {
+ // Public key of the certificate that is used in NewPipe release versions
+ private const val RELEASE_CERT_PUBLIC_KEY_SHA1 =
+ "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15"
+
+ @JvmStatic
+ fun isReleaseApk(): Boolean {
+ return certificateSHA1Fingerprint == RELEASE_CERT_PUBLIC_KEY_SHA1
+ }
+
+ /**
+ * Method to get the APK's SHA1 key. See https://stackoverflow.com/questions/9293019/#22506133.
+ *
+ * @return String with the APK's SHA1 fingerprint in hexadecimal
+ */
+ private val certificateSHA1Fingerprint: String
+ get() {
+ val app = App.getApp()
+ val signatures: List = try {
+ PackageInfoCompat.getSignatures(app.packageManager, app.packageName)
+ } catch (e: PackageManager.NameNotFoundException) {
+ showRequestError(app, e, "Could not find package info")
+ return ""
+ }
+ if (signatures.isEmpty()) {
+ return ""
+ }
+ val x509cert = try {
+ val cert = signatures[0].toByteArray()
+ val input: InputStream = ByteArrayInputStream(cert)
+ val cf = CertificateFactory.getInstance("X509")
+ cf.generateCertificate(input) as X509Certificate
+ } catch (e: CertificateException) {
+ showRequestError(app, e, "Certificate error")
+ return ""
+ }
+
+ return try {
+ val md = MessageDigest.getInstance("SHA1")
+ val publicKey = md.digest(x509cert.encoded)
+ byte2HexFormatted(publicKey)
+ } catch (e: NoSuchAlgorithmException) {
+ showRequestError(app, e, "Could not retrieve SHA1 key")
+ ""
+ } catch (e: CertificateEncodingException) {
+ showRequestError(app, e, "Could not retrieve SHA1 key")
+ ""
+ }
+ }
+
+ private fun byte2HexFormatted(arr: ByteArray): String {
+ val str = StringBuilder(arr.size * 2)
+ for (i in arr.indices) {
+ var h = Integer.toHexString(arr[i].toInt())
+ val l = h.length
+ if (l == 1) {
+ h = "0$h"
+ }
+ if (l > 2) {
+ h = h.substring(l - 2, l)
+ }
+ str.append(h.uppercase())
+ if (i < arr.size - 1) {
+ str.append(':')
+ }
+ }
+ return str.toString()
+ }
+
+ private fun showRequestError(app: App, e: Exception, request: String) {
+ createNotification(
+ app, ErrorInfo(e, UserAction.CHECK_FOR_NEW_APP_VERSION, request)
+ )
+ }
+
+ fun isLastUpdateCheckExpired(expiry: Long): Boolean {
+ return Instant.ofEpochSecond(expiry).isBefore(Instant.now())
+ }
+
+ /**
+ * Coerce expiry date time in between 6 hours and 72 hours from now
+ *
+ * @return Epoch second of expiry date time
+ */
+ fun coerceUpdateCheckExpiry(expiryString: String?): Long {
+ val now = ZonedDateTime.now()
+ return expiryString?.let {
+ var expiry =
+ ZonedDateTime.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(expiryString))
+ expiry = maxOf(expiry, now.plusHours(6))
+ expiry = minOf(expiry, now.plusHours(72))
+ expiry.toEpochSecond()
+ } ?: now.plusHours(6).toEpochSecond()
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/util/SaveUploaderUrlHelper.java b/app/src/main/java/org/schabi/newpipe/util/SaveUploaderUrlHelper.java
deleted file mode 100644
index 3c7b1ce91..000000000
--- a/app/src/main/java/org/schabi/newpipe/util/SaveUploaderUrlHelper.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.schabi.newpipe.util;
-
-import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
-
-import android.content.Context;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import org.schabi.newpipe.NewPipeDatabase;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.error.ErrorInfo;
-import org.schabi.newpipe.error.ErrorUtil;
-import org.schabi.newpipe.error.UserAction;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.player.playqueue.PlayQueueItem;
-
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.schedulers.Schedulers;
-
-/**
- * Utility class for putting the uploader url into the database - when required.
- */
-public final class SaveUploaderUrlHelper {
- private SaveUploaderUrlHelper() {
- }
-
- // Public functions which call the function that does
- // the actual work with the correct parameters
- public static void saveUploaderUrlIfNeeded(@NonNull final Fragment fragment,
- @NonNull final StreamInfoItem infoItem,
- @NonNull final SaveUploaderUrlCallback callback) {
- saveUploaderUrlIfNeeded(fragment.requireContext(),
- infoItem.getServiceId(),
- infoItem.getUrl(),
- infoItem.getUploaderUrl(),
- callback);
- }
- public static void saveUploaderUrlIfNeeded(@NonNull final Context context,
- @NonNull final PlayQueueItem queueItem,
- @NonNull final SaveUploaderUrlCallback callback) {
- saveUploaderUrlIfNeeded(context,
- queueItem.getServiceId(),
- queueItem.getUrl(),
- queueItem.getUploaderUrl(),
- callback);
- }
-
- /**
- * Fetches and saves the uploaderUrl if it is empty (meaning that it does
- * not exist in the video item). The callback is called with either the
- * fetched uploaderUrl, or the already saved uploaderUrl, but it is always
- * called with a valid uploaderUrl that can be used to show channel details.
- *
- * @param context Context
- * @param serviceId The serviceId of the item
- * @param url The item url
- * @param uploaderUrl The uploaderUrl of the item, if null or empty, it
- * will be fetched using the item url.
- * @param callback The callback that returns the fetched or existing
- * uploaderUrl
- */
- private static void saveUploaderUrlIfNeeded(@NonNull final Context context,
- final int serviceId,
- @NonNull final String url,
- // Only used if not null or empty
- @Nullable final String uploaderUrl,
- @NonNull final SaveUploaderUrlCallback callback) {
- if (isNullOrEmpty(uploaderUrl)) {
- Toast.makeText(context, R.string.loading_channel_details,
- Toast.LENGTH_SHORT).show();
- ExtractorHelper.getStreamInfo(serviceId, url, false)
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(result -> {
- NewPipeDatabase.getInstance(context).streamDAO()
- .setUploaderUrl(serviceId, url, result.getUploaderUrl())
- .subscribeOn(Schedulers.io()).subscribe();
- callback.onCallback(result.getUploaderUrl());
- }, throwable -> ErrorUtil.createNotification(context,
- new ErrorInfo(throwable, UserAction.REQUESTED_CHANNEL,
- "Could not load channel details")
- ));
- } else {
- callback.onCallback(uploaderUrl);
- }
- }
-
- public interface SaveUploaderUrlCallback {
- void onCallback(@NonNull String uploaderUrl);
- }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/util/SerializedCache.java b/app/src/main/java/org/schabi/newpipe/util/SerializedCache.java
index 9d97e013a..b4c196ce4 100644
--- a/app/src/main/java/org/schabi/newpipe/util/SerializedCache.java
+++ b/app/src/main/java/org/schabi/newpipe/util/SerializedCache.java
@@ -19,7 +19,7 @@ public final class SerializedCache {
private static final boolean DEBUG = MainActivity.DEBUG;
private static final SerializedCache INSTANCE = new SerializedCache();
private static final int MAX_ITEMS_ON_CACHE = 5;
- private static final LruCache LRU_CACHE =
+ private static final LruCache> LRU_CACHE =
new LruCache<>(MAX_ITEMS_ON_CACHE);
private static final String TAG = "SerializedCache";
@@ -47,7 +47,7 @@ public final class SerializedCache {
Log.d(TAG, "get() called with: key = [" + key + "]");
}
synchronized (LRU_CACHE) {
- final CacheData data = LRU_CACHE.get(key);
+ final CacheData data = LRU_CACHE.get(key);
return data != null ? getItem(data, type) : null;
}
}
@@ -91,7 +91,7 @@ public final class SerializedCache {
}
@Nullable
- private T getItem(@NonNull final CacheData data, @NonNull final Class type) {
+ private T getItem(@NonNull final CacheData data, @NonNull final Class type) {
return type.isAssignableFrom(data.type) ? type.cast(data.item) : null;
}
diff --git a/app/src/main/java/org/schabi/newpipe/util/SimpleOnSeekBarChangeListener.kt b/app/src/main/java/org/schabi/newpipe/util/SimpleOnSeekBarChangeListener.kt
new file mode 100644
index 000000000..a79085fc0
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/util/SimpleOnSeekBarChangeListener.kt
@@ -0,0 +1,12 @@
+package org.schabi.newpipe.util
+
+import android.widget.SeekBar
+
+/**
+ * Why the hell didn't they make a stub implementation for this?
+ */
+abstract class SimpleOnSeekBarChangeListener : SeekBar.OnSeekBarChangeListener {
+ override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {}
+ override fun onStartTrackingTouch(seekBar: SeekBar) {}
+ override fun onStopTrackingTouch(seekBar: SeekBar) {}
+}
diff --git a/app/src/main/java/org/schabi/newpipe/util/SparseItemUtil.java b/app/src/main/java/org/schabi/newpipe/util/SparseItemUtil.java
new file mode 100644
index 000000000..5daf7f073
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/util/SparseItemUtil.java
@@ -0,0 +1,128 @@
+package org.schabi.newpipe.util;
+
+import static org.schabi.newpipe.extractor.stream.StreamType.AUDIO_LIVE_STREAM;
+import static org.schabi.newpipe.extractor.stream.StreamType.LIVE_STREAM;
+import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
+
+import android.content.Context;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.schabi.newpipe.NewPipeDatabase;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
+import org.schabi.newpipe.error.UserAction;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
+
+import java.util.function.Consumer;
+
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+
+/**
+ * Utility class for fetching additional data for stream items when needed.
+ */
+public final class SparseItemUtil {
+ private SparseItemUtil() {
+ }
+
+ /**
+ * Use this to certainly obtain an single play queue with all of the data filled in when the
+ * stream info item you are handling might be sparse, e.g. because it was fetched via a {@link
+ * org.schabi.newpipe.extractor.feed.FeedExtractor}. FeedExtractors provide a fast and
+ * lightweight method to fetch info, but the info might be incomplete (see
+ * {@link org.schabi.newpipe.local.feed.service.FeedLoadService} for more details).
+ *
+ * @param context Android context
+ * @param item item which is checked and eventually loaded completely
+ * @param callback callback to call with the single play queue built from the original item if
+ * all info was available, otherwise from the fetched {@link
+ * org.schabi.newpipe.extractor.stream.StreamInfo}
+ */
+ public static void fetchItemInfoIfSparse(@NonNull final Context context,
+ @NonNull final StreamInfoItem item,
+ @NonNull final Consumer callback) {
+ if (((item.getStreamType() == LIVE_STREAM || item.getStreamType() == AUDIO_LIVE_STREAM)
+ || item.getDuration() >= 0) && !isNullOrEmpty(item.getUploaderUrl())) {
+ // if the duration is >= 0 (provided that the item is not a livestream) and there is an
+ // uploader url, probably all info is already there, so there is no need to fetch it
+ callback.accept(new SinglePlayQueue(item));
+ }
+
+ // either the duration or the uploader url are not available, so fetch more info
+ fetchStreamInfoAndSaveToDatabase(context, item.getServiceId(), item.getUrl(),
+ streamInfo -> callback.accept(new SinglePlayQueue(streamInfo)));
+ }
+
+ /**
+ * Use this to certainly obtain an uploader url when the stream info item or play queue item you
+ * are handling might not have the uploader url (e.g. because it was fetched with {@link
+ * org.schabi.newpipe.extractor.feed.FeedExtractor}). A toast is shown if loading details is
+ * required.
+ *
+ * @param context Android context
+ * @param serviceId serviceId of the item
+ * @param url item url
+ * @param uploaderUrl uploaderUrl of the item; if null or empty will be fetched
+ * @param callback callback to be called with either the original uploaderUrl, if it was a
+ * valid url, otherwise with the uploader url obtained by fetching the {@link
+ * org.schabi.newpipe.extractor.stream.StreamInfo} corresponding to the item
+ */
+ public static void fetchUploaderUrlIfSparse(@NonNull final Context context,
+ final int serviceId,
+ @NonNull final String url,
+ @Nullable final String uploaderUrl,
+ @NonNull final Consumer callback) {
+ if (isNullOrEmpty(uploaderUrl)) {
+ fetchStreamInfoAndSaveToDatabase(context, serviceId, url,
+ streamInfo -> callback.accept(streamInfo.getUploaderUrl()));
+ } else {
+ callback.accept(uploaderUrl);
+ }
+ }
+
+ /**
+ * Loads the stream info corresponding to the given data on an I/O thread, stores the result in
+ * the database and calls the callback on the main thread with the result. A toast will be shown
+ * to the user about loading stream details, so this needs to be called on the main thread.
+ *
+ * @param context Android context
+ * @param serviceId service id of the stream to load
+ * @param url url of the stream to load
+ * @param callback callback to be called with the result
+ */
+ private static void fetchStreamInfoAndSaveToDatabase(@NonNull final Context context,
+ final int serviceId,
+ @NonNull final String url,
+ final Consumer callback) {
+ Toast.makeText(context, R.string.loading_stream_details, Toast.LENGTH_SHORT).show();
+ ExtractorHelper.getStreamInfo(serviceId, url, false)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(result -> {
+ // save to database in the background (not on main thread)
+ Completable.fromAction(() -> NewPipeDatabase.getInstance(context)
+ .streamDAO().upsert(new StreamEntity(result)))
+ .subscribeOn(Schedulers.io())
+ .observeOn(Schedulers.io())
+ .doOnError(throwable ->
+ ErrorUtil.createNotification(context,
+ new ErrorInfo(throwable, UserAction.REQUESTED_STREAM,
+ "Saving stream info to database", result)))
+ .subscribe();
+
+ // call callback on main thread with the obtained result
+ callback.accept(result);
+ }, throwable -> ErrorUtil.createNotification(context,
+ new ErrorInfo(throwable, UserAction.REQUESTED_STREAM,
+ "Loading stream info: " + url, serviceId)
+ ));
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
deleted file mode 100644
index 1b4c8046c..000000000
--- a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package org.schabi.newpipe.util;
-
-import android.content.Context;
-import android.net.Uri;
-import android.util.Log;
-
-import androidx.fragment.app.Fragment;
-import androidx.preference.PreferenceManager;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.stream.model.StreamEntity;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.extractor.stream.StreamType;
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
-import org.schabi.newpipe.local.dialog.PlaylistDialog;
-import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
-import org.schabi.newpipe.util.external_communication.KoreUtils;
-import org.schabi.newpipe.util.external_communication.ShareUtils;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Consumer;
-
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.schedulers.Schedulers;
-
-public enum StreamDialogEntry {
- //////////////////////////////////////
- // enum values with DEFAULT actions //
- //////////////////////////////////////
-
- show_channel_details(R.string.show_channel_details, (fragment, item) -> {
- SaveUploaderUrlHelper.saveUploaderUrlIfNeeded(fragment, item,
- uploaderUrl -> openChannelFragment(fragment, item, uploaderUrl));
- }),
-
- /**
- * Enqueues the stream automatically to the current PlayerType.
- *
- * Info: Add this entry within showStreamDialog.
- */
- enqueue(R.string.enqueue_stream, (fragment, item) -> {
- fetchItemInfoIfSparse(fragment, item, fullItem ->
- NavigationHelper.enqueueOnPlayer(fragment.getContext(), fullItem));
- }),
-
- enqueue_next(R.string.enqueue_next_stream, (fragment, item) -> {
- fetchItemInfoIfSparse(fragment, item, fullItem ->
- NavigationHelper.enqueueNextOnPlayer(fragment.getContext(), fullItem));
- }),
-
- start_here_on_background(R.string.start_here_on_background, (fragment, item) -> {
- fetchItemInfoIfSparse(fragment, item, fullItem ->
- NavigationHelper.playOnBackgroundPlayer(fragment.getContext(), fullItem, true));
- }),
-
- start_here_on_popup(R.string.start_here_on_popup, (fragment, item) -> {
- fetchItemInfoIfSparse(fragment, item, fullItem ->
- NavigationHelper.playOnPopupPlayer(fragment.getContext(), fullItem, true));
- }),
-
- set_as_playlist_thumbnail(R.string.set_as_playlist_thumbnail, (fragment, item) -> {
- }), // has to be set manually
-
- delete(R.string.delete, (fragment, item) -> {
- }), // has to be set manually
-
- append_playlist(R.string.add_to_playlist, (fragment, item) -> {
- PlaylistDialog.createCorrespondingDialog(
- fragment.getContext(),
- Collections.singletonList(new StreamEntity(item)),
- dialog -> dialog.show(
- fragment.getParentFragmentManager(),
- "StreamDialogEntry@"
- + (dialog instanceof PlaylistAppendDialog ? "append" : "create")
- + "_playlist"
- )
- );
- }),
-
- play_with_kodi(R.string.play_with_kodi_title, (fragment, item) -> {
- final Uri videoUrl = Uri.parse(item.getUrl());
- try {
- NavigationHelper.playWithKore(fragment.requireContext(), videoUrl);
- } catch (final Exception e) {
- KoreUtils.showInstallKoreDialog(fragment.requireActivity());
- }
- }),
-
- share(R.string.share, (fragment, item) ->
- ShareUtils.shareText(fragment.requireContext(), item.getName(), item.getUrl(),
- item.getThumbnailUrl())),
-
- open_in_browser(R.string.open_in_browser, (fragment, item) ->
- ShareUtils.openUrlInBrowser(fragment.requireContext(), item.getUrl())),
-
-
- mark_as_watched(R.string.mark_as_watched, (fragment, item) -> {
- new HistoryRecordManager(fragment.getContext())
- .markAsWatched(item)
- .onErrorComplete()
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe();
- });
-
- ///////////////
- // variables //
- ///////////////
-
- private static StreamDialogEntry[] enabledEntries;
- private final int resource;
- private final StreamDialogEntryAction defaultAction;
- private StreamDialogEntryAction customAction;
-
- StreamDialogEntry(final int resource, final StreamDialogEntryAction defaultAction) {
- this.resource = resource;
- this.defaultAction = defaultAction;
- this.customAction = null;
- }
-
-
- ///////////////////////////////////////////////////////
- // non-static methods to initialize and edit entries //
- ///////////////////////////////////////////////////////
-
- public static void setEnabledEntries(final List entries) {
- setEnabledEntries(entries.toArray(new StreamDialogEntry[0]));
- }
-
- /**
- * To be called before using {@link #setCustomAction(StreamDialogEntryAction)}.
- *
- * @param entries the entries to be enabled
- */
- public static void setEnabledEntries(final StreamDialogEntry... entries) {
- // cleanup from last time StreamDialogEntry was used
- for (final StreamDialogEntry streamDialogEntry : values()) {
- streamDialogEntry.customAction = null;
- }
-
- enabledEntries = entries;
- }
-
- public static String[] getCommands(final Context context) {
- final String[] commands = new String[enabledEntries.length];
- for (int i = 0; i != enabledEntries.length; ++i) {
- commands[i] = context.getResources().getString(enabledEntries[i].resource);
- }
-
- return commands;
- }
-
-
- ////////////////////////////////////////////////
- // static methods that act on enabled entries //
- ////////////////////////////////////////////////
-
- public static void clickOn(final int which, final Fragment fragment,
- final StreamInfoItem infoItem) {
- if (enabledEntries[which].customAction == null) {
- enabledEntries[which].defaultAction.onClick(fragment, infoItem);
- } else {
- enabledEntries[which].customAction.onClick(fragment, infoItem);
- }
- }
-
- /**
- * Can be used after {@link #setEnabledEntries(StreamDialogEntry...)} has been called.
- *
- * @param action the action to be set
- */
- public void setCustomAction(final StreamDialogEntryAction action) {
- this.customAction = action;
- }
-
- public interface StreamDialogEntryAction {
- void onClick(Fragment fragment, StreamInfoItem infoItem);
- }
-
- public static boolean shouldAddMarkAsWatched(final StreamType streamType,
- final Context context) {
- final boolean isWatchHistoryEnabled = PreferenceManager
- .getDefaultSharedPreferences(context)
- .getBoolean(context.getString(R.string.enable_watch_history_key), false);
- return streamType != StreamType.AUDIO_LIVE_STREAM
- && streamType != StreamType.LIVE_STREAM
- && isWatchHistoryEnabled;
- }
-
- /////////////////////////////////////////////
- // private method to open channel fragment //
- /////////////////////////////////////////////
-
- private static void openChannelFragment(final Fragment fragment,
- final StreamInfoItem item,
- final String uploaderUrl) {
- // For some reason `getParentFragmentManager()` doesn't work, but this does.
- NavigationHelper.openChannelFragment(
- fragment.requireActivity().getSupportFragmentManager(),
- item.getServiceId(), uploaderUrl, item.getUploaderName());
- }
-
- /////////////////////////////////////////////
- // helper functions //
- /////////////////////////////////////////////
-
- private static void fetchItemInfoIfSparse(final Fragment fragment,
- final StreamInfoItem item,
- final Consumer callback) {
- if (!(item.getStreamType() == StreamType.LIVE_STREAM
- || item.getStreamType() == StreamType.AUDIO_LIVE_STREAM)
- && item.getDuration() < 0) {
- // Sparse item: fetched by fast fetch
- ExtractorHelper.getStreamInfo(
- item.getServiceId(),
- item.getUrl(),
- false
- )
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(result -> {
- final HistoryRecordManager recordManager =
- new HistoryRecordManager(fragment.getContext());
- recordManager.saveStreamState(result, 0)
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .doOnError(throwable -> Log.e("StreamDialogEntry",
- throwable.toString()))
- .subscribe();
-
- callback.accept(new SinglePlayQueue(result));
- }, throwable -> Log.e("StreamDialogEntry", throwable.toString()));
- } else {
- callback.accept(new SinglePlayQueue(item));
- }
- }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java b/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java
index 9150b5c1a..c89da9d45 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java
@@ -12,6 +12,7 @@ import android.widget.TextView;
import org.schabi.newpipe.DownloaderImpl;
import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.MediaFormat;
import org.schabi.newpipe.extractor.stream.AudioStream;
import org.schabi.newpipe.extractor.stream.Stream;
import org.schabi.newpipe.extractor.stream.SubtitlesStream;
@@ -137,7 +138,7 @@ public class StreamItemAdapter extends BaseA
}
if (streamsWrapper.getSizeInBytes(position) > 0) {
- final SecondaryStreamHelper secondary = secondaryStreams == null ? null
+ final SecondaryStreamHelper secondary = secondaryStreams == null ? null
: secondaryStreams.get(position);
if (secondary != null) {
final long size
@@ -153,16 +154,11 @@ public class StreamItemAdapter extends BaseA
if (stream instanceof SubtitlesStream) {
formatNameView.setText(((SubtitlesStream) stream).getLanguageTag());
+ } else if (stream.getFormat() == MediaFormat.WEBMA_OPUS) {
+ // noinspection AndroidLintSetTextI18n
+ formatNameView.setText("opus");
} else {
- switch (stream.getFormat()) {
- case WEBMA_OPUS:
- // noinspection AndroidLintSetTextI18n
- formatNameView.setText("opus");
- break;
- default:
- formatNameView.setText(stream.getFormat().getName());
- break;
- }
+ formatNameView.setText(stream.getFormat().getName());
}
qualityView.setText(qualityString);
diff --git a/app/src/main/java/org/schabi/newpipe/util/external_communication/KoreUtils.java b/app/src/main/java/org/schabi/newpipe/util/external_communication/KoreUtils.java
index 6801f24ef..0df579d88 100644
--- a/app/src/main/java/org/schabi/newpipe/util/external_communication/KoreUtils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/external_communication/KoreUtils.java
@@ -10,6 +10,10 @@ import org.schabi.newpipe.R;
import org.schabi.newpipe.extractor.ServiceList;
import org.schabi.newpipe.util.NavigationHelper;
+/**
+ * Util class that provides methods which are related to the Kodi Media Center and its Kore app.
+ * @see Kodi website
+ */
public final class KoreUtils {
private KoreUtils() { }
diff --git a/app/src/main/java/org/schabi/newpipe/views/LargeTextMovementMethod.java b/app/src/main/java/org/schabi/newpipe/views/LargeTextMovementMethod.java
deleted file mode 100644
index 1219304e1..000000000
--- a/app/src/main/java/org/schabi/newpipe/views/LargeTextMovementMethod.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright 2019 Alexander Rvachev
- * FocusOverlayView.java is part of NewPipe
- *
- * License: GPL-3.0+
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package org.schabi.newpipe.views;
-
-import android.graphics.Rect;
-import android.text.Layout;
-import android.text.Selection;
-import android.text.Spannable;
-import android.text.method.LinkMovementMethod;
-import android.text.style.ClickableSpan;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.widget.TextView;
-
-public class LargeTextMovementMethod extends LinkMovementMethod {
- private final Rect visibleRect = new Rect();
-
- private int direction;
-
- @Override
- public void onTakeFocus(final TextView view, final Spannable text, final int dir) {
- Selection.removeSelection(text);
-
- super.onTakeFocus(view, text, dir);
-
- this.direction = dirToRelative(dir);
- }
-
- @Override
- protected boolean handleMovementKey(final TextView widget,
- final Spannable buffer,
- final int keyCode,
- final int movementMetaState,
- final KeyEvent event) {
- if (!doHandleMovement(widget, buffer, keyCode, movementMetaState, event)) {
- // clear selection to make sure, that it does not confuse focus handling code
- Selection.removeSelection(buffer);
- return false;
- }
-
- return true;
- }
-
- private boolean doHandleMovement(final TextView widget,
- final Spannable buffer,
- final int keyCode,
- final int movementMetaState,
- final KeyEvent event) {
- final int newDir = keyToDir(keyCode);
-
- if (direction != 0 && newDir != direction) {
- return false;
- }
-
- this.direction = 0;
-
- final ViewGroup root = findScrollableParent(widget);
-
- widget.getHitRect(visibleRect);
-
- root.offsetDescendantRectToMyCoords((View) widget.getParent(), visibleRect);
-
- return super.handleMovementKey(widget, buffer, keyCode, movementMetaState, event);
- }
-
- @Override
- protected boolean up(final TextView widget, final Spannable buffer) {
- if (gotoPrev(widget, buffer)) {
- return true;
- }
-
- return super.up(widget, buffer);
- }
-
- @Override
- protected boolean left(final TextView widget, final Spannable buffer) {
- if (gotoPrev(widget, buffer)) {
- return true;
- }
-
- return super.left(widget, buffer);
- }
-
- @Override
- protected boolean right(final TextView widget, final Spannable buffer) {
- if (gotoNext(widget, buffer)) {
- return true;
- }
-
- return super.right(widget, buffer);
- }
-
- @Override
- protected boolean down(final TextView widget, final Spannable buffer) {
- if (gotoNext(widget, buffer)) {
- return true;
- }
-
- return super.down(widget, buffer);
- }
-
- private boolean gotoPrev(final TextView view, final Spannable buffer) {
- final Layout layout = view.getLayout();
- if (layout == null) {
- return false;
- }
-
- final View root = findScrollableParent(view);
-
- final int rootHeight = root.getHeight();
-
- if (visibleRect.top >= 0) {
- // we fit entirely into the viewport, no need for fancy footwork
- return false;
- }
-
- final int topExtra = -visibleRect.top;
-
- final int firstVisibleLineNumber = layout.getLineForVertical(topExtra);
-
- // when deciding whether to pass "focus" to span, account for one more line
- // this ensures, that focus is never passed to spans partially outside scroll window
- final int visibleStart = firstVisibleLineNumber == 0
- ? 0
- : layout.getLineStart(firstVisibleLineNumber - 1);
-
- final ClickableSpan[] candidates = buffer.getSpans(
- visibleStart, buffer.length(), ClickableSpan.class);
-
- if (candidates.length != 0) {
- final int a = Selection.getSelectionStart(buffer);
- final int b = Selection.getSelectionEnd(buffer);
-
- final int selStart = Math.min(a, b);
- final int selEnd = Math.max(a, b);
-
- int bestStart = -1;
- int bestEnd = -1;
-
- for (final ClickableSpan candidate : candidates) {
- final int start = buffer.getSpanStart(candidate);
- final int end = buffer.getSpanEnd(candidate);
-
- if ((end < selEnd || selStart == selEnd) && start >= visibleStart) {
- if (end > bestEnd) {
- bestStart = buffer.getSpanStart(candidate);
- bestEnd = end;
- }
- }
- }
-
- if (bestStart >= 0) {
- Selection.setSelection(buffer, bestEnd, bestStart);
- return true;
- }
- }
-
- final float fourLines = view.getTextSize() * 4;
-
- visibleRect.left = 0;
- visibleRect.right = view.getWidth();
- visibleRect.top = Math.max(0, (int) (topExtra - fourLines));
- visibleRect.bottom = visibleRect.top + rootHeight;
-
- return view.requestRectangleOnScreen(visibleRect);
- }
-
- private boolean gotoNext(final TextView view, final Spannable buffer) {
- final Layout layout = view.getLayout();
- if (layout == null) {
- return false;
- }
-
- final View root = findScrollableParent(view);
-
- final int rootHeight = root.getHeight();
-
- if (visibleRect.bottom <= rootHeight) {
- // we fit entirely into the viewport, no need for fancy footwork
- return false;
- }
-
- final int bottomExtra = visibleRect.bottom - rootHeight;
-
- final int visibleBottomBorder = view.getHeight() - bottomExtra;
-
- final int lineCount = layout.getLineCount();
-
- final int lastVisibleLineNumber = layout.getLineForVertical(visibleBottomBorder);
-
- // when deciding whether to pass "focus" to span, account for one more line
- // this ensures, that focus is never passed to spans partially outside scroll window
- final int visibleEnd = lastVisibleLineNumber == lineCount - 1
- ? buffer.length()
- : layout.getLineEnd(lastVisibleLineNumber - 1);
-
- final ClickableSpan[] candidates = buffer.getSpans(0, visibleEnd, ClickableSpan.class);
-
- if (candidates.length != 0) {
- final int a = Selection.getSelectionStart(buffer);
- final int b = Selection.getSelectionEnd(buffer);
-
- final int selStart = Math.min(a, b);
- final int selEnd = Math.max(a, b);
-
- int bestStart = Integer.MAX_VALUE;
- int bestEnd = Integer.MAX_VALUE;
-
- for (final ClickableSpan candidate : candidates) {
- final int start = buffer.getSpanStart(candidate);
- final int end = buffer.getSpanEnd(candidate);
-
- if ((start > selStart || selStart == selEnd) && end <= visibleEnd) {
- if (start < bestStart) {
- bestStart = start;
- bestEnd = buffer.getSpanEnd(candidate);
- }
- }
- }
-
- if (bestEnd < Integer.MAX_VALUE) {
- // cool, we have managed to find next link without having to adjust self within view
- Selection.setSelection(buffer, bestStart, bestEnd);
- return true;
- }
- }
-
- // there are no links within visible area, but still some text past visible area
- // scroll visible area further in required direction
- final float fourLines = view.getTextSize() * 4;
-
- visibleRect.left = 0;
- visibleRect.right = view.getWidth();
- visibleRect.bottom = Math.min((int) (visibleBottomBorder + fourLines), view.getHeight());
- visibleRect.top = visibleRect.bottom - rootHeight;
-
- return view.requestRectangleOnScreen(visibleRect);
- }
-
- private ViewGroup findScrollableParent(final View view) {
- View current = view;
-
- ViewParent parent;
- do {
- parent = current.getParent();
-
- if (parent == current || !(parent instanceof View)) {
- return (ViewGroup) view.getRootView();
- }
-
- current = (View) parent;
-
- if (current.isScrollContainer()) {
- return (ViewGroup) current;
- }
- }
- while (true);
- }
-
- private static int dirToRelative(final int dir) {
- switch (dir) {
- case View.FOCUS_DOWN:
- case View.FOCUS_RIGHT:
- return View.FOCUS_FORWARD;
- case View.FOCUS_UP:
- case View.FOCUS_LEFT:
- return View.FOCUS_BACKWARD;
- }
-
- return dir;
- }
-
- private int keyToDir(final int keyCode) {
- switch (keyCode) {
- case KeyEvent.KEYCODE_DPAD_UP:
- case KeyEvent.KEYCODE_DPAD_LEFT:
- return View.FOCUS_BACKWARD;
- case KeyEvent.KEYCODE_DPAD_DOWN:
- case KeyEvent.KEYCODE_DPAD_RIGHT:
- return View.FOCUS_FORWARD;
- }
-
- return View.FOCUS_FORWARD;
- }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/views/player/SecondsView.kt b/app/src/main/java/org/schabi/newpipe/views/player/SecondsView.kt
index d209d24da..8472653fb 100644
--- a/app/src/main/java/org/schabi/newpipe/views/player/SecondsView.kt
+++ b/app/src/main/java/org/schabi/newpipe/views/player/SecondsView.kt
@@ -1,11 +1,11 @@
package org.schabi.newpipe.views.player
-import android.animation.Animator
import android.animation.ValueAnimator
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.LinearLayout
+import androidx.core.animation.addListener
import org.schabi.newpipe.R
import org.schabi.newpipe.databinding.PlayerFastSeekSecondsViewBinding
import org.schabi.newpipe.util.DeviceUtils
@@ -163,19 +163,10 @@ class SecondsView(context: Context, attrs: AttributeSet?) : LinearLayout(context
setFloatValues(0f, 1f)
addUpdateListener { update(it.animatedValue as Float) }
- addListener(object : AnimatorListener {
- override fun onAnimationStart(animation: Animator?) {
- start()
- }
-
- override fun onAnimationEnd(animation: Animator?) {
- end()
- }
-
- override fun onAnimationCancel(animation: Animator?) = Unit
-
- override fun onAnimationRepeat(animation: Animator?) = Unit
- })
+ addListener(
+ onStart = { start() },
+ onEnd = { end() }
+ )
}
}
}
diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index dda2d6dee..b5fc0297c 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -192,14 +192,7 @@ public class MissionsFragment extends Fragment {
updateList();
return true;
case R.id.clear_list:
- AlertDialog.Builder prompt = new AlertDialog.Builder(mContext);
- prompt.setTitle(R.string.clear_download_history);
- prompt.setMessage(R.string.confirm_prompt);
- // Intentionally misusing button's purpose in order to achieve good order
- prompt.setNegativeButton(R.string.clear_download_history, (dialog, which) -> mAdapter.clearFinishedDownloads(false));
- prompt.setPositiveButton(R.string.delete_downloaded_files, (dialog, which) -> mAdapter.clearFinishedDownloads(true));
- prompt.setNeutralButton(R.string.cancel, null);
- prompt.create().show();
+ showClearDownloadHistoryPrompt();
return true;
case R.id.start_downloads:
mBinder.getDownloadManager().startAllMissions();
@@ -212,6 +205,32 @@ public class MissionsFragment extends Fragment {
}
}
+ public void showClearDownloadHistoryPrompt() {
+ // ask the user whether he wants to just clear history or instead delete files on disk
+ new AlertDialog.Builder(mContext)
+ .setTitle(R.string.clear_download_history)
+ .setMessage(R.string.confirm_prompt)
+ // Intentionally misusing buttons' purpose in order to achieve good order
+ .setNegativeButton(R.string.clear_download_history,
+ (dialog, which) -> mAdapter.clearFinishedDownloads(false))
+ .setNeutralButton(R.string.cancel, null)
+ .setPositiveButton(R.string.delete_downloaded_files,
+ (dialog, which) -> showDeleteDownloadedFilesConfirmationPrompt())
+ .create()
+ .show();
+ }
+
+ public void showDeleteDownloadedFilesConfirmationPrompt() {
+ // make sure the user confirms once more before deleting files on disk
+ new AlertDialog.Builder(mContext)
+ .setTitle(R.string.delete_downloaded_files_confirm)
+ .setNegativeButton(R.string.cancel, null)
+ .setPositiveButton(R.string.ok,
+ (dialog, which) -> mAdapter.clearFinishedDownloads(true))
+ .create()
+ .show();
+ }
+
private void updateList() {
if (mLinear) {
mList.setLayoutManager(mLinearManager);
diff --git a/app/src/main/res/drawable-night/ic_add.xml b/app/src/main/res/drawable-night/ic_add.xml
deleted file mode 100644
index bbda803b0..000000000
--- a/app/src/main/res/drawable-night/ic_add.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_add_circle_outline.xml b/app/src/main/res/drawable-night/ic_add_circle_outline.xml
deleted file mode 100644
index 2f2cfe3e3..000000000
--- a/app/src/main/res/drawable-night/ic_add_circle_outline.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_apps.xml b/app/src/main/res/drawable-night/ic_apps.xml
deleted file mode 100644
index 2d7d796f7..000000000
--- a/app/src/main/res/drawable-night/ic_apps.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_arrow_back.xml b/app/src/main/res/drawable-night/ic_arrow_back.xml
deleted file mode 100644
index b7c728783..000000000
--- a/app/src/main/res/drawable-night/ic_arrow_back.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_asterisk.xml b/app/src/main/res/drawable-night/ic_asterisk.xml
deleted file mode 100644
index c66bb4051..000000000
--- a/app/src/main/res/drawable-night/ic_asterisk.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_attach_money.xml b/app/src/main/res/drawable-night/ic_attach_money.xml
deleted file mode 100644
index fcc1ab160..000000000
--- a/app/src/main/res/drawable-night/ic_attach_money.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_backup.xml b/app/src/main/res/drawable-night/ic_backup.xml
deleted file mode 100644
index 29259b0e0..000000000
--- a/app/src/main/res/drawable-night/ic_backup.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_bookmark.xml b/app/src/main/res/drawable-night/ic_bookmark.xml
deleted file mode 100644
index 2e919f18d..000000000
--- a/app/src/main/res/drawable-night/ic_bookmark.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_bug_report.xml b/app/src/main/res/drawable-night/ic_bug_report.xml
deleted file mode 100644
index e1a204a29..000000000
--- a/app/src/main/res/drawable-night/ic_bug_report.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_campaign.xml b/app/src/main/res/drawable-night/ic_campaign.xml
deleted file mode 100644
index eabaddaee..000000000
--- a/app/src/main/res/drawable-night/ic_campaign.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_cast.xml b/app/src/main/res/drawable-night/ic_cast.xml
deleted file mode 100644
index 61a1f61fe..000000000
--- a/app/src/main/res/drawable-night/ic_cast.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_child_care.xml b/app/src/main/res/drawable-night/ic_child_care.xml
deleted file mode 100644
index 9375e3116..000000000
--- a/app/src/main/res/drawable-night/ic_child_care.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_close.xml b/app/src/main/res/drawable-night/ic_close.xml
deleted file mode 100644
index c63eeb597..000000000
--- a/app/src/main/res/drawable-night/ic_close.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_cloud_download.xml b/app/src/main/res/drawable-night/ic_cloud_download.xml
deleted file mode 100644
index 67e870456..000000000
--- a/app/src/main/res/drawable-night/ic_cloud_download.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_computer.xml b/app/src/main/res/drawable-night/ic_computer.xml
deleted file mode 100644
index 68f85594d..000000000
--- a/app/src/main/res/drawable-night/ic_computer.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_crop_portrait.xml b/app/src/main/res/drawable-night/ic_crop_portrait.xml
deleted file mode 100644
index fc11eba57..000000000
--- a/app/src/main/res/drawable-night/ic_crop_portrait.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_delete.xml b/app/src/main/res/drawable-night/ic_delete.xml
deleted file mode 100644
index 3760de238..000000000
--- a/app/src/main/res/drawable-night/ic_delete.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_directions_bike.xml b/app/src/main/res/drawable-night/ic_directions_bike.xml
deleted file mode 100644
index 90c7f7a77..000000000
--- a/app/src/main/res/drawable-night/ic_directions_bike.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_directions_car.xml b/app/src/main/res/drawable-night/ic_directions_car.xml
deleted file mode 100644
index 26404bddb..000000000
--- a/app/src/main/res/drawable-night/ic_directions_car.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_done.xml b/app/src/main/res/drawable-night/ic_done.xml
deleted file mode 100644
index bb657f6ec..000000000
--- a/app/src/main/res/drawable-night/ic_done.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_drag_handle.xml b/app/src/main/res/drawable-night/ic_drag_handle.xml
deleted file mode 100644
index a6d3b5270..000000000
--- a/app/src/main/res/drawable-night/ic_drag_handle.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_expand_more.xml b/app/src/main/res/drawable-night/ic_expand_more.xml
deleted file mode 100644
index b6a470043..000000000
--- a/app/src/main/res/drawable-night/ic_expand_more.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_explore.xml b/app/src/main/res/drawable-night/ic_explore.xml
deleted file mode 100644
index a910c5429..000000000
--- a/app/src/main/res/drawable-night/ic_explore.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_fastfood.xml b/app/src/main/res/drawable-night/ic_fastfood.xml
deleted file mode 100644
index ddb9b6257..000000000
--- a/app/src/main/res/drawable-night/ic_fastfood.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_favorite.xml b/app/src/main/res/drawable-night/ic_favorite.xml
deleted file mode 100644
index efc717ee9..000000000
--- a/app/src/main/res/drawable-night/ic_favorite.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_file_download.xml b/app/src/main/res/drawable-night/ic_file_download.xml
deleted file mode 100644
index 97bdac0f1..000000000
--- a/app/src/main/res/drawable-night/ic_file_download.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_filter_list.xml b/app/src/main/res/drawable-night/ic_filter_list.xml
deleted file mode 100644
index 2df495e15..000000000
--- a/app/src/main/res/drawable-night/ic_filter_list.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_fitness_center.xml b/app/src/main/res/drawable-night/ic_fitness_center.xml
deleted file mode 100644
index 892def491..000000000
--- a/app/src/main/res/drawable-night/ic_fitness_center.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_headset.xml b/app/src/main/res/drawable-night/ic_headset.xml
deleted file mode 100644
index f23764766..000000000
--- a/app/src/main/res/drawable-night/ic_headset.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_help.xml b/app/src/main/res/drawable-night/ic_help.xml
deleted file mode 100644
index 04c1c00fc..000000000
--- a/app/src/main/res/drawable-night/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_history.xml b/app/src/main/res/drawable-night/ic_history.xml
deleted file mode 100644
index 2418fd6f9..000000000
--- a/app/src/main/res/drawable-night/ic_history.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_home.xml b/app/src/main/res/drawable-night/ic_home.xml
deleted file mode 100644
index 12afe9051..000000000
--- a/app/src/main/res/drawable-night/ic_home.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_info_outline.xml b/app/src/main/res/drawable-night/ic_info_outline.xml
deleted file mode 100644
index 085665e4b..000000000
--- a/app/src/main/res/drawable-night/ic_info_outline.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_insert_emoticon.xml b/app/src/main/res/drawable-night/ic_insert_emoticon.xml
deleted file mode 100644
index de8e66530..000000000
--- a/app/src/main/res/drawable-night/ic_insert_emoticon.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_language.xml b/app/src/main/res/drawable-night/ic_language.xml
deleted file mode 100644
index 9b97aa592..000000000
--- a/app/src/main/res/drawable-night/ic_language.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_list.xml b/app/src/main/res/drawable-night/ic_list.xml
deleted file mode 100644
index 4fd341d82..000000000
--- a/app/src/main/res/drawable-night/ic_list.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_live_tv.xml b/app/src/main/res/drawable-night/ic_live_tv.xml
deleted file mode 100644
index 303858f9d..000000000
--- a/app/src/main/res/drawable-night/ic_live_tv.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_mic.xml b/app/src/main/res/drawable-night/ic_mic.xml
deleted file mode 100644
index c0c92fcc7..000000000
--- a/app/src/main/res/drawable-night/ic_mic.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_more_vert.xml b/app/src/main/res/drawable-night/ic_more_vert.xml
deleted file mode 100644
index 19703e8e7..000000000
--- a/app/src/main/res/drawable-night/ic_more_vert.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_motorcycle.xml b/app/src/main/res/drawable-night/ic_motorcycle.xml
deleted file mode 100644
index 4ffd8b451..000000000
--- a/app/src/main/res/drawable-night/ic_motorcycle.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_movie.xml b/app/src/main/res/drawable-night/ic_movie.xml
deleted file mode 100644
index 79f93d1c1..000000000
--- a/app/src/main/res/drawable-night/ic_movie.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_music_note.xml b/app/src/main/res/drawable-night/ic_music_note.xml
deleted file mode 100644
index ca80ad5ad..000000000
--- a/app/src/main/res/drawable-night/ic_music_note.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_palette.xml b/app/src/main/res/drawable-night/ic_palette.xml
deleted file mode 100644
index 8edcceb76..000000000
--- a/app/src/main/res/drawable-night/ic_palette.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_pause.xml b/app/src/main/res/drawable-night/ic_pause.xml
deleted file mode 100644
index ea843aff3..000000000
--- a/app/src/main/res/drawable-night/ic_pause.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_people.xml b/app/src/main/res/drawable-night/ic_people.xml
deleted file mode 100644
index 8b925badc..000000000
--- a/app/src/main/res/drawable-night/ic_people.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_person.xml b/app/src/main/res/drawable-night/ic_person.xml
deleted file mode 100644
index 5efaaf0dd..000000000
--- a/app/src/main/res/drawable-night/ic_person.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_pets.xml b/app/src/main/res/drawable-night/ic_pets.xml
deleted file mode 100644
index 14373a3c5..000000000
--- a/app/src/main/res/drawable-night/ic_pets.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_picture_in_picture.xml b/app/src/main/res/drawable-night/ic_picture_in_picture.xml
deleted file mode 100644
index 1b01f3233..000000000
--- a/app/src/main/res/drawable-night/ic_picture_in_picture.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_play_arrow.xml b/app/src/main/res/drawable-night/ic_play_arrow.xml
deleted file mode 100644
index 95cace1c8..000000000
--- a/app/src/main/res/drawable-night/ic_play_arrow.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_playlist_add.xml b/app/src/main/res/drawable-night/ic_playlist_add.xml
deleted file mode 100644
index bf86fd24a..000000000
--- a/app/src/main/res/drawable-night/ic_playlist_add.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_playlist_add_check.xml b/app/src/main/res/drawable-night/ic_playlist_add_check.xml
deleted file mode 100644
index a69d284a1..000000000
--- a/app/src/main/res/drawable-night/ic_playlist_add_check.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_public.xml b/app/src/main/res/drawable-night/ic_public.xml
deleted file mode 100644
index 6ae97422a..000000000
--- a/app/src/main/res/drawable-night/ic_public.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_radio.xml b/app/src/main/res/drawable-night/ic_radio.xml
deleted file mode 100644
index d0902426b..000000000
--- a/app/src/main/res/drawable-night/ic_radio.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_refresh.xml b/app/src/main/res/drawable-night/ic_refresh.xml
deleted file mode 100644
index 4ca5e73a7..000000000
--- a/app/src/main/res/drawable-night/ic_refresh.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_restaurant.xml b/app/src/main/res/drawable-night/ic_restaurant.xml
deleted file mode 100644
index dbb849680..000000000
--- a/app/src/main/res/drawable-night/ic_restaurant.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_rss_feed.xml b/app/src/main/res/drawable-night/ic_rss_feed.xml
deleted file mode 100644
index 193f4fe92..000000000
--- a/app/src/main/res/drawable-night/ic_rss_feed.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_save.xml b/app/src/main/res/drawable-night/ic_save.xml
deleted file mode 100644
index b32b11451..000000000
--- a/app/src/main/res/drawable-night/ic_save.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_school.xml b/app/src/main/res/drawable-night/ic_school.xml
deleted file mode 100644
index dc16c4782..000000000
--- a/app/src/main/res/drawable-night/ic_school.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_search.xml b/app/src/main/res/drawable-night/ic_search.xml
deleted file mode 100644
index 4d0f18584..000000000
--- a/app/src/main/res/drawable-night/ic_search.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_search_add.xml b/app/src/main/res/drawable-night/ic_search_add.xml
deleted file mode 100644
index 856433e41..000000000
--- a/app/src/main/res/drawable-night/ic_search_add.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_select_all.xml b/app/src/main/res/drawable-night/ic_select_all.xml
deleted file mode 100644
index 157734911..000000000
--- a/app/src/main/res/drawable-night/ic_select_all.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_settings.xml b/app/src/main/res/drawable-night/ic_settings.xml
deleted file mode 100644
index 61ee02ee0..000000000
--- a/app/src/main/res/drawable-night/ic_settings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_share.xml b/app/src/main/res/drawable-night/ic_share.xml
deleted file mode 100644
index 9dad7b85f..000000000
--- a/app/src/main/res/drawable-night/ic_share.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_shopping_cart.xml b/app/src/main/res/drawable-night/ic_shopping_cart.xml
deleted file mode 100644
index 75c330cef..000000000
--- a/app/src/main/res/drawable-night/ic_shopping_cart.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_sort.xml b/app/src/main/res/drawable-night/ic_sort.xml
deleted file mode 100644
index 484be5ad2..000000000
--- a/app/src/main/res/drawable-night/ic_sort.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_stars.xml b/app/src/main/res/drawable-night/ic_stars.xml
deleted file mode 100644
index 135980afe..000000000
--- a/app/src/main/res/drawable-night/ic_stars.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_telescope.xml b/app/src/main/res/drawable-night/ic_telescope.xml
deleted file mode 100644
index 86468f34a..000000000
--- a/app/src/main/res/drawable-night/ic_telescope.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_thumb_down.xml b/app/src/main/res/drawable-night/ic_thumb_down.xml
deleted file mode 100644
index 1ee3ed018..000000000
--- a/app/src/main/res/drawable-night/ic_thumb_down.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_thumb_up.xml b/app/src/main/res/drawable-night/ic_thumb_up.xml
deleted file mode 100644
index c4e387866..000000000
--- a/app/src/main/res/drawable-night/ic_thumb_up.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_trending_up.xml b/app/src/main/res/drawable-night/ic_trending_up.xml
deleted file mode 100644
index ca4eb654b..000000000
--- a/app/src/main/res/drawable-night/ic_trending_up.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_tv.xml b/app/src/main/res/drawable-night/ic_tv.xml
deleted file mode 100644
index b9d14869b..000000000
--- a/app/src/main/res/drawable-night/ic_tv.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_videogame_asset.xml b/app/src/main/res/drawable-night/ic_videogame_asset.xml
deleted file mode 100644
index 4861bf809..000000000
--- a/app/src/main/res/drawable-night/ic_videogame_asset.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_visibility_off.xml b/app/src/main/res/drawable-night/ic_visibility_off.xml
deleted file mode 100644
index 689f3f47c..000000000
--- a/app/src/main/res/drawable-night/ic_visibility_off.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_visibility_on.xml b/app/src/main/res/drawable-night/ic_visibility_on.xml
deleted file mode 100644
index e02f1d191..000000000
--- a/app/src/main/res/drawable-night/ic_visibility_on.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_volume_off.xml b/app/src/main/res/drawable-night/ic_volume_off.xml
deleted file mode 100644
index a2cabcee0..000000000
--- a/app/src/main/res/drawable-night/ic_volume_off.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_volume_up.xml b/app/src/main/res/drawable-night/ic_volume_up.xml
deleted file mode 100644
index 5d604f823..000000000
--- a/app/src/main/res/drawable-night/ic_volume_up.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_watch_later.xml b/app/src/main/res/drawable-night/ic_watch_later.xml
deleted file mode 100644
index ff93ce2d7..000000000
--- a/app/src/main/res/drawable-night/ic_watch_later.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_wb_sunny.xml b/app/src/main/res/drawable-night/ic_wb_sunny.xml
deleted file mode 100644
index 12a5d9774..000000000
--- a/app/src/main/res/drawable-night/ic_wb_sunny.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_whatshot.xml b/app/src/main/res/drawable-night/ic_whatshot.xml
deleted file mode 100644
index 935ac8450..000000000
--- a/app/src/main/res/drawable-night/ic_whatshot.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_work.xml b/app/src/main/res/drawable-night/ic_work.xml
deleted file mode 100644
index 8af0219f9..000000000
--- a/app/src/main/res/drawable-night/ic_work.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
index fedd077d8..fc2163f43 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_add_circle_outline.xml b/app/src/main/res/drawable/ic_add_circle_outline.xml
index 1596099f3..0d79d6918 100644
--- a/app/src/main/res/drawable/ic_add_circle_outline.xml
+++ b/app/src/main/res/drawable/ic_add_circle_outline.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_apps.xml b/app/src/main/res/drawable/ic_apps.xml
index b8c4ab12e..b800b1743 100644
--- a/app/src/main/res/drawable/ic_apps.xml
+++ b/app/src/main/res/drawable/ic_apps.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
index 2d68f797b..5ed19d5fd 100644
--- a/app/src/main/res/drawable/ic_arrow_back.xml
+++ b/app/src/main/res/drawable/ic_arrow_back.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_arrow_drop_down.xml b/app/src/main/res/drawable/ic_arrow_drop_down.xml
index 270637216..da5d30807 100644
--- a/app/src/main/res/drawable/ic_arrow_drop_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_drop_down.xml
@@ -1,9 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_arrow_drop_up.xml b/app/src/main/res/drawable/ic_arrow_drop_up.xml
index fdc9dcf8d..df4199d18 100644
--- a/app/src/main/res/drawable/ic_arrow_drop_up.xml
+++ b/app/src/main/res/drawable/ic_arrow_drop_up.xml
@@ -1,9 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_art_track.xml b/app/src/main/res/drawable/ic_art_track.xml
index abfdc203a..7e61e1044 100644
--- a/app/src/main/res/drawable/ic_art_track.xml
+++ b/app/src/main/res/drawable/ic_art_track.xml
@@ -1,5 +1,10 @@
-
-
+
+
diff --git a/app/src/main/res/drawable/ic_asterisk.xml b/app/src/main/res/drawable/ic_asterisk.xml
index 840682fee..df7c4b32c 100644
--- a/app/src/main/res/drawable/ic_asterisk.xml
+++ b/app/src/main/res/drawable/ic_asterisk.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_attach_money.xml b/app/src/main/res/drawable/ic_attach_money.xml
index dd93a7599..b2c0f5c36 100644
--- a/app/src/main/res/drawable/ic_attach_money.xml
+++ b/app/src/main/res/drawable/ic_attach_money.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_backup.xml b/app/src/main/res/drawable/ic_backup.xml
index 200bb7081..cf996d197 100644
--- a/app/src/main/res/drawable/ic_backup.xml
+++ b/app/src/main/res/drawable/ic_backup.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_bookmark.xml b/app/src/main/res/drawable/ic_bookmark.xml
index 5bf2e951c..32cd107f7 100644
--- a/app/src/main/res/drawable/ic_bookmark.xml
+++ b/app/src/main/res/drawable/ic_bookmark.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_brightness_high.xml b/app/src/main/res/drawable/ic_brightness_high.xml
index 1ff2d2e26..d613ed523 100644
--- a/app/src/main/res/drawable/ic_brightness_high.xml
+++ b/app/src/main/res/drawable/ic_brightness_high.xml
@@ -1,9 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_brightness_low.xml b/app/src/main/res/drawable/ic_brightness_low.xml
index 1a00ce2dd..498a67ec0 100644
--- a/app/src/main/res/drawable/ic_brightness_low.xml
+++ b/app/src/main/res/drawable/ic_brightness_low.xml
@@ -1,9 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_brightness_medium.xml b/app/src/main/res/drawable/ic_brightness_medium.xml
index 853e219bd..1f3952586 100644
--- a/app/src/main/res/drawable/ic_brightness_medium.xml
+++ b/app/src/main/res/drawable/ic_brightness_medium.xml
@@ -1,9 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_bug_report.xml b/app/src/main/res/drawable/ic_bug_report.xml
index 206702ff2..c7c44ccb2 100644
--- a/app/src/main/res/drawable/ic_bug_report.xml
+++ b/app/src/main/res/drawable/ic_bug_report.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_campaign.xml b/app/src/main/res/drawable/ic_campaign.xml
index 4a0e2ddbb..a368f50f6 100644
--- a/app/src/main/res/drawable/ic_campaign.xml
+++ b/app/src/main/res/drawable/ic_campaign.xml
@@ -1,6 +1,7 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_child_care.xml b/app/src/main/res/drawable/ic_child_care.xml
index 25a51bb23..5d2ac1665 100644
--- a/app/src/main/res/drawable/ic_child_care.xml
+++ b/app/src/main/res/drawable/ic_child_care.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index f50fd991b..1d5133364 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_cloud_download.xml b/app/src/main/res/drawable/ic_cloud_download.xml
index aa051b25d..79c7db8e3 100644
--- a/app/src/main/res/drawable/ic_cloud_download.xml
+++ b/app/src/main/res/drawable/ic_cloud_download.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_comment.xml b/app/src/main/res/drawable/ic_comment.xml
index 7361b7fa6..4bc124a81 100644
--- a/app/src/main/res/drawable/ic_comment.xml
+++ b/app/src/main/res/drawable/ic_comment.xml
@@ -1,5 +1,10 @@
-
-
+
+
diff --git a/app/src/main/res/drawable/ic_computer.xml b/app/src/main/res/drawable/ic_computer.xml
index 04eb86a51..6b0e79313 100644
--- a/app/src/main/res/drawable/ic_computer.xml
+++ b/app/src/main/res/drawable/ic_computer.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_crop_portrait.xml b/app/src/main/res/drawable/ic_crop_portrait.xml
index d906df150..50ce52f91 100644
--- a/app/src/main/res/drawable/ic_crop_portrait.xml
+++ b/app/src/main/res/drawable/ic_crop_portrait.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 962e03374..f38c5f130 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_description.xml b/app/src/main/res/drawable/ic_description.xml
index e7ef3d4b5..5b80cbefd 100644
--- a/app/src/main/res/drawable/ic_description.xml
+++ b/app/src/main/res/drawable/ic_description.xml
@@ -1,5 +1,10 @@
-
-
+
+
diff --git a/app/src/main/res/drawable/ic_directions_bike.xml b/app/src/main/res/drawable/ic_directions_bike.xml
index 328fbe393..b5580ee8d 100644
--- a/app/src/main/res/drawable/ic_directions_bike.xml
+++ b/app/src/main/res/drawable/ic_directions_bike.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_directions_car.xml b/app/src/main/res/drawable/ic_directions_car.xml
index b2fe8bdbd..3bfd9b4c3 100644
--- a/app/src/main/res/drawable/ic_directions_car.xml
+++ b/app/src/main/res/drawable/ic_directions_car.xml
@@ -1,8 +1,9 @@
+ android:tint="@color/defaultIconTint"
+ android:viewportWidth="24"
+ android:viewportHeight="24">