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

-Condensed repeating entries on stream history.

Browse source 
-Changed search history to show service name and stream history to show repeat count.
-Removed history entry abstract and unused info items.
This commit is contained in:
John Zhen Mo 2018-01-28 18:26:19 -08:00
parent ee618f7911
commit cf1c6f4a6c
22 changed files with 140 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/schabi/newpipe/fragments/local/LocalItemBuilder.java
View file

@ -32,7 +32,7 @@ public class LocalItemBuilder {
private final Context context;
private ImageLoader imageLoader = ImageLoader.getInstance();
private OnCustomItemGesture<LocalItem> onSelectedListener;
private OnLocalItemGesture<LocalItem> onSelectedListener;
public LocalItemBuilder(Context context) {
this.context = context;
@ -46,11 +46,11 @@ public class LocalItemBuilder {
return imageLoader;
}
public OnCustomItemGesture<LocalItem> getOnItemSelectedListener() {
public OnLocalItemGesture<LocalItem> getOnItemSelectedListener() {
return onSelectedListener;
}
public void setOnItemSelectedListener(OnCustomItemGesture<LocalItem> listener) {
public void setOnItemSelectedListener(OnLocalItemGesture<LocalItem> listener) {
this.onSelectedListener = listener;
}
}

2
app/src/main/java/org/schabi/newpipe/fragments/local/LocalItemListAdapter.java
View file

@ -66,7 +66,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
Localization.getPreferredLocale(activity));
}
public void setSelectedListener(OnCustomItemGesture<LocalItem> listener) {
public void setSelectedListener(OnLocalItemGesture<LocalItem> listener) {
localItemBuilder.setOnItemSelectedListener(listener);
}

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

@ -151,7 +151,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
itemTouchHelper = new ItemTouchHelper(getItemTouchCallback());
itemTouchHelper.attachToRecyclerView(itemsList);
itemListAdapter.setSelectedListener(new OnCustomItemGesture<LocalItem>() {
itemListAdapter.setSelectedListener(new OnLocalItemGesture<LocalItem>() {
@Override
public void selected(LocalItem selectedItem) {
if (selectedItem instanceof PlaylistStreamEntry) {

2
app/src/main/java/org/schabi/newpipe/fragments/local/OnCustomItemGesture.java → app/src/main/java/org/schabi/newpipe/fragments/local/OnLocalItemGesture.java
View file

@ -5,7 +5,7 @@ import android.support.v7.widget.RecyclerView;
import org.schabi.newpipe.database.LocalItem;
import org.schabi.newpipe.extractor.InfoItem;
public abstract class OnCustomItemGesture<T extends LocalItem> {
public abstract class OnLocalItemGesture<T extends LocalItem> {
public abstract void selected(T selectedItem);

26
app/src/main/java/org/schabi/newpipe/fragments/local/PlaylistAppendDialog.java
View file

@ -13,15 +13,11 @@ import android.widget.Toast;
import org.schabi.newpipe.NewPipeDatabase;
import org.schabi.newpipe.R;
import org.schabi.newpipe.database.LocalItem;
import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
import org.schabi.newpipe.database.stream.model.StreamEntity;
import org.schabi.newpipe.extractor.InfoItem;
import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
import org.schabi.newpipe.info_list.InfoListAdapter;
import org.schabi.newpipe.info_list.OnInfoItemGesture;
import org.schabi.newpipe.info_list.stored.LocalPlaylistInfoItem;
import org.schabi.newpipe.playlist.PlayQueueItem;
import java.util.ArrayList;
@ -34,7 +30,7 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
private static final String TAG = PlaylistAppendDialog.class.getCanonicalName();
private RecyclerView playlistRecyclerView;
private InfoListAdapter playlistAdapter;
private LocalItemListAdapter playlistAdapter;
public static PlaylistAppendDialog fromStreamInfo(final StreamInfo info) {
PlaylistAppendDialog dialog = new PlaylistAppendDialog();
@ -69,8 +65,7 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
@Override
public void onAttach(Context context) {
super.onAttach(context);
playlistAdapter = new InfoListAdapter(getActivity());
playlistAdapter.useMiniItemVariants(true);
playlistAdapter = new LocalItemListAdapter(getActivity());
}
/*//////////////////////////////////////////////////////////////////////////
@ -97,13 +92,13 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
newPlaylistButton.setOnClickListener(ignored -> openCreatePlaylistDialog());
playlistAdapter.setOnPlaylistSelectedListener(new OnInfoItemGesture<PlaylistInfoItem>() {
playlistAdapter.setSelectedListener(new OnLocalItemGesture<LocalItem>() {
@Override
public void selected(PlaylistInfoItem selectedItem) {
if (!(selectedItem instanceof LocalPlaylistInfoItem) || getStreams() == null)
public void selected(LocalItem selectedItem) {
if (!(selectedItem instanceof PlaylistMetadataEntry) || getStreams() == null)
return;
final long playlistId = ((LocalPlaylistInfoItem) selectedItem).getPlaylistId();
final long playlistId = ((PlaylistMetadataEntry) selectedItem).uid;
final Toast successToast =
Toast.makeText(getContext(), "Added", Toast.LENGTH_SHORT);
@ -123,13 +118,8 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
return;
}
List<InfoItem> playlistInfoItems = new ArrayList<>(metadataEntries.size());
for (final PlaylistMetadataEntry metadataEntry : metadataEntries) {
playlistInfoItems.add(metadataEntry.toStoredPlaylistInfoItem());
}
playlistAdapter.clearStreamItemList();
playlistAdapter.addInfoItemList(playlistInfoItems);
playlistAdapter.addInfoItemList(metadataEntries);
playlistRecyclerView.setVisibility(View.VISIBLE);
});
}

4
app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/BookmarkFragment.java
View file

@ -22,7 +22,7 @@ import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
import org.schabi.newpipe.fragments.BaseStateFragment;
import org.schabi.newpipe.fragments.local.LocalItemListAdapter;
import org.schabi.newpipe.fragments.local.LocalPlaylistManager;
import org.schabi.newpipe.fragments.local.OnCustomItemGesture;
import org.schabi.newpipe.fragments.local.OnLocalItemGesture;
import org.schabi.newpipe.report.UserAction;
import org.schabi.newpipe.util.NavigationHelper;
@ -136,7 +136,7 @@ public class BookmarkFragment extends BaseStateFragment<List<PlaylistMetadataEnt
protected void initListeners() {
super.initListeners();
itemListAdapter.setSelectedListener(new OnCustomItemGesture<LocalItem>() {
itemListAdapter.setSelectedListener(new OnLocalItemGesture<LocalItem>() {
@Override
public void selected(LocalItem selectedItem) {
// Requires the parent fragment to find holder for fragment replacement

4
app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/StatisticsPlaylistFragment.java
View file

@ -18,7 +18,7 @@ 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.fragments.local.OnCustomItemGesture;
import org.schabi.newpipe.fragments.local.OnLocalItemGesture;
import org.schabi.newpipe.history.HistoryRecordManager;
import org.schabi.newpipe.info_list.InfoItemDialog;
import org.schabi.newpipe.playlist.PlayQueue;
@ -122,7 +122,7 @@ public abstract class StatisticsPlaylistFragment
protected void initListeners() {
super.initListeners();
itemListAdapter.setSelectedListener(new OnCustomItemGesture<LocalItem>() {
itemListAdapter.setSelectedListener(new OnLocalItemGesture<LocalItem>() {
@Override
public void selected(LocalItem selectedItem) {
if (selectedItem instanceof StreamStatisticsEntry) {