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

reorder playqueue/localPlaylist classes

Browse source
This commit is contained in:
Christian Schabesberger 2018-04-21 23:10:01 +02:00
parent bcfd8a2450
commit a099fe35d2
49 changed files with 99 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
View file

@ -48,7 +48,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.player.event.PlayerEventListener;
import org.schabi.newpipe.player.helper.LockManager;
import org.schabi.newpipe.player.helper.PlayerHelper;
import org.schabi.newpipe.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
import org.schabi.newpipe.util.ListHelper;
import org.schabi.newpipe.util.NavigationHelper;
import org.schabi.newpipe.util.ThemeHelper;

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

@ -69,9 +69,9 @@ import org.schabi.newpipe.player.playback.BasePlayerMediaSession;
import org.schabi.newpipe.player.playback.CustomTrackSelector;
import org.schabi.newpipe.player.playback.MediaSourceManager;
import org.schabi.newpipe.player.playback.PlaybackListener;
import org.schabi.newpipe.playqueue.PlayQueue;
import org.schabi.newpipe.playqueue.PlayQueueAdapter;
import org.schabi.newpipe.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.PlayQueue;
import org.schabi.newpipe.player.playqueue.PlayQueueAdapter;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
import org.schabi.newpipe.util.SerializedCache;
import java.io.IOException;

8
app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
View file

@ -62,10 +62,10 @@ import org.schabi.newpipe.extractor.stream.VideoStream;
import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
import org.schabi.newpipe.player.helper.PlaybackParameterDialog;
import org.schabi.newpipe.player.helper.PlayerHelper;
import org.schabi.newpipe.playqueue.PlayQueueItem;
import org.schabi.newpipe.playqueue.PlayQueueItemBuilder;
import org.schabi.newpipe.playqueue.PlayQueueItemHolder;
import org.schabi.newpipe.playqueue.PlayQueueItemTouchCallback;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.PlayQueueItemBuilder;
import org.schabi.newpipe.player.playqueue.PlayQueueItemHolder;
import org.schabi.newpipe.player.playqueue.PlayQueueItemTouchCallback;
import org.schabi.newpipe.util.AnimationUtils;
import org.schabi.newpipe.util.ListHelper;
import org.schabi.newpipe.util.NavigationHelper;

2
app/src/main/java/org/schabi/newpipe/player/PlayerState.java
View file

@ -7,7 +7,7 @@ import android.util.Log;
import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
import org.schabi.newpipe.playqueue.PlayQueue;
import org.schabi.newpipe.player.playqueue.PlayQueue;
import java.io.Serializable;

2
app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
View file

@ -64,7 +64,7 @@ import org.schabi.newpipe.player.event.PlayerEventListener;
import org.schabi.newpipe.player.helper.LockManager;
import org.schabi.newpipe.player.helper.PlayerHelper;
import org.schabi.newpipe.player.old.PlayVideoActivity;
import org.schabi.newpipe.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
import org.schabi.newpipe.util.ListHelper;
import org.schabi.newpipe.util.NavigationHelper;
import org.schabi.newpipe.util.ThemeHelper;

10
app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
View file

@ -32,11 +32,11 @@ import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
import org.schabi.newpipe.fragments.local.dialog.PlaylistAppendDialog;
import org.schabi.newpipe.player.event.PlayerEventListener;
import org.schabi.newpipe.player.helper.PlaybackParameterDialog;
import org.schabi.newpipe.playqueue.PlayQueueAdapter;
import org.schabi.newpipe.playqueue.PlayQueueItem;
import org.schabi.newpipe.playqueue.PlayQueueItemBuilder;
import org.schabi.newpipe.playqueue.PlayQueueItemHolder;
import org.schabi.newpipe.playqueue.PlayQueueItemTouchCallback;
import org.schabi.newpipe.player.playqueue.PlayQueueAdapter;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.PlayQueueItemBuilder;
import org.schabi.newpipe.player.playqueue.PlayQueueItemHolder;
import org.schabi.newpipe.player.playqueue.PlayQueueItemTouchCallback;
import org.schabi.newpipe.util.Localization;
import org.schabi.newpipe.util.NavigationHelper;
import org.schabi.newpipe.util.ThemeHelper;

2
app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
View file

@ -68,7 +68,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.extractor.stream.StreamType;
import org.schabi.newpipe.extractor.stream.VideoStream;
import org.schabi.newpipe.player.helper.PlayerHelper;
import org.schabi.newpipe.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
import org.schabi.newpipe.util.AnimationUtils;
import org.schabi.newpipe.util.ListHelper;

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

@ -24,9 +24,9 @@ import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
import org.schabi.newpipe.extractor.stream.SubtitlesFormat;
import org.schabi.newpipe.extractor.stream.VideoStream;
import org.schabi.newpipe.playqueue.PlayQueue;
import org.schabi.newpipe.playqueue.PlayQueueItem;
import org.schabi.newpipe.playqueue.SinglePlayQueue;
import org.schabi.newpipe.player.playqueue.PlayQueue;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
import java.text.DecimalFormat;
import java.text.NumberFormat;

2
app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java
View file

@ -7,7 +7,7 @@ import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.source.MediaPeriod;
import com.google.android.exoplayer2.upstream.Allocator;
import org.schabi.newpipe.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
import java.io.IOException;

2
app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java
View file

@ -7,7 +7,7 @@ import com.google.android.exoplayer2.source.MediaPeriod;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.upstream.Allocator;
import org.schabi.newpipe.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
import java.io.IOException;

2
app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java
View file

@ -4,7 +4,7 @@ import android.support.annotation.NonNull;
import com.google.android.exoplayer2.source.MediaSource;
import org.schabi.newpipe.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
public interface ManagedMediaSource extends MediaSource {
/**

2
app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java
View file

@ -6,7 +6,7 @@ import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.source.MediaPeriod;
import com.google.android.exoplayer2.upstream.Allocator;
import org.schabi.newpipe.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
import java.io.IOException;

2
app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java
View file

@ -5,7 +5,7 @@ import android.support.v4.media.MediaDescriptionCompat;
import org.schabi.newpipe.player.BasePlayer;
import org.schabi.newpipe.player.mediasession.MediaSessionCallback;
import org.schabi.newpipe.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
public class BasePlayerMediaSession implements MediaSessionCallback {
private BasePlayer player;

14
app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
View file

@ -16,12 +16,12 @@ import org.schabi.newpipe.player.mediasource.LoadedMediaSource;
import org.schabi.newpipe.player.mediasource.ManagedMediaSource;
import org.schabi.newpipe.player.mediasource.ManagedMediaSourcePlaylist;
import org.schabi.newpipe.player.mediasource.PlaceholderMediaSource;
import org.schabi.newpipe.playqueue.PlayQueue;
import org.schabi.newpipe.playqueue.PlayQueueItem;
import org.schabi.newpipe.playqueue.events.MoveEvent;
import org.schabi.newpipe.playqueue.events.PlayQueueEvent;
import org.schabi.newpipe.playqueue.events.RemoveEvent;
import org.schabi.newpipe.playqueue.events.ReorderEvent;
import org.schabi.newpipe.player.playqueue.PlayQueue;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.events.MoveEvent;
import org.schabi.newpipe.player.playqueue.events.PlayQueueEvent;
import org.schabi.newpipe.player.playqueue.events.RemoveEvent;
import org.schabi.newpipe.player.playqueue.events.ReorderEvent;
import org.schabi.newpipe.util.ServiceHelper;
import java.util.ArrayList;
@ -45,7 +45,7 @@ import io.reactivex.subjects.PublishSubject;
import static org.schabi.newpipe.player.mediasource.FailedMediaSource.MediaSourceResolutionException;
import static org.schabi.newpipe.player.mediasource.FailedMediaSource.StreamInfoLoadException;
import static org.schabi.newpipe.playqueue.PlayQueue.DEBUG;
import static org.schabi.newpipe.player.playqueue.PlayQueue.DEBUG;
public class MediaSourceManager {
@NonNull private final String TAG = "MediaSourceManager@" + hashCode();

2
app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java
View file

@ -6,7 +6,7 @@ import android.support.annotation.Nullable;
import com.google.android.exoplayer2.source.MediaSource;
import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
import java.util.List;

2
app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue;
package org.schabi.newpipe.player.playqueue;
import android.util.Log;

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

@ -1,6 +1,6 @@
package org.schabi.newpipe.playqueue;
package org.schabi.newpipe.player.playqueue;
import org.schabi.newpipe.extractor.InfoItem;
import org.schabi.newpipe.extractor.channel.ChannelInfo;
import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;

20
app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue;
package org.schabi.newpipe.player.playqueue;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -6,15 +6,15 @@ import android.util.Log;
import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription;
import org.schabi.newpipe.playqueue.events.AppendEvent;
import org.schabi.newpipe.playqueue.events.ErrorEvent;
import org.schabi.newpipe.playqueue.events.InitEvent;
import org.schabi.newpipe.playqueue.events.MoveEvent;
import org.schabi.newpipe.playqueue.events.PlayQueueEvent;
import org.schabi.newpipe.playqueue.events.RecoveryEvent;
import org.schabi.newpipe.playqueue.events.RemoveEvent;
import org.schabi.newpipe.playqueue.events.ReorderEvent;
import org.schabi.newpipe.playqueue.events.SelectEvent;
import org.schabi.newpipe.player.playqueue.events.AppendEvent;
import org.schabi.newpipe.player.playqueue.events.ErrorEvent;
import org.schabi.newpipe.player.playqueue.events.InitEvent;
import org.schabi.newpipe.player.playqueue.events.MoveEvent;
import org.schabi.newpipe.player.playqueue.events.PlayQueueEvent;
import org.schabi.newpipe.player.playqueue.events.RecoveryEvent;
import org.schabi.newpipe.player.playqueue.events.RemoveEvent;
import org.schabi.newpipe.player.playqueue.events.ReorderEvent;
import org.schabi.newpipe.player.playqueue.events.SelectEvent;
import java.io.Serializable;
import java.util.ArrayList;

14
app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue;
package org.schabi.newpipe.player.playqueue;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
@ -8,12 +8,12 @@ import android.view.View;
import android.view.ViewGroup;
import org.schabi.newpipe.R;
import org.schabi.newpipe.playqueue.events.AppendEvent;
import org.schabi.newpipe.playqueue.events.ErrorEvent;
import org.schabi.newpipe.playqueue.events.MoveEvent;
import org.schabi.newpipe.playqueue.events.PlayQueueEvent;
import org.schabi.newpipe.playqueue.events.RemoveEvent;
import org.schabi.newpipe.playqueue.events.SelectEvent;
import org.schabi.newpipe.player.playqueue.events.AppendEvent;
import org.schabi.newpipe.player.playqueue.events.ErrorEvent;
import org.schabi.newpipe.player.playqueue.events.MoveEvent;
import org.schabi.newpipe.player.playqueue.events.PlayQueueEvent;
import org.schabi.newpipe.player.playqueue.events.RemoveEvent;
import org.schabi.newpipe.player.playqueue.events.SelectEvent;
import java.util.List;

2
app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue;
package org.schabi.newpipe.player.playqueue;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;

2
app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue;
package org.schabi.newpipe.player.playqueue;
import android.content.Context;
import android.text.TextUtils;

2
app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue;
package org.schabi.newpipe.player.playqueue;
import android.support.v7.widget.RecyclerView;
import android.view.View;

2
app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue;
package org.schabi.newpipe.player.playqueue;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.helper.ItemTouchHelper;

3
app/src/main/java/org/schabi/newpipe/player/playqueue/PlaylistPlayQueue.java
View file

@ -1,6 +1,5 @@
package org.schabi.newpipe.playqueue;
package org.schabi.newpipe.player.playqueue;
import org.schabi.newpipe.extractor.InfoItem;
import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;

2
app/src/main/java/org/schabi/newpipe/player/playqueue/SinglePlayQueue.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue;
package org.schabi.newpipe.player.playqueue;
import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;

299
app/src/main/java/org/schabi/newpipe/player/playqueue/StatisticsPlaylistFragment.java
View file

@ -1,299 +0,0 @@
package org.schabi.newpipe.playqueue;
import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription;
import org.schabi.newpipe.R;
import org.schabi.newpipe.database.LocalItem;
import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
import org.schabi.newpipe.fragments.local.BaseLocalListFragment;
import org.schabi.newpipe.local.history.HistoryRecordManager;
import org.schabi.newpipe.info_list.InfoItemDialog;
import org.schabi.newpipe.report.UserAction;
import org.schabi.newpipe.util.NavigationHelper;
import org.schabi.newpipe.util.OnClickGesture;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import icepick.State;
import io.reactivex.android.schedulers.AndroidSchedulers;
public abstract class StatisticsPlaylistFragment
extends BaseLocalListFragment<List<StreamStatisticsEntry>, Void> {
private View headerPlayAllButton;
private View headerPopupButton;
private View headerBackgroundButton;
@State
protected Parcelable itemsListState;
/* Used for independent events */
private Subscription databaseSubscription;
private HistoryRecordManager recordManager;
///////////////////////////////////////////////////////////////////////////
// Abstracts
///////////////////////////////////////////////////////////////////////////
protected abstract String getName();
protected abstract List<StreamStatisticsEntry> processResult(final List<StreamStatisticsEntry> results);
///////////////////////////////////////////////////////////////////////////
// Fragment LifeCycle - Creation
///////////////////////////////////////////////////////////////////////////
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
recordManager = new HistoryRecordManager(getContext());
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater,
@Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_playlist, container, false);
}
///////////////////////////////////////////////////////////////////////////
// Fragment LifeCycle - Views
///////////////////////////////////////////////////////////////////////////
@Override
protected void initViews(View rootView, Bundle savedInstanceState) {
super.initViews(rootView, savedInstanceState);
setTitle(getName());
}
@Override
protected View getListHeader() {
final View headerRootLayout = activity.getLayoutInflater().inflate(R.layout.playlist_control,
itemsList, false);
headerPlayAllButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_all_button);
headerPopupButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_popup_button);
headerBackgroundButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_bg_button);
return headerRootLayout;
}
@Override
protected void initListeners() {
super.initListeners();
itemListAdapter.setSelectedListener(new OnClickGesture<LocalItem>() {
@Override
public void selected(LocalItem selectedItem) {
if (selectedItem instanceof StreamStatisticsEntry) {
final StreamStatisticsEntry item = (StreamStatisticsEntry) selectedItem;
NavigationHelper.openVideoDetailFragment(getFragmentManager(),
item.serviceId, item.url, item.title);
}
}
@Override
public void held(LocalItem selectedItem) {
if (selectedItem instanceof StreamStatisticsEntry) {
showStreamDialog((StreamStatisticsEntry) selectedItem);
}
}
});
}
///////////////////////////////////////////////////////////////////////////
// Fragment LifeCycle - Loading
///////////////////////////////////////////////////////////////////////////
@Override
public void startLoading(boolean forceLoad) {
super.startLoading(forceLoad);
recordManager.getStreamStatistics()
.observeOn(AndroidSchedulers.mainThread())
.subscribe(getHistoryObserver());
}
///////////////////////////////////////////////////////////////////////////
// Fragment LifeCycle - Destruction
///////////////////////////////////////////////////////////////////////////
@Override
public void onPause() {
super.onPause();
itemsListState = itemsList.getLayoutManager().onSaveInstanceState();
}
@Override
public void onDestroyView() {
super.onDestroyView();
if (itemListAdapter != null) itemListAdapter.unsetSelectedListener();
if (headerBackgroundButton != null) headerBackgroundButton.setOnClickListener(null);
if (headerPlayAllButton != null) headerPlayAllButton.setOnClickListener(null);
if (headerPopupButton != null) headerPopupButton.setOnClickListener(null);
if (databaseSubscription != null) databaseSubscription.cancel();
databaseSubscription = null;
}
@Override
public void onDestroy() {
super.onDestroy();
recordManager = null;
itemsListState = null;
}
///////////////////////////////////////////////////////////////////////////
// Statistics Loader
///////////////////////////////////////////////////////////////////////////
private Subscriber<List<StreamStatisticsEntry>> getHistoryObserver() {
return new Subscriber<List<StreamStatisticsEntry>>() {
@Override
public void onSubscribe(Subscription s) {
showLoading();
if (databaseSubscription != null) databaseSubscription.cancel();
databaseSubscription = s;
databaseSubscription.request(1);
}
@Override
public void onNext(List<StreamStatisticsEntry> streams) {
handleResult(streams);
if (databaseSubscription != null) databaseSubscription.request(1);
}
@Override
public void onError(Throwable exception) {
StatisticsPlaylistFragment.this.onError(exception);
}
@Override
public void onComplete() {
}
};
}
@Override
public void handleResult(@NonNull List<StreamStatisticsEntry> result) {
super.handleResult(result);
if (itemListAdapter == null) return;
itemListAdapter.clearStreamItemList();
if (result.isEmpty()) {
showEmptyState();
return;
}
itemListAdapter.addItems(processResult(result));
if (itemsListState != null) {
itemsList.getLayoutManager().onRestoreInstanceState(itemsListState);
itemsListState = null;
}
headerPlayAllButton.setOnClickListener(view ->
NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
headerPopupButton.setOnClickListener(view ->
NavigationHelper.playOnPopupPlayer(activity, getPlayQueue()));
headerBackgroundButton.setOnClickListener(view ->
NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue()));
hideLoading();
}
///////////////////////////////////////////////////////////////////////////
// Fragment Error Handling
///////////////////////////////////////////////////////////////////////////
@Override
protected void resetFragment() {
super.resetFragment();
if (databaseSubscription != null) databaseSubscription.cancel();
}
@Override
protected boolean onError(Throwable exception) {
if (super.onError(exception)) return true;
onUnrecoverableError(exception, UserAction.SOMETHING_ELSE,
"none", "History Statistics", R.string.general_error);
return true;
}
/*//////////////////////////////////////////////////////////////////////////
// Utils
//////////////////////////////////////////////////////////////////////////*/
private void showStreamDialog(final StreamStatisticsEntry item) {
final Context context = getContext();
final Activity activity = getActivity();
if (context == null || context.getResources() == null || getActivity() == null) return;
final StreamInfoItem infoItem = item.toStreamInfoItem();
final String[] commands = new String[]{
context.getResources().getString(R.string.enqueue_on_background),
context.getResources().getString(R.string.enqueue_on_popup),
context.getResources().getString(R.string.start_here_on_main),
context.getResources().getString(R.string.start_here_on_background),
context.getResources().getString(R.string.start_here_on_popup),
};
final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
final int index = Math.max(itemListAdapter.getItemsList().indexOf(item), 0);
switch (i) {
case 0:
NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(infoItem));
break;
case 1:
NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(infoItem));
break;
case 2:
NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
break;
case 3:
NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
break;
case 4:
NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
break;
default:
break;
}
};
new InfoItemDialog(getActivity(), infoItem, commands, actions).show();
}
private PlayQueue getPlayQueue() {
return getPlayQueue(0);
}
private PlayQueue getPlayQueue(final int index) {
if (itemListAdapter == null) {
return new SinglePlayQueue(Collections.emptyList(), 0);
}
final List<LocalItem> infoItems = itemListAdapter.getItemsList();
List<StreamInfoItem> streamInfoItems = new ArrayList<>(infoItems.size());
for (final LocalItem item : infoItems) {
if (item instanceof StreamStatisticsEntry) {
streamInfoItems.add(((StreamStatisticsEntry) item).toStreamInfoItem());
}
}
return new SinglePlayQueue(streamInfoItems, index);
}
}

2
app/src/main/java/org/schabi/newpipe/player/playqueue/events/AppendEvent.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue.events;
package org.schabi.newpipe.player.playqueue.events;
public class AppendEvent implements PlayQueueEvent {

2
app/src/main/java/org/schabi/newpipe/player/playqueue/events/ErrorEvent.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue.events;
package org.schabi.newpipe.player.playqueue.events;
public class ErrorEvent implements PlayQueueEvent {

2
app/src/main/java/org/schabi/newpipe/player/playqueue/events/InitEvent.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue.events;
package org.schabi.newpipe.player.playqueue.events;
public class InitEvent implements PlayQueueEvent {
@Override

2
app/src/main/java/org/schabi/newpipe/player/playqueue/events/MoveEvent.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue.events;
package org.schabi.newpipe.player.playqueue.events;
public class MoveEvent implements PlayQueueEvent {
final private int fromIndex;

2
app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEvent.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue.events;
package org.schabi.newpipe.player.playqueue.events;
import java.io.Serializable;

2
app/src/main/java/org/schabi/newpipe/player/playqueue/events/PlayQueueEventType.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue.events;
package org.schabi.newpipe.player.playqueue.events;
public enum PlayQueueEventType {
INIT,

2
app/src/main/java/org/schabi/newpipe/player/playqueue/events/RecoveryEvent.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue.events;
package org.schabi.newpipe.player.playqueue.events;
public class RecoveryEvent implements PlayQueueEvent {

2
app/src/main/java/org/schabi/newpipe/player/playqueue/events/RemoveEvent.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue.events;
package org.schabi.newpipe.player.playqueue.events;
public class RemoveEvent implements PlayQueueEvent {

2
app/src/main/java/org/schabi/newpipe/player/playqueue/events/ReorderEvent.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue.events;
package org.schabi.newpipe.player.playqueue.events;
public class ReorderEvent implements PlayQueueEvent {
private final int fromSelectedIndex;

2
app/src/main/java/org/schabi/newpipe/player/playqueue/events/SelectEvent.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.playqueue.events;
package org.schabi.newpipe.player.playqueue.events;
public class SelectEvent implements PlayQueueEvent {