Skip to content

Commit c70ce79

Browse files
committed
Added the duplicate indicator explanation & removed some unnecessary functions
1 parent ef4a623 commit c70ce79

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import androidx.recyclerview.widget.RecyclerView;
1212

1313
import org.schabi.newpipe.database.LocalItem;
14-
import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
1514
import org.schabi.newpipe.database.stream.model.StreamStateEntity;
1615
import org.schabi.newpipe.local.history.HistoryRecordManager;
1716
import org.schabi.newpipe.local.holder.LocalItemHolder;
@@ -345,16 +344,6 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, fina
345344
}
346345
}
347346

348-
@Override
349-
public long getItemId(final int position) {
350-
final LocalItem item = localItems.get(position);
351-
if (item != null && item.getLocalItemType() == LocalItem.LocalItemType.
352-
PLAYLIST_LOCAL_ITEM) {
353-
return ((PlaylistMetadataEntry) item).uid;
354-
}
355-
return super.getItemId(position);
356-
}
357-
358347
public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
359348
return new GridLayoutManager.SpanSizeLookup() {
360349
@Override

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public void onViewCreated(@NonNull final View view, @Nullable final Bundle saved
6161
new LocalPlaylistManager(NewPipeDatabase.getInstance(requireContext()));
6262

6363
playlistAdapter = new LocalItemListAdapter(getActivity());
64-
playlistAdapter.setHasStableIds(true);
6564
playlistAdapter.setSelectedListener(selectedItem -> {
6665
final List<StreamEntity> entities = getStreamEntities();
6766
if (selectedItem instanceof PlaylistDuplicatesEntry && entities != null) {
@@ -125,8 +124,20 @@ private void onPlaylistsReceived(@NonNull final List<PlaylistDuplicatesEntry> pl
125124
playlistAdapter.clearStreamItemList();
126125
playlistAdapter.addItems(playlists);
127126
playlistRecyclerView.setVisibility(View.VISIBLE);
127+
setDuplicateIndicatorExplanation(playlists);
128128
}
129129
}
130+
private void setDuplicateIndicatorExplanation(final List<PlaylistDuplicatesEntry> playlists) {
131+
for (final PlaylistDuplicatesEntry entry : playlists) {
132+
if (entry.timesStreamIsContained > 0) {
133+
final View indicatorExplanation = getView()
134+
.findViewById(R.id.playlist_duplicate);
135+
indicatorExplanation.setVisibility(View.VISIBLE);
136+
return;
137+
}
138+
}
139+
140+
}
130141

131142
private void onPlaylistSelected(@NonNull final LocalPlaylistManager manager,
132143
@NonNull final PlaylistDuplicatesEntry playlist,

0 commit comments

Comments
 (0)